From 05788ef450cd63da4009cea1825323e10e572e43 Mon Sep 17 00:00:00 2001
From: Elrond <elrond+mediagoblin.org@samba-tng.org>
Date: Mon, 3 Oct 2011 14:01:13 +0200
Subject: i592: Use full path in various places

When running mediagoblin in a sub path on a web server,
most things inside mediagoblin need the "inside path", but
when generating URLs for the webbrowser, full paths are
needed.

urlgen and routes already do that.

Some (mostly pagination and login) need the URL of the
current page. They used request.path_info. But this is the
"inside" path, not the full.

So now there is request.full_path and its used in various
places.
---
 mediagoblin/templates/mediagoblin/utils/pagination.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mediagoblin/templates')

diff --git a/mediagoblin/templates/mediagoblin/utils/pagination.html b/mediagoblin/templates/mediagoblin/utils/pagination.html
index 0df3bfea..84336103 100644
--- a/mediagoblin/templates/mediagoblin/utils/pagination.html
+++ b/mediagoblin/templates/mediagoblin/utils/pagination.html
@@ -21,7 +21,7 @@
   {# only display if {{pagination}} is defined #}
   {% if pagination and pagination.pages > 1 %}
     {% if not base_url %}
-      {% set base_url = request.path_info %}
+      {% set base_url = request.full_path %}
     {% endif %}
 
     {% if preserve_get_params %}
-- 
cgit v1.2.3


From c302bcd918302347f89b2c06c141db89d0c55848 Mon Sep 17 00:00:00 2001
From: Aaron Williamson <aaron@copiesofcopies.org>
Date: Mon, 3 Oct 2011 20:47:39 -0400
Subject: Checkbox label is being translated in the form definition --
 translating it in the template is redundant and breaks <label> functionality.

---
 mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mediagoblin/templates')

diff --git a/mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html b/mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html
index dd6923a9..a96e04dc 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html
@@ -41,7 +41,7 @@
 	  
       <p class="delete_checkbox_box">
 	{{ form.confirm }}
-	{{ _(form.confirm.label.text) }}
+	{{ form.confirm.label }}
       </p>
 
       <div class="form_submit_buttons">
-- 
cgit v1.2.3


From b7206469faeb0318bc930261b4cf908df86da259 Mon Sep 17 00:00:00 2001
From: Aaron Williamson <aaron@copiesofcopies.org>
Date: Mon, 3 Oct 2011 21:32:36 -0400
Subject: Move comment form below comments.

---
 .../templates/mediagoblin/user_pages/media.html    | 25 ++++++++++++----------
 1 file changed, 14 insertions(+), 11 deletions(-)

(limited to 'mediagoblin/templates')

diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html
index 433f74dc..760783a3 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/media.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/media.html
@@ -65,17 +65,7 @@
       <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">
-          {{ 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 %}
+      <p>{% trans %}<a href="#comment_form">Post a comment</a>{% endtrans %}</p>
 
       {% if comments %}
         {% for comment in comments %}
@@ -108,6 +98,19 @@
           </div>
         {% endfor %}
 
+    {% if request.user %}
+      <a name="comment_form"></a>
+      <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,
-- 
cgit v1.2.3


From ad6d2277da6a0356576578487cb12bebb7875715 Mon Sep 17 00:00:00 2001
From: Aaron Williamson <aaron@copiesofcopies.org>
Date: Tue, 4 Oct 2011 16:11:47 -0400
Subject: Add label tag to fix translation issue.

---
 mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mediagoblin/templates')

diff --git a/mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html b/mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html
index a96e04dc..dbf70ddc 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html
@@ -41,7 +41,7 @@
 	  
       <p class="delete_checkbox_box">
 	{{ form.confirm }}
-	{{ form.confirm.label }}
+	<label for="{{ _(form.confirm.name) }}">{{ _(form.confirm.label.text) }}</label>
       </p>
 
       <div class="form_submit_buttons">
-- 
cgit v1.2.3


From 29264e0d74ef4020cd87a2ed4d22bdda2421f784 Mon Sep 17 00:00:00 2001
From: Aaron Williamson <aaron@copiesofcopies.org>
Date: Tue, 4 Oct 2011 16:12:43 -0400
Subject: No need to translate label name.

---
 mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mediagoblin/templates')

diff --git a/mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html b/mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html
index dbf70ddc..8da90f79 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/media_confirm_delete.html
@@ -41,7 +41,7 @@
 	  
       <p class="delete_checkbox_box">
 	{{ form.confirm }}
-	<label for="{{ _(form.confirm.name) }}">{{ _(form.confirm.label.text) }}</label>
+	<label for="{{ (form.confirm.name) }}">{{ _(form.confirm.label.text) }}</label>
       </p>
 
       <div class="form_submit_buttons">
-- 
cgit v1.2.3


From f7ede646e4e33175af9b72c1b2b23674a558a698 Mon Sep 17 00:00:00 2001
From: Aaron Williamson <aaron@copiesofcopies.org>
Date: Fri, 14 Oct 2011 19:33:48 -0400
Subject: Put the trans tag in the right place.

---
 mediagoblin/templates/mediagoblin/user_pages/media.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mediagoblin/templates')

diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html
index 760783a3..4f3a8ac8 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/media.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/media.html
@@ -65,7 +65,7 @@
       <br />
       <h3>{% trans %}Comments{% endtrans %}</h3>
 
-      <p>{% trans %}<a href="#comment_form">Post a comment</a>{% endtrans %}</p>
+      <p><a href="#comment_form">{% trans %}Post a comment{% endtrans %}</a></p>
 
       {% if comments %}
         {% for comment in comments %}
-- 
cgit v1.2.3


From b06e4f3b2d47cf55dfe4784eeab05e981f3131b4 Mon Sep 17 00:00:00 2001
From: Elrond <elrond+mediagoblin.org@samba-tng.org>
Date: Sat, 15 Oct 2011 13:31:43 +0200
Subject: Improve indentation a bit

Only change: Indentation, nothing else!
---
 .../templates/mediagoblin/user_pages/media.html    | 24 +++++++++++-----------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'mediagoblin/templates')

diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html
index 4f3a8ac8..2c1b7c82 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/media.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/media.html
@@ -98,18 +98,18 @@
           </div>
         {% endfor %}
 
-    {% if request.user %}
-      <a name="comment_form"></a>
-      <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 %}
+        {% if request.user %}
+          <a name="comment_form"></a>
+          <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',
-- 
cgit v1.2.3


From ecc56c0afbaae29b1167ff943974d32094faf70e Mon Sep 17 00:00:00 2001
From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Thu, 27 Oct 2011 10:52:18 -0500
Subject: Renamed "Temporary button holder" to "actions"

---
 mediagoblin/templates/mediagoblin/user_pages/media.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mediagoblin/templates')

diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html
index 2c1b7c82..b8d0b9ff 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/media.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/media.html
@@ -123,7 +123,7 @@
 
       {% if media['uploader'] == request.user['_id'] or 
                                  request.user['is_admin'] %}
-        <h3>Temporary button holder</h3>
+        <h3>{% trans %}Actions{% endtrans %}</h3>
         <p>
           {% set edit_url = request.urlgen('mediagoblin.edit.edit_media',
                                      user= media.uploader().username,
-- 
cgit v1.2.3


From e360a992762ca6ca36aec58a4be6a9b45cf6ca9a Mon Sep 17 00:00:00 2001
From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Thu, 27 Oct 2011 13:13:19 -0500
Subject: Only show the "post a comment" link if there's a logged in user

---
 mediagoblin/templates/mediagoblin/user_pages/media.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'mediagoblin/templates')

diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html
index b8d0b9ff..c4fe3a71 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/media.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/media.html
@@ -65,7 +65,9 @@
       <br />
       <h3>{% trans %}Comments{% endtrans %}</h3>
 
-      <p><a href="#comment_form">{% trans %}Post a comment{% endtrans %}</a></p>
+      {% if request.user %}
+        <p><a href="#comment_form">{% trans %}Post a comment{% endtrans %}</a></p>
+      {% endif %}
 
       {% if comments %}
         {% for comment in comments %}
-- 
cgit v1.2.3


From 18909d599479903771aba1d5ff4a8355b95bce15 Mon Sep 17 00:00:00 2001
From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Thu, 27 Oct 2011 13:53:32 -0500
Subject: Unclosed anchor tags in the tags!  Fixed :)

---
 mediagoblin/templates/mediagoblin/utils/tags.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mediagoblin/templates')

diff --git a/mediagoblin/templates/mediagoblin/utils/tags.html b/mediagoblin/templates/mediagoblin/utils/tags.html
index 87e6a85f..b3211bd9 100644
--- a/mediagoblin/templates/mediagoblin/utils/tags.html
+++ b/mediagoblin/templates/mediagoblin/utils/tags.html
@@ -23,7 +23,7 @@
       <li class="tag">
         <a href="{{ request.urlgen(
                         'mediagoblin.listings.tags_listing',
-                        tag=tag['slug']) }}">{{ tag['name'] }}</li>
+                        tag=tag['slug']) }}">{{ tag['name'] }}</a></li>
     {% endfor %}
   </ul>
 {% endblock %}
-- 
cgit v1.2.3


From 6f73c51e3c19f70b66d5767bf3642d94162d781f Mon Sep 17 00:00:00 2001
From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Sat, 29 Oct 2011 14:11:45 -0500
Subject: Removing comment_form link which doesn't do anything?

---
 mediagoblin/templates/mediagoblin/user_pages/media.html | 1 -
 1 file changed, 1 deletion(-)

(limited to 'mediagoblin/templates')

diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html
index c4fe3a71..11fa72cf 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/media.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/media.html
@@ -101,7 +101,6 @@
         {% endfor %}
 
         {% if request.user %}
-          <a name="comment_form"></a>
           <form action="{{ request.urlgen('mediagoblin.user_pages.media_post_comment', 
                                            user= media.uploader().username,
                                            media=media._id) }}" method="POST">
-- 
cgit v1.2.3


From 157c60267e0c0e464f89779a190d8b2d11d5a4be Mon Sep 17 00:00:00 2001
From: Jef van Schendel <jefvanschendel@gmail.com>
Date: Fri, 4 Nov 2011 01:54:41 +0100
Subject: Several small changes (reordering/restyling) for media descriptions
 and comments

---
 .../templates/mediagoblin/user_pages/media.html    | 28 +++++++---------------
 1 file changed, 9 insertions(+), 19 deletions(-)

(limited to 'mediagoblin/templates')

diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html
index 11fa72cf..17beffb2 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/media.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/media.html
@@ -47,28 +47,22 @@
       <h2 class="media_title">
         {{ media.title }}
       </h2>
-
+      {% autoescape False %}
+        <p>{{ media.description_html }}</p>
+      {% endautoescape %}
       <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 -%}
-          Uploaded on {{ date }} by <a href="{{ user_url }}">{{ username }}</a>
+          By <a href="{{ user_url }}">{{ username }}</a> on {{ date }}
         {%- endtrans %}
       </p>
-
-      {% autoescape False %}
-        <p>{{ media.description_html }}</p>
-      {% endautoescape %}
-
-      <br />
-      <h3>{% trans %}Comments{% endtrans %}</h3>
-
+      <h3></h3>
       {% if request.user %}
         <p><a href="#comment_form">{% trans %}Post a comment{% endtrans %}</a></p>
       {% endif %}
-
       {% if comments %}
         {% for comment in comments %}
           {% set comment_author = comment.author() %}
@@ -79,14 +73,10 @@
               <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',
+            <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 %} 
@@ -94,7 +84,7 @@
 		       comment = comment['_id'],
 		       user = media.uploader().username,
 		       media = media._id) }}#comment">
-                {{ comment.created.strftime("%Y-%m-%d %I:%M%p") }}
+                {{ comment.created.strftime("%I:%M%p %Y-%m-%d") }}
               </a>
             </div>
           </div>
-- 
cgit v1.2.3


From 726afba3bb4446b07db869b5e770ade35a527299 Mon Sep 17 00:00:00 2001
From: Jef van Schendel <jefvanschendel@gmail.com>
Date: Fri, 4 Nov 2011 02:06:33 +0100
Subject: Text changes to front page, as described in ticket #637

---
 mediagoblin/templates/mediagoblin/root.html | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

(limited to 'mediagoblin/templates')

diff --git a/mediagoblin/templates/mediagoblin/root.html b/mediagoblin/templates/mediagoblin/root.html
index e3ca9726..43d973d1 100644
--- a/mediagoblin/templates/mediagoblin/root.html
+++ b/mediagoblin/templates/mediagoblin/root.html
@@ -24,30 +24,21 @@
     <h1>{% trans %}Explore{% endtrans %}</h1>
   {% else %}
    <div class="grid_11 alpha">
-      <h1>{% trans %}Hi there, media lover! MediaGoblin is...{% endtrans %}</h1>
-      <ul>
-        <li>{% trans %}The perfect place for your media!{% endtrans %}</li>
-        <li>{% trans %}A place for people to collaborate and show off original and derived creations!{% endtrans %}</li>
-        <li>{% trans %}Free, as in freedom. (We’re a <a href="http://gnu.org">GNU</a> project, after all.){% endtrans %}</li>
-        <li>{% trans %}Aiming to make the world a better place through decentralization and (eventually, coming soon!) federation!{% endtrans %}</li>
-        <li>{% trans %}Built for extensibility.  (Multiple media types coming soon to the software, including video support!){% endtrans %}</li>
-        <li>{% trans %}Powered by people like you.  (<a href="http://mediagoblin.org/pages/join.html">You can help us improve this software!</a>){% endtrans %}</li>
-      </ul>
-
+      <h1>{% trans %}Hi there, welcome to this MediaGoblin site!{% endtrans %}</h1>
+      <p>{% trans %}Your finest source for all goblin-related media.{% endtrans %}</p>
+      <p>{% trans %}To add your own media, place comments, save your favourites and more, you can log in with your MediaGoblin account.{% endtrans %}</p>
       {% if allow_registration %}
-        <p>{% trans %}Excited to join us?{% endtrans %}<p>
+        <p>{% trans %}Don't have one yet? It's easy!{% endtrans %}</p>
         {% trans register_url=request.urlgen('mediagoblin.auth.register') -%}
-          <a class="header_submit_highlight" href="{{ register_url }}">Create a free account</a>
+          <a class="header_submit_highlight" href="{{ register_url }}">Create an account at this site</a>
           or
           <a class="header_submit" href="http://wiki.mediagoblin.org/HackingHowto">Set up MediaGoblin on your own server</a>
         {%- endtrans %}
       {% endif %}
     </div>
-
     <div class="grid_5 omega">
       <img src="{{ request.staticdirect('/images/frontpage_image.png') }}" />
     </div>
-
     <div class="clear"></div>
   {% endif %}
   <h2>{% trans %}Most recent media{% endtrans %}</h2>
-- 
cgit v1.2.3


From d1bee08d5a142c2ddd7f060c45e43e968b7a1bcb Mon Sep 17 00:00:00 2001
From: Jef van Schendel <jefvanschendel@gmail.com>
Date: Fri, 4 Nov 2011 02:14:19 +0100
Subject: Text changes to forgot-paddword page

---
 mediagoblin/templates/mediagoblin/auth/forgot_password.html | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'mediagoblin/templates')

diff --git a/mediagoblin/templates/mediagoblin/auth/forgot_password.html b/mediagoblin/templates/mediagoblin/auth/forgot_password.html
index b95a4dcb..57de425c 100644
--- a/mediagoblin/templates/mediagoblin/auth/forgot_password.html
+++ b/mediagoblin/templates/mediagoblin/auth/forgot_password.html
@@ -20,20 +20,15 @@
 {% import "/mediagoblin/utils/wtforms.html" as wtforms_util %}
 
 {% block mediagoblin_content %}
-
   <form action="{{ request.urlgen('mediagoblin.auth.forgot_password') }}"
         method="POST" enctype="multipart/form-data">
     {{ csrf_token }}
-
     <div class="grid_6 prefix_1 suffix_1 form_box">
-      <h1>{% trans %}Enter your username or email{% endtrans %}</h1>
-
+      <h1>{% trans %}Forgot your password?{% endtrans %}</h1>
       {{ wtforms_util.render_divs(fp_form) }}
       <div class="form_submit_buttons">
-        <input type="submit" value="submit" class="button"/>
+        <input type="submit" value="Send instructions" class="button"/>
       </div>
-
     </div>
   </form>
 {% endblock %}
-
-- 
cgit v1.2.3


From b4b10a222df3cf36a70a3d354a5d0f40326ae290 Mon Sep 17 00:00:00 2001
From: Jef van Schendel <jefvanschendel@gmail.com>
Date: Fri, 4 Nov 2011 02:15:52 +0100
Subject: Add translation brackety things to forgot-password page, I forgot
 those

---
 mediagoblin/templates/mediagoblin/auth/forgot_password.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mediagoblin/templates')

diff --git a/mediagoblin/templates/mediagoblin/auth/forgot_password.html b/mediagoblin/templates/mediagoblin/auth/forgot_password.html
index 57de425c..c7f01678 100644
--- a/mediagoblin/templates/mediagoblin/auth/forgot_password.html
+++ b/mediagoblin/templates/mediagoblin/auth/forgot_password.html
@@ -27,7 +27,7 @@
       <h1>{% trans %}Forgot your password?{% endtrans %}</h1>
       {{ wtforms_util.render_divs(fp_form) }}
       <div class="form_submit_buttons">
-        <input type="submit" value="Send instructions" class="button"/>
+        <input type="submit" value="{% trans %}Send instructions{% endtrans %}" class="button"/>
       </div>
     </div>
   </form>
-- 
cgit v1.2.3


From 560af7ba4342ac89b0a96594ac22944e27547445 Mon Sep 17 00:00:00 2001
From: Jef van Schendel <jefvanschendel@gmail.com>
Date: Fri, 4 Nov 2011 02:19:35 +0100
Subject: Text edits and rearrangements to login.html

---
 mediagoblin/templates/mediagoblin/auth/login.html | 24 ++++++++++-------------
 1 file changed, 10 insertions(+), 14 deletions(-)

(limited to 'mediagoblin/templates')

diff --git a/mediagoblin/templates/mediagoblin/auth/login.html b/mediagoblin/templates/mediagoblin/auth/login.html
index 61c5a203..756f67c0 100644
--- a/mediagoblin/templates/mediagoblin/auth/login.html
+++ b/mediagoblin/templates/mediagoblin/auth/login.html
@@ -30,27 +30,23 @@
           {% trans %}Logging in failed!{% endtrans %}
         </div>
       {% endif %}
-      {{ wtforms_util.render_divs(login_form) }}
-      <div class="form_submit_buttons">
-        <input type="submit" value="{% trans %}Log in{% endtrans %}" class="button"/>
-      </div>
-      {% if next %}
-        <input type="hidden" name="next" value="{{ next }}" class="button"
-               style="display: none;"/>
-      {% endif %}
       {% if allow_registration %}
         <p>
-          {% trans %}Don't have an account yet?{% endtrans %}
-          <br />
-          <a href="{{ request.urlgen('mediagoblin.auth.register') }}">
+          {% trans %}Don't have an account yet?{% endtrans %} <a href="{{ request.urlgen('mediagoblin.auth.register') }}">
             {%- trans %}Create one here!{% endtrans %}</a>
         </p>
+      {% endif %}
+      {{ wtforms_util.render_divs(login_form) }}
         <p>
-          {% trans %}Forgot your password?{% endtrans %}
-          <br />
           <a href="{{ request.urlgen('mediagoblin.auth.forgot_password') }}">
-            {%- trans %}Change it!{% endtrans %}</a>
+          {% trans %}Forgot your password?{% endtrans %}</a>
         </p>
+      <div class="form_submit_buttons">
+        <input type="submit" value="{% trans %}Log in{% endtrans %}" class="button"/>
+      </div>
+      {% if next %}
+        <input type="hidden" name="next" value="{{ next }}" class="button"
+               style="display: none;"/>
       {% endif %}
     </div>
   </form>
-- 
cgit v1.2.3


From 1b36a8e80c09307a2c4ddf8cc8bfe786a9d86f7d Mon Sep 17 00:00:00 2001
From: Jef van Schendel <jefvanschendel@gmail.com>
Date: Fri, 4 Nov 2011 02:20:26 +0100
Subject: On second thought, let's use this title for forgot_password.html

---
 mediagoblin/templates/mediagoblin/auth/forgot_password.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mediagoblin/templates')

diff --git a/mediagoblin/templates/mediagoblin/auth/forgot_password.html b/mediagoblin/templates/mediagoblin/auth/forgot_password.html
index c7f01678..9b821426 100644
--- a/mediagoblin/templates/mediagoblin/auth/forgot_password.html
+++ b/mediagoblin/templates/mediagoblin/auth/forgot_password.html
@@ -24,7 +24,7 @@
         method="POST" enctype="multipart/form-data">
     {{ csrf_token }}
     <div class="grid_6 prefix_1 suffix_1 form_box">
-      <h1>{% trans %}Forgot your password?{% endtrans %}</h1>
+      <h1>{% trans %}Recover password{% endtrans %}</h1>
       {{ wtforms_util.render_divs(fp_form) }}
       <div class="form_submit_buttons">
         <input type="submit" value="{% trans %}Send instructions{% endtrans %}" class="button"/>
-- 
cgit v1.2.3


From efd0a42ca1b81a2dd17aee1626060584a278020c Mon Sep 17 00:00:00 2001
From: Elrond <elrond+mediagoblin.org@samba-tng.org>
Date: Sun, 13 Nov 2011 19:51:11 +0100
Subject: Mark two strings for translation

---
 mediagoblin/templates/mediagoblin/base.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mediagoblin/templates')

diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html
index b4c4dcf3..925386e5 100644
--- a/mediagoblin/templates/mediagoblin/base.html
+++ b/mediagoblin/templates/mediagoblin/base.html
@@ -67,7 +67,7 @@
                                             user= request.user['username']) }}">
                   {{ request.user['username'] }}</a>
 
-                (<a href="{{ request.urlgen('mediagoblin.auth.logout') }}">log out</a>)
+                (<a href="{{ request.urlgen('mediagoblin.auth.logout') }}">{% trans %}log out{% endtrans %}</a>)
               {% else %}
                 <a href="{{ request.urlgen('mediagoblin.auth.login') }}">
                   {% trans %}Log in{% endtrans %}</a>
-- 
cgit v1.2.3


From 688f56c2dc579218b35263d0189e5d7c9ba9627f Mon Sep 17 00:00:00 2001
From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Sun, 13 Nov 2011 14:34:22 -0600
Subject: Improved title block on media page

---
 mediagoblin/templates/mediagoblin/user_pages/media.html | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'mediagoblin/templates')

diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html
index 17beffb2..2441ec1b 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/media.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/media.html
@@ -20,6 +20,8 @@
 {% import "/mediagoblin/utils/wtforms.html" as wtforms_util %}
 {% from "mediagoblin/utils/pagination.html" import render_pagination %}
 
+{% block title %}{{ media.title }} &mdash; {{ super() }}{% endblock %}
+
 {% block mediagoblin_content %}
   {% if media %}
     <div class="grid_11 alpha">
-- 
cgit v1.2.3


From 017d6ca3501b157277fc01fb37df2dbbd9ed17ef Mon Sep 17 00:00:00 2001
From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Sun, 13 Nov 2011 14:38:40 -0600
Subject: Enhanced title for user profile page

---
 mediagoblin/templates/mediagoblin/user_pages/user.html | 11 +++++++++++
 1 file changed, 11 insertions(+)

(limited to 'mediagoblin/templates')

diff --git a/mediagoblin/templates/mediagoblin/user_pages/user.html b/mediagoblin/templates/mediagoblin/user_pages/user.html
index c5beeaaa..d65da055 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/user.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/user.html
@@ -26,6 +26,17 @@
                        user=user.username) }}">
 {% endblock mediagoblin_head %}
 
+{% block title %}
+  {%- if user -%}
+    {%- trans username=user.username -%}
+      {{ username }}'s profile
+    {%- endtrans %} &mdash; {{ super() }}
+  {%- else -%}
+    {{ super() }}
+  {%- endif -%}
+{% endblock %}
+
+
 {% block mediagoblin_content -%}
   {# If no user... #}
   {% if not user %}
-- 
cgit v1.2.3


From 7fc25d27208ef9926e94eeba953160ffbe676942 Mon Sep 17 00:00:00 2001
From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Sun, 13 Nov 2011 14:40:11 -0600
Subject: If the gallery view makes sure we have a user anyway, do we need this
 check?

Seems like the classic annoying "SHOULD NEVER HAPPEN" else: statement :)
---
 .../templates/mediagoblin/user_pages/gallery.html  | 39 ++++++++++------------
 1 file changed, 17 insertions(+), 22 deletions(-)

(limited to 'mediagoblin/templates')

diff --git a/mediagoblin/templates/mediagoblin/user_pages/gallery.html b/mediagoblin/templates/mediagoblin/user_pages/gallery.html
index df931d9c..86105493 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/gallery.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/gallery.html
@@ -27,28 +27,23 @@
 {% endblock mediagoblin_head %}
 
 {% block mediagoblin_content -%}
-  {% if user %}
-    <h1>
-      {%- trans username=user.username,
-                user_url=request.urlgen(
-                           'mediagoblin.user_pages.user_home',
-                            user=user.username) -%}
-        <a href="{{ user_url }}">{{ username }}</a>'s media
-      {%- endtrans %}
-    </h1>
+  <h1>
+    {%- trans username=user.username,
+              user_url=request.urlgen(
+                         'mediagoblin.user_pages.user_home',
+                          user=user.username) -%}
+      <a href="{{ user_url }}">{{ username }}</a>'s media
+    {%- endtrans %}
+  </h1>
 
-    <div class="container_16 media_gallery">
-      {{ object_gallery(request, media_entries, pagination) }}
-    </div>
+  <div class="container_16 media_gallery">
+    {{ object_gallery(request, media_entries, pagination) }}
+  </div>
 
-    <div class="grid_16">
-      {% set feed_url = request.urlgen(
-                'mediagoblin.user_pages.atom_feed',
-                user=user.username) %}
-      {% include "mediagoblin/utils/feed_link.html" %}
-    </div>
-  {% else %}
-    {# This *should* not occur as the view makes sure we pass in a user. #}
-    <p>{% trans %}Sorry, no such user found.{% endtrans %}<p/>
-  {% endif %}
+  <div class="grid_16">
+    {% set feed_url = request.urlgen(
+              'mediagoblin.user_pages.atom_feed',
+              user=user.username) %}
+    {% include "mediagoblin/utils/feed_link.html" %}
+  </div>
 {% endblock %}    
-- 
cgit v1.2.3


From ab56689017daa985f3938af4710f3c76ad415bda Mon Sep 17 00:00:00 2001
From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Sun, 13 Nov 2011 14:42:03 -0600
Subject: Enhanced title on the user's main media gallery

---
 mediagoblin/templates/mediagoblin/user_pages/gallery.html | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'mediagoblin/templates')

diff --git a/mediagoblin/templates/mediagoblin/user_pages/gallery.html b/mediagoblin/templates/mediagoblin/user_pages/gallery.html
index 86105493..b066dd71 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/gallery.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/gallery.html
@@ -26,6 +26,12 @@
                        user=user.username) }}">
 {% endblock mediagoblin_head %}
 
+{% block title %}
+  {%- trans username=user.username -%}
+    {{ username }}'s media
+  {%- endtrans %} &mdash; {{ super() }}
+{% endblock %}
+
 {% block mediagoblin_content -%}
   <h1>
     {%- trans username=user.username,
-- 
cgit v1.2.3


From 4671fda345394dad9ca4278b1cf7b2cdf7d2b4ee Mon Sep 17 00:00:00 2001
From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Sun, 13 Nov 2011 14:48:51 -0600
Subject: Improving <title> on tag page *and* adjusting translation for RTL
 reasons

Basically moving the variable inside the translation to give
translators more flexibility
---
 mediagoblin/templates/mediagoblin/listings/tag.html | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'mediagoblin/templates')

diff --git a/mediagoblin/templates/mediagoblin/listings/tag.html b/mediagoblin/templates/mediagoblin/listings/tag.html
index 58863015..f797f72f 100644
--- a/mediagoblin/templates/mediagoblin/listings/tag.html
+++ b/mediagoblin/templates/mediagoblin/listings/tag.html
@@ -26,9 +26,13 @@
                        tag=tag_slug) }}">
 {% endblock mediagoblin_head %}
 
+{% block title %}
+  {% trans %}Media tagged with: {{ tag_name }}{% endtrans %} &mdash; {{ super() }}
+{% endblock %}
+
 {% block mediagoblin_content -%}
   <h1>
-    {% trans %}Media tagged with:{% endtrans %} {{ tag_name }}
+    {% trans %}Media tagged with: {{ tag_name }}{% endtrans %}
   </h1>
 
   <div class="container_16 media_gallery">
-- 
cgit v1.2.3


From 2b7aa99d3c221e713a95b664491f35612f9023cc Mon Sep 17 00:00:00 2001
From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Sun, 13 Nov 2011 20:39:42 -0600
Subject: Only show "post a comment" link if comments already exist

The purpose of the link is to help you jump past comments to the
comment box, and so...

Even with this new conditional, I'm not entirely sure I like that link ;)
---
 mediagoblin/templates/mediagoblin/user_pages/media.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mediagoblin/templates')

diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html
index 2441ec1b..1e495b98 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/media.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/media.html
@@ -62,7 +62,7 @@
         {%- endtrans %}
       </p>
       <h3></h3>
-      {% if request.user %}
+      {% if request.user and comments.count() %}
         <p><a href="#comment_form">{% trans %}Post a comment{% endtrans %}</a></p>
       {% endif %}
       {% if comments %}
-- 
cgit v1.2.3


From eabe6b678a98fd06d9cd8463935a3b842f41485c Mon Sep 17 00:00:00 2001
From: Elrond <elrond+mediagoblin.org@samba-tng.org>
Date: Sun, 13 Nov 2011 19:25:06 +0100
Subject: Dot-Notation for "_id"

Note: Migrations can't use "Dot Notation"!

Migrations run on pymongo, not mongokit.
So they can't use the "Dot Notation".
This isn't really a big issue, as migrations are anyway
quite mongo specific.
---
 mediagoblin/templates/mediagoblin/user_pages/media.html | 10 +++++-----
 mediagoblin/templates/mediagoblin/user_pages/user.html  |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

(limited to 'mediagoblin/templates')

diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html
index 1e495b98..4b02b684 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/media.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/media.html
@@ -69,10 +69,10 @@
         {% for comment in comments %}
           {% set comment_author = comment.author() %}
 	    {% if pagination.active_id == comment._id %}
-              <div class="comment_wrapper comment_active" id="comment-{{ 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 }}
@@ -83,7 +83,7 @@
                 {{ 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.uploader().username,
 		       media = media._id) }}#comment">
                 {{ comment.created.strftime("%I:%M%p %Y-%m-%d") }}
@@ -114,7 +114,7 @@
     <div class="grid_5 omega">
       {% include "mediagoblin/utils/prev_next.html" %}
 
-      {% if media['uploader'] == request.user['_id'] or 
+      {% if media['uploader'] == request.user._id or 
                                  request.user['is_admin'] %}
         <h3>{% trans %}Actions{% endtrans %}</h3>
         <p>
@@ -151,7 +151,7 @@
       {% endif %}
 
       {% if app_config['allow_attachments']
-            and (media['uploader'] == request.user['_id']
+            and (media['uploader'] == request.user._id
                  or request.user['is_admin']) %}
         <p>
           <a href="{{ request.urlgen('mediagoblin.edit.attachments',
diff --git a/mediagoblin/templates/mediagoblin/user_pages/user.html b/mediagoblin/templates/mediagoblin/user_pages/user.html
index d65da055..1de7f611 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/user.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/user.html
@@ -90,7 +90,7 @@
     </h1>
 
     {% if not user['url'] and not user['profile'] %}
-      {% if request.user['_id'] == user['_id'] %}
+      {% if request.user._id == user._id %}
         <div class="grid_6 alpha empty_space">
           <p>
             {% trans %}Here's a spot to tell others about yourself.{% endtrans %}
@@ -113,7 +113,7 @@
     {% else %}
       <div class="grid_6 alpha">
         {% include "mediagoblin/utils/profile.html" %}
-        {% if request.user['_id'] == user['_id'] or request.user['is_admin'] %}
+        {% if request.user._id == user._id or request.user['is_admin'] %}
           <a href="{{ request.urlgen('mediagoblin.edit.profile') }}?username={{
                           user.username }}">
             {%- trans %}Edit profile{% endtrans -%}
@@ -140,7 +140,7 @@
         {% include "mediagoblin/utils/feed_link.html" %}
       </div>
     {% else %}
-      {% if request.user['_id'] == user['_id'] %}
+      {% if request.user._id == user._id %}
         <div class="grid_10 omega empty_space">
           <p>
             {% trans -%}
-- 
cgit v1.2.3


From 76c6c806caec7af20a3fe11c04bb783baacc3934 Mon Sep 17 00:00:00 2001
From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Wed, 16 Nov 2011 17:53:46 -0600
Subject: Accidentally had user['profile'] where it shoulda been user['bio']

---
 mediagoblin/templates/mediagoblin/user_pages/user.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mediagoblin/templates')

diff --git a/mediagoblin/templates/mediagoblin/user_pages/user.html b/mediagoblin/templates/mediagoblin/user_pages/user.html
index c5beeaaa..6d938262 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/user.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/user.html
@@ -78,7 +78,7 @@
       {%- trans username=user.username %}{{ username }}'s profile{% endtrans -%}
     </h1>
 
-    {% if not user['url'] and not user['profile'] %}
+    {% if not user['url'] and not user['bio'] %}
       {% if request.user['_id'] == user['_id'] %}
         <div class="grid_6 alpha empty_space">
           <p>
-- 
cgit v1.2.3


From 3c0411f51f43ade8c7d47df4f3843fd79d4709b5 Mon Sep 17 00:00:00 2001
From: "Pablo J. Urbano Santos" <flamma@member.fsf.org>
Date: Sat, 19 Nov 2011 17:07:41 +0100
Subject: Allow instance owners to customize html titles of page: 	Added
 html_title config option. 	Made base.html template use html_title option
 as page title.

---
 mediagoblin/templates/mediagoblin/base.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mediagoblin/templates')

diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html
index 925386e5..0d6b9e40 100644
--- a/mediagoblin/templates/mediagoblin/base.html
+++ b/mediagoblin/templates/mediagoblin/base.html
@@ -19,7 +19,7 @@
 <html>
   <head>
     <meta charset="utf-8">
-    <title>{% block title %}{% trans %}GNU MediaGoblin{% endtrans %}{% endblock title %}</title>
+    <title>{{ app_config['html_title'] }}</title>
     <link rel="stylesheet" type="text/css"
           href="{{ request.staticdirect('/css/extlib/reset.css') }}"/>
     <link rel="stylesheet" type="text/css"
-- 
cgit v1.2.3


From 7880168526032bc2ddce96257d8f62a01e562832 Mon Sep 17 00:00:00 2001
From: Christopher Allan Webber <cwebber@dustycloud.org>
Date: Sat, 19 Nov 2011 14:06:48 -0600
Subject: Added back the title block

---
 mediagoblin/templates/mediagoblin/base.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mediagoblin/templates')

diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html
index 0d6b9e40..64fafb73 100644
--- a/mediagoblin/templates/mediagoblin/base.html
+++ b/mediagoblin/templates/mediagoblin/base.html
@@ -19,7 +19,7 @@
 <html>
   <head>
     <meta charset="utf-8">
-    <title>{{ app_config['html_title'] }}</title>
+    <title>{% block title %}{{ app_config['html_title'] }}{% endblock %}</title>
     <link rel="stylesheet" type="text/css"
           href="{{ request.staticdirect('/css/extlib/reset.css') }}"/>
     <link rel="stylesheet" type="text/css"
-- 
cgit v1.2.3


From aea6d577cbf4d937427dea173f74fb17ad45bd75 Mon Sep 17 00:00:00 2001
From: Jef van Schendel <jef@jef-laptop.(none)>
Date: Sat, 19 Nov 2011 23:46:42 +0100
Subject: Change form structure and add relevant CSS rules

---
 mediagoblin/templates/mediagoblin/utils/wtforms.html | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

(limited to 'mediagoblin/templates')

diff --git a/mediagoblin/templates/mediagoblin/utils/wtforms.html b/mediagoblin/templates/mediagoblin/utils/wtforms.html
index 6a86fd24..39dca7cc 100644
--- a/mediagoblin/templates/mediagoblin/utils/wtforms.html
+++ b/mediagoblin/templates/mediagoblin/utils/wtforms.html
@@ -18,18 +18,16 @@
 
 {# Generically render a field #}
 {% macro render_field_div(field) %}
-  <div class="form_field_box">
-    <div class="form_field_label">{{ _(field.label.text) }}</div>
-    <div class="form_field_input">{{ field }}</div>
+  <p class="form_field_label"><label for="{{ field.name }}">{{ _(field.label.text) }}</label></p>
+  <div class="form_field_input">
+    {{ field }}
     {%- if field.errors -%}
       {% for error in field.errors %}
-        <div class="form_field_error">
-          {{ error }}
-        </div>
+        <p class="form_field_error">{{ error }}</p>
       {% endfor %}
     {%- endif %}
     {% if field.description -%}
-      <div class="form_field_description">{{ _(field.description) }}</div>
+      <p class="form_field_description">{{ _(field.description) }}</p>
     {%- endif %}
   </div>
 {%- endmacro %}
-- 
cgit v1.2.3