diff options
4 files changed, 25 insertions, 5 deletions
diff --git a/mediagoblin/static/js/notifications.js b/mediagoblin/static/js/notifications.js index 77793b34..0153463a 100644 --- a/mediagoblin/static/js/notifications.js +++ b/mediagoblin/static/js/notifications.js @@ -1,4 +1,22 @@ 'use strict'; +/** + * GNU MediaGoblin -- federated, autonomous media hosting + * Copyright (C) 2011, 2012 MediaGoblin contributors. See AUTHORS. + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + var notifications = {}; (function (n) { diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html index f2723edb..25186b18 100644 --- a/mediagoblin/templates/mediagoblin/base.html +++ b/mediagoblin/templates/mediagoblin/base.html @@ -60,8 +60,11 @@ {%- if request.user %} {% if request.user and request.user.status == 'active' %} + {% set notification_count = request.notifications.get_notification_count(request.user.id) %} + {% if notification_count %} <a href="#notifications" class="notification-gem button_action" title="Notifications"> - {{ request.notifications.get_notification_count(request.user.id) }}</a> + {{ notification_count }}</a> + {% endif %} <div class="button_action header_dropdown_down">▼</div> <div class="button_action header_dropdown_up">▲</div> {% elif request.user and request.user.status == "needs_email_verification" %} diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html index a2a8f3b6..c16e4c78 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/media.html +++ b/mediagoblin/templates/mediagoblin/user_pages/media.html @@ -81,6 +81,7 @@ user= media.get_uploader.username, media_id=media.id) %} <a class="button_action" href="{{ delete_url }}">{% trans %}Delete{% endtrans %}</a> + {% endif %} {% autoescape False %} <p>{{ media.description_html }}</p> @@ -94,6 +95,8 @@ class="button_action" id="button_addcomment" title="Add a comment"> {% trans %}Add a comment{% endtrans %} </a> + {% include "mediagoblin/utils/comment-subscription.html" %} + {% endif %} {% if request.user %} <form action="{{ request.urlgen('mediagoblin.user_pages.media_post_comment', @@ -167,8 +170,6 @@ {% include "mediagoblin/utils/exif.html" %} - {% include "mediagoblin/utils/comment-subscription.html" %} - {%- if media.attachment_files|count %} <h3>{% trans %}Attachments{% endtrans %}</h3> <ul> diff --git a/mediagoblin/templates/mediagoblin/utils/comment-subscription.html b/mediagoblin/templates/mediagoblin/utils/comment-subscription.html index 6598c733..8ee8c883 100644 --- a/mediagoblin/templates/mediagoblin/utils/comment-subscription.html +++ b/mediagoblin/templates/mediagoblin/utils/comment-subscription.html @@ -16,7 +16,6 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. #} {%- if request.user %} -<p> {% set subscription = request.notifications.get_comment_subscription( request.user.id, media.id) %} {% if not subscription or not subscription.notify %} @@ -32,5 +31,4 @@ class="button_action">Silence comments </a> {% endif %} -</p> {%- endif %} |