Automated merge with ssh://openslides.org/openslides
@ -1,6 +1,6 @@
|
||||
/* agenda item open/closed */
|
||||
a.close_link span {
|
||||
background-image: url(../images/icons/task-complete-grey.png);
|
||||
background-image: url(../images/icons/done-grey.png);
|
||||
background-repeat: no-repeat;
|
||||
background-position: center;
|
||||
width: 16px;
|
||||
@ -8,5 +8,5 @@ a.close_link span {
|
||||
display: inline-block;
|
||||
}
|
||||
a.close_link.closed span {
|
||||
background-image: url(../images/icons/task-complete.png);
|
||||
background-image: url(../images/icons/done.png);
|
||||
}
|
||||
|
@ -7,7 +7,7 @@
|
||||
<span></span>
|
||||
</a>
|
||||
{% elif item.closed %}
|
||||
<img src="{% static 'images/icons/task-complete.png' %}" title="{% trans 'Item closed' %}">
|
||||
<img src="{% static 'images/icons/done.png' %}" title="{% trans 'Item closed' %}">
|
||||
{% endif %}
|
||||
</td>
|
||||
<td>
|
||||
@ -29,7 +29,7 @@
|
||||
{% endif %}
|
||||
{% if perms.agenda.can_manage_agenda %}
|
||||
<a href="{% url item_edit item.id %}"><img src="{% static 'images/icons/edit.png' %}" title="{% trans 'Edit item' %}"></a>
|
||||
<a href="{% url item_delete item.id %}"><img src="{% static 'images/icons/edit-delete.png' %}" title="{% trans 'Delete item' %}"></a>
|
||||
<a href="{% url item_delete item.id %}"><img src="{% static 'images/icons/delete.png' %}" title="{% trans 'Delete item' %}"></a>
|
||||
{% endif %}
|
||||
</span>
|
||||
</td>
|
||||
|
@ -45,9 +45,9 @@
|
||||
<li><a href="{% url print_application application.id %}"><img src="{% static 'images/icons/pdf.png' %}"> {%trans 'Application as PDF' %}</a></li>
|
||||
{# activate and polls #}
|
||||
{% if perms.projector.can_manage_projector %}
|
||||
<li><a href="{% url projector_activate_slide application.sid %}"><img src="{% static 'images/icons/video-projector.png' %}"> {%trans 'Show Application' %}</a></li>
|
||||
<li><a href="{% url projector_activate_slide application.sid %}"><img src="{% static 'images/icons/projector.png' %}"> {%trans 'Show Application' %}</a></li>
|
||||
{% if "genpoll" in actions %}
|
||||
<li><a href='{% url application_gen_poll application.id %}'><img src="{% static 'images/icons/view-statistics.png' %}"> {%trans 'New vote' %}</a></li>
|
||||
<li><a href='{% url application_gen_poll application.id %}'><img src="{% static 'images/icons/statistics.png' %}"> {%trans 'New vote' %}</a></li>
|
||||
{% endif %}
|
||||
{% for poll in application.polls %}
|
||||
{% url application_poll_view poll.id as url_applicationpollview %}
|
||||
|
@ -68,8 +68,8 @@
|
||||
</a>
|
||||
{% endif %}
|
||||
{% if perms.application.can_manage_application %}
|
||||
<a href="{% url application_edit application.id %}"><img src="{% static 'images/icons/document-edit.png' %}" title="{% trans 'Edit application' %}"></a>
|
||||
<a href="#"><img src="{% static 'images/icons/edit-delete.png' %}" title="{% trans 'Delete application' %}"></a>
|
||||
<a href="{% url application_edit application.id %}"><img src="{% static 'images/icons/edit.png' %}" title="{% trans 'Edit application' %}"></a>
|
||||
<a href="#"><img src="{% static 'images/icons/delete.png' %}" title="{% trans 'Delete application' %}"></a>
|
||||
{% endif %}
|
||||
<a href="{% url print_application application.id %}" title="{%trans 'Application as PDF' %}"><img src="{% static 'pdf.png' %}"></a>
|
||||
</span>
|
||||
|
@ -50,7 +50,7 @@
|
||||
{% if perms.application.can_manage_application %}
|
||||
{% if "genpoll" in actions %}
|
||||
<a href='{% url application_gen_poll application.id %}'>
|
||||
<span class="button"><span class="icon poll">{%trans 'New vote' %}</span></span>
|
||||
<span class="button"><span class="icon statistics">{%trans 'New vote' %}</span></span>
|
||||
</a>
|
||||
{% else %}
|
||||
-
|
||||
@ -68,7 +68,7 @@
|
||||
<b>{{ forloop.counter }}. {% trans "Vote" %}:</b>
|
||||
</a>
|
||||
<a href="{% url application_poll_delete poll.id %}">
|
||||
<img src="{% static 'images/icons/edit-delete.png' %}" title="{% trans 'Delete Vote' %}">
|
||||
<img src="{% static 'images/icons/delete.png' %}" title="{% trans 'Delete Vote' %}">
|
||||
</a>
|
||||
{% elif poll.has_votes %}
|
||||
<b>{{ forloop.counter }}. {% trans "Vote" %}:</b>
|
||||
@ -88,7 +88,7 @@
|
||||
{% if forloop.last %}
|
||||
{% if "genpoll" in actions %}
|
||||
<a href='{% url application_gen_poll application.id %}'>
|
||||
<span class="button"><span class="icon poll">{%trans 'New vote' %}</span></span>
|
||||
<span class="button"><span class="icon statistics">{%trans 'New vote' %}</span></span>
|
||||
</a>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
@ -149,7 +149,7 @@
|
||||
<a href='{% url application_permit application.id %}'><span class="button"><span class="icon ok-blue">{% trans 'Permit' %}</span></span></a>
|
||||
{% endif %}
|
||||
{% if "nop" in actions %}
|
||||
<a href='{% url application_notpermit application.id %}'><span class="button"><span class="icon stop">{% trans 'Not permit (reject)' %}</span></span></a>
|
||||
<a href='{% url application_notpermit application.id %}'><span class="button"><span class="icon reject">{% trans 'Not permit (reject)' %}</span></span></a>
|
||||
{% endif %}
|
||||
{% if "setnumber" in actions %}
|
||||
<a href='{% url application_set_number application.id %}'><span class="button"><span class="icon number">{% trans 'Set Number' %}</span></span></a>
|
||||
@ -162,7 +162,7 @@
|
||||
<h4>{% trans "Result after vote" %}:</h4>
|
||||
{% if "acc" in actions %}
|
||||
<a href='{% url application_set_status application.id 'acc' %}'>
|
||||
<span class="button"><span class="icon accept">{%trans 'Accepted' %}</span></span>
|
||||
<span class="button"><span class="icon done">{%trans 'Accepted' %}</span></span>
|
||||
</a>
|
||||
{% endif %}
|
||||
{% if "rej" in actions %}
|
||||
@ -250,17 +250,17 @@
|
||||
<td style="white-space:nowrap;">
|
||||
{% if application.status != "pub" %}
|
||||
{% if revision == application.permitted %}
|
||||
<img title="{%trans 'Version accepted' %}" src="{% static 'images/icons/task-accepted.png' %}">
|
||||
<img title="{%trans 'Version accepted' %}" src="{% static 'images/icons/accept.png' %}">
|
||||
{% else %}
|
||||
{% if perms.application.can_manage_application %}
|
||||
<a href="{% url application_version_permit revision.id %}"><img title="{%trans 'Accept Version' %}" src="{% static 'images/icons/task-accepted-grey.png' %}"></a>
|
||||
<a href="{% url application_version_permit revision.id %}"><img title="{%trans 'Accept Version' %}" src="{% static 'images/icons/accept-grey.png' %}"></a>
|
||||
{% endif %}
|
||||
{% if not revision.rejected and revision.id > application.permitted.id and perms.application.can_manage_application %}
|
||||
<a href="{% url application_version_reject revision.id %}"><img title="{%trans 'Reject Version' %}" src="{% static 'images/icons/task-reject-grey.png' %}"></a>
|
||||
<a href="{% url application_version_reject revision.id %}"><img title="{%trans 'Reject Version' %}" src="{% static 'images/icons/reject-grey.png' %}"></a>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
{% if revision.rejected %}
|
||||
<img title="{%trans 'Version rejected' %}" src="{% static 'images/icons/task-reject.png' %}">
|
||||
<img title="{%trans 'Version rejected' %}" src="{% static 'images/icons/reject.png' %}">
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
</td>
|
||||
|
@ -40,8 +40,8 @@
|
||||
</a>
|
||||
{% endif %}
|
||||
{% if perms.assignment.can_manage_assignment %}
|
||||
<a href="{% url assignment_edit assignment.id %}"><img src="{% static 'images/icons/document-edit.png' %}" title="{%trans 'Edit election' %}"></a>
|
||||
<a href="{% url assignment_delete assignment.id %}"><img src="{% static 'images/icons/edit-delete.png' %}" title="{%trans 'Delete election' %}"></a>
|
||||
<a href="{% url assignment_edit assignment.id %}"><img src="{% static 'images/icons/edit.png' %}" title="{%trans 'Edit election' %}"></a>
|
||||
<a href="{% url assignment_delete assignment.id %}"><img src="{% static 'images/icons/delete.png' %}" title="{%trans 'Delete election' %}"></a>
|
||||
{% endif %}
|
||||
<a href="{% url print_assignment assignment.id %}" title="{% trans 'Election as PDF' %}"><img src="{% static 'images/icons/pdf.png' %}"></a>
|
||||
</span>
|
||||
|
@ -64,7 +64,7 @@
|
||||
<li>{{ profile }}
|
||||
{% if perms.assignment.can_manage_assignment %}
|
||||
{% if assignment.status == "sea" or assignment.status == "vot" %}
|
||||
<a href="{% url assignment_delother assignment.id profile.id %}"><img src="{% static 'images/icons/edit-delete.png' %}" title="{% trans 'Remove candidate' %}"></a>
|
||||
<a href="{% url assignment_delother assignment.id profile.id %}"><img src="{% static 'images/icons/delete.png' %}" title="{% trans 'Remove candidate' %}"></a>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
</li>
|
||||
@ -101,7 +101,7 @@
|
||||
<label>{{ field.label }}:</label>
|
||||
<nobr>{{ field }}
|
||||
{% if perms.participant.can_see_participant and perms.participant.can_manage_participant %}
|
||||
<a href="{% url user_new %}" target="_blank"><img src="{% static 'images/icons/list-add-user.png' %}" title="{% trans 'Add new participant' %}"></a>
|
||||
<a href="{% url user_new %}" target="_blank"><img src="{% static 'images/icons/add-user.png' %}" title="{% trans 'Add new participant' %}"></a>
|
||||
{% endif %}
|
||||
</nobr>
|
||||
{% endfor %}
|
||||
@ -138,14 +138,14 @@
|
||||
</a>
|
||||
{% if poll.published %}
|
||||
<a href={% url assignment_poll_notpublish poll.id %}><img
|
||||
src="{% static 'images/icons/user-online.png' %}"
|
||||
src="{% static 'images/icons/on.png' %}"
|
||||
title="{% trans 'Unpublish results' %}"></a>
|
||||
{% else %}
|
||||
<a href={% url assignment_poll_publish poll.id %}><img
|
||||
src="{% static 'images/icons/user-offline.png' %}"
|
||||
src="{% static 'images/icons/off.png' %}"
|
||||
title="{% trans 'Publish results' %}"></a>
|
||||
{% endif %}
|
||||
<a href="{% url assignment_poll_delete poll.id %}"><img src="{% static 'images/icons/edit-delete.png' %}" title="{% trans 'Delete Poll' %}"></a>
|
||||
<a href="{% url assignment_poll_delete poll.id %}"><img src="{% static 'images/icons/delete.png' %}" title="{% trans 'Delete Poll' %}"></a>
|
||||
{% endif %}
|
||||
</th>
|
||||
{# endif #}
|
||||
@ -154,7 +154,7 @@
|
||||
<th>
|
||||
<a href='{% url assignment_gen_poll assignment.id %}'>
|
||||
<span class="button">
|
||||
<span class="icon poll">{%trans 'New ballot' %}</span>
|
||||
<span class="icon statistics">{%trans 'New ballot' %}</span>
|
||||
</span>
|
||||
</a>
|
||||
</th>
|
||||
@ -231,7 +231,7 @@
|
||||
{% if assignment.profile.count > 0 and perms.assignment.can_manage_assignment and assignment.status == "vot" %}
|
||||
<p><a href='{% url assignment_gen_poll assignment.id %}'>
|
||||
<span class="button">
|
||||
<span class="icon poll">{%trans 'New ballot' %}</span>
|
||||
<span class="icon statistics">{%trans 'New ballot' %}</span>
|
||||
</span>
|
||||
</a></p>
|
||||
{% endif %}
|
||||
|
@ -7,7 +7,7 @@ msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2012-04-22 16:46+0200\n"
|
||||
"POT-Creation-Date: 2012-04-23 22:16+0200\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
@ -54,7 +54,6 @@ msgid "Closed"
|
||||
msgstr "Abgeschlossen"
|
||||
|
||||
#: agenda/models.py:42 agenda/templates/agenda/overview.html:66
|
||||
#: projector/models.py:19
|
||||
msgid "Weight"
|
||||
msgstr "Gewichtung"
|
||||
|
||||
@ -1007,7 +1006,7 @@ msgstr "Version akzeptiert"
|
||||
|
||||
#: application/templates/application/view.html:256
|
||||
msgid "Accept Version"
|
||||
msgstr "Zugelassene Version"
|
||||
msgstr "Version zulassen"
|
||||
|
||||
#: application/templates/application/view.html:259
|
||||
msgid "Reject Version"
|
||||
@ -1119,7 +1118,7 @@ msgstr "Darf selbst für Wahlen kandidieren"
|
||||
msgid "Can manage assignment"
|
||||
msgstr "Darf Wahlen verwalten"
|
||||
|
||||
#: assignment/models.py:203 assignment/views.py:291 assignment/views.py:575
|
||||
#: assignment/models.py:205 assignment/views.py:291 assignment/views.py:575
|
||||
#: assignment/templates/assignment/base_assignment.html:14
|
||||
#: assignment/templates/assignment/overview.html:6
|
||||
#: assignment/templates/assignment/overview.html:9
|
||||
@ -1249,8 +1248,8 @@ msgid "New election"
|
||||
msgstr "Neue Wahl"
|
||||
|
||||
#: assignment/templates/assignment/base_assignment.html:20
|
||||
msgid "Print all elections"
|
||||
msgstr "Alle Wahlen drucken"
|
||||
msgid "All elections as PDF"
|
||||
msgstr "Alle Wahlen als PDF"
|
||||
|
||||
#: assignment/templates/assignment/config.html:5
|
||||
#: assignment/templates/assignment/config.html:8
|
||||
@ -1277,6 +1276,7 @@ msgid "Delete election"
|
||||
msgstr "Wahl löschen"
|
||||
|
||||
#: assignment/templates/assignment/overview.html:46
|
||||
#: assignment/templates/assignment/view.html:14
|
||||
msgid "Election as PDF"
|
||||
msgstr "Wahl als PDF"
|
||||
|
||||
@ -1305,10 +1305,6 @@ msgstr "Kurzbeschreibung"
|
||||
msgid "Print ballot"
|
||||
msgstr "Stimmzettel drucken"
|
||||
|
||||
#: assignment/templates/assignment/view.html:14
|
||||
msgid "Print Election"
|
||||
msgstr "Wahl drucken"
|
||||
|
||||
#: assignment/templates/assignment/view.html:26
|
||||
msgid "Manage election"
|
||||
msgstr "Wahl verwalten"
|
||||
@ -1408,7 +1404,7 @@ msgstr "Erlaube Zugriff für anonyme Gast-Nutzer"
|
||||
|
||||
#: config/forms.py:28 participant/forms.py:95
|
||||
msgid "Welcome text"
|
||||
msgstr "Willkommens text"
|
||||
msgstr "Willkommenstext"
|
||||
|
||||
#: config/models.py:34
|
||||
msgid "Can manage configuration"
|
||||
@ -1762,12 +1758,12 @@ msgid "Import participants"
|
||||
msgstr "Teilnehmer/innen importieren"
|
||||
|
||||
#: participant/templates/participant/base_participant.html:24
|
||||
msgid "Print participant list"
|
||||
msgstr "Teilnehmerliste drucken"
|
||||
msgid "List of participants as PDF"
|
||||
msgstr "Teilnehmerliste als PDF"
|
||||
|
||||
#: participant/templates/participant/base_participant.html:27
|
||||
msgid "Print first time passwords"
|
||||
msgstr "Erst-Passwörter drucken"
|
||||
msgid "First time passwords as PDF"
|
||||
msgstr "Erst-Passwörter als PDF"
|
||||
|
||||
#: participant/templates/participant/config.html:5
|
||||
#: participant/templates/participant/config.html:8
|
||||
@ -1905,10 +1901,6 @@ msgstr "Darf den Beamer steuern"
|
||||
msgid "Can see projector"
|
||||
msgstr "Darf den Beamer sehen"
|
||||
|
||||
#: projector/models.py:49
|
||||
msgid "Projector Slide"
|
||||
msgstr "Beamer-Folie"
|
||||
|
||||
#: projector/views.py:209 projector/templates/projector/base_projector.html:7
|
||||
#: projector/templates/projector/base_projector.html:11
|
||||
#: projector/templates/projector/control.html:41
|
||||
@ -1975,10 +1967,18 @@ msgstr "Countdown starten"
|
||||
msgid "Stop countdown"
|
||||
msgstr "Countdown stoppen"
|
||||
|
||||
#: projector/templates/projector/control.html:151
|
||||
msgid "Custom slides"
|
||||
msgstr "Benutzerdefinierte Folien"
|
||||
|
||||
#: projector/templates/projector/control.html:163
|
||||
msgid "New slide"
|
||||
msgstr "Neue Folie"
|
||||
|
||||
#: projector/templates/projector/new.html:6
|
||||
#: projector/templates/projector/new.html:9
|
||||
msgid "New Slide"
|
||||
msgstr "Neue Folie"
|
||||
msgid "New custom slide"
|
||||
msgstr "Neue benutzerdefinierte Folie"
|
||||
|
||||
#: templates/404.html:7
|
||||
msgid "Page not found."
|
||||
@ -2023,18 +2023,3 @@ msgstr "Bedaure, Sie haben keine Berechtigung diese Seite zu sehen."
|
||||
#: utils/views.py:223
|
||||
msgid "undefined-filename"
|
||||
msgstr "undefinierter-dateiname"
|
||||
|
||||
#~ msgid "Edit assignment"
|
||||
#~ msgstr "Wahl bearbeiten"
|
||||
|
||||
#~ msgid "Delete assignment"
|
||||
#~ msgstr "Wahl löschen"
|
||||
|
||||
#~ msgid "passwords"
|
||||
#~ msgstr "Passwörter"
|
||||
|
||||
#~ msgid "Print vote"
|
||||
#~ msgstr "Abstimmung drucken"
|
||||
|
||||
#~ msgid "available posts"
|
||||
#~ msgstr "verfügbare Posten"
|
||||
|
@ -1,5 +1,5 @@
|
||||
a.status_link.active span {
|
||||
background-image: url(../images/icons/user-online.png);
|
||||
background-image: url(../images/icons/on.png);
|
||||
background-repeat: no-repeat;
|
||||
background-position: center;
|
||||
width: 16px;
|
||||
@ -7,7 +7,7 @@ a.status_link.active span {
|
||||
display: inline-block;
|
||||
}
|
||||
a.status_link.inactive span {
|
||||
background-image: url(../images/icons/user-offline.png);
|
||||
background-image: url(../images/icons/off.png);
|
||||
background-repeat: no-repeat;
|
||||
background-position: center;
|
||||
width: 16px;
|
||||
|
@ -15,9 +15,9 @@
|
||||
{% for group in groups %}
|
||||
<tr class="{% cycle '' 'odd' %}">
|
||||
<td>{{ group.name }}</td>
|
||||
<td><a href="{% url user_group_edit group.id %}"><img src="{% static 'images/icons/document-edit.png' %}" title="{%trans 'Edit group' %}"></a>
|
||||
<td><a href="{% url user_group_edit group.id %}"><img src="{% static 'images/icons/edit.png' %}" title="{%trans 'Edit group' %}"></a>
|
||||
{% if group.name != 'Anonymous' %}
|
||||
<a href="{% url user_group_delete group.id %}"><img src="{% static 'images/icons/edit-delete.png' %}" title="{%trans 'Delete group' %}"></a>
|
||||
<a href="{% url user_group_delete group.id %}"><img src="{% static 'images/icons/delete.png' %}" title="{%trans 'Delete group' %}"></a>
|
||||
{% endif %}
|
||||
</td>
|
||||
</tr>
|
||||
|
@ -85,8 +85,8 @@
|
||||
{{ user.last_login }}
|
||||
{% endif %}</td>
|
||||
<td><span style="width: 1px; white-space: nowrap;">
|
||||
<a href="{% url user_edit user.id %}"><img src="{% static 'images/icons/document-edit.png' %}" title="{%trans 'Edit participant' %}"></a>
|
||||
<a href="{% url user_delete user.id %}"><img src="{% static 'images/icons/edit-delete.png' %}" title="{%trans 'Delete participant' %}"></a>
|
||||
<a href="{% url user_edit user.id %}"><img src="{% static 'images/icons/edit.png' %}" title="{%trans 'Edit participant' %}"></a>
|
||||
<a href="{% url user_delete user.id %}"><img src="{% static 'images/icons/delete.png' %}" title="{%trans 'Delete participant' %}"></a>
|
||||
<a class="status_link {% if user.is_active %}active{% else %}inactive{% endif %}"
|
||||
href="{% if user.is_active %}{% url user_inactive user.id %}{% else %}{% url user_active user.id %}{% endif %}"
|
||||
title="{%trans 'Change status (active/inactive)' %}">
|
||||
|
@ -16,7 +16,7 @@ class ProjectorSlide(models.Model, SlideMixin):
|
||||
|
||||
title = models.CharField(max_length=100, verbose_name=_("Title"))
|
||||
text = models.TextField(null=True, blank=True, verbose_name=_("Text"))
|
||||
weight = models.IntegerField(default=0, verbose_name=_("Weight"))
|
||||
#weight = models.IntegerField(default=0, verbose_name=_("Weight"))
|
||||
|
||||
def slide(self):
|
||||
return {
|
||||
@ -46,7 +46,7 @@ class ProjectorOverlay(models.Model):
|
||||
return self.def_name
|
||||
|
||||
|
||||
register_slidemodel(ProjectorSlide, model_name=_('Projector Slide'))
|
||||
register_slidemodel(ProjectorSlide, model_name='customslide')
|
||||
|
||||
|
||||
@receiver(default_config_value, dispatch_uid="projector_default_config")
|
||||
|
Before Width: | Height: | Size: 484 B After Width: | Height: | Size: 484 B |
Before Width: | Height: | Size: 501 B After Width: | Height: | Size: 501 B |
Before Width: | Height: | Size: 511 B After Width: | Height: | Size: 511 B |
Before Width: | Height: | Size: 370 B After Width: | Height: | Size: 370 B |
@ -11,6 +11,7 @@ $(function() {
|
||||
success: function(data) {
|
||||
$('.activate_link').removeClass('active');
|
||||
$('li').removeClass('activeline');
|
||||
$('div').removeClass('activeline');
|
||||
link.addClass('active');
|
||||
link.parent().addClass('activeline');
|
||||
},
|
||||
|
@ -67,7 +67,7 @@
|
||||
}
|
||||
/* countdown */
|
||||
a.countdown_visible_link.closed div {
|
||||
background-image: url(../images/icons/user-offline.png);
|
||||
background-image: url(../images/icons/off.png);
|
||||
background-repeat: no-repeat;
|
||||
background-position: center;
|
||||
width: 16px;
|
||||
@ -75,7 +75,7 @@ a.countdown_visible_link.closed div {
|
||||
display: inline-block;
|
||||
}
|
||||
a.countdown_visible_link.open div {
|
||||
background-image: url(../images/icons/user-online.png);
|
||||
background-image: url(../images/icons/on.png);
|
||||
background-repeat: no-repeat;
|
||||
background-position: center;
|
||||
width: 16px;
|
||||
@ -84,7 +84,7 @@ a.countdown_visible_link.open div {
|
||||
}
|
||||
/* activate link */
|
||||
a.activate_link div {
|
||||
background-image: url(../images/icons/task-accepted-grey.png);
|
||||
background-image: url(../images/icons/accept-grey.png);
|
||||
background-repeat: no-repeat;
|
||||
float: left;
|
||||
width: 16px;
|
||||
@ -95,5 +95,5 @@ a.activate_link div {
|
||||
left: 4px;
|
||||
}
|
||||
a.activate_link.active div {
|
||||
background-image: url(../images/icons/task-accepted.png);
|
||||
background-image: url(../images/icons/accept.png);
|
||||
}
|
||||
|
@ -17,7 +17,7 @@
|
||||
{% endif %}
|
||||
{% if perms.projector.can_see_projector %}
|
||||
<li>
|
||||
<a href="{% url projector_show %}"><img src="{% static 'images/icons/video-projector.png' %}"> {% trans 'Projector view' %}</a>
|
||||
<a href="{% url projector_show %}"><img src="{% static 'images/icons/projector.png' %}"> {% trans 'Projector view' %}</a>
|
||||
</li>
|
||||
{% endif %}
|
||||
</ul>
|
||||
|
@ -55,7 +55,7 @@
|
||||
<img src="{% static 'images/icons/go-down.png' %}" />
|
||||
</a>
|
||||
<a class="projector_edit" href="{% url projector_clean %}" title="{% trans 'Reset projector view' %}">
|
||||
<img src="{% static 'images/icons/view-restore.png' %}" />
|
||||
<img src="{% static 'images/icons/view-reset.png' %}" />
|
||||
</a>
|
||||
</div>
|
||||
|
||||
@ -64,7 +64,7 @@
|
||||
{% if category != 'projector' %}
|
||||
<div class="portlet">
|
||||
{% with category_big=category|capfirst %}
|
||||
<div class="portlet-header">{% trans category_big %}</div>
|
||||
<div class="portlet-header">{% trans category_big %}</div>
|
||||
{% endwith %}
|
||||
<div class="portlet-content">
|
||||
{% for slides in group %}
|
||||
@ -113,13 +113,13 @@
|
||||
|
|
||||
<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' %}" />
|
||||
<img src="{% static 'images/icons/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' %}" />
|
||||
<img src="{% static 'images/icons/play.png' %}" />
|
||||
</a>
|
||||
<a class="projector_countdown" href="{% url countdown_stop %}" title="{% trans 'Stop countdown' %}">
|
||||
<img src="{% static 'images/icons/media-playback-pause.png' %}" />
|
||||
<img src="{% static 'images/icons/pause.png' %}" />
|
||||
</a>
|
||||
{% endif %}
|
||||
{% if overlay.def_name == "Message" %}
|
||||
@ -143,5 +143,29 @@
|
||||
</ul>
|
||||
</div>
|
||||
</div> <!-- end portlet-->
|
||||
|
||||
<!-- Custom slides -->
|
||||
{% for category, group in categories.items %}
|
||||
{% if category == 'projector' %}
|
||||
<div class="portlet">
|
||||
<div class="portlet-header">{% trans "Custom slides" %}</div>
|
||||
<div class="portlet-content">
|
||||
{% for slides in group %}
|
||||
{% if slides.control_template %}
|
||||
{% include slides.control_template %}
|
||||
{% endif %}
|
||||
{% if not forloop.last %}
|
||||
<hr>
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
<a href='{% url custom_slides_new %}'>
|
||||
<button class="button" type="button" onclick="window.location='{% url custom_slides_new %}'">
|
||||
<span class="icon add">{%trans 'New slide' %}</span>
|
||||
</button>
|
||||
</a>
|
||||
</div>
|
||||
</div> <!-- end portlet-->
|
||||
{% endif %}
|
||||
{% endfor %}
|
||||
</div> <!-- end column -->
|
||||
{% endblock %}
|
||||
|
@ -3,10 +3,10 @@
|
||||
{% load tags %}
|
||||
{% load i18n %}
|
||||
|
||||
{% block title %}{{ block.super }} – {%trans "New Slide" %}{% endblock %}
|
||||
{% block title %}{{ block.super }} – {%trans "New custom slide" %}{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<h1>{% trans 'New Slide' %}</h1>
|
||||
<h1>{% trans 'New custom slide' %}</h1>
|
||||
<form action="" method="post">{% csrf_token %}
|
||||
{{ form.as_p }}
|
||||
<button class="button" type="submit">
|
||||
|
@ -53,7 +53,7 @@ urlpatterns = patterns('projector.views',
|
||||
template_name='projector/new.html',
|
||||
permission_required='projector.can_manage_projector'
|
||||
),
|
||||
name='projector_new',
|
||||
name='custom_slides_new',
|
||||
),
|
||||
|
||||
url(r'^bigger/$', 'projector_edit', {'direction': 'bigger'},
|
||||
|
Before Width: | Height: | Size: 3.1 KiB After Width: | Height: | Size: 3.1 KiB |
Before Width: | Height: | Size: 924 B After Width: | Height: | Size: 924 B |
Before Width: | Height: | Size: 821 B After Width: | Height: | Size: 821 B |
Before Width: | Height: | Size: 564 B After Width: | Height: | Size: 564 B |
Before Width: | Height: | Size: 640 B After Width: | Height: | Size: 640 B |
Before Width: | Height: | Size: 413 B After Width: | Height: | Size: 413 B |
Before Width: | Height: | Size: 756 B After Width: | Height: | Size: 756 B |
Before Width: | Height: | Size: 726 B After Width: | Height: | Size: 726 B |
Before Width: | Height: | Size: 614 B After Width: | Height: | Size: 614 B |
Before Width: | Height: | Size: 575 B |
Before Width: | Height: | Size: 634 B |
Before Width: | Height: | Size: 636 B After Width: | Height: | Size: 636 B |
Before Width: | Height: | Size: 694 B |
Before Width: | Height: | Size: 609 B After Width: | Height: | Size: 609 B |
Before Width: | Height: | Size: 332 B |
Before Width: | Height: | Size: 694 B After Width: | Height: | Size: 694 B |
Before Width: | Height: | Size: 489 B After Width: | Height: | Size: 489 B |
Before Width: | Height: | Size: 757 B After Width: | Height: | Size: 757 B |
Before Width: | Height: | Size: 745 B |
Before Width: | Height: | Size: 722 B |
Before Width: | Height: | Size: 720 B After Width: | Height: | Size: 720 B |
Before Width: | Height: | Size: 665 B |
Before Width: | Height: | Size: 3.0 KiB After Width: | Height: | Size: 3.0 KiB |
Before Width: | Height: | Size: 842 B After Width: | Height: | Size: 842 B |
Before Width: | Height: | Size: 707 B After Width: | Height: | Size: 707 B |
Before Width: | Height: | Size: 794 B After Width: | Height: | Size: 794 B |
Before Width: | Height: | Size: 495 B After Width: | Height: | Size: 495 B |
Before Width: | Height: | Size: 866 B After Width: | Height: | Size: 866 B |
Before Width: | Height: | Size: 287 B |
Before Width: | Height: | Size: 280 B |
Before Width: | Height: | Size: 257 B |
Before Width: | Height: | Size: 299 B |
Before Width: | Height: | Size: 618 B |
Before Width: | Height: | Size: 632 B |
Before Width: | Height: | Size: 741 B After Width: | Height: | Size: 741 B |
@ -357,61 +357,52 @@ input[type="submit"], input[type="button"] {
|
||||
background:url(../images/icons/dialog-ok.png) no-repeat 0px 0px;
|
||||
}
|
||||
.button .edit{
|
||||
background:url(../images/icons/document-edit.png) no-repeat 0px 0px;
|
||||
background:url(../images/icons/edit.png) no-repeat 0px 0px;
|
||||
}
|
||||
.button .revert{
|
||||
background:url(../images/icons/document-revert.png) no-repeat 0px 0px;
|
||||
background:url(../images/icons/revert.png) no-repeat 0px 0px;
|
||||
}
|
||||
.button .undo{
|
||||
background:url(../images/icons/edit-undo.png) no-repeat 0px 0px;
|
||||
background:url(../images/icons/undo.png) no-repeat 0px 0px;
|
||||
}
|
||||
.button .item{
|
||||
background:url(../images/icons/view-list-details.png) no-repeat 0px 0px;
|
||||
}
|
||||
.button .projector{
|
||||
background:url(../images/icons/video-projector.png) no-repeat 0px 0px;
|
||||
background:url(../images/icons/projector.png) no-repeat 0px 0px;
|
||||
}
|
||||
.button .accept{
|
||||
background:url(../images/icons/task-complete.png) no-repeat 0px 0px;
|
||||
.button .done{
|
||||
background:url(../images/icons/done.png) no-repeat 0px 0px;
|
||||
}
|
||||
.button .reject{
|
||||
background:url(../images/icons/task-reject.png) no-repeat 0px 0px;
|
||||
background:url(../images/icons/reject.png) no-repeat 0px 0px;
|
||||
}
|
||||
.button .poll{
|
||||
background:url(../images/icons/view-statistics.png) no-repeat 0px 0px;
|
||||
}
|
||||
.button .previous{
|
||||
background:url(../images/icons/go-previous.png) no-repeat 0px 0px;
|
||||
.statistics{
|
||||
background:url(../images/icons/statistics.png) no-repeat 0px 0px;
|
||||
}
|
||||
.button .pdf{
|
||||
background:url(../images/icons/pdf.png) no-repeat 0px 0px;
|
||||
}
|
||||
.button .adduser{
|
||||
background:url(../images/icons/list-add-user.png) no-repeat 0px 0px;
|
||||
background:url(../images/icons/add-user.png) no-repeat 0px 0px;
|
||||
}
|
||||
.button .removeuser{
|
||||
background:url(../images/icons/list-remove-user.png) no-repeat 0px 0px;
|
||||
background:url(../images/icons/remove-user.png) no-repeat 0px 0px;
|
||||
}
|
||||
.button .export{
|
||||
background:url(../images/icons/document-export.png) no-repeat 0px 0px;
|
||||
background:url(../images/icons/export.png) no-repeat 0px 0px;
|
||||
}
|
||||
.button .import{
|
||||
background:url(../images/icons/document-import.png) no-repeat 0px 0px;
|
||||
background:url(../images/icons/import.png) no-repeat 0px 0px;
|
||||
}
|
||||
.button .add{
|
||||
background:url(../images/icons/list-add.png) no-repeat 0px 0px;
|
||||
}
|
||||
.button .remove{
|
||||
background:url(../images/icons/list-remove.png) no-repeat 0px 0px;
|
||||
.add{
|
||||
background:url(../images/icons/add.png) no-repeat 0px 0px;
|
||||
}
|
||||
.button .number{
|
||||
background:url(../images/icons/milestone.png) no-repeat 0px 0px;
|
||||
}
|
||||
.button .stop{
|
||||
background:url(../images/icons/process-stop.png) no-repeat 0px 0px;
|
||||
background:url(../images/icons/number.png) no-repeat 0px 0px;
|
||||
}
|
||||
.button .guest{
|
||||
background:url(../images/icons/user-identity.png) no-repeat 0px 0px;
|
||||
background:url(../images/icons/guest.png) no-repeat 0px 0px;
|
||||
}
|
||||
.button .clear{
|
||||
background:url(../images/icons/clear.png) no-repeat 0px 0px;
|
||||
@ -553,7 +544,7 @@ ul.results {
|
||||
padding: 10px 20px 10px 36px;
|
||||
}
|
||||
.notification.success {
|
||||
background: url("../images/icons/task-complete.png") repeat scroll 0 0 #D5FFCE;
|
||||
background: url("../images/icons/done.png") repeat scroll 0 0 #D5FFCE;
|
||||
border-color: #9ADF8F;
|
||||
color: #556652;
|
||||
}
|
||||
@ -563,7 +554,7 @@ ul.results {
|
||||
color: #665252;
|
||||
}
|
||||
.notification.warning {
|
||||
background: url("../images/icons/task-attention.png") repeat scroll 0 0 #FFFBCC;
|
||||
background: url("../images/icons/warning.png") repeat scroll 0 0 #FFFBCC;
|
||||
border-color: #E6DB55;
|
||||
color: #666452;
|
||||
}
|
||||
@ -587,14 +578,12 @@ ul.results {
|
||||
.preview {
|
||||
background:url("../images/icons/preview.png") no-repeat 0px 0px;
|
||||
}
|
||||
.poll {
|
||||
background:url("../images/icons/view-statistics.png") no-repeat 0px 0px;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/* inactive/active */
|
||||
a.activate_link span {
|
||||
background-image: url(../images/icons/task-accepted-grey.png);
|
||||
background-image: url(../images/icons/accept-grey.png);
|
||||
background-repeat: no-repeat;
|
||||
background-position: center;
|
||||
width: 16px;
|
||||
@ -602,7 +591,7 @@ a.activate_link span {
|
||||
display: inline-block;
|
||||
}
|
||||
a.activate_link.active span {
|
||||
background-image: url(../images/icons/task-accepted.png);
|
||||
background-image: url(../images/icons/accept.png);
|
||||
}
|
||||
tr.activeline td, .activeline {
|
||||
background-color: #bed4de !important;
|
||||
|