From 404bf7f0b5b946c1f4a3fef78f3a8c4bc4cf5b0e Mon Sep 17 00:00:00 2001 From: Emanuel Schuetze Date: Mon, 4 Feb 2013 13:38:29 +0100 Subject: [PATCH] template: Added missing back link. --- .../templates/participant/group_detail.html | 14 ++++++++---- .../templates/participant/overview.html | 4 ++-- .../templates/participant/user_detail.html | 22 +++++++++++-------- 3 files changed, 25 insertions(+), 15 deletions(-) diff --git a/openslides/participant/templates/participant/group_detail.html b/openslides/participant/templates/participant/group_detail.html index fb456c31c..ea3f5fab0 100644 --- a/openslides/participant/templates/participant/group_detail.html +++ b/openslides/participant/templates/participant/group_detail.html @@ -1,4 +1,4 @@ -{% extends "participant/base_participant.html" %} +{% extends "base.html" %} {% load i18n %} {% load tags %} @@ -7,16 +7,22 @@ {% block content %} -

{{ group }}

+

{{ group }} + + {% trans "Back to overview" %} + +

{{ group.description }}

-

{% trans "Members" %}

+

{% trans "Members" %}

+
    {% for member in group.user_set.all %} -

    {{ member }}

    +
  1. {{ member }}
  2. {% empty %}

    {% trans "No members available." %}

    {% endfor %} +
{% endblock %} diff --git a/openslides/participant/templates/participant/overview.html b/openslides/participant/templates/participant/overview.html index cdd052767..56c7ac5bc 100644 --- a/openslides/participant/templates/participant/overview.html +++ b/openslides/participant/templates/participant/overview.html @@ -116,8 +116,8 @@ {% for user in users %} - {{ user.first_name }} - {{ user.last_name }} + {{ user.first_name }} + {{ user.last_name }} {{ user.structure_level }} {{ user.get_type_display }} {{ user.committee }} diff --git a/openslides/participant/templates/participant/user_detail.html b/openslides/participant/templates/participant/user_detail.html index af3b581c3..e31502b29 100644 --- a/openslides/participant/templates/participant/user_detail.html +++ b/openslides/participant/templates/participant/user_detail.html @@ -1,4 +1,4 @@ -{% extends "participant/base_participant.html" %} +{% extends "base.html" %} {% load i18n %} {% load tags %} @@ -7,11 +7,15 @@ {% block content %} -

{{ shown_user }}

+

{{ shown_user }} + + {% trans "Back to overview" %} + +

{{ shown_user.email }}

-

{% trans "Groups" %}

+

{% trans "Groups" %}

{% if shown_user.groups.all %} {{ shown_user.groups.all|join:", " }} @@ -21,32 +25,32 @@

{% if shown_user.get_gender_display %} -

{% trans "Gender" %}

+

{% trans "Gender" %}

{{ shown_user.get_gender_display }}

{% endif %} {% if shown_user.get_type_display %} -

{% trans "Type" %}

+

{% trans "Type" %}

{{ shown_user.get_type_display }}

{% endif %} {% if shown_user.committee %} -

{% trans "Committee" %}

+

{% trans "Committee" %}

{{ shown_user.committee }}

{% endif %} {% if shown_user.about_me %} -

{% trans "About me" %}

+

{% trans "About me" %}

{{ shown_user.about_me }}

{% endif %} {% if perms.participant.can_manage_participant %} {% if shown_user.comment %} -

{% trans "Comment" %}

+

{% trans "Comment" %}

{{ shown_user.comment }}

{% endif %} -

{% trans "Last Login" %}

+

{% trans "Last Login" %}

{% if shown_user.last_login > shown_user.date_joined %}

{{ shown_user.last_login }}

{% else %}