diff options
Diffstat (limited to 'src/web/templates/admin')
| -rw-r--r-- | src/web/templates/admin/dashboard.html | 11 | ||||
| -rw-r--r-- | src/web/templates/admin/user.html | 19 |
2 files changed, 4 insertions, 26 deletions
diff --git a/src/web/templates/admin/dashboard.html b/src/web/templates/admin/dashboard.html index 2436c955..22e82349 100644 --- a/src/web/templates/admin/dashboard.html +++ b/src/web/templates/admin/dashboard.html @@ -11,6 +11,7 @@ <th>#</th> <th>{{ _('Nickname') }}</th> <th>{{ _('Email') }}</th> + <th>{{ _('Member since') }}</th> <th>{{ _('Last seen') }}</th> <th>{{ _('Actions') }}</th> </tr> @@ -19,15 +20,11 @@ {% for user in users|sort(attribute="last_seen")|reverse %} <tr {% if user.activation_key != "" %}class="warning"{% endif %}> <td>{{ loop.index }}</td> - {% if user.id == current_user.id %} - <td><a href="{{ url_for("user.management") }}">{{ user.nickname }}</a> (It's you!)</td> - {% else %} - <td><a href="{{ url_for("admin.user", user_id=user.id) }}">{{ user.nickname }}</a></td> - {% endif %} + <td>{{ user.nickname }}{% if user.id == current_user.id %} (It's you!){% endif %}</td> <td><a href="mailto:{{ user.email }}">{{ user.email }}</a></td> - <td class="date">{{ user.last_seen }}</td> + <td class="date">{{ user.date_created | datetime }}</td> + <td class="date">{{ user.last_seen | datetime }}</td> <td> - <a href="{{ url_for("admin.user", user_id=user.id) }}"><i class="glyphicon glyphicon-user" title="{{ _('View this user') }}"></i></a> <a href="{{ url_for("admin.user_form", user_id=user.id) }}"><i class="glyphicon glyphicon-edit" title="{{ _('Edit this user') }}"></i></a> {% if user.id != current_user.id %} <a href="{{ url_for("admin.toggle_user", user_id=user.id) }}"> diff --git a/src/web/templates/admin/user.html b/src/web/templates/admin/user.html deleted file mode 100644 index d1e08c0d..00000000 --- a/src/web/templates/admin/user.html +++ /dev/null @@ -1,19 +0,0 @@ -{% extends "layout.html" %} -{% block head%} -{{super()}} -{% endblock %} -{% block content %} -<div class="container"> - <div class="well"> - <a href="/admin/edit_user/{{ user.id }}" class="btn btn-default">{{ _('Edit this user') }}</a> - <h2>{{ _('Membership') }}</h2> - <div class="row"> - <div class="col-md-6"> - <p>{{ _('Member since') }} {{ user.date_created | datetime }}.</p> - <p>{{ _('Last seen:') }} {{ user.last_seen | datetime }}.</p> - </div> - </div> - </div> - {% include "feed_list.html" %} -</div> -{% endblock %} |