X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=mediagoblin%2Ftemplates%2Fmediagoblin%2Fuser_pages%2Fmedia.html;h=10b48296234e2dc73ac9590e3addd6908922f410;hb=8c33fc75054e66ef162675a1d424826cf2f80e76;hp=d52f544ff5d133275133b9dadd6497b67087fb74;hpb=228c4470f40d66e8b9383321d44d89e2a1c0ecad;p=mediagoblin.git

diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html
index d52f544f..10b48296 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
@@ -23,12 +23,35 @@
 {% block title %}{{ media.title }} — {{ super() }}{% endblock %}
 
 {% block mediagoblin_head %}
+<!--[if lte IE 8]><link rel="stylesheet"
+    href="{{ request.staticdirect('/extlib/leaflet/leaflet.ie.css') }}" /><![endif]-->
   <script type="text/javascript"
           src="{{ request.staticdirect('/js/comment_show.js') }}"></script>
+  <script type="text/javascript"
+          src="{{ request.staticdirect('/js/keyboard_navigation.js') }}"></script>
+
+  {% if app_config['geolocation_map_visible'] %}
+    <link rel="stylesheet"
+	  href="{{ request.staticdirect('/extlib/leaflet/leaflet.css') }}" />
+
+    <script type="text/javascript"
+            src="{{ request.staticdirect('/extlib/leaflet/leaflet.js') }}"></script>
+    <script type="text/javascript"
+            src="{{ request.staticdirect('/js/geolocation-map.js') }}"></script>
+  {% endif %}
 {% endblock mediagoblin_head %}
 
 {% block mediagoblin_content %}
-  <div class="grid_11 alpha">
+  <p class="context">
+    {%- trans user_url=request.urlgen(
+              'mediagoblin.user_pages.user_home',
+              user=media.get_uploader.username),
+              username=media.get_uploader.username -%}
+    ❖ Browsing media by <a href="{{user_url}}">{{username}}</a>
+    {%- endtrans -%}
+  </p>
+  {% include "mediagoblin/utils/prev_next.html" %}
+  <div class="media_pane">     
     <div class="media_image_container">
       {% block mediagoblin_media %}
         {% set display_media = request.app.public_store.file_url(
@@ -41,62 +64,49 @@
                         media.media_files['original']) }}">
             <img class="media_image"
                  src="{{ display_media }}"
-                 alt="Image for {{ media.title }}" />
+                 alt="{% trans media_title=media.title -%}
+                        Image for {{ media_title }}{% endtrans %}" />
           </a>
         {% else %}
           <img class="media_image"
                src="{{ display_media }}"
-               alt="Image for {{ media.title }}" />
+               alt="{% trans media_title=media.title -%}
+                      Image for {{ media_title }}{% endtrans %}" />
         {% endif %}
       {% endblock %}
     </div>
     <h2 class="media_title">
       {{ media.title }}
     </h2>
+    {% 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_id=media.id) %}
+      <a class="button_action" href="{{ edit_url }}">{% trans %}Edit{% endtrans %}</a>
+      {% set delete_url = request.urlgen('mediagoblin.user_pages.media_confirm_delete',
+                                 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>
-    {% endautoescape %}       
-    <p class="media_specs">
-      {% trans date=media.created.strftime("%Y-%m-%d") -%}
-        Added on {{ date }}.
-      {%- endtrans %}
-      {% if 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) %}
-        <a class="button_action" href="{{ edit_url }}">{% trans %}Edit{% endtrans %}</a>
-        {% set delete_url = request.urlgen('mediagoblin.user_pages.media_confirm_delete',
-                                   user= media.get_uploader.username,
-                                   media= media._id) %}
-        <a class="button_action" href="{{ delete_url }}">{% trans %}Delete{% endtrans %}</a>
-      {% endif %}
-    </p>
+    {% endautoescape %}
     {% if comments %}
-      <h3>
-        {% 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 %}
-        <div class="right_align">
           <a
             {% if not request.user %}
               href="{{ request.urlgen('mediagoblin.auth.login') }}"
             {% endif %}
             class="button_action" id="button_addcomment" title="Add a comment">
-            {% trans %}Add one{% endtrans %}
+            {% trans %}Add a comment{% endtrans %}
           </a>
-        </div>
-      </h3>
       {% if request.user %}
         <form action="{{ request.urlgen('mediagoblin.user_pages.media_post_comment', 
                                          user= media.get_uploader.username,
-                                         media=media._id) }}" method="POST" id="form_comment">
+                                         media_id=media.id) }}" method="POST" id="form_comment">
           <p>
-            {% trans %}Type your comment here. You can use <a href="http://daringfireball.net/projects/markdown/basics" target="_blank">Markdown</a> for formatting.{% endtrans %}
+            {% trans %}You can use <a href="http://daringfireball.net/projects/markdown/basics">Markdown</a> for formatting.{% endtrans %}
           </p>
           {{ wtforms_util.render_divs(comment_form) }}
           <div class="form_submit_buttons">
@@ -107,28 +117,30 @@
       {% endif %}
       {% for comment in comments %}
         {% set comment_author = comment.get_author %}
-	        {% if pagination.active_id == comment._id %}
-            <div class="comment_wrapper comment_active" id="comment-{{ comment._id }}">
+	        {% 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 }}">
+            <div class="comment_wrapper" id="comment-{{ comment.id }}">
 	        {% endif %}
-          <div class="comment_content">
-            {% autoescape False %}
-              {{ comment.content_html }}
-            {% endautoescape %}
+	        <div class="comment_author">
             <img src="{{ request.staticdirect('/images/icon_comment.png') }}" />
             <a href="{{ request.urlgen('mediagoblin.user_pages.user_home',
                             user = comment_author.username) }}">
-              {{ comment_author.username }}
+              {{ comment_author.username -}}
             </a>
             {% trans %}at{% endtrans %}
             <a href="{{ request.urlgen('mediagoblin.user_pages.media_home.view_comment',
-                   comment = comment._id,
+                   comment = comment.id,
                    user = media.get_uploader.username,
-                   media = media.slug) }}#comment">
+                   media = media.slug_or_id) }}#comment">
               {{ comment.created.strftime("%I:%M%p %Y-%m-%d") }}
-            </a>
+            </a>:
+          </div>
+          <div class="comment_content">
+            {% autoescape False %}
+              {{ comment.content_html }}
+            {% endautoescape %}
           </div>
         </div>
       {% endfor %}
@@ -136,37 +148,66 @@
                  media.url_for_self(request.urlgen)) }}
     {% endif %}
   </div>
-  <div class="grid_5 omega">
-    {% trans user_url=request.urlgen(
-                'mediagoblin.user_pages.user_home',
-                user=media.get_uploader.username),
-                username=media.get_uploader.username -%}
-      <p>❖ Browsing media by <a href="{{ user_url }}">{{ username }}</a></p>
-    {%- endtrans %}  
-    {% include "mediagoblin/utils/prev_next.html" %}
+  <div class="media_sidebar">
+    {% trans date=media.created.strftime("%Y-%m-%d") -%}
+      <h3>Added on</h3>
+      <p>{{ date }}</p>
+    {%- endtrans %}
+    {% if media.tags %}
+      {% include "mediagoblin/utils/tags.html" %}
+    {% endif %}
+
+    {% if media.collections %}
+      {% include "mediagoblin/utils/collections.html" %}
+    {% endif %}
+
+    {% include "mediagoblin/utils/license.html" %}
+
+    {% include "mediagoblin/utils/geolocation_map.html" %}
+
+    {% include "mediagoblin/utils/exif.html" %}
+    
     {% if media.attachment_files|count %}
-      <h3>Attachments</h3>
+      <h3>{% trans %}Attachments{% endtrans %}</h3>
       <ul>
         {% for attachment in media.attachment_files %}
           <li>
             <a href="{{ request.app.public_store.file_url(attachment.filepath) }}">
-              {{ attachment.name }}
+              {{- attachment.name -}}
             </a>
           </li>
         {% endfor %}
       </ul>
     {% endif %}
     {% if app_config['allow_attachments']
-          and (media.uploader == request.user._id
+          and request.user
+          and (media.uploader == request.user.id
                or request.user.is_admin) %}
+      {% if not media.attachment_files|count %}
+        <h3>{% trans %}Attachments{% endtrans %}</h3>
+      {% endif %}
       <p>
         <a href="{{ request.urlgen('mediagoblin.edit.attachments',
                       user=media.get_uploader.username,
-                      media=media._id) }}">Add attachment</a>
+                      media=media.id) }}">{% trans %}Add attachment{% endtrans %}</a>
       </p>
     {% endif %}
-    {% if media.tags %}
-      {% include "mediagoblin/utils/tags.html" %}
+
+    {% if request.user %}
+      <p>
+        <a type="submit" href="{{ request.urlgen('mediagoblin.user_pages.media_collect', 
+                                    user=media.get_uploader.username,
+                                    media=media.id) }}"
+           class="button_action"
+           title="{% trans %}Add media to collection{% endtrans %}">
+          <img src="{{ request.staticdirect('/images/icon_collect.png') }}"
+               />
+	</a>
+      </p>
     {% endif %}
+
+    {% block mediagoblin_sidebar %}
+    {% endblock %}
   </div>
+  <div class="clear"></div>
 {% endblock %}