uses render_divs for the comments form in media.html for completeness

[mediagoblin.git] / mediagoblin / templates / mediagoblin / user_pages / media.html

diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html
index 3cebe2f9a27a4a9acf6373d2e959c6d400646b8a..9c0a1cca848e5c2c3d4a82f54442f9cc82b1f0d9 100644 (file)
--- a/mediagoblin/templates/mediagoblin/user_pages/media.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/media.html
@@ -18,86 +18,114 @@
 {% extends "mediagoblin/base.html" %}
 
 {% import "/mediagoblin/utils/wtforms.html" as wtforms_util %}
+{% from "mediagoblin/utils/pagination.html" import render_pagination %}
 
 {% block mediagoblin_content %}
-  {# temporarily, an "image gallery" that isn't one really ;) #}
   {% if media %}
-    <div class="grid_8 alpha media_image">
-      <h1>
+    <div class="grid_11 alpha">
+      <div class="media_image_container">
+        <img class="media_image"
+             src="{{ request.app.public_store.file_url(
+                         media.get_display_media(media.media_files)) }}" />
+      </div>
+
+      <h2>
         {{media.title}}
-      </h1>
-      <img class="media_image" src="{{ request.app.public_store.file_url(
-                    media.media_files.main) }}" />
-      <p>
-        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>   
+      </h2>
 
       {% autoescape False %}
         <p>{{ media.description_html }}</p>
       {% endautoescape %}
 
-      {% if media['uploader'] == request.user['_id'] %}
-        <p><a href="{{ request.urlgen('mediagoblin.edit.edit_media',
-                                      user= media.uploader().username,
-                                      media= media._id) }}">Edit</a></p>
-      {% endif %}
+      <p>
+        {% trans date="%4d-%02d-%02d"|format(
+                   media.created.year,
+                   media.created.month, media.created.day),
+                 user_url=request.urlgen(
+                   'mediagoblin.user_pages.user_home',
+                   user=media.uploader().username),
+                 username=media.uploader().username -%}
+          &mdash;&nbsp;uploaded on {{ date }} by <a href="{{ user_url }}">{{ username }}</a>
+        {%- endtrans %}
+      </p>
+      <br />
+
+      <h3>{% trans %}Comments{% endtrans %}</h3>
       {% if request.user %}
         <form action="{{ request.urlgen('mediagoblin.user_pages.media_post_comment', 
                                          user= media.uploader().username,
                                          media=media._id) }}" method="POST">
-          <h3>Post a comment!</h3>
-          {{ wtforms_util.render_field_div(comment_form.comment) }}
+          {{ wtforms_util.render_divs(comment_form) }}
           <div class="form_submit_buttons">
-            <input type="submit" value="Submit" class="button" />
+            <input type="submit" value="{% trans %}Post comment!{% endtrans %}" class="button" />
           </div>
         </form>
       {% endif %}
 
-      {#
-      {{ wtforms_util.render_textarea_div(submit_form.description) }}
-      {{ wtforms_util.render_field_div(submit_form.file) }}
-      #}
-
       {% if comments %}
-        <h3>Comments</h3>
         {% for comment in comments %}
-          <div class="comment_wrapper" id="comment-{{ comment['_id'] }}">
-         <div class="comment_author">By: 
-           <a href="{{ request.urlgen('mediagoblin.user_pages.user_home',
-                                          user = comment['author']['username']) }}">
-             {{ comment['author']['username'] }}
-           </a>
-         </div>
-         <div class="comment_datetime">
-           <a href="#comment-{{ comment['_id'] }}">
-             {{ "%4d-%02d-%02d %02d:%02d"|format(comment.created.year,
-                                          comment.created.month,
-                                          comment.created.day,
-                                          comment.created.hour,
-                                          comment.created.minute) }}
-           </a>
-         </div>
+          {% set comment_author = comment.author() %}
+           {% if pagination.active_id == comment._id %}
+              <div class="comment_wrapper comment_active" id="comment-{{ comment['_id'] }}">
+               <a name="comment" id="comment"></a>
+            {% else %}
+              <div class="comment_wrapper" id="comment-{{ comment['_id'] }}">
+           {% endif %}
             <div class="comment_content">
               {% autoescape False %}
                 {{ comment.content_html }}
               {% endautoescape %}
-         </div>
-       </div>
+            </div>
+            <div class="comment_author">&mdash; 
+              <a href="{{ request.urlgen('mediagoblin.user_pages.user_home',
+                                user = comment_author['username']) }}">
+              {{ comment_author['username'] }}</a> {% trans %}at{% endtrans %} 
+            <!--</div>
+            <div class="comment_datetime">-->
+              <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) }}
+              </a>
+            </div>
+          </div>
         {% endfor %}
-        {% include "mediagoblin/utils/pagination.html" %}
+
+        {{ render_pagination(request, pagination, 
+             request.urlgen('mediagoblin.user_pages.media_home',
+             user = media.uploader().username,
+             media = media._id)) }}
       </div>
     {% endif %}
 
-    <div class="grid_4 omega media_sidebar">
-      <p>This is a sidebar! Yay!</p>
+    <div class="grid_5 omega">
+      {% include "mediagoblin/utils/prev_next.html" %}
+        {% if media['uploader'] == request.user['_id'] or 
+                                   request.user['is_admin'] %}
+          <h3>Temporary button holder</h3>
+          <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" />{% trans %}delete{% endtrans %}
+          </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 %}