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.po b/openslides/locale/de/LC_MESSAGES/django.po index 52c5429b9..4abfeaca9 100644 --- a/openslides/locale/de/LC_MESSAGES/django.po +++ b/openslides/locale/de/LC_MESSAGES/django.po @@ -1007,7 +1007,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" 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/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/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..f685e4a40 100644 --- a/openslides/projector/templates/projector/control.html +++ b/openslides/projector/templates/projector/control.html @@ -55,7 +55,7 @@ - + @@ -113,13 +113,13 @@ | {{countdown_time}}{% trans "sec" %} - + - + - + {% endif %} {% if overlay.def_name == "Message" %} diff --git a/openslides/static/images/icons/task-accepted-grey.png b/openslides/static/images/icons/accept-grey.png similarity index 100% rename from openslides/static/images/icons/task-accepted-grey.png rename to openslides/static/images/icons/accept-grey.png diff --git a/openslides/static/images/icons/task-accepted.png b/openslides/static/images/icons/accept.png similarity index 100% rename from openslides/static/images/icons/task-accepted.png rename to openslides/static/images/icons/accept.png diff --git a/openslides/static/images/icons/list-add-user.png b/openslides/static/images/icons/add-user.png similarity index 100% rename from openslides/static/images/icons/list-add-user.png rename to openslides/static/images/icons/add-user.png diff --git a/openslides/static/images/icons/list-add.png b/openslides/static/images/icons/add.png similarity index 100% rename from openslides/static/images/icons/list-add.png rename to openslides/static/images/icons/add.png diff --git a/openslides/static/images/icons/edit-delete.png b/openslides/static/images/icons/delete.png similarity index 100% rename from openslides/static/images/icons/edit-delete.png rename to openslides/static/images/icons/delete.png diff --git a/openslides/static/images/icons/task-complete-grey.png b/openslides/static/images/icons/done-grey.png similarity index 100% rename from openslides/static/images/icons/task-complete-grey.png rename to openslides/static/images/icons/done-grey.png diff --git a/openslides/static/images/icons/task-complete.png b/openslides/static/images/icons/done.png similarity index 100% rename from openslides/static/images/icons/task-complete.png rename to openslides/static/images/icons/done.png diff --git a/openslides/static/images/icons/document-edit.png b/openslides/static/images/icons/edit.png similarity index 100% rename from openslides/static/images/icons/document-edit.png rename to openslides/static/images/icons/edit.png diff --git a/openslides/static/images/icons/document-export.png b/openslides/static/images/icons/export.png similarity index 100% rename from openslides/static/images/icons/document-export.png rename to openslides/static/images/icons/export.png diff --git a/openslides/static/images/icons/games-endturn.png b/openslides/static/images/icons/games-endturn.png deleted file mode 100644 index 909a2f0d7..000000000 Binary files a/openslides/static/images/icons/games-endturn.png and /dev/null differ diff --git a/openslides/static/images/icons/go-previous.png b/openslides/static/images/icons/go-previous.png deleted file mode 100644 index 940797b8a..000000000 Binary files a/openslides/static/images/icons/go-previous.png and /dev/null differ diff --git a/openslides/static/images/icons/user-identity.png b/openslides/static/images/icons/guest.png similarity index 100% rename from openslides/static/images/icons/user-identity.png rename to openslides/static/images/icons/guest.png diff --git a/openslides/static/images/icons/help-hint.png b/openslides/static/images/icons/help-hint.png deleted file mode 100644 index 352fd5415..000000000 Binary files a/openslides/static/images/icons/help-hint.png and /dev/null differ diff --git a/openslides/static/images/icons/document-import.png b/openslides/static/images/icons/import.png similarity index 100% rename from openslides/static/images/icons/document-import.png rename to openslides/static/images/icons/import.png diff --git a/openslides/static/images/icons/list-remove.png b/openslides/static/images/icons/list-remove.png deleted file mode 100644 index 5a4d15b7b..000000000 Binary files a/openslides/static/images/icons/list-remove.png and /dev/null differ diff --git a/openslides/static/images/icons/milestone.png b/openslides/static/images/icons/number.png similarity index 100% rename from openslides/static/images/icons/milestone.png rename to openslides/static/images/icons/number.png diff --git a/openslides/static/images/icons/user-offline.png b/openslides/static/images/icons/off.png similarity index 100% rename from openslides/static/images/icons/user-offline.png rename to openslides/static/images/icons/off.png diff --git a/openslides/static/images/icons/user-online.png b/openslides/static/images/icons/on.png similarity index 100% rename from openslides/static/images/icons/user-online.png rename to openslides/static/images/icons/on.png diff --git a/openslides/static/images/icons/pdf-annotations.png b/openslides/static/images/icons/pdf-annotations.png deleted file mode 100644 index dbb2e8b1c..000000000 Binary files a/openslides/static/images/icons/pdf-annotations.png and /dev/null differ diff --git a/openslides/static/images/icons/process-stop.png b/openslides/static/images/icons/process-stop.png deleted file mode 100644 index 5b4c488bd..000000000 Binary files a/openslides/static/images/icons/process-stop.png and /dev/null differ diff --git a/openslides/static/images/icons/video-projector.png b/openslides/static/images/icons/projector.png similarity index 100% rename from openslides/static/images/icons/video-projector.png rename to openslides/static/images/icons/projector.png diff --git a/openslides/static/images/icons/rating.png b/openslides/static/images/icons/rating.png deleted file mode 100644 index b47a7d609..000000000 Binary files a/openslides/static/images/icons/rating.png and /dev/null differ diff --git a/openslides/static/images/icons/task-reject-grey.png b/openslides/static/images/icons/reject-grey.png similarity index 100% rename from openslides/static/images/icons/task-reject-grey.png rename to openslides/static/images/icons/reject-grey.png diff --git a/openslides/static/images/icons/task-reject.png b/openslides/static/images/icons/reject.png similarity index 100% rename from openslides/static/images/icons/task-reject.png rename to openslides/static/images/icons/reject.png diff --git a/openslides/static/images/icons/list-remove-user.png b/openslides/static/images/icons/remove-user.png similarity index 100% rename from openslides/static/images/icons/list-remove-user.png rename to openslides/static/images/icons/remove-user.png diff --git a/openslides/static/images/icons/document-revert.png b/openslides/static/images/icons/revert.png similarity index 100% rename from openslides/static/images/icons/document-revert.png rename to openslides/static/images/icons/revert.png diff --git a/openslides/static/images/icons/view-statistics.png b/openslides/static/images/icons/statistics.png similarity index 100% rename from openslides/static/images/icons/view-statistics.png rename to openslides/static/images/icons/statistics.png diff --git a/openslides/static/images/icons/edit-undo.png b/openslides/static/images/icons/undo.png similarity index 100% rename from openslides/static/images/icons/edit-undo.png rename to openslides/static/images/icons/undo.png diff --git a/openslides/static/images/icons/view-list-details.png b/openslides/static/images/icons/view-list-details.png deleted file mode 100644 index be9cd195b..000000000 Binary files a/openslides/static/images/icons/view-list-details.png and /dev/null differ diff --git a/openslides/static/images/icons/view-list-icons.png b/openslides/static/images/icons/view-list-icons.png deleted file mode 100644 index 30f013899..000000000 Binary files a/openslides/static/images/icons/view-list-icons.png and /dev/null differ diff --git a/openslides/static/images/icons/view-list-text.png b/openslides/static/images/icons/view-list-text.png deleted file mode 100644 index f4dcabdb2..000000000 Binary files a/openslides/static/images/icons/view-list-text.png and /dev/null differ diff --git a/openslides/static/images/icons/view-list-tree.png b/openslides/static/images/icons/view-list-tree.png deleted file mode 100644 index 0f8264c78..000000000 Binary files a/openslides/static/images/icons/view-list-tree.png and /dev/null differ diff --git a/openslides/static/images/icons/view-presentation.png b/openslides/static/images/icons/view-presentation.png deleted file mode 100644 index 5426e6386..000000000 Binary files a/openslides/static/images/icons/view-presentation.png and /dev/null differ diff --git a/openslides/static/images/icons/view-sort-ascending.png b/openslides/static/images/icons/view-sort-ascending.png deleted file mode 100644 index c199438d8..000000000 Binary files a/openslides/static/images/icons/view-sort-ascending.png and /dev/null differ diff --git a/openslides/static/images/icons/task-attention.png b/openslides/static/images/icons/warning.png similarity index 100% rename from openslides/static/images/icons/task-attention.png rename to openslides/static/images/icons/warning.png diff --git a/openslides/static/styles/base.css b/openslides/static/styles/base.css index e9a8482e5..76496ac16 100644 --- a/openslides/static/styles/base.css +++ b/openslides/static/styles/base.css @@ -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; + 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/accepted-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/accepted.png); } tr.activeline td, .activeline { background-color: #bed4de !important;