Added sidebar to profile page; moved some content

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;
-}

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 %}

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 %}