Merge pull request #1338 from normanjaeckel/FixedMotionDetailViewTemplate
Fixed motion detail view template.
This commit is contained in:
commit
b3c2e67613
14
CHANGELOG
14
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)
|
||||
|
@ -92,7 +92,7 @@
|
||||
|
||||
<!-- Reason -->
|
||||
<h4>{% trans "Reason" %}:</h4>
|
||||
{{ reason|safe|default:'–' }}
|
||||
{{ reason|safe|default:'–' }}
|
||||
<br>
|
||||
|
||||
<!-- Attachments -->
|
||||
@ -208,9 +208,12 @@
|
||||
<h5>{% trans "Vote result" %}:</h5>
|
||||
{% with motion.polls.all as polls %}
|
||||
{% for poll in polls %}
|
||||
{% if perms.motion.can_manage_motion or poll.has_votes %}
|
||||
<p>{{ poll.poll_number|ordinal|safe }} {% trans "vote" %}:<br>
|
||||
<p>
|
||||
{% if polls.count > 1 %}
|
||||
{{ poll.poll_number|ordinal|safe }} {% trans "vote" %}:
|
||||
{% endif %}
|
||||
{% if perms.motion.can_manage_motion %}
|
||||
{% if polls.count > 1 %}<br>{% endif %}
|
||||
<a class="btn btn-mini activate_link {% if poll.is_active_slide %}btn-primary{% endif %}" href="{{ poll|absolute_url:'projector' }}"
|
||||
rel="tooltip" data-original-title="{% trans 'Show vote result' %}">
|
||||
<i class="icon-facetime-video {% if poll.is_active_slide %}icon-white{% endif %}"></i></a>
|
||||
@ -220,7 +223,6 @@
|
||||
rel="tooltip" data-original-title="{% trans 'Edit Vote' %}"><i class="icon-pencil"></i></a>
|
||||
<a class="btn btn-mini" href="{{ poll|absolute_url:'delete' }}"
|
||||
rel="tooltip" data-original-title="{% trans 'Delete Vote' %}"><i class="icon-remove"></i></a>
|
||||
</p>
|
||||
{% endif %}
|
||||
{% if poll.has_votes %}
|
||||
<div class="result">
|
||||
@ -244,11 +246,10 @@
|
||||
{% endwith %}
|
||||
</div>
|
||||
{% else %}
|
||||
{% if perms.motion.can_manage_motion %}
|
||||
<p><span class="label label-info">{% trans 'No result' %}</span></p>
|
||||
{% endif %}
|
||||
<p><span class="label label-info">{% trans 'No result' %}</span></p>
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
{% block meta_box_poll_extras %}{% endblock %}
|
||||
</p>
|
||||
{% empty %}
|
||||
–
|
||||
{% endfor %}
|
||||
@ -279,15 +280,6 @@
|
||||
</h5>
|
||||
{{ version.creation_time }}
|
||||
|
||||
<!-- Widthdraw button -->
|
||||
{# TODO: Check this button #}
|
||||
{% if allowed_actions.wit and user in motion.submitters %}
|
||||
<br><br>
|
||||
<a href="{% url 'motion_set_state' motion.id 'wit' %}" class="btn">
|
||||
<span class="icon revert">{% trans 'Withdraw motion' %}</span>
|
||||
</a>
|
||||
{% endif %}
|
||||
|
||||
<!-- Support/Unsupport button -->
|
||||
{% if perms.motion.can_support_motion and 'motion_min_supporters'|get_config > 0 %}
|
||||
{% if allowed_actions.unsupport %}
|
||||
|
@ -50,7 +50,7 @@
|
||||
<!-- Submitter -->
|
||||
<h4>{% trans "Submitter" %}:</h4>
|
||||
{% for submitter in motion.submitter.all %}
|
||||
{{ submitter.person }}{% if not forloop.last %},<br> {% endif %}
|
||||
{{ submitter.person }}{% if not forloop.last %},<br>{% endif %}
|
||||
{% empty %}
|
||||
-
|
||||
{% endfor %}
|
||||
@ -60,9 +60,8 @@
|
||||
{% if supporters|length > 0 %}
|
||||
<h4>{% trans "Supporters" %}:</h4>
|
||||
{% for supporter in supporters %}
|
||||
{{ supporter.person }}{% if not forloop.last %},<br> {% endif %}
|
||||
{{ supporter.person }}{% if not forloop.last %},<br>{% endif %}
|
||||
{% endfor %}
|
||||
</p>
|
||||
{% endif %}
|
||||
{% endwith %}
|
||||
|
||||
@ -82,9 +81,14 @@
|
||||
</small>
|
||||
</h1>
|
||||
|
||||
<div class="text">{{ motion.active_version.text|safe }}</div>
|
||||
<div class="text">
|
||||
{{ motion.active_version.text|safe }}
|
||||
</div>
|
||||
|
||||
{% if motion.active_version.reason %}
|
||||
<br>
|
||||
<div class="reason"><p><b>{% trans "Reason" %}:</b></p>
|
||||
{{ motion.active_version.reason|safe }}</div>
|
||||
<div class="reason">
|
||||
<p><b>{% trans "Reason" %}:</b></p>
|
||||
{{ motion.active_version.reason|safe }}
|
||||
</div>
|
||||
{% endif %}
|
||||
|
Loading…
Reference in New Issue
Block a user