From 654388117be9420d77da632ee5dfd43ac9d9c361 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Norman=20J=C3=A4ckel?= Date: Sat, 23 Jun 2012 13:14:18 +0200 Subject: [PATCH] #208 and other symbol things --- .../application/templates/application/view.html | 11 ++++------- .../templates/assignment/base_assignment.html | 2 +- openslides/assignment/templates/assignment/view.html | 7 ++++--- openslides/static/styles/base.css | 4 ++++ 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/openslides/application/templates/application/view.html b/openslides/application/templates/application/view.html index f296ca7dc..70e46bb47 100644 --- a/openslides/application/templates/application/view.html +++ b/openslides/application/templates/application/view.html @@ -64,14 +64,11 @@ {% if perms.application.can_manage_application or poll.has_votes %}
  • {% if perms.application.can_manage_application %} - - {{ forloop.counter }}. {% trans "Vote" %}: - - - - + {{ forloop.counter }}. {% trans "Vote" %} + + {% elif poll.has_votes %} - {{ forloop.counter }}. {% trans "Vote" %}: + {{ forloop.counter }}. {% trans "Vote" %}: {% endif %}
    {% if poll.has_votes %} diff --git a/openslides/assignment/templates/assignment/base_assignment.html b/openslides/assignment/templates/assignment/base_assignment.html index b6bf4591a..98840cec0 100644 --- a/openslides/assignment/templates/assignment/base_assignment.html +++ b/openslides/assignment/templates/assignment/base_assignment.html @@ -56,7 +56,7 @@ {% if perms.assignment.can_manage_assignment %} {% for poll in polls %} {% url assignment_poll_view poll.id as url_assignmentpollview %} -
  • {{ forloop.counter }}. {% trans "ballot" %}
  • +
  • {{ forloop.counter }}. {% trans "ballot" %}
  • {% endfor %} {% endif %} diff --git a/openslides/assignment/templates/assignment/view.html b/openslides/assignment/templates/assignment/view.html index b9175dadd..bf120d4d4 100644 --- a/openslides/assignment/templates/assignment/view.html +++ b/openslides/assignment/templates/assignment/view.html @@ -110,16 +110,17 @@ {% trans "Candidates" %} {% for poll in polls %} {# if poll.published and not perms.assignment.can_manage_assignment or perms.assignment.can_manage_assignment #} - {% if perms.assignment.can_manage_assignment %}{% endif %} + {{ forloop.counter }}. {% trans 'ballot' %} {% if perms.assignment.can_manage_assignment %} - +
    - + + {% endif %} {# endif #} diff --git a/openslides/static/styles/base.css b/openslides/static/styles/base.css index 2e76d57f5..2f756b978 100644 --- a/openslides/static/styles/base.css +++ b/openslides/static/styles/base.css @@ -568,6 +568,10 @@ ul.results { } /* Icons */ +.icon { + font-size: 14px; +} + .icon span { background-repeat: no-repeat; background-position: center;