diff --git a/openslides/application/templates/application/overview.html b/openslides/application/templates/application/overview.html index d7c3e9bde..e487d55d8 100644 --- a/openslides/application/templates/application/overview.html +++ b/openslides/application/templates/application/overview.html @@ -47,7 +47,7 @@ {% if application.number %}{{ application.number }}{% else %}-{% endif %} - {{ application }} + {{ application.public_version.title }} {% if min_supporters > 0 %} {{ application.supporter.count }} {% endif %} diff --git a/openslides/application/templates/application/poll_view.html b/openslides/application/templates/application/poll_view.html index 479f1eb29..c4b340c54 100644 --- a/openslides/application/templates/application/poll_view.html +++ b/openslides/application/templates/application/poll_view.html @@ -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 %} -

{% trans "Application No." %} {{ application.number }} – {% trans "Vote" %}

-

{{ application.title }}

- -

{% trans "Results of" %} {{ ballot }}. {% trans "Vote" %}

+

{{ application.public_version.title }} ({% trans "Application" %} + {{ application.number }}) – {{ ballot }}. {% trans "Vote" %}

{% trans "Special values" %}: -1 = {% trans 'majority' %}; -2 = {% trans 'undocumented' %}
{% csrf_token %} {{ pre_form }} diff --git a/openslides/application/templates/application/view.html b/openslides/application/templates/application/view.html index e5d1aca78..9f2e4a0f8 100644 --- a/openslides/application/templates/application/view.html +++ b/openslides/application/templates/application/view.html @@ -205,12 +205,15 @@

- {% if application.number != None %} - {% trans "Application No." %} {{ application.number }} - {% else %} - {% trans "Application" %} [{% trans "no number" %}] - {% endif %} + {{ version.title }} + ({% trans "Application" %} + {% if application.number != None %} + {{ application.number }}) + {% else %} + [{% trans "no number" %}]) + {% endif %}

+ {% trans "Version" %} {{ version.aid }} {% if application.public_version != application.last_version %} @@ -222,7 +225,7 @@ {% endif %} {% endif %} -

{{ version.title }}

+

{% trans "Application" %}:

{{ version.text|linebreaks }} @@ -231,7 +234,7 @@ {% if version.reason %} {{ version.reason|linebreaks }} {% else %} - - + – {% endif %}