diff options
| author | Aditi <aditi.iitr@gmail.com> | 2013-08-25 09:24:13 +0530 |
|---|---|---|
| committer | Aditi <aditi.iitr@gmail.com> | 2013-08-25 09:24:13 +0530 |
| commit | 7d9dbe32ccf1606d8ffa147bad2ac81e2af66ec6 (patch) | |
| tree | 32f715388cb985b0de84c6c502e7ec98d7f0d885 /mediagoblin/templates | |
| parent | 70cc6eb8f383dcc97aeac22216a9da0d65a09085 (diff) | |
| parent | e8eec575f3a1d893036ce9b3356d2f56fd15016d (diff) | |
| download | mediagoblin-7d9dbe32ccf1606d8ffa147bad2ac81e2af66ec6.tar.lz mediagoblin-7d9dbe32ccf1606d8ffa147bad2ac81e2af66ec6.tar.xz mediagoblin-7d9dbe32ccf1606d8ffa147bad2ac81e2af66ec6.zip | |
Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin
Diffstat (limited to 'mediagoblin/templates')
3 files changed, 13 insertions, 6 deletions
diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html index b1fc658e..bd26e707 100644 --- a/mediagoblin/templates/mediagoblin/base.html +++ b/mediagoblin/templates/mediagoblin/base.html @@ -37,6 +37,9 @@ src="{{ request.staticdirect('/js/header_dropdown.js') }}"></script> <script type="text/javascript" src="{{ request.staticdirect('/js/notifications.js') }}"></script> + <script> + var mark_all_comments_seen_url = "{{ request.urlgen('mediagoblin.notifications.mark_all_comment_notifications_seen') }}" + </script> {# For clarification, the difference between the extra_head.html template # and the head template hook is that the former should be used by @@ -63,11 +66,11 @@ {% set notification_count = get_notification_count(request.user.id) %} {% if notification_count %} - <a href="#notifications" class="notification-gem button_action" title="Notifications"> + <a href="javascript:;" class="notification-gem button_action" title="Notifications"> {{ notification_count }}</a> {% endif %} - <a href="#header" class="button_action header_dropdown_down">▼</a> - <a href="#no_header" class="button_action header_dropdown_up">▲</a> + <a href="javascript:;" class="button_action header_dropdown_down">▼</a> + <a href="javascript:;" class="button_action header_dropdown_up">▲</a> {% elif request.user and request.user.status == "needs_email_verification" %} {# the following link should only appear when verification is needed #} <a href="{{ request.urlgen('mediagoblin.user_pages.user_home', diff --git a/mediagoblin/templates/mediagoblin/fragments/header_notifications.html b/mediagoblin/templates/mediagoblin/fragments/header_notifications.html index 70d7935a..55759a39 100644 --- a/mediagoblin/templates/mediagoblin/fragments/header_notifications.html +++ b/mediagoblin/templates/mediagoblin/fragments/header_notifications.html @@ -36,5 +36,9 @@ </li> {% endfor %} </ul> + <a href="{{ request.urlgen('mediagoblin.notifications.mark_all_comment_notifications_seen') }}?next={{ + request.base_url|urlencode }}" id="mark_all_comments_seen"> + {% trans %}Mark all read{% endtrans %} + </a> </div> {% endif %} diff --git a/mediagoblin/templates/mediagoblin/media_displays/video.html b/mediagoblin/templates/mediagoblin/media_displays/video.html index b0854c9f..5c52f9f0 100644 --- a/mediagoblin/templates/mediagoblin/media_displays/video.html +++ b/mediagoblin/templates/mediagoblin/media_displays/video.html @@ -62,11 +62,11 @@ </a> </li> {% endif %} - {% if 'webm_640' in media.media_files %} + {% if 'webm_video' in media.media_files %} <li> <a href="{{ request.app.public_store.file_url( - media.media_files.webm_640) }}"> - {%- trans %}WebM file (640p; VP8/Vorbis){% endtrans -%} + media.media_files.webm_video) }}"> + {%- trans %}WebM file (VP8/Vorbis){% endtrans -%} </a> </li> {% endif %} |