diff --git a/openslides/agenda/static/styles/agenda.css b/openslides/agenda/static/styles/agenda.css index 760e57598..7c3700e9e 100644 --- a/openslides/agenda/static/styles/agenda.css +++ b/openslides/agenda/static/styles/agenda.css @@ -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); } diff --git a/openslides/agenda/templates/agenda/item_row.html b/openslides/agenda/templates/agenda/item_row.html index fa871aad3..eebe20c86 100644 --- a/openslides/agenda/templates/agenda/item_row.html +++ b/openslides/agenda/templates/agenda/item_row.html @@ -7,7 +7,7 @@ {% elif item.closed %} - + {% endif %} @@ -29,7 +29,7 @@ {% endif %} {% if perms.agenda.can_manage_agenda %} - + {% endif %} diff --git a/openslides/application/templates/application/base_application.html b/openslides/application/templates/application/base_application.html index 67fc2caa3..dac22d596 100644 --- a/openslides/application/templates/application/base_application.html +++ b/openslides/application/templates/application/base_application.html @@ -45,9 +45,9 @@
  • {%trans 'Application as PDF' %}
    • {# activate and polls #} {% if perms.projector.can_manage_projector %} -
  • {%trans 'Show Application' %}
    • +
  • {%trans 'Show Application' %}
    • {% if "genpoll" in actions %} -
  • {%trans 'New vote' %}
    • +
  • {%trans 'New vote' %}
    • {% endif %} {% for poll in application.polls %} {% url application_poll_view poll.id as url_applicationpollview %} diff --git a/openslides/application/templates/application/overview.html b/openslides/application/templates/application/overview.html index 3922542f4..b485b38f8 100644 --- a/openslides/application/templates/application/overview.html +++ b/openslides/application/templates/application/overview.html @@ -68,8 +68,8 @@ {% endif %} {% if perms.application.can_manage_application %} - - + + {% endif %} diff --git a/openslides/application/templates/application/view.html b/openslides/application/templates/application/view.html index 575d002e4..f296ca7dc 100644 --- a/openslides/application/templates/application/view.html +++ b/openslides/application/templates/application/view.html @@ -50,7 +50,7 @@ {% if perms.application.can_manage_application %} {% if "genpoll" in actions %} - {%trans 'New vote' %} + {%trans 'New vote' %} {% else %} - @@ -68,7 +68,7 @@ {{ forloop.counter }}. {% trans "Vote" %}: - + {% elif poll.has_votes %} {{ forloop.counter }}. {% trans "Vote" %}: @@ -88,7 +88,7 @@ {% if forloop.last %} {% if "genpoll" in actions %} - {%trans 'New vote' %} + {%trans 'New vote' %} {% endif %} {% endif %} @@ -149,7 +149,7 @@ {% trans 'Permit' %} {% endif %} {% if "nop" in actions %} - {% trans 'Not permit (reject)' %} + {% trans 'Not permit (reject)' %} {% endif %} {% if "setnumber" in actions %} {% trans 'Set Number' %} @@ -162,7 +162,7 @@

    {% trans "Result after vote" %}:

    {% if "acc" in actions %} - {%trans 'Accepted' %} + {%trans 'Accepted' %} {% endif %} {% if "rej" in actions %} @@ -250,17 +250,17 @@ {% if application.status != "pub" %} {% if revision == application.permitted %} - + {% else %} {% if perms.application.can_manage_application %} - + {% endif %} {% if not revision.rejected and revision.id > application.permitted.id and perms.application.can_manage_application %} - + {% endif %} {% endif %} {% if revision.rejected %} - + {% endif %} {% endif %} diff --git a/openslides/assignment/templates/assignment/overview.html b/openslides/assignment/templates/assignment/overview.html index 98c835876..4c59da819 100644 --- a/openslides/assignment/templates/assignment/overview.html +++ b/openslides/assignment/templates/assignment/overview.html @@ -40,8 +40,8 @@ {% endif %} {% if perms.assignment.can_manage_assignment %} - - + + {% endif %} diff --git a/openslides/assignment/templates/assignment/view.html b/openslides/assignment/templates/assignment/view.html index 163161b5b..c8e736298 100644 --- a/openslides/assignment/templates/assignment/view.html +++ b/openslides/assignment/templates/assignment/view.html @@ -64,7 +64,7 @@
  • {{ profile }} {% if perms.assignment.can_manage_assignment %} {% if assignment.status == "sea" or assignment.status == "vot" %} - + {% endif %} {% endif %}
    • @@ -101,7 +101,7 @@ {{ field }} {% if perms.participant.can_see_participant and perms.participant.can_manage_participant %} - + {% endif %} {% endfor %} @@ -138,14 +138,14 @@ {% if poll.published %} {% else %} {% endif %} - + {% endif %} {# endif #} @@ -154,7 +154,7 @@ - {%trans 'New ballot' %} + {%trans 'New ballot' %} @@ -231,7 +231,7 @@ {% if assignment.profile.count > 0 and perms.assignment.can_manage_assignment and assignment.status == "vot" %}

    - {%trans 'New ballot' %} + {%trans 'New ballot' %}

    {% endif %} diff --git a/openslides/locale/de/LC_MESSAGES/django.mo b/openslides/locale/de/LC_MESSAGES/django.mo index 406d2f133..cdccd2864 100644 Binary files a/openslides/locale/de/LC_MESSAGES/django.mo and b/openslides/locale/de/LC_MESSAGES/django.mo differ diff --git a/openslides/locale/de/LC_MESSAGES/django.po b/openslides/locale/de/LC_MESSAGES/django.po index 52c5429b9..1a75f2f49 100644 --- a/openslides/locale/de/LC_MESSAGES/django.po +++ b/openslides/locale/de/LC_MESSAGES/django.po @@ -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 \n" "Language-Team: LANGUAGE \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" diff --git a/openslides/participant/static/styles/participant.css b/openslides/participant/static/styles/participant.css index ae2bb0c56..3292dc417 100644 --- a/openslides/participant/static/styles/participant.css +++ b/openslides/participant/static/styles/participant.css @@ -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; diff --git a/openslides/participant/templates/participant/group_overview.html b/openslides/participant/templates/participant/group_overview.html index ee685aa08..e355ccc9a 100644 --- a/openslides/participant/templates/participant/group_overview.html +++ b/openslides/participant/templates/participant/group_overview.html @@ -15,9 +15,9 @@ {% for group in groups %} {{ group.name }} - + {% if group.name != 'Anonymous' %} - + {% endif %} diff --git a/openslides/participant/templates/participant/overview.html b/openslides/participant/templates/participant/overview.html index 0d695d69b..e13f4a4ca 100644 --- a/openslides/participant/templates/participant/overview.html +++ b/openslides/participant/templates/participant/overview.html @@ -85,8 +85,8 @@ {{ user.last_login }} {% endif %} - - + + diff --git a/openslides/projector/models.py b/openslides/projector/models.py index cd6334516..3836c60c0 100644 --- a/openslides/projector/models.py +++ b/openslides/projector/models.py @@ -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") diff --git a/openslides/projector/static/images/icons/media-playback-pause.png b/openslides/projector/static/images/icons/pause.png similarity index 100% rename from openslides/projector/static/images/icons/media-playback-pause.png rename to openslides/projector/static/images/icons/pause.png diff --git a/openslides/projector/static/images/icons/media-playback-start.png b/openslides/projector/static/images/icons/play.png similarity index 100% rename from openslides/projector/static/images/icons/media-playback-start.png rename to openslides/projector/static/images/icons/play.png diff --git a/openslides/projector/static/images/icons/media-skip-backward.png b/openslides/projector/static/images/icons/skip-backward.png similarity index 100% rename from openslides/projector/static/images/icons/media-skip-backward.png rename to openslides/projector/static/images/icons/skip-backward.png diff --git a/openslides/projector/static/images/icons/view-restore.png b/openslides/projector/static/images/icons/view-reset.png similarity index 100% rename from openslides/projector/static/images/icons/view-restore.png rename to openslides/projector/static/images/icons/view-reset.png diff --git a/openslides/projector/static/javascript/projector-control.js b/openslides/projector/static/javascript/projector-control.js index 3948cb97b..ad4ceac32 100644 --- a/openslides/projector/static/javascript/projector-control.js +++ b/openslides/projector/static/javascript/projector-control.js @@ -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'); }, diff --git a/openslides/projector/static/styles/projector-control.css b/openslides/projector/static/styles/projector-control.css index 984a738fc..62e3e8ae9 100644 --- a/openslides/projector/static/styles/projector-control.css +++ b/openslides/projector/static/styles/projector-control.css @@ -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); } diff --git a/openslides/projector/templates/projector/base_projector.html b/openslides/projector/templates/projector/base_projector.html index 163c9f8ef..73bfb2e5b 100644 --- a/openslides/projector/templates/projector/base_projector.html +++ b/openslides/projector/templates/projector/base_projector.html @@ -17,7 +17,7 @@ {% endif %} {% if perms.projector.can_see_projector %}
  • - {% trans 'Projector view' %} + {% trans 'Projector view' %}
    • {% endif %} diff --git a/openslides/projector/templates/projector/control.html b/openslides/projector/templates/projector/control.html index 39648f1ee..c0eac9a3d 100644 --- a/openslides/projector/templates/projector/control.html +++ b/openslides/projector/templates/projector/control.html @@ -55,7 +55,7 @@ - + @@ -64,7 +64,7 @@ {% if category != 'projector' %}
    {% with category_big=category|capfirst %} -
    {% trans category_big %}
    +
    {% trans category_big %}
    {% endwith %}
    {% for slides in group %} @@ -113,13 +113,13 @@ | {{countdown_time}}{% trans "sec" %} - + - + - + {% endif %} {% if overlay.def_name == "Message" %} @@ -143,5 +143,29 @@
    + + + {% for category, group in categories.items %} + {% if category == 'projector' %} +
    +
    {% trans "Custom slides" %}
    +
    + {% for slides in group %} + {% if slides.control_template %} + {% include slides.control_template %} + {% endif %} + {% if not forloop.last %} +
    + {% endif %} + {% endfor %} + + + +
    +
    + {% endif %} + {% endfor %} {% endblock %} diff --git a/openslides/projector/templates/projector/new.html b/openslides/projector/templates/projector/new.html index 607a4bc31..927839d2c 100644 --- a/openslides/projector/templates/projector/new.html +++ b/openslides/projector/templates/projector/new.html @@ -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 %} -

    {% trans 'New Slide' %}

    +

    {% trans 'New custom slide' %}

    {% csrf_token %} {{ form.as_p }}