From 8cd0ac877810a5b9624823e275581e084dc6c84c Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Mon, 5 Sep 2011 23:13:18 +0200
Subject: [PATCH] Added icon and style information for elected/not elected
 candidates.

---
 .../assignment/templates/assignment/view.html |  13 +++++++---
 .../images/icons/games-highscores-grey.png    | Bin 0 -> 3136 bytes
 openslides/static/javascript/assignment.js    |  15 +++++------
 openslides/static/styles/assignment.css       |  24 ++++++++++++++++--
 4 files changed, 39 insertions(+), 13 deletions(-)
 create mode 100644 openslides/static/images/icons/games-highscores-grey.png

diff --git a/openslides/assignment/templates/assignment/view.html b/openslides/assignment/templates/assignment/view.html
index d8ccb6b97..e3ad2ebfe 100644
--- a/openslides/assignment/templates/assignment/view.html
+++ b/openslides/assignment/templates/assignment/view.html
@@ -145,12 +145,19 @@
     <tr class="{% cycle 'odd' '' %}">
         <td class="candidate">
         {% with vote|first as candidate %}
-            {{ candidate.0 }}
             {% if candidate.1 %}
-                <a class="election_link iselected" href='{% url assignment_user_not_elected assignment.id candidate.0.id %}'>{% trans 'not elected' %}</a>
+                {% if perms.assignment.can_manage_assignment %}
+                <a class="election_link elected" href='{% url assignment_user_not_elected assignment.id candidate.0.id %}'></a>
+                {% else %}
+                <img src="/static/images/icons/games-highscores.png" title="{% trans 'Participant is elected' %}">
+                {% endif %}
             {% else %}
-                <a class="election_link" href='{% url assignment_user_elected assignment.id candidate.0.id %}'>{% trans 'elected' %}</a>
+                {% if perms.assignment.can_manage_assignment %}
+                <a class="election_link" href='{% url assignment_user_elected assignment.id candidate.0.id %}'></a>
+                {% endif %}
             {% endif %}
+            
+            {{ candidate.0 }}
         {% endwith %}
         </td>
         {% for v in vote|last %}
diff --git a/openslides/static/images/icons/games-highscores-grey.png b/openslides/static/images/icons/games-highscores-grey.png
new file mode 100644
index 0000000000000000000000000000000000000000..72e363a12b352873e12adff8a95fbf51c5a9c21e
GIT binary patch
literal 3136
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
a2lx*s!jYbEl#g8i0000<MNUMnLSTYU-uveO

literal 0
HcmV?d00001

diff --git a/openslides/static/javascript/assignment.js b/openslides/static/javascript/assignment.js
index 8a64e6c4a..eb7a4596d 100644
--- a/openslides/static/javascript/assignment.js
+++ b/openslides/static/javascript/assignment.js
@@ -1,5 +1,5 @@
 $(function() {
-    $('a.iselected').parent().parent().children('td').addClass('iselected');
+    $('a.elected').parent().parent().children('td').addClass('elected');
 
 
 
@@ -11,15 +11,14 @@ $(function() {
             url: line.attr('href'),
             dataType: 'json',
             success: function(data) {
-                if (line.hasClass('iselected') && !data.elected) {
-                    line.removeClass('iselected')
-                    line.parent().parent().children('td').removeClass('iselected')
-                } else if (!line.hasClass('iselected') && data.elected) {
-                    line.addClass('iselected')
-                    line.parent().parent().children('td').addClass('iselected')
+                if (line.hasClass('elected') && !data.elected) {
+                    line.removeClass('elected')
+                    line.parent().parent().children('td').removeClass('elected')
+                } else if (!line.hasClass('elected') && data.elected) {
+                    line.addClass('elected')
+                    line.parent().parent().children('td').addClass('elected')
                 }
                 line.attr('href', data.link);
-                line.text(data.text);
             },
             error: function () {
                 alert("Ajax Error");
diff --git a/openslides/static/styles/assignment.css b/openslides/static/styles/assignment.css
index 7571ee6d8..270d7640d 100644
--- a/openslides/static/styles/assignment.css
+++ b/openslides/static/styles/assignment.css
@@ -1,5 +1,25 @@
-td.iselected {
-    background-color: green !important;
+td.elected {
+    background-color: #BED4DE !important;
 }
 
+td.elected a.election_link {
+    background-image: url(/static/images/icons/games-highscores.png);
+    background-repeat: no-repeat;
+    background-position: center;
+    width: 16px;
+    height: 16px;
+    display: block;
+    margin-right: 5px;
+    float: left;
+}
 
+td a.election_link {
+    background-image: url(/static/images/icons/games-highscores-grey.png);
+    background-repeat: no-repeat;
+    background-position: center;
+    width: 16px;
+    height: 16px;
+    display: block;
+    margin-right: 5px;
+    float: left;
+}
\ No newline at end of file