aboutsummaryrefslogtreecommitdiff
path: root/src/web/templates/admin/dashboard.html
diff options
context:
space:
mode:
authorCédric Bonhomme <cedric@cedricbonhomme.org>2016-04-06 23:59:01 +0200
committerCédric Bonhomme <cedric@cedricbonhomme.org>2016-04-06 23:59:01 +0200
commita0a3bda9340a57203391400a5ac32e87281e8a19 (patch)
tree040d69d70cb9e2b649259052ecc1f6984b123db2 /src/web/templates/admin/dashboard.html
parentmajor problems fixed. (diff)
parentcreate a new user is now working (diff)
downloadnewspipe-a0a3bda9340a57203391400a5ac32e87281e8a19.tar.gz
newspipe-a0a3bda9340a57203391400a5ac32e87281e8a19.tar.bz2
newspipe-a0a3bda9340a57203391400a5ac32e87281e8a19.zip
Fixed merge conflicts.
Diffstat (limited to 'src/web/templates/admin/dashboard.html')
-rw-r--r--src/web/templates/admin/dashboard.html6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/web/templates/admin/dashboard.html b/src/web/templates/admin/dashboard.html
index 57b20bb5..d6e53526 100644
--- a/src/web/templates/admin/dashboard.html
+++ b/src/web/templates/admin/dashboard.html
@@ -17,7 +17,7 @@
</tr>
</thead>
<tbody>
- {% for user in users|sort(attribute="last_seen")|reverse %}
+ {% for user in users %}
<tr {% if not user.enabled %}class="warning"{% endif %}>
<td>{{ loop.index }}</td>
<td>{{ user.nickname }}{% if user.id == current_user.id %} (It's you!){% endif %}</td>
@@ -25,7 +25,7 @@
<td class="date">{{ user.date_created | datetime }}</td>
<td class="date">{{ user.last_seen | datetime }}</td>
<td>
- <a href="{{ url_for("admin.user_form", user_id=user.id) }}"><i class="glyphicon glyphicon-edit" title="{{ _('Edit this user') }}"></i></a>
+ <a href="{{ url_for("admin.user", 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) }}">
{% if user.enabled %}
@@ -34,7 +34,7 @@
<i class="glyphicon glyphicon-ok-circle" title="{{ _("Enable this account") }}"></i>
{% endif %}
</a>
- <a href="{{ url_for("admin.delete_user", user_id=user.id) }}"><i class="glyphicon glyphicon-remove" title="{{ _('Delete this user') }}" onclick="return confirm('{{ _('You are going to delete this account.') }}');"></i></a>
+ <a href="{{ url_for("admin.toggle_user", user_id=user.id) }}"><i class="glyphicon glyphicon-remove" title="{{ _('Delete this user') }}" onclick="return confirm('{{ _('You are going to delete this account.') }}');"></i></a>
{% endif %}
</td>
</tr>
bgstack15