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

#79: Merged fix of r361 from default branch into 1.2-dev branch.

Browse Source
This commit is contained in:
Emanuel Schuetze 2012-04-02 08:30:28 +02:00
parent b480db2e8a
commit c2ec9e958f
5 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -169,7 +169,7 @@
{% if perms.assignment.can_manage_assignment %}
<a class="election_link elected" href='{% url assignment_user_not_elected assignment.id candidate.0.id %}'></a>
{% else %}
<a class="elected"><img src="/static/images/icons/games-highscores.png" title="{% trans 'Candidate is elected' %}"></a>
<a class="elected"><img src="/static/images/icons/voting-yes.png" title="{% trans 'Candidate is elected' %}"></a>
{% endif %}
{% else %}
{% if perms.assignment.can_manage_assignment %}

2
openslides/assignment/templates/projector/Assignment.html
View File

@ -61,7 +61,7 @@
{% with vote|first as candidate %}
<td class="candidate {% if candidate.1 %}elected{% endif %}">
{% if candidate.1 %}
<a class="elected"><img src="/static/images/icons/games-highscores.png" title="{% trans 'Candidate is elected' %}"></a>
<a class="elected"><img src="/static/images/icons/voting-yes.png" title="{% trans 'Candidate is elected' %}"></a>
{% endif %}
{{ candidate.0 }}
</td>

BIN
openslides/static/images/icons/games-highscores.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 876 B

BIN
openslides/static/images/icons/games-highscores-grey.png → openslides/static/images/icons/voting-yes-grey.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 3.1 KiB

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

@ -3,7 +3,7 @@ td.elected {
}
td.elected a.election_link {
background-image: url(/static/images/icons/games-highscores.png);
background-image: url(/static/images/icons/voting-yes.png);
background-repeat: no-repeat;
background-position: center;
width: 16px;
@ -14,7 +14,7 @@ td.elected a.election_link {
}
td a.election_link {
background-image: url(/static/images/icons/games-highscores-grey.png);
background-image: url(/static/images/icons/voting-yes-grey.png);
background-repeat: no-repeat;
background-position: center;
width: 16px;