From a54e5be78ee71dcc2dc5ad3b8aeac27b74c00d9f Mon Sep 17 00:00:00 2001
From: Jef van Schendel <jefvanschendel@gmail.com>
Date: Mon, 27 Jun 2011 22:39:05 +0200
Subject: [PATCH 1/3] Implement sidebar on media page

---
 mediagoblin/static/css/base.css               | 12 +++--
 .../templates/mediagoblin/media_details.html  | 16 +++---
 .../mediagoblin/user_pages/media.html         | 49 ++++++++++---------
 3 files changed, 45 insertions(+), 32 deletions(-)

diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css
index e39770d5..994903cf 100644
--- a/mediagoblin/static/css/base.css
+++ b/mediagoblin/static/css/base.css
@@ -174,12 +174,16 @@ a.mediagoblin_logo:hover {
 
 /* media pages */
 
-img.media_image {
-  display:block;
-  margin-left:auto;
-  margin-right:auto;
+.media_image{
+  width:640px;
 }
 
+.media_sidebar{
+  width:280px;
+}
+
+/* media galleries */
+
 ul.media_thumbnail {
   padding:0px;
 }
diff --git a/mediagoblin/templates/mediagoblin/media_details.html b/mediagoblin/templates/mediagoblin/media_details.html
index 8cb23e81..b43bea32 100644
--- a/mediagoblin/templates/mediagoblin/media_details.html
+++ b/mediagoblin/templates/mediagoblin/media_details.html
@@ -19,14 +19,18 @@
 {% block mediagoblin_content %}
   {# temporarily, an "image gallery" that isn't one really ;) #}
   {% if media %}
-  
-    <h1>Media details for {{media.title}}</h1>
-    <div>
+
+    <div class="grid_8 alpha media_image">
       <img src="{{ request.app.public_store.file_url(
                     media.media_files.main) }}" />
-  
-      <br/>Uploaded: {{ media.created}}
-      <br/>Description: {{media.description}}
+      <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/>
diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html
index 97ff8e51..fdaa0e2d 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/media.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/media.html
@@ -20,28 +20,33 @@
 
   {# temporarily, an "image gallery" that isn't one really ;) #}
   {% if media %}
-    <h1>
-      {{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>   
-    {% 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 %}
+    <div class="grid_8 alpha media_image">
+      <img class="media_image" src="{{ request.app.public_store.file_url(
+                    media.media_files.main) }}" />
+      <h2>
+        {{media.title}}
+      </h2>
+      <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>
+      {% 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 %}
+    </div>
+    <div class="grid_4 omega media_sidebar">
+      <p>This is a sidebar! Yay!</p>
+    </div>
   {% else %}
   <p>Sorry, no such media found.<p/>
   {% endif %}

From 664682aaf6d61029b4e6d1c336b294cff93059a5 Mon Sep 17 00:00:00 2001
From: Jef van Schendel <jefvanschendel@gmail.com>
Date: Mon, 27 Jun 2011 22:41:58 +0200
Subject: [PATCH 2/3] Tiny changes

---
 mediagoblin/templates/mediagoblin/media_details.html    | 1 -
 mediagoblin/templates/mediagoblin/user_pages/media.html | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/mediagoblin/templates/mediagoblin/media_details.html b/mediagoblin/templates/mediagoblin/media_details.html
index b43bea32..0e907616 100644
--- a/mediagoblin/templates/mediagoblin/media_details.html
+++ b/mediagoblin/templates/mediagoblin/media_details.html
@@ -19,7 +19,6 @@
 {% block mediagoblin_content %}
   {# temporarily, an "image gallery" that isn't one really ;) #}
   {% if media %}
-
     <div class="grid_8 alpha media_image">
       <img src="{{ request.app.public_store.file_url(
                     media.media_files.main) }}" />
diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html
index fdaa0e2d..90c5a231 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/media.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/media.html
@@ -17,11 +17,10 @@
 #}
 {% extends "mediagoblin/base.html" %}
 {% block mediagoblin_content %}
-
   {# temporarily, an "image gallery" that isn't one really ;) #}
   {% if media %}
     <div class="grid_8 alpha media_image">
-      <img class="media_image" src="{{ request.app.public_store.file_url(
+      <img src="{{ request.app.public_store.file_url(
                     media.media_files.main) }}" />
       <h2>
         {{media.title}}

From 741d5a375dedacfc3867b2e9845fa9c22c1b41bf Mon Sep 17 00:00:00 2001
From: Jef van Schendel <jefvanschendel@gmail.com>
Date: Wed, 29 Jun 2011 14:05:28 +0200
Subject: [PATCH 3/3] Put messages.html in grid_12, above content

---
 mediagoblin/templates/mediagoblin/base.html        |  5 +----
 .../templates/mediagoblin/utils/messages.html      | 14 +++++---------
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html
index 58de7325..fbb52803 100644
--- a/mediagoblin/templates/mediagoblin/base.html
+++ b/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">
diff --git a/mediagoblin/templates/mediagoblin/utils/messages.html b/mediagoblin/templates/mediagoblin/utils/messages.html
index 52d03daa..a8d9c37e 100644
--- a/mediagoblin/templates/mediagoblin/utils/messages.html
+++ b/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>
+  <ul class="mediagoblin_messages">
+    {% for msg in messages %}
+      <li class="message_{{ msg.level }}">{{ msg.text }}</li>
+    {% endfor %}
+  </ul>
 {% endif %}