Change design of application view and poll view (see #292)

This commit is contained in:
Norman Jäckel 2012-07-16 00:01:26 +02:00
parent bd9c609dc0
commit 0279c07b15
3 changed files with 17 additions and 13 deletions

View File

@ -47,7 +47,7 @@
<tr class="{% cycle '' 'odd' %} <tr class="{% cycle '' 'odd' %}
{% if application.active %}activeline{% endif %}"> {% if application.active %}activeline{% endif %}">
<td>{% if application.number %}{{ application.number }}{% else %}-{% endif %}</td> <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 %} {% if min_supporters > 0 %}
<td>{{ application.supporter.count }}</td> <td>{{ application.supporter.count }}</td>
{% endif %} {% endif %}

View File

@ -3,13 +3,14 @@
{% load i18n %} {% load i18n %}
{% load staticfiles %} {% 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 %} {% block content %}
<h1>{% trans "Application No." %} {{ application.number }} {% trans "Vote" %}</h1> <h1>{{ application.public_version.title }} ({% trans "Application" %}
<h3>{{ application.title }}</h3> {{ application.number }}) {{ ballot }}. {% trans "Vote" %}</h1>
<p>{% trans "Results of" %} {{ ballot }}. {% trans "Vote" %}</p>
<i class="helptext">{% trans "Special values" %}: -1 = {% trans 'majority' %}; -2 = {% trans 'undocumented' %}</i> <i class="helptext">{% trans "Special values" %}: -1 = {% trans 'majority' %}; -2 = {% trans 'undocumented' %}</i>
<form action="" method="post" class="small-form">{% csrf_token %} <form action="" method="post" class="small-form">{% csrf_token %}
{{ pre_form }} {{ pre_form }}

View File

@ -205,12 +205,15 @@
<div id="main"> <div id="main">
<h1> <h1>
{{ version.title }}
({% trans "Application" %}
{% if application.number != None %} {% if application.number != None %}
{% trans "Application No." %} {{ application.number }} {{ application.number }})
{% else %} {% else %}
{% trans "Application" %} <i>[{% trans "no number" %}]</i> <i>[{% trans "no number" %}]</i>)
{% endif %} {% endif %}
</h1> </h1>
{% trans "Version" %} {{ version.aid }} {% trans "Version" %} {{ version.aid }}
{% if application.public_version != application.last_version %} {% if application.public_version != application.last_version %}
@ -222,7 +225,7 @@
{% endif %} {% endif %}
{% endif %} {% endif %}
<h2>{{ version.title }}</h2> <h2>{% trans "Application" %}:</h2>
{{ version.text|linebreaks }} {{ version.text|linebreaks }}
@ -231,7 +234,7 @@
{% if version.reason %} {% if version.reason %}
{{ version.reason|linebreaks }} {{ version.reason|linebreaks }}
{% else %} {% else %}
-
{% endif %} {% endif %}