From cdc8cb285dc4aec215cac763d423c6c7e12d0926 Mon Sep 17 00:00:00 2001
From: Jef van Schendel <jefvanschendel@gmail.com>
Date: Fri, 8 Jul 2011 15:22:15 +0200
Subject: [PATCH] Added sidebar to profile page; moved some content

---
 mediagoblin/static/css/base.css               |  8 ------
 .../mediagoblin/user_pages/user.html          |  5 ++++
 .../templates/mediagoblin/utils/profile.html  | 25 ++++++++-----------
 3 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css
index 02fa3469..9dc6444b 100644
--- a/mediagoblin/static/css/base.css
+++ b/mediagoblin/static/css/base.css
@@ -257,11 +257,3 @@ ul.mediagoblin_messages {
   background-color: #f7f7f7;
   color:#272727;
 }
-
-/* profile stuff */
-
-.profile_content {
-  padding: 6px;
-  background-color: #393939;
-  margin-bottom: 10px;
-}
diff --git a/mediagoblin/templates/mediagoblin/user_pages/user.html b/mediagoblin/templates/mediagoblin/user_pages/user.html
index aed330c8..97a882c6 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/user.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/user.html
@@ -28,6 +28,7 @@
   {% if user %}
     <h1>{{ user.username }}'s profile</h1>
 
+    <div class="grid_6 alpha">
     {% include "mediagoblin/utils/profile.html" %}
 
     {% if request.user['_id'] == user['_id'] or request.user['is_admin'] %}
@@ -40,6 +41,8 @@
         <a href="{{ request.urlgen('mediagoblin.submit.start') }}">Submit an item</a> 
       </p>
     {% endif %}
+    </div>
+    <div class="grid_10 omega">
 
     {% set pagination_base_url = user_gallery_url %}
     {% include "mediagoblin/utils/object_gallery.html" %}
@@ -55,4 +58,6 @@
     {# This *should* not occur as the view makes sure we pass in a user. #}
     <p>Sorry, no such user found.<p/>
   {% endif %}
+  
+    </div>
 {% endblock %}
diff --git a/mediagoblin/templates/mediagoblin/utils/profile.html b/mediagoblin/templates/mediagoblin/utils/profile.html
index cd60bbfc..f44defa5 100644
--- a/mediagoblin/templates/mediagoblin/utils/profile.html
+++ b/mediagoblin/templates/mediagoblin/utils/profile.html
@@ -17,19 +17,14 @@
 #}
 
 {% block profile_content -%}
-  {% if user.url or user.bio %}
-    <div class="profile_content">
-      {% if user.url %}
-        <div class="profile_homepage">
-          <a href="{{ user.url }}">{{ user.url }}</a>
-        </div>
-      {% endif %}
-    
-      {% if user.bio %}
-        <div class="profile_bio">
-          {{ user.bio }}
-        </div>
-      {% endif %}
-    </div>
+  {% if user.bio %}
+    <p>
+      {{ user.bio }}
+    </p>
   {% endif %}
-{% endblock %}    
+  {% if user.url %}
+    <p>
+      <a href="{{ user.url }}">{{ user.url }}</a>
+    </p>
+  {% endif %}
+{% endblock %}
-- 
2.25.1