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

Some style work. Move countdown to message portlet.

Browse Source
This commit is contained in:
Emanuel Schuetze 2012-04-14 17:50:31 +02:00
parent fc5b738b87
commit ad1e87cd99
3 changed files with 22 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openslides/projector/static/styles/projector-control.css
View File

@ -9,7 +9,7 @@
padding-bottom: 0px; padding-bottom: 0px;
} }
.portlet { .portlet {
margin: 0 1em 1em 0; margin: 0 10px 10px 0;
} }
.portlet-header { .portlet-header {
margin: 0.3em; margin: 0.3em;

46
openslides/projector/templates/projector/control.html
View File

@ -34,22 +34,7 @@
{% block content %} {% block content %}
<h1>{% trans 'Projector' %}</h1> <h1>{% trans 'Projector' %}</h1>
<div style="text-align: right; padding: 0 5px 5px 0; margin-top:-20px;"> <div style="text-align: right; padding: 0 10px 5px 0; margin-top:-20px;">
<!-- countdown -->
<input type="checkbox" name="countdown" onchange="document.location='{% if countdown_visible %}{% url countdown_close %}{% else %}{% url countdown_open %}{% endif %}'"{% if countdown_visible %} checked{% endif %}>
{% trans "Countdown" %} (<a href="{% url config_agenda %}">{{countdown_time}}{% trans "sec" %}</a>)
{% if countdown_visible %}:
<a class="projector_countdown" href="{% url countdown_reset %}" title="{% trans 'Reset countdown' %}">
<img src="{% static 'images/icons/media-skip-backward.png' %}" />
</a>
<a class="projector_countdown" href="{% url countdown_start %}" title="{% trans 'Start countdown' %}">
<img src="{% static 'images/icons/media-playback-start.png' %}" />
</a>
<a class="projector_countdown" href="{% url countdown_stop %}" title="{% trans 'Stop countdown' %}">
<img src="{% static 'images/icons/media-playback-pause.png' %}" />
</a>
{% endif %}
<p></p>
<!-- projector control --> <!-- projector control -->
{% trans "Adjust projector view" %}: {% trans "Adjust projector view" %}:
<a class="projector_edit" href="{% url projector_bigger %}" title="{% trans 'Zoom in' %}"> <a class="projector_edit" href="{% url projector_bigger %}" title="{% trans 'Zoom in' %}">
@ -112,9 +97,11 @@
{% trans "Projector Live View" %} {% trans "Projector Live View" %}
</div> </div>
<div class="portlet-content"> <div class="portlet-content">
<a href="{% url projector_show %}" target="_blank" title="{% trans 'Open Projector view' %}" >
<div id="iframewrapper"> <div id="iframewrapper">
<iframe id="iframe" src="{% url projector_show %}"></iframe> <iframe id="iframe" src="{% url projector_show %}"></iframe>
</div> </div>
</a>
</div> </div>
</div> <!-- end portlet--> </div> <!-- end portlet-->
@ -122,7 +109,7 @@
{% for category, slides in categories.items %} {% for category, slides in categories.items %}
{% if category == 'projector' %} {% if category == 'projector' %}
<div class="portlet"> <div class="portlet">
<div class="portlet-header">{{ category }}</div> <div class="portlet-header">{% trans "Static Slides" %}</div>
<div class="portlet-content"> <div class="portlet-content">
{% for slide in slides %} {% for slide in slides %}
{% if slide.model_slide %} {% if slide.model_slide %}
@ -162,19 +149,24 @@
<ul> <ul>
{% for message in projector_messages %} {% for message in projector_messages %}
<li> <li>
<input type="checkbox" name="{{ message }}"{% if message.active %} checked="checked"{% endif %}> {{ message }} <input type="checkbox" name="{{ message }}" onchange="submit()"
{% if message.active %} checked="checked"{% endif %}> {{ message }}
{% if message.def_name == "Countdown" %}
|
<a href="{% url config_agenda %}">{{countdown_time}}{% trans "sec" %}</a>
<a class="projector_countdown" href="{% url countdown_reset %}" title="{% trans 'Reset countdown' %}">
<img src="{% static 'images/icons/media-skip-backward.png' %}" />
</a>
<a class="projector_countdown" href="{% url countdown_start %}" title="{% trans 'Start countdown' %}">
<img src="{% static 'images/icons/media-playback-start.png' %}" />
</a>
<a class="projector_countdown" href="{% url countdown_stop %}" title="{% trans 'Stop countdown' %}">
<img src="{% static 'images/icons/media-playback-pause.png' %}" />
</a>
{% endif %}
</li> </li>
{% endfor %} {% endfor %}
</ul> </ul>
<button class="button" type="submit">
<span class="icon ok">{%trans 'Save' %}</span>
</button>
<button class="button" type="submit" name="apply">
<span class="icon apply">{%trans 'Apply' %}</span>
</button>
<button class="button" type="button" onclick="window.location='{% url projector_control %}'">
<span class="icon cancel">{%trans 'Cancel' %}</span>
</button>
</form> </form>
</ul> </ul>
</div> </div>

2
openslides/static/styles/base.css
View File

@ -46,7 +46,7 @@ body {
position:absolute; position:absolute;
font-size:10px; font-size:10px;
top:10px; top:10px;
right:10px; right:20px;
} }
#header_userprofile li { #header_userprofile li {
float:right; float:right;