ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed #675: CSS for list of speakers slide and overlay

Browse Source
This commit is contained in:
Norman Jäckel 2013-05-24 00:52:09 +02:00
parent 00910b218e
commit 6566a2897c
3 changed files with 47 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
openslides/agenda/static/styles/agenda.css
View File

@ -23,54 +23,7 @@ table#agendatime td {
}
/*** List of speakers ***/
/* List of speakers - projector slide */
ul#list_of_speakers {
list-style-type: none;
padding: 0;
}
#list_of_speakers li {
font-size: 130%;
line-height: 150%;
}
#list_of_speakers .old_speaker {
color: #9FA9B7;
}
#list_of_speakers .actual_speaker {
font-weight: bold;
margin-bottom: 0.5em;
}
/* List of speakers - overlay */
#overlay_list_of_speaker_box {
position: fixed;
bottom: 0;
right: 0;
border-radius: 0.4em;
border: 0.1em solid #777777;
background-color: #cccccc;
opacity: 0.9;
padding: 1em;
margin: 1em;
z-index: 2;
width: 45%;
min-width: 200px;
}
#overlay_list_of_speaker_box h3 {
margin: 5px;
}
#overlay_list_of_speaker_box ul {
margin: 5px;
}
#overlay_list_of_speaker_box li {
font-size: 120%;
line-height: 120%;
}
#overlay_list_of_speaker_box .old_speaker {
color: #777777;
}
#overlay_list_of_speaker_box .actual_speaker {
margin-bottom: 0em;
}
/* List of speakers - agenda item view */
/* List of speakers – agenda item view */
div#complete_list_of_speakers li {
list-style-type: none;
}

28
openslides/agenda/templates/agenda/overlay_speaker_projector.html
View File

@ -1,6 +1,34 @@
{% load i18n %}
{% load tags %}
<style type="text/css">
/* List of speakers – overlay */
#overlay_list_of_speaker_box {
position: fixed;
bottom: 0;
right: 0;
border-radius: 0.4em;
border: 0.1em solid #777777;
background-color: #cccccc;
opacity: 0.9;
padding: 1em;
margin: 1em;
z-index: 2;
width: 45%;
min-width: 200px}
#overlay_list_of_speaker_box h3 {
margin: 5px}
#overlay_list_of_speaker_box ul {
margin: 5px}
#overlay_list_of_speaker_box li {
font-size: 120%;
line-height: 120%}
#overlay_list_of_speaker_box .old_speaker {
color: #777777}
#overlay_list_of_speaker_box .actual_speaker {
margin-bottom: 0em}
</style>
<div id="overlay_list_of_speaker_box">
<h3>{% trans "List of speakers" %} {% if closed %}(<span class="closed">{% trans 'closed' %}</span>){% endif %}</h3>
{% if list_of_speakers %}

19
openslides/agenda/templates/projector/agenda_list_of_speaker.html
View File

@ -5,6 +5,23 @@
{% block title %}{{ block.super }} – {{ item }}{% endblock %}
{% block header %}
<style type="text/css">
/* List of speakers – projector slide */
ul#list_of_speakers {
list-style-type: none;
padding: 0}
#list_of_speakers li {
font-size: 130%;
line-height: 150%}
#list_of_speakers .old_speaker {
color: #9FA9B7}
#list_of_speakers .actual_speaker {
font-weight: bold;
margin-bottom: 0.5em}
</style>
{% endblock %}
{% block content %}
<h1>{{ title }}</h1>
<h2 style="margin-top: -10px;">
@ -18,7 +35,7 @@
{% if list_of_speakers %}
<ul id="list_of_speakers">
{% for speaker_dict in list_of_speakers %}
<li class="{{speaker_dict.type}}"> {#o ld_speaker, actual_speaker, coming_speaker #}
<li class="{{ speaker_dict.type }}"> {# old_speaker, actual_speaker, coming_speaker #}
{% if speaker_dict.type == 'coming_speaker' %}
{{ speaker_dict.prefix }}.
{% endif %}