X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=mediagoblin%2Ftemplates%2Fmediagoblin%2Fuser_pages%2Fmedia.html;h=17beffb26fb3806c1eb576b5e8ceb939e6cf80c9;hb=157c60267e0c0e464f89779a190d8b2d11d5a4be;hp=477eae61fe4128ce3ec9bc43a37ba2a03ebf6f40;hpb=af2fcba5c4ce16bde1a2267b95803bc2afc9e572;p=mediagoblin.git

diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html
index 477eae61..17beffb2 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 Free Software Foundation, Inc
+# Copyright (C) 2011 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
@@ -23,45 +23,46 @@
 {% block mediagoblin_content %}
   {% if media %}
     <div class="grid_11 alpha">
-      {% if media.media_files.medium %}
-        <img src="{{ request.app.public_store.file_url(
-		         media.media_files.medium) }}" />
-      {% else %}
-        <img src="{{ request.app.public_store.file_url(
-                         media.media_files.main) }}" />
-      {% endif %}
+      <div class="media_image_container">
+        {% set display_media = request.app.public_store.file_url(
+                 media.get_display_media(media.media_files)) %}
 
-      <h2>
-        {{media.title}}
-      </h2>
+        {# 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') %}
+          <a href="{{ request.app.public_store.file_url(
+                        media['media_files']['original']) }}">
+            <img class="media_image"
+                 src="{{ display_media }}"
+                 alt="Image for {{ media.title }}" />
+          </a>
+        {% else %}
+          <img class="media_image"
+               src="{{ display_media }}"
+               alt="Image for {{ media.title }}" />
+        {% endif %}
+      </div>
 
+      <h2 class="media_title">
+        {{ media.title }}
+      </h2>
       {% autoescape False %}
         <p>{{ media.description_html }}</p>
       {% endautoescape %}
-
-      <p>
-        &mdash;&nbsp;uploaded on
-        {{ "%4d-%02d-%02d"|format(media.created.year,
-                                  media.created.month, media.created.day) }}
-        by
-        <a href="{{ request.urlgen('mediagoblin.user_pages.user_home',
-                                   user= media.uploader().username) }}">
-          {{- media.uploader().username }}</a>
+      <p class="media_uploader">
+        {% 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 <a href="{{ user_url }}">{{ username }}</a> on {{ date }}
+        {%- endtrans %}
       </p>
-      <br />
-
-      <h3>Comments</h3>
+      <h3></h3>
       {% if request.user %}
-        <form action="{{ request.urlgen('mediagoblin.user_pages.media_post_comment', 
-                                         user= media.uploader().username,
-                                         media=media._id) }}" method="POST">
-          {{ wtforms_util.render_field_div(comment_form.field_comment) }}
-          <div class="form_submit_buttons">
-            <input type="submit" value="Post comment!" class="button" />
-          </div>
-        </form>
+        <p><a href="#comment_form">{% trans %}Post a comment{% endtrans %}</a></p>
       {% endif %}
-
       {% if comments %}
         {% for comment in comments %}
           {% set comment_author = comment.author() %}
@@ -71,58 +72,97 @@
             {% else %}
               <div class="comment_wrapper" id="comment-{{ comment['_id'] }}">
 	    {% endif %}
-            <div class="comment_content">
-              {% autoescape False %}
-                {{ comment.content_html }}
+
+            <div class="comment_content">{% autoescape False %}{{ comment.content_html }}
               {% endautoescape %}
-            </div>
-            <div class="comment_author">&mdash; 
-              <a href="{{ request.urlgen('mediagoblin.user_pages.user_home',
-                                user = comment_author['username']) }}">
-              {{ comment_author['username'] }}</a> at 
-            <!--</div>
-            <div class="comment_datetime">-->
+            <img src="{{ request.staticdirect('/images/icon_comment.png') }}" />
+            <a href="{{ request.urlgen('mediagoblin.user_pages.user_home',
+                            user = comment_author['username']) }}">
+                {{ comment_author['username'] }}</a>
+              {% trans %}at{% endtrans %} 
               <a href="{{ request.urlgen('mediagoblin.user_pages.media_home.view_comment',
 		       comment = comment['_id'],
 		       user = media.uploader().username,
 		       media = media._id) }}#comment">
-                {{ "%4d-%02d-%02d %02d:%02d"|format(comment.created.year,
-                                         comment.created.month,
-                                         comment.created.day,
-                                         comment.created.hour,
-                                         comment.created.minute) }}
+                {{ comment.created.strftime("%I:%M%p %Y-%m-%d") }}
               </a>
             </div>
           </div>
         {% endfor %}
 
+        {% if request.user %}
+          <form action="{{ request.urlgen('mediagoblin.user_pages.media_post_comment', 
+                                           user= media.uploader().username,
+                                           media=media._id) }}" method="POST">
+            {{ wtforms_util.render_divs(comment_form) }}
+            <div class="form_submit_buttons">
+              <input type="submit" value="{% trans %}Post comment!{% endtrans %}" class="button" />
+                {{ csrf_token }}
+            </div>
+          </form>
+        {% endif %}
+
         {{ render_pagination(request, pagination, 
 	      request.urlgen('mediagoblin.user_pages.media_home',
 	      user = media.uploader().username,
 	      media = media._id)) }}
       </div>
     {% endif %}
+
     <div class="grid_5 omega">
       {% include "mediagoblin/utils/prev_next.html" %}
-      <h3>Sidebar content here!</h3>
-      <p>
-        {% if media['uploader'] == request.user['_id'] or 
-                                   request.user['is_admin'] %}
-          <p>
-            <a href="{{ request.urlgen('mediagoblin.edit.edit_media',
-                                       user= media.uploader().username,
-                                       media= media._id) }}"
-               ><img src="{{ request.staticdirect('/images/icon_edit.png') }}"
-                     class="media_icon" />edit</a>
-          </p>
-          <p>
-            <img src="{{ request.staticdirect('/images/icon_delete.png') }}"
-                 class="media_icon" />delete
-          </p>
-        {% endif %}
-      </p>
+
+      {% if media['uploader'] == request.user['_id'] or 
+                                 request.user['is_admin'] %}
+        <h3>{% trans %}Actions{% endtrans %}</h3>
+        <p>
+          {% set edit_url = request.urlgen('mediagoblin.edit.edit_media',
+                                     user= media.uploader().username,
+                                     media= media._id) %}
+          <a href="{{ edit_url }}"
+             ><img src="{{ request.staticdirect('/images/icon_edit.png') }}"
+                   class="media_icon" /></a>
+          <a href="{{ edit_url }}">{% trans %}edit{% endtrans %}</a>
+        </p>
+        <p>
+          {% set delete_url = request.urlgen('mediagoblin.user_pages.media_confirm_delete',
+                                     user= media.uploader().username,
+                                     media= media._id) %}
+          <a href="{{ delete_url }}"
+             ><img src="{{ request.staticdirect('/images/icon_delete.png') }}"
+               class="media_icon" /></a>
+          <a href="{{ delete_url }}">{% trans %}delete{% endtrans %}</a>
+        </p>
+      {% endif %}
+
+      {% if media.attachment_files|count %}
+        <h3>Attachments</h3>
+        <ul>
+          {% for attachment in media.attachment_files %}
+            <li>
+              <a href="{{ request.app.public_store.file_url(attachment.filepath) }}">
+                {{ attachment.name }}
+              </a>
+            </li>
+          {% endfor %}
+        </ul>
+      {% endif %}
+
+      {% if app_config['allow_attachments']
+            and (media['uploader'] == request.user['_id']
+                 or request.user['is_admin']) %}
+        <p>
+          <a href="{{ request.urlgen('mediagoblin.edit.attachments',
+                        user=media.uploader().username,
+                        media=media._id) }}">Add attachment</a>
+        </p>
+      {% endif %}
+
+      {% if media.tags %}
+        {% include "mediagoblin/utils/tags.html" %}
+      {% endif %}
     </div>
   {% else %}
-    <p>Sorry, no such media found.<p/>
+    <p>{% trans %}Sorry, no such media found.{% endtrans %}<p/>
   {% endif %}
 {% endblock %}