Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin

mediagoblin/static/css/base.css

@@ -147,7 +147,7 @@ a.mediagoblin_logo:hover {
 }
 
 .form_field_input input, .form_field_input textarea {
-  width:460px;
+  width:100%;
   font-size:18px;
 }
 
@@ -191,6 +191,7 @@ li.media_thumbnail {
   display:inline-block;
   vertical-align:top;
   margin:0px 10px 10px 0px;
+  text-align:center;
   zoom:1;
 . *display:inline;
 }

mediagoblin/templates/mediagoblin/base.html

@@ -51,12 +51,14 @@
           </div>
         </div>
       {% endblock %}
+
       <div class="container_12 mediagoblin_content">
         <div class="grid_12">
           {% block mediagoblin_content %}
           {% endblock mediagoblin_content %}
         </div>
       </div>
+
       {% block mediagoblin_footer %}
         <div class="mediagoblin_footer">
           <div class="container_12">

mediagoblin/templates/mediagoblin/user_pages/gallery.html

@@ -26,7 +26,8 @@
 
 {% block mediagoblin_content -%}
   {% if user %}
-    <h1><a href="{{ request.urlgen(
+    <h1>
+      <a href="{{ request.urlgen(
                       'mediagoblin.user_pages.user_home',
                       user=user.username) }}">{{ user.username }}</a>'s media</h1>
 

mediagoblin/templates/mediagoblin/user_pages/media.html

@@ -25,16 +25,18 @@
     </h1>
     <img class="media_image" src="{{ request.app.public_store.file_url(
                   media.media_files.main) }}" />
-    {% autoescape False %}
-    <p>{{ media.description_html }}</p>
-    {% endautoescape %}
-    <p>Uploaded on
+    <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>   
+        {{- media.uploader().username }}</a>
+    </p>   
+    {% 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,