diff options
| -rw-r--r-- | src/web/templates/admin/dashboard.html | 11 | ||||
| -rw-r--r-- | src/web/templates/admin/user.html | 19 | ||||
| -rw-r--r-- | src/web/templates/feed_list.html | 12 | ||||
| -rw-r--r-- | src/web/views/admin.py | 15 |
4 files changed, 9 insertions, 48 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 %} diff --git a/src/web/templates/feed_list.html b/src/web/templates/feed_list.html index 2cfab7d8..114ae960 100644 --- a/src/web/templates/feed_list.html +++ b/src/web/templates/feed_list.html @@ -34,14 +34,10 @@ <td><a href="{{ feed.site_link }}">{{ feed.site_link }}</a></td> <td>( {{ unread_article_count.get(feed.id, 0) }} ) {{ article_count.get(feed.id, 0) }}</td> <td> - {% if feed.user_id == current_user.id %} - <a href="{{ url_for("home", feed_id=feed.id, filter_="all") }}"><i class="glyphicon glyphicon-th-list" title="{{ _('Articles') }}"></i></a> - <a href="{{ url_for("feed.form", feed_id=feed.id) }}"><i class="glyphicon glyphicon-edit" title="{{ _('Edit this feed') }}"></i></a> - <a href="{{ url_for("feed.duplicates", feed_id=feed.id) }}"><i class="glyphicon glyphicon-book" title="{{ _('Duplicate articles') }}"></i></a> - <a href="{{ url_for("feed.delete", feed_id=feed.id) }}"><i class="glyphicon glyphicon-remove" title="{{ _('Delete this feed') }}" onclick="return confirm('{{ _('You are going to delete this feed.') }}');"></i></a> - {% else %} - <a href="{{ url_for("admin.delete", feed_id=feed.id) }}"><i class="glyphicon glyphicon-remove" title="{{ _('Delete this feed') }}" onclick="return confirm('{{ _('You are going to delete this feed.') }}');"></i></a> - {% endif %} + <a href="{{ url_for("home", feed_id=feed.id, filter_="all") }}"><i class="glyphicon glyphicon-th-list" title="{{ _('Articles') }}"></i></a> + <a href="{{ url_for("feed.form", feed_id=feed.id) }}"><i class="glyphicon glyphicon-edit" title="{{ _('Edit this feed') }}"></i></a> + <a href="{{ url_for("feed.duplicates", feed_id=feed.id) }}"><i class="glyphicon glyphicon-book" title="{{ _('Duplicate articles') }}"></i></a> + <a href="{{ url_for("feed.delete", feed_id=feed.id) }}"><i class="glyphicon glyphicon-remove" title="{{ _('Delete this feed') }}" onclick="return confirm('{{ _('You are going to delete this feed.') }}');"></i></a> </td> </tr> {% endfor %} diff --git a/src/web/views/admin.py b/src/web/views/admin.py index 753b864f..30758f63 100644 --- a/src/web/views/admin.py +++ b/src/web/views/admin.py @@ -7,7 +7,7 @@ from flask.ext.principal import Permission, RoleNeed from web.lib.utils import redirect_url from web.models import Role -from web.controllers import UserController, ArticleController, FeedController +from web.controllers import UserController, ArticleController from web.forms import InformationMessageForm, UserForm from web import notifications @@ -130,19 +130,6 @@ def delete_user(user_id=None): '%(error)', error=error), 'danger') return redirect(redirect_url()) -@admin_bp.route('/delete/<feed_id>', methods=['GET']) -@login_required -@admin_permission.require(http_exception=403) -def delete(feed_id=None): - "Deletes the feed of a user." - try: - feed = FeedController().delete(feed_id) - flash(gettext("Feed successfully deleted."), 'success') - except Exception as error: - flash('An error occured while trying to delete a feed: ' - + str(error), 'danger') - return redirect(url_for('home')) - @admin_bp.route('/toggle_user/<int:user_id>', methods=['GET']) @login_required @admin_permission.require() |