diff --git a/openslides/agenda/static/images/icons/summary.png b/openslides/agenda/static/images/icons/summary.png
deleted file mode 100644
index 0f8264c78..000000000
Binary files a/openslides/agenda/static/images/icons/summary.png and /dev/null differ
diff --git a/openslides/agenda/static/styles/agenda.css b/openslides/agenda/static/styles/agenda.css
index 3851b9db8..27cb3d47c 100644
--- a/openslides/agenda/static/styles/agenda.css
+++ b/openslides/agenda/static/styles/agenda.css
@@ -5,20 +5,6 @@
* :license: GNU GPL, see LICENSE for more details.
*/
-/* agenda item open/closed */
-.close_link span {
- background-image: url(../images/icons/close-grey.png);
- background-repeat: no-repeat;
- background-position: center;
- width: 16px;
- height: 16px;
- display: inline-block;
-}
-
-.close_link.closed span {
- background-image: url(../images/icons/close.png);
-}
-
tr.topline td {
border-bottom: 1px solid #333333;
background-color: #CDCDCD;
diff --git a/openslides/assignment/static/javascript/assignment.js b/openslides/assignment/static/javascript/assignment.js
index 9198434a0..1f3efd113 100644
--- a/openslides/assignment/static/javascript/assignment.js
+++ b/openslides/assignment/static/javascript/assignment.js
@@ -24,9 +24,6 @@ $(function() {
line.parent().parent().children('td').addClass('elected')
}
line.attr('href', data.link);
- },
- error: function () {
- alert("Ajax Error");
}
});
});
@@ -48,22 +45,24 @@ $(function() {
}
});
});
+ // change publish status of ballot
$('.publish_link').click(function(event) {
event.preventDefault();
- link = $(this);
+ var link = $(this);
$.ajax({
type: 'GET',
- url: link.attr('href'),
+ url: $(this).attr('href'),
dataType: 'json',
success: function(data) {
if (data.published) {
- link.addClass('published');
- //link.attr('title', gettext('Unpublish ballot'))
+ newclass = 'icon-checked-new_white';
+ link.addClass('btn-primary');
} else {
- link.removeClass('published');
- //link.attr('title', 'Publish ballot')
+ newclass = 'icon-unchecked-new';
+ link.removeClass('btn-primary');
}
+ link.children('i').removeClass('icon-checked-new_white icon-unchecked-new').addClass(newclass);
+ link.attr('href', data.link);
}
});
- });
-});
+ });});
diff --git a/openslides/assignment/static/styles/assignment.css b/openslides/assignment/static/styles/assignment.css
index 4079471c7..4a84a9189 100644
--- a/openslides/assignment/static/styles/assignment.css
+++ b/openslides/assignment/static/styles/assignment.css
@@ -10,7 +10,7 @@ td.elected {
}
td.elected a.election_link {
- background-image: url(../images/icons/voting-yes.png);
+ background-image: url(../img/voting-yes.png);
background-repeat: no-repeat;
background-position: center;
width: 16px;
@@ -21,7 +21,7 @@ td.elected a.election_link {
}
td a.election_link {
- background-image: url(../images/icons/voting-yes-grey.png);
+ background-image: url(../img/voting-yes-grey.png);
background-repeat: no-repeat;
background-position: center;
width: 16px;
@@ -30,15 +30,3 @@ td a.election_link {
margin-right: 5px;
float: left;
}
-
-a.publish_link span {
- background-image: url(../images/icons/off.png);
- background-repeat: no-repeat;
- background-position: center;
- width: 16px;
- height: 16px;
- display: inline-block;
-}
-a.publish_link.published span {
- background-image: url(../images/icons/on.png);
-}
diff --git a/openslides/assignment/templates/assignment/view.html b/openslides/assignment/templates/assignment/view.html
index cab84e86c..743117126 100644
--- a/openslides/assignment/templates/assignment/view.html
+++ b/openslides/assignment/templates/assignment/view.html
@@ -77,7 +77,9 @@
| {% trans "elected" %}
{% if perms.assignment.can_manage_assignment %}
{% if assignment.status == "sea" or assignment.status == "vot" %}
-
+
+
+
{% endif %}
{% endif %}
{% endif %}
@@ -107,9 +109,9 @@