diff --git a/CHANGELOG b/CHANGELOG index a8a2bd2c3..3987d5f12 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -10,15 +10,21 @@ Version 1.6.1 (unreleased) Motions: - Show supporters on motion slide if available. +- Fixed motion detail view template. Added block to enable extra content via + plugins. + +Assignments: +- Fixed PDF when an assignment has a lot of posts. Used only 7 signature + lines. Participants: -- Fixed participant csv import for group id: - * Allowed to add multiple groups in csv group id field, e.g. "3,4". - * Fixed bug that group ids > 9 can not be imported. +- Fixed participant csv import with group ids: + * Allowed to add multiple groups in csv group id field, e. g. "3,4". + * Fixed bug that group ids greater than 9 can not be imported. * Updated error message if group id does not exists. Other: -- Fixed CKEditor stuff (added insertpre plugin and removed unused code) +- Fixed CKEditor stuff (added insertpre plugin and removed unused code). Version 1.6 (2014-06-02) diff --git a/openslides/motion/templates/motion/motion_detail.html b/openslides/motion/templates/motion/motion_detail.html index 399a8d4ec..9eaa029fd 100644 --- a/openslides/motion/templates/motion/motion_detail.html +++ b/openslides/motion/templates/motion/motion_detail.html @@ -92,7 +92,7 @@
{{ poll.poll_number|ordinal|safe }} {% trans "vote" %}:
+
+ {% if polls.count > 1 %}
+ {{ poll.poll_number|ordinal|safe }} {% trans "vote" %}:
+ {% endif %}
{% if perms.motion.can_manage_motion %}
+ {% if polls.count > 1 %}
{% endif %}
@@ -220,7 +223,6 @@
rel="tooltip" data-original-title="{% trans 'Edit Vote' %}">
-
{% trans 'No result' %}
- {% endif %} +{% trans 'No result' %}
{% endif %} - {% endif %} + {% block meta_box_poll_extras %}{% endblock %} + {% empty %} – {% endfor %} @@ -279,15 +280,6 @@ {{ version.creation_time }} - - {# TODO: Check this button #} - {% if allowed_actions.wit and user in motion.submitters %} -{% trans "Reason" %}:
- {{ motion.active_version.reason|safe }}{% trans "Reason" %}:
+ {{ motion.active_version.reason|safe }} +