diff --git a/openslides/agenda/templates/agenda/base_agenda.html b/openslides/agenda/templates/agenda/base_agenda.html index 6760fad73..e05221945 100644 --- a/openslides/agenda/templates/agenda/base_agenda.html +++ b/openslides/agenda/templates/agenda/base_agenda.html @@ -13,6 +13,6 @@ {% if perms.agenda.can_manage_agenda %}
  • {%trans "New item" %}
  • {% endif %} -
  • {%trans 'Agenda as PDF' %}
  • +
  • {%trans 'Agenda as PDF' %}
  • {% endblock %} diff --git a/openslides/agenda/templates/agenda/item_row.html b/openslides/agenda/templates/agenda/item_row.html index fc477eb8b..fa871aad3 100644 --- a/openslides/agenda/templates/agenda/item_row.html +++ b/openslides/agenda/templates/agenda/item_row.html @@ -28,7 +28,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 5a134da4b..67fc2caa3 100644 --- a/openslides/application/templates/application/base_application.html +++ b/openslides/application/templates/application/base_application.html @@ -15,7 +15,7 @@ {% if perms.application.can_manage_application %}
  • {%trans 'Import applications' %}
  • {% endif %} -
  • {%trans 'All applications as PDF' %}
  • +
  • {%trans 'All applications as PDF' %}
  • {# second submenu #} @@ -42,7 +42,7 @@
  • {%trans 'Delete application' %}
  • {% endif %} {# PDF #} -
  • {%trans 'Application as PDF' %}
  • +
  • {%trans 'Application as PDF' %}
  • {# activate and polls #} {% if perms.projector.can_manage_projector %}
  • {%trans 'Show Application' %}
  • @@ -53,7 +53,7 @@ {% url application_poll_view poll.id as url_applicationpollview %}
  • {% trans "View Vote" %} {% if forloop.counter > 1 %}(#{{ forloop.counter }}){% endif %}
  • {% url print_application_poll poll.id as url_applicationedit %} -
  • {%trans 'Ballot paper' %} {% if forloop.counter > 1 %}(#{{ forloop.counter }}){% endif %}
  • +
  • {%trans 'Ballot paper' %} {% if forloop.counter > 1 %}(#{{ forloop.counter }}){% endif %}
  • {% endfor %} {% endif %} diff --git a/openslides/application/templates/application/overview.html b/openslides/application/templates/application/overview.html index fab80be16..3922542f4 100644 --- a/openslides/application/templates/application/overview.html +++ b/openslides/application/templates/application/overview.html @@ -71,7 +71,7 @@ {% endif %} - + diff --git a/openslides/assignment/templates/assignment/base_assignment.html b/openslides/assignment/templates/assignment/base_assignment.html index 80656e155..3e4943883 100644 --- a/openslides/assignment/templates/assignment/base_assignment.html +++ b/openslides/assignment/templates/assignment/base_assignment.html @@ -17,6 +17,6 @@ {% if perms.assignment.can_manage_assignment %}
  • {%trans "New election" %}
  • {% endif %} -
  • {%trans 'Print all elections' %}
  • +
  • {%trans 'All elections as PDF' %}
  • {% endblock %} diff --git a/openslides/assignment/templates/assignment/overview.html b/openslides/assignment/templates/assignment/overview.html index 45c6af90b..98c835876 100644 --- a/openslides/assignment/templates/assignment/overview.html +++ b/openslides/assignment/templates/assignment/overview.html @@ -43,7 +43,7 @@ {% endif %} - + diff --git a/openslides/assignment/templates/assignment/view.html b/openslides/assignment/templates/assignment/view.html index b2944755b..163161b5b 100644 --- a/openslides/assignment/templates/assignment/view.html +++ b/openslides/assignment/templates/assignment/view.html @@ -11,7 +11,7 @@

    {% trans "Status" %}:

    - +

    {% trans assignment.get_status_display %} diff --git a/openslides/participant/templates/participant/base_participant.html b/openslides/participant/templates/participant/base_participant.html index 4bb6153a0..cf531f158 100644 --- a/openslides/participant/templates/participant/base_participant.html +++ b/openslides/participant/templates/participant/base_participant.html @@ -21,10 +21,10 @@
  • {%trans 'Import participants' %}
  • {% endif %} {% if perms.participant.can_see_participant %} -
  • {%trans 'Print participant list' %}
  • +
  • {%trans 'List of participants as PDF' %}
  • {% endif %} {% if perms.participant.can_manage_participant %} -
  • {% trans 'Print first time passwords' %}
  • +
  • {% trans 'First time passwords as PDF' %}
  • {% endif %} {% endblock %} diff --git a/openslides/static/images/icons/checkbox.png b/openslides/static/images/icons/checkbox.png deleted file mode 100644 index 1c311e210..000000000 Binary files a/openslides/static/images/icons/checkbox.png and /dev/null differ diff --git a/openslides/static/images/icons/dialog-error.png b/openslides/static/images/icons/error.png similarity index 100% rename from openslides/static/images/icons/dialog-error.png rename to openslides/static/images/icons/error.png diff --git a/openslides/static/images/icons/dialog-information.png b/openslides/static/images/icons/information.png similarity index 100% rename from openslides/static/images/icons/dialog-information.png rename to openslides/static/images/icons/information.png diff --git a/openslides/static/images/icons/application-pdf.png b/openslides/static/images/icons/pdf.png similarity index 100% rename from openslides/static/images/icons/application-pdf.png rename to openslides/static/images/icons/pdf.png diff --git a/openslides/static/styles/base.css b/openslides/static/styles/base.css index 5ec37381c..e9a8482e5 100644 --- a/openslides/static/styles/base.css +++ b/openslides/static/styles/base.css @@ -384,7 +384,7 @@ input[type="submit"], input[type="button"] { background:url(../images/icons/go-previous.png) no-repeat 0px 0px; } .button .pdf{ - background:url(../images/icons/application-pdf.png) no-repeat 0px 0px; + background:url(../images/icons/pdf.png) no-repeat 0px 0px; } .button .adduser{ background:url(../images/icons/list-add-user.png) no-repeat 0px 0px; @@ -558,7 +558,7 @@ ul.results { color: #556652; } .notification.error { - background: url("../images/icons/task-reject.png") repeat scroll 0 0 #FFCECE; + background: url("../images/icons/error.png") repeat scroll 0 0 #FFCECE; border-color: #DF8F8F; color: #665252; } @@ -568,7 +568,7 @@ ul.results { color: #666452; } .notification.info { - background: url("../images/icons/dialog-information.png") repeat scroll 0 0 #DBE3FF; + background: url("../images/icons/information.png") repeat scroll 0 0 #DBE3FF; border-color: #A2B4EE; color: #585B66; }