ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Updated application projector view.

Browse Source
This commit is contained in:
Emanuel Schuetze 2011-09-08 18:57:11 +02:00
parent e6f1e64ffa
commit 475b7a1ffe
1 changed files with 34 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
openslides/agenda/templates/beamer/ItemApplication.html
View File

@ -2,27 +2,38 @@
{% load tags %} {% load tags %}
{% block title %}{{ block.super }} - {{ item.title }}{% endblock %} {% block title %}{{ block.super }} - {{ item.title }}{% endblock %}
{% block content %} {% block content %}
<div class="number">{% trans "Application" %} #{{ item.application.number }}</div>
<h1>{{ item.title }}</h1>
{% if item.application.status != "pub" and item.application.status != "per" %}
<div id="sidebar"> <div id="sidebar">
<div class="box"> <div class="box">
<h4>{%trans "Status" %}:</h4> <p><b>{%trans "Status" %}:</b><br>
{% if item.application.status != "pub" %}
{%trans item.application.get_status_display %} {%trans item.application.get_status_display %}
<br>
{% with item.application.poll_set.all as poll %} {% else %}
{% if poll|length > 0 %} {% for note in item.application.notes %}
<h4>{% trans "Poll result" %}:</h4> {{ note }}
{% for p in poll %} {% endfor %}
{% if p.has_vote %}
{% if poll|length > 1 %}
{{forloop.counter}}. {% trans "Poll" %}:<br>&nbsp;&nbsp;&nbsp;
{% endif %} {% endif %}
{% for option in p.get_options %} </p>
{% trans "Yes" %}: {{ option.voteyes }} <br>&nbsp;&nbsp;&nbsp;
{% trans "No" %}: {{ option.voteno }} <br>&nbsp;&nbsp;&nbsp; <p><b>{% trans "Submitter" %}:</b><br>
{% trans "Abstention" %}: {{ option.voteundesided }} {{ item.application.submitter }}</p>
{% with item.application.poll_set.all as polls %}
{% if polls|length > 0 and polls.0.has_vote %}
<p><b>{% trans "Poll result" %}:</b></p>
{% for p in polls %}
{% if p.has_vote %}
{% if polls|length > 1 %}
{{forloop.counter}}. {% trans "Vote" %}:<br>
{% endif %}
{% for option in p.options %}
<img src="/static/images/icons/voting-yes.png" title="{% trans 'Yes' %}"> {{ option.yes }} <br>
<img src="/static/images/icons/voting-no.png" title="{% trans 'No' %}"> {{ option.no }} <br>
<img src="/static/images/icons/voting-abstention.png" title="{% trans 'Abstention' %}"> {{ option.undesided }}<br>
<img src="/static/images/icons/voting-invalid.png" title="{% trans 'Invalid' %}"> {{ p.votesinvalid }}<br>
<div style="border-top: 1px solid; padding-top: 5px; margin: 5px 0; width: 5em;">
<img src="/static/images/icons/voting-total.png" title="{% trans 'Votes cast' %}"> {{ p.votescast }}
</div>
{% endfor %} {% endfor %}
<br> <br>
{% else %} {% else %}
@ -33,15 +44,17 @@
{% endfor %} {% endfor %}
{% endif %} {% endif %}
{% endwith %} {% endwith %}
</div> </div>
</div> </div>
{% endif %}
<h1>{% trans "Application No." %} {{ item.application.number }}</h1>
<b>{{ item.title }}</b>
<p> <p>
<div class="text">{{ item.application.text|linebreaks }}</div> <div class="text">{{ item.application.public_version.text|linebreaks }}</div>
{% if item.application.public_version.reason %}
<br> <br>
<div class="reason"><p><b>{% trans "Reason" %}:</b></p> <div class="reason"><p><b>{% trans "Reason" %}:</b></p>
{{ item.application.reason|linebreaks }}</div> {{ item.application.public_version.reason|linebreaks }}</div>
{% endif %}
</p> </p>
{% endblock %} {% endblock %}