ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

#208 and other symbol things

Browse Source
This commit is contained in:
Norman Jäckel 2012-06-23 13:14:18 +02:00
parent cc42792a38
commit 654388117b
4 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
openslides/application/templates/application/view.html
View File

@ -64,14 +64,11 @@
{% if perms.application.can_manage_application or poll.has_votes %} {% if perms.application.can_manage_application or poll.has_votes %}
<li> <li>
{% if perms.application.can_manage_application %} {% if perms.application.can_manage_application %}
<a href="{% url application_poll_view poll.id %}"> <strong>{{ forloop.counter }}. {% trans "Vote" %} </strong>
<b>{{ forloop.counter }}. {% trans "Vote" %}:</b> <a class="icon edit" href="{% url application_poll_view poll.id %}" title="{% trans 'Edit Vote' %}"><span></span></a>
</a> <a class="icon delete" href="{% url application_poll_delete poll.id %}" title="{% trans 'Delete Vote' %}"><span></span></a>
<a href="{% url application_poll_delete poll.id %}">
<img src="{% static 'images/icons/delete.png' %}" title="{% trans 'Delete Vote' %}">
</a>
{% elif poll.has_votes %} {% elif poll.has_votes %}
<b>{{ forloop.counter }}. {% trans "Vote" %}:</b> <strong>{{ forloop.counter }}. {% trans "Vote" %}:</strong>
{% endif %} {% endif %}
<br> <br>
{% if poll.has_votes %} {% if poll.has_votes %}

2
openslides/assignment/templates/assignment/base_assignment.html
View File

@ -56,7 +56,7 @@
{% if perms.assignment.can_manage_assignment %} {% if perms.assignment.can_manage_assignment %}
{% for poll in polls %} {% for poll in polls %}
{% url assignment_poll_view poll.id as url_assignmentpollview %} {% url assignment_poll_view poll.id as url_assignmentpollview %}
<li class="{% if request.path == url_assignmentpollview %}selected{% endif %}"><a href="{% url assignment_poll_view poll.id %}">{{ forloop.counter }}. {% trans "ballot" %}</a></li> <li class="{% if request.path == url_assignmentpollview %}selected{% endif %}"><a href="{% url assignment_poll_view poll.id %}"><img src="{% static 'images/icons/edit.png' %}"> {{ forloop.counter }}. {% trans "ballot" %}</a></li>
{% endfor %} {% endfor %}
{% endif %} {% endif %}
</ul> </ul>

7
openslides/assignment/templates/assignment/view.html
View File

@ -110,16 +110,17 @@
<th>{% trans "Candidates" %}</th> <th>{% trans "Candidates" %}</th>
{% for poll in polls %} {% for poll in polls %}
{# if poll.published and not perms.assignment.can_manage_assignment or perms.assignment.can_manage_assignment #} {# if poll.published and not perms.assignment.can_manage_assignment or perms.assignment.can_manage_assignment #}
<th style="vertical-align: top; white-space:nowrap;">{% if perms.assignment.can_manage_assignment %}<a href="{% url assignment_poll_view poll.id %}">{% endif %} <th style="vertical-align: top; white-space:nowrap;">
{{ forloop.counter }}. {% trans 'ballot' %} {{ forloop.counter }}. {% trans 'ballot' %}
{% if perms.assignment.can_manage_assignment %} {% if perms.assignment.can_manage_assignment %}
</a> <br>
<a class="publish_link {% if poll.published %}published{% endif %}" <a class="publish_link {% if poll.published %}published{% endif %}"
href="{% url assignment_poll_publish_status poll.id %}" href="{% url assignment_poll_publish_status poll.id %}"
title="{%trans 'Publish/unpublish results' %}"> title="{%trans 'Publish/unpublish results' %}">
<span></span> <span></span>
</a> </a>
<a href="{% url assignment_poll_delete poll.id %}"><img src="{% static 'images/icons/delete.png' %}" title="{% trans 'Delete Poll' %}"></a> <a href="{% url assignment_poll_view poll.id %}"><img src="{% static 'images/icons/edit.png' %}" title="{% trans 'Edit' %}"></a>
<a href="{% url assignment_poll_delete poll.id %}"><img src="{% static 'images/icons/delete.png' %}" title="{% trans 'Delete' %}"></a>
{% endif %} {% endif %}
</th> </th>
{# endif #} {# endif #}

4
openslides/static/styles/base.css
View File

@ -568,6 +568,10 @@ ul.results {
} }
/* Icons */ /* Icons */
.icon {
font-size: 14px;
}
.icon span { .icon span {
background-repeat: no-repeat; background-repeat: no-repeat;
background-position: center; background-position: center;