From 3cfb9b739b3268c7213971cf6859d1162331763b Mon Sep 17 00:00:00 2001 From: Emanuel Schuetze Date: Sat, 3 Jan 2015 08:08:09 +0100 Subject: [PATCH 1/9] Template improvements for tags of agenda items, motions and assignments. --- openslides/agenda/templates/agenda/item_row.html | 3 +++ openslides/agenda/templates/agenda/overview.html | 2 +- openslides/agenda/templates/agenda/view.html | 10 +++++++++- .../search/indexes/agenda/item_text.txt | 1 + .../templates/assignment/assignment_detail.html | 5 +++++ .../templates/assignment/assignment_list.html | 8 ++++++-- .../indexes/assignment/assignment_text.txt | 1 + openslides/core/templates/base.html | 2 +- openslides/core/templates/core/tag_list.html | 13 ++++++++++--- .../motion/templates/motion/motion_detail.html | 16 +++++++++++----- .../motion/templates/motion/motion_list.html | 14 +++++++++----- .../search/indexes/motion/motion_text.txt | 1 + 12 files changed, 58 insertions(+), 18 deletions(-) diff --git a/openslides/agenda/templates/agenda/item_row.html b/openslides/agenda/templates/agenda/item_row.html index 89fc545a0..f6a39e51b 100644 --- a/openslides/agenda/templates/agenda/item_row.html +++ b/openslides/agenda/templates/agenda/item_row.html @@ -83,5 +83,8 @@ {% endwith %} {% if node.type == node.ORGANIZATIONAL_ITEM %}[{% endif %}{{ node }}{% if node.type == node.ORGANIZATIONAL_ITEM %}]{% endif %} {{ node.get_title_supplement|safe }} + {% for tag in node.tags.all %} + {{ tag }} + {% endfor %} diff --git a/openslides/agenda/templates/agenda/overview.html b/openslides/agenda/templates/agenda/overview.html index eaee7a1f2..19de2f53d 100644 --- a/openslides/agenda/templates/agenda/overview.html +++ b/openslides/agenda/templates/agenda/overview.html @@ -41,7 +41,7 @@ {% endif %} {% if perms.core.can_manage_tags %} - + {% trans 'Tags' %} {% endif %} diff --git a/openslides/agenda/templates/agenda/view.html b/openslides/agenda/templates/agenda/view.html index 99813b900..adb9d5b46 100644 --- a/openslides/agenda/templates/agenda/view.html +++ b/openslides/agenda/templates/agenda/view.html @@ -41,6 +41,13 @@ + + +{% for tag in item.tags.all %} + {{ tag }} +{% endfor %} + +

{% if not item.content_object %} {{ item.text|safe }} @@ -49,6 +56,7 @@ {% endif %}

+ {% if perms.agenda.can_manage_agenda %} {% if item.comment %}

{% trans "Comment" %}

@@ -56,7 +64,7 @@ {% endif %} {% endif %} -{# List of Speakers #} +

{% trans "List of speakers" %} {% if item.speaker_list_closed %}{% trans 'closed' %}{% endif %}

{% if perms.agenda.can_manage_agenda %} diff --git a/openslides/agenda/templates/search/indexes/agenda/item_text.txt b/openslides/agenda/templates/search/indexes/agenda/item_text.txt index 61e3e6538..b7c4eae96 100644 --- a/openslides/agenda/templates/search/indexes/agenda/item_text.txt +++ b/openslides/agenda/templates/search/indexes/agenda/item_text.txt @@ -1,2 +1,3 @@ {{ object.title }} {{ object.text }} +{{ object.tags.all }} diff --git a/openslides/assignment/templates/assignment/assignment_detail.html b/openslides/assignment/templates/assignment/assignment_detail.html index 2744f5f4a..c50f09f25 100644 --- a/openslides/assignment/templates/assignment/assignment_detail.html +++ b/openslides/assignment/templates/assignment/assignment_detail.html @@ -50,6 +50,11 @@ + +{% for tag in assignment.tags.all %} + {{ tag }} +{% endfor %} +

diff --git a/openslides/assignment/templates/assignment/assignment_list.html b/openslides/assignment/templates/assignment/assignment_list.html index 8af8c8977..da85429a7 100644 --- a/openslides/assignment/templates/assignment/assignment_list.html +++ b/openslides/assignment/templates/assignment/assignment_list.html @@ -23,7 +23,7 @@ {% endif %} {% if perms.core.can_manage_tags %} - + {% trans 'Tags' %} {% endif %} @@ -46,7 +46,11 @@ {% for object in object_list %} - {{ object }} + {{ object }} + {% for tag in object.tags.all %} + {{ tag }} + {% endfor %} + {% trans "Posts" context "Number of searched candidates for an election" %}: diff --git a/openslides/assignment/templates/search/indexes/assignment/assignment_text.txt b/openslides/assignment/templates/search/indexes/assignment/assignment_text.txt index 26c4bab18..3ea7b5085 100644 --- a/openslides/assignment/templates/search/indexes/assignment/assignment_text.txt +++ b/openslides/assignment/templates/search/indexes/assignment/assignment_text.txt @@ -1,3 +1,4 @@ {{ object.name }} {{ object.description }} {{ object.candidates }} +{{ object.tags.all }} diff --git a/openslides/core/templates/base.html b/openslides/core/templates/base.html index c2ea0e954..9d9545222 100644 --- a/openslides/core/templates/base.html +++ b/openslides/core/templates/base.html @@ -113,7 +113,7 @@
diff --git a/openslides/core/templates/core/tag_list.html b/openslides/core/templates/core/tag_list.html index f6e19e2c5..731844b68 100644 --- a/openslides/core/templates/core/tag_list.html +++ b/openslides/core/templates/core/tag_list.html @@ -5,17 +5,23 @@ {% block title %}{% trans "Tags" %} – {{ block.super }}{% endblock %} {% block content %} -

{% trans "Tags" %}

+

{% trans "Tags" %} + + + {% trans "Back to overview" %} + + +

- + {% trans 'Save' %}
- + @@ -47,6 +53,7 @@ {% endfor %}
{% trans "Tag name" %}{% trans "Tag" %} {% trans "Actions" %}
+

{% trans "You can use these tags for agenda items, motions and elections." %}

{% endblock %} {% block javascript %} diff --git a/openslides/motion/templates/motion/motion_detail.html b/openslides/motion/templates/motion/motion_detail.html index 306a9193c..2add57d23 100644 --- a/openslides/motion/templates/motion/motion_detail.html +++ b/openslides/motion/templates/motion/motion_detail.html @@ -71,8 +71,6 @@ -{{ motion.tags.all|join:', ' }} -
{# TODO: show only for workflow with versioning #} @@ -256,7 +254,9 @@ {% block meta_box_poll_extras %}{% endblock %}

{% empty %} + {% if not allowed_actions.create_poll %} – + {% endif %} {% endfor %} {% if allowed_actions.create_poll %}

@@ -268,13 +268,19 @@ {% endwith %} -

{% trans "Category" %}:
{% if motion.category %} +
{% trans "Category" %}:
{{ motion.category }} - {% else %} - – {% endif %} + + {% for tag in motion.tags.all %} + {% if forloop.first %} +
{% trans "Tags" %}:
+ {% endif %} + {{ tag }} + {% endfor %} +
{% if motion.versions.count > 1 %} diff --git a/openslides/motion/templates/motion/motion_list.html b/openslides/motion/templates/motion/motion_list.html index f47280cbe..b8af4ede6 100644 --- a/openslides/motion/templates/motion/motion_list.html +++ b/openslides/motion/templates/motion/motion_list.html @@ -38,7 +38,7 @@ {% endif %} {% if perms.core.can_manage_tags %} - + {% trans 'Tags' %} {% endif %} @@ -72,15 +72,19 @@ {% for motion in motion_list %} - {{ motion.identifier|default:'' }} - - {{ motion.title }} + {{ motion.identifier|default:'' }} {% if motion.is_amendment %} - + {{ 'motion_amendments_prefix'|get_config }} {% endif %} + + {{ motion.title }} + {% for tag in motion.tags.all %} + {{ tag }} + {% endfor %} + {% if motion.category %}{{ motion.category }}{% else %}–{% endif %} {% trans motion.state.name %} diff --git a/openslides/motion/templates/search/indexes/motion/motion_text.txt b/openslides/motion/templates/search/indexes/motion/motion_text.txt index cdd239c13..d6261e605 100644 --- a/openslides/motion/templates/search/indexes/motion/motion_text.txt +++ b/openslides/motion/templates/search/indexes/motion/motion_text.txt @@ -5,3 +5,4 @@ {{ object.submitters }} {{ object.supporters }} {{ object.category }} +{{ object.tags.all }} From 91cef13326d37ae0718e8971dd5fb89178dbdebf Mon Sep 17 00:00:00 2001 From: Emanuel Schuetze Date: Thu, 8 Jan 2015 10:58:25 +0100 Subject: [PATCH 2/9] Improve the usage of bsmselect jquery plugin. Allow to disable the plugin for defined