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 @@ {% with vote|first as candidate %} - {{ candidate.0 }} {% if candidate.1 %} - {% trans 'not elected' %} + {% if perms.assignment.can_manage_assignment %} + + {% else %} + + {% endif %} {% else %} - {% trans 'elected' %} + {% if perms.assignment.can_manage_assignment %} + + {% endif %} {% endif %} + + {{ candidate.0 }} {% endwith %} {% 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 000000000..72e363a12 Binary files /dev/null and b/openslides/static/images/icons/games-highscores-grey.png differ 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