X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=mediagoblin%2Ftemplates%2Fmediagoblin%2Fuser_pages%2Fmedia.html;h=0b9bb8086ea733df8fde8a1e592f972ae93eb2d1;hb=643278243c3e68efdee579e9b92dd8ab7355391f;hp=17beffb26fb3806c1eb576b5e8ceb939e6cf80c9;hpb=157c60267e0c0e464f89779a190d8b2d11d5a4be;p=mediagoblin.git diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html index 17beffb2..0b9bb808 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/media.html +++ b/mediagoblin/templates/mediagoblin/user_pages/media.html @@ -1,6 +1,6 @@ {# # GNU MediaGoblin -- federated, autonomous media hosting -# Copyright (C) 2011 MediaGoblin contributors. See AUTHORS. +# 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 @@ -20,19 +20,39 @@ {% import "/mediagoblin/utils/wtforms.html" as wtforms_util %} {% from "mediagoblin/utils/pagination.html" import render_pagination %} +{% block title %}{{ media.title }} — {{ super() }}{% endblock %} + +{% block mediagoblin_head %} + + + + + {% if app_config['geolocation_map_visible'] %} + + + + + {% endif %} +{% endblock mediagoblin_head %} + {% block mediagoblin_content %} - {% if media %} -
-
+
+
+ {% block mediagoblin_media %} {% set display_media = request.app.public_store.file_url( media.get_display_media(media.media_files)) %} - {# if there's a medium file size, that means the medium size # isn't the original... so link to the original! #} - {% if media['media_files'].has_key('medium') %} + {% if media.media_files.has_key('medium') %} + media.media_files['original']) }}"> Image for {{ media.title }} @@ -42,127 +62,133 @@ src="{{ display_media }}" alt="Image for {{ media.title }}" /> {% endif %} -
- -

- {{ media.title }} -

- {% autoescape False %} -

{{ media.description_html }}

- {% endautoescape %} -

- {% trans date=media.created.strftime("%Y-%m-%d"), - user_url=request.urlgen( - 'mediagoblin.user_pages.user_home', - user=media.uploader().username), - username=media.uploader().username -%} - By {{ username }} on {{ date }} - {%- endtrans %} -

-

+ {% endblock %} +
+

+ {{ media.title }} +

+ {% autoescape False %} +

{{ media.description_html }}

+ {% endautoescape %} +

+ {% trans date=media.created.strftime("%Y-%m-%d") -%} + Added on {{ date }}. + {%- endtrans %} + {% if request.user and + (media.uploader == request.user._id or + request.user.is_admin) %} + {% set edit_url = request.urlgen('mediagoblin.edit.edit_media', + user= media.get_uploader.username, + media= media._id) %} + {% trans %}Edit{% endtrans %} + {% set delete_url = request.urlgen('mediagoblin.user_pages.media_confirm_delete', + user= media.get_uploader.username, + media= media._id) %} + {% trans %}Delete{% endtrans %} + {% endif %} +

+ {% if comments %} +

+ {% if comments.count()==1 %} + {% trans comment_count=comments.count() -%}{{ comment_count }} comment{%- endtrans %} + {% elif comments.count()>1 %} + {% trans comment_count=comments.count() -%}{{ comment_count }} comments{%- endtrans %} + {% else %} + {% trans %}No comments yet.{% endtrans %} + {% endif %} +
+ + {% trans %}Add one{% endtrans %} + +
+

{% if request.user %} -

{% trans %}Post a comment{% endtrans %}

+
+

+ {% trans %}You can use Markdown for formatting.{% endtrans %} +

+ {{ wtforms_util.render_divs(comment_form) }} +
+ + {{ csrf_token }} +
+
{% endif %} - {% if comments %} - {% for comment in comments %} - {% set comment_author = comment.author() %} - {% if pagination.active_id == comment._id %} -
- - {% else %} -
- {% endif %} - -
{% autoescape False %}{{ comment.content_html }} - {% endautoescape %} + {% for comment in comments %} + {% set comment_author = comment.get_author %} + {% if pagination.active_id == comment._id %} +
+ + {% else %} +
+ {% endif %} +
+ {% autoescape False %} + {{ comment.content_html }} + {% endautoescape %} - {{ comment_author['username'] }} - {% trans %}at{% endtrans %} - - {{ comment.created.strftime("%I:%M%p %Y-%m-%d") }} - -
+ user = comment_author.username) }}"> + {{ comment_author.username }} + + {% trans %}at{% endtrans %} + + {{ comment.created.strftime("%I:%M%p %Y-%m-%d") }} +
+
+ {% endfor %} + {{ render_pagination(request, pagination, + media.url_for_self(request.urlgen)) }} + {% endif %} +
+
+ {% trans user_url=request.urlgen( + 'mediagoblin.user_pages.user_home', + user=media.get_uploader.username), + username=media.get_uploader.username -%} +

❖ Browsing media by {{ username }}

+ {%- endtrans %} + {% include "mediagoblin/utils/prev_next.html" %} + {% if media.attachment_files|count %} +

Attachments

+
    + {% for attachment in media.attachment_files %} +
  • + + {{ attachment.name }} + +
    • {% endfor %} - - {% if request.user %} -
    - {{ wtforms_util.render_divs(comment_form) }} -
    - - {{ csrf_token }} -
    -
    - {% endif %} - - {{ render_pagination(request, pagination, - request.urlgen('mediagoblin.user_pages.media_home', - user = media.uploader().username, - media = media._id)) }} -
+ + {% endif %} + {% if app_config['allow_attachments'] + and request.user + and (media.uploader == request.user._id + or request.user.is_admin) %} +

+ Add attachment +

+ {% endif %} + {% if media.tags %} + {% include "mediagoblin/utils/tags.html" %} {% endif %} -
- {% include "mediagoblin/utils/prev_next.html" %} - - {% if media['uploader'] == request.user['_id'] or - request.user['is_admin'] %} -

{% trans %}Actions{% endtrans %}

-

- {% set edit_url = request.urlgen('mediagoblin.edit.edit_media', - user= media.uploader().username, - media= media._id) %} - - {% trans %}edit{% endtrans %} -

-

- {% set delete_url = request.urlgen('mediagoblin.user_pages.media_confirm_delete', - user= media.uploader().username, - media= media._id) %} - - {% trans %}delete{% endtrans %} -

- {% endif %} - - {% if media.attachment_files|count %} -

Attachments

- - {% endif %} + {% include "mediagoblin/utils/license.html" %} - {% if app_config['allow_attachments'] - and (media['uploader'] == request.user['_id'] - or request.user['is_admin']) %} -

- Add attachment -

- {% endif %} + {% include "mediagoblin/utils/geolocation_map.html" %} - {% if media.tags %} - {% include "mediagoblin/utils/tags.html" %} - {% endif %} -
- {% else %} -

{% trans %}Sorry, no such media found.{% endtrans %}

- {% endif %} + {% include "mediagoblin/utils/exif.html" %} +

{% endblock %}