Merge remote branch 'remotes/schendje/master'

Conflicts:
	mediagoblin/templates/mediagoblin/user_pages/media.html

mediagoblin/static/css/base.css

@@ -215,12 +215,16 @@ a.mediagoblin_logo:hover {
 
 /* media pages */
 
-img.media_image {
+.media_image{
-  display:block;
+  width:640px;
-  margin-left:auto;
-  margin-right:auto;
 }
 
+.media_sidebar{
+  width:280px;
+}
+
+/* media galleries */
+
 ul.media_thumbnail {
   padding:0px;
 }

mediagoblin/templates/mediagoblin/base.html

@@ -51,16 +51,13 @@
           </div>
         </div>
       {% endblock %}
-      
-      {% include "mediagoblin/utils/messages.html" %}
-
       <div class="container_12 mediagoblin_content">
         <div class="grid_12">
+          {% include "mediagoblin/utils/messages.html" %}
           {% block mediagoblin_content %}
           {% endblock mediagoblin_content %}
         </div>
       </div>
-
       {% block mediagoblin_footer %}
         <div class="mediagoblin_footer">
           <div class="container_12">

mediagoblin/templates/mediagoblin/media_details.html

@@ -19,14 +19,17 @@
 {% block mediagoblin_content %}
   {# temporarily, an "image gallery" that isn't one really ;) #}
   {% if media %}
-  
+    <div class="grid_8 alpha media_image">
-    <h1>Media details for {{media.title}}</h1>
-    <div>
       <img src="{{ request.app.public_store.file_url(
                     media.media_files.main) }}" />
-  
+      <h1>Media details for {{media.title}}</h1>
+      <p>
         <br/>Uploaded: {{ media.created}}
         <br/>Description: {{media.description}}
+      </p>
+    </div>
+    <div class="grid_4 omega sidebar">
+      <p>Uploaded: {{ media.created}}</p>
     </div>
   {% else %}
     <p>Sorry, no such media found.<p/>

mediagoblin/templates/mediagoblin/user_pages/media.html

@@ -20,9 +20,9 @@
 {% import "/mediagoblin/utils/wtforms.html" as wtforms_util %}
 
 {% block mediagoblin_content %}
-
   {# temporarily, an "image gallery" that isn't one really ;) #}
   {% if media %}
+    <div class="grid_8 alpha media_image">
       <h1>
         {{media.title}}
       </h1>
@@ -37,9 +37,11 @@
                                    user= media.uploader().username) }}">
           {{- 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,
@@ -56,10 +58,12 @@
           </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 %}
@@ -87,7 +91,12 @@
   	</div>
         {% endfor %}
         {% include "mediagoblin/utils/pagination.html" %}
+      </div>
     {% endif %}
+
+    <div class="grid_4 omega media_sidebar">
+      <p>This is a sidebar! Yay!</p>
+    </div>
   {% else %}
   <p>Sorry, no such media found.<p/>
   {% endif %}

mediagoblin/templates/mediagoblin/utils/messages.html

@@ -19,14 +19,10 @@
 {# Display any queued messages #}
 {% set messages = fetch_messages(request) %}
 {% if messages %}
-<div class="container_12 mediagoblin_messages">
-  <div class="grid_12">
   <ul class="mediagoblin_messages">
     {% for msg in messages %}
       <li class="message_{{ msg.level }}">{{ msg.text }}</li>
     {% endfor %}
   </ul>
-  </div>
-</div>
 {% endif %}