Change design of application view and poll view (see #292)
This commit is contained in:
parent
bd9c609dc0
commit
0279c07b15
|
@ -47,7 +47,7 @@
|
|||
<tr class="{% cycle '' 'odd' %}
|
||||
{% if application.active %}activeline{% endif %}">
|
||||
<td>{% if application.number %}{{ application.number }}{% else %}-{% endif %}</td>
|
||||
<td><a href="{% url application_view application.id %}">{{ application }}</a></td>
|
||||
<td><a href="{% url application_view application.id %}">{{ application.public_version.title }}</a></td>
|
||||
{% if min_supporters > 0 %}
|
||||
<td>{{ application.supporter.count }}</td>
|
||||
{% endif %}
|
||||
|
|
|
@ -3,13 +3,14 @@
|
|||
{% load i18n %}
|
||||
{% load staticfiles %}
|
||||
|
||||
{% block title %}{{ block.super }} – {% trans "Application No." %} {{ application.number }} – {% trans "Vote" %}{% endblock %}
|
||||
{% block title %}
|
||||
{{ block.super }} – {% trans "Application" %} "{{ application.public_version.title }}"
|
||||
– {{ ballot }}. {% trans "Vote" %}
|
||||
{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<h1>{% trans "Application No." %} {{ application.number }} – {% trans "Vote" %}</h1>
|
||||
<h3>{{ application.title }}</h3>
|
||||
|
||||
<p>{% trans "Results of" %} {{ ballot }}. {% trans "Vote" %}</p>
|
||||
<h1>{{ application.public_version.title }} ({% trans "Application" %}
|
||||
{{ application.number }}) – {{ ballot }}. {% trans "Vote" %}</h1>
|
||||
<i class="helptext">{% trans "Special values" %}: -1 = {% trans 'majority' %}; -2 = {% trans 'undocumented' %}</i>
|
||||
<form action="" method="post" class="small-form">{% csrf_token %}
|
||||
{{ pre_form }}
|
||||
|
|
|
@ -205,12 +205,15 @@
|
|||
|
||||
<div id="main">
|
||||
<h1>
|
||||
{% if application.number != None %}
|
||||
{% trans "Application No." %} {{ application.number }}
|
||||
{% else %}
|
||||
{% trans "Application" %} <i>[{% trans "no number" %}]</i>
|
||||
{% endif %}
|
||||
{{ version.title }}
|
||||
({% trans "Application" %}
|
||||
{% if application.number != None %}
|
||||
{{ application.number }})
|
||||
{% else %}
|
||||
<i>[{% trans "no number" %}]</i>)
|
||||
{% endif %}
|
||||
</h1>
|
||||
|
||||
{% trans "Version" %} {{ version.aid }}
|
||||
|
||||
{% if application.public_version != application.last_version %}
|
||||
|
@ -222,7 +225,7 @@
|
|||
{% endif %}
|
||||
{% endif %}
|
||||
|
||||
<h2>{{ version.title }}</h2>
|
||||
<h2>{% trans "Application" %}:</h2>
|
||||
|
||||
{{ version.text|linebreaks }}
|
||||
|
||||
|
@ -231,7 +234,7 @@
|
|||
{% if version.reason %}
|
||||
{{ version.reason|linebreaks }}
|
||||
{% else %}
|
||||
-
|
||||
–
|
||||
{% endif %}
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue