From af8dead5a3ec66d1fb175bdd108b7b33cb0a7dd4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Norman=20J=C3=A4ckel?=
Date: Sat, 4 Oct 2014 00:50:00 +0200
Subject: [PATCH] Fixed motion detail view template. Added block to enable
extra content via plugins. Updated CHANGELOG.
---
CHANGELOG | 14 +++++++---
.../templates/motion/motion_detail.html | 26 +++++++------------
openslides/motion/templates/motion/slide.html | 16 +++++++-----
3 files changed, 29 insertions(+), 27 deletions(-)
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 @@
{% trans "Reason" %}:
- {{ reason|safe|default:'–' }}
+ {{ reason|safe|default:'–' }}
@@ -208,9 +208,12 @@
{% trans "Vote result" %}:
{% with motion.polls.all as polls %}
{% for poll in polls %}
- {% if perms.motion.can_manage_motion or poll.has_votes %}
- {{ 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' %}">
-
{% endif %}
{% if poll.has_votes %}
@@ -244,11 +246,10 @@
{% endwith %}
{% else %}
- {% if perms.motion.can_manage_motion %}
- {% 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 'Withdraw motion' %}
-
- {% endif %}
-
{% if perms.motion.can_support_motion and 'motion_min_supporters'|get_config > 0 %}
{% if allowed_actions.unsupport %}
diff --git a/openslides/motion/templates/motion/slide.html b/openslides/motion/templates/motion/slide.html
index 2a6c97f03..ae64d6696 100644
--- a/openslides/motion/templates/motion/slide.html
+++ b/openslides/motion/templates/motion/slide.html
@@ -50,7 +50,7 @@
{% trans "Submitter" %}:
{% for submitter in motion.submitter.all %}
- {{ submitter.person }}{% if not forloop.last %},
{% endif %}
+ {{ submitter.person }}{% if not forloop.last %},
{% endif %}
{% empty %}
-
{% endfor %}
@@ -60,9 +60,8 @@
{% if supporters|length > 0 %}
{% trans "Supporters" %}:
{% for supporter in supporters %}
- {{ supporter.person }}{% if not forloop.last %},
{% endif %}
+ {{ supporter.person }}{% if not forloop.last %},
{% endif %}
{% endfor %}
-
{% endif %}
{% endwith %}
@@ -82,9 +81,14 @@
-{{ motion.active_version.text|safe }}
+
+ {{ motion.active_version.text|safe }}
+
+
{% if motion.active_version.reason %}
- {% trans "Reason" %}:
- {{ motion.active_version.reason|safe }}
+
+
{% trans "Reason" %}:
+ {{ motion.active_version.reason|safe }}
+
{% endif %}