From d6ae709c14a628edb2c493654f0c02146503b7d8 Mon Sep 17 00:00:00 2001
From: Jef van Schendel <jefvanschendel@gmail.com>
Date: Thu, 7 Jul 2011 17:54:33 +0200
Subject: Additional style changes to navigation; add three navigation images

---
 mediagoblin/templates/mediagoblin/utils/prev_next.html | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'mediagoblin/templates')

diff --git a/mediagoblin/templates/mediagoblin/utils/prev_next.html b/mediagoblin/templates/mediagoblin/utils/prev_next.html
index 8908c298..7cf8d2a4 100644
--- a/mediagoblin/templates/mediagoblin/utils/prev_next.html
+++ b/mediagoblin/templates/mediagoblin/utils/prev_next.html
@@ -24,20 +24,23 @@
   {# There are no previous entries for the very first media entry #}
   {% if prev_entry_url %}
     <a class="navigation_button navigation_left" href="{{ prev_entry_url }}">
-      &lt;
+      <img src="/mgoblin_static/images/navigation_left.png" alt="Previous image" />
     </a>
   {% else %}
     {# This is the first entry. display greyed-out 'previous' image #}
-    <p class="navigation_button">X</p>
+    <p class="navigation_button navigation_left">
+      <img src="/mgoblin_static/images/navigation_end.png" alt="No previous images" />
+    </p>
   {% endif %}
-
   {# Likewise, this could be the very last media entry #}
   {% if next_entry_url %}
     <a class="navigation_button" href="{{ next_entry_url }}">
-       &gt;
+      <img src="/mgoblin_static/images/navigation_right.png" alt="Next image" />
     </a>
   {% else %}
     {# This is the last entry. display greyed-out 'next' image #}
-    <p class="navigation_button">X</p>
+    <p class="navigation_button">
+      <img src="/mgoblin_static/images/navigation_end.png" alt="No following images" />
+    </p>
   {% endif %}
 </div>
-- 
cgit v1.2.3


From 0a45fa590395a12dfd529a67a8264aab48099819 Mon Sep 17 00:00:00 2001
From: Jef van Schendel <jefvanschendel@gmail.com>
Date: Thu, 7 Jul 2011 20:04:30 +0200
Subject: Change pagination styling; add 2 images

---
 mediagoblin/templates/mediagoblin/utils/pagination.html | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

(limited to 'mediagoblin/templates')

diff --git a/mediagoblin/templates/mediagoblin/utils/pagination.html b/mediagoblin/templates/mediagoblin/utils/pagination.html
index aae50d22..23d49463 100644
--- a/mediagoblin/templates/mediagoblin/utils/pagination.html
+++ b/mediagoblin/templates/mediagoblin/utils/pagination.html
@@ -34,9 +34,16 @@
         {% if pagination.has_prev %}
           <a href="{{ pagination.get_page_url_explicit(
                           base_url, get_params,
-                          pagination.page - 1) }}">&laquo; Prev</a>
+                          pagination.page - 1) }}"><img class="pagination_arrow" src="/mgoblin_static/images/pagination_left.png" alt="Previous page" />Newer</a>
         {% endif %}
-  
+        {% if pagination.has_next %}
+          <a href="{{ pagination.get_page_url_explicit(
+                          base_url, get_params,
+                          pagination.page + 1) }}">Older<img class="pagination_arrow" src="/mgoblin_static/images/pagination_right.png" alt="Next page" />
+          </a>
+        {% endif %}
+        <br />
+        Go to page: 
         {%- for page in pagination.iter_pages() %}
           {% if page %}
             {% if page != pagination.page %}
@@ -50,12 +57,6 @@
             <span class="ellipsis">…</span>
           {% endif %}
         {%- endfor %}
-  
-        {% if pagination.has_next %}
-          <a href="{{ pagination.get_page_url_explicit(
-                          base_url, get_params,
-                          pagination.page + 1) }}">Next &raquo;</a>
-        {% endif %}
        </p>
      </div>
   {% endif %}
-- 
cgit v1.2.3


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: Added sidebar to profile page; moved some content

---
 .../templates/mediagoblin/user_pages/user.html     |  5 +++++
 .../templates/mediagoblin/utils/profile.html       | 25 +++++++++-------------
 2 files changed, 15 insertions(+), 15 deletions(-)

(limited to 'mediagoblin/templates')

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 %}
-- 
cgit v1.2.3


From 681e137194ec68632e0feb54955f2e23c0c7ed71 Mon Sep 17 00:00:00 2001
From: Jef van Schendel <jefvanschendel@gmail.com>
Date: Fri, 8 Jul 2011 15:53:45 +0200
Subject: Moved Submit button to header, styled button

---
 mediagoblin/templates/mediagoblin/base.html        |  6 ++-
 .../templates/mediagoblin/user_pages/user.html     | 51 ++++++++--------------
 2 files changed, 24 insertions(+), 33 deletions(-)

(limited to 'mediagoblin/templates')

diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html
index b71fca24..d6890ac0 100644
--- a/mediagoblin/templates/mediagoblin/base.html
+++ b/mediagoblin/templates/mediagoblin/base.html
@@ -39,7 +39,11 @@
             <div class="grid_16">
               {% block mediagoblin_logo %}
                 <a class="mediagoblin_logo" href="{{ request.urlgen('index') }}"></a>
-              {% endblock %}{% block mediagoblin_header_title %}{% endblock %}
+              {% endblock %}
+              {% if request.user %}
+              <a class="header_submit" href="{{ request.urlgen('mediagoblin.submit.start') }}">Submit media</a>
+              {% endif %}
+              {% block mediagoblin_header_title %}{% endblock %}
               <div class="mediagoblin_header_right">
                 {% if request.user %}
                   <a href="{{ request.urlgen('mediagoblin.user_pages.user_home',
diff --git a/mediagoblin/templates/mediagoblin/user_pages/user.html b/mediagoblin/templates/mediagoblin/user_pages/user.html
index 97a882c6..9d99ac53 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/user.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/user.html
@@ -26,38 +26,25 @@
 
 {% block mediagoblin_content -%}
   {% 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'] %}
-       <a href="{{ request.urlgen('mediagoblin.edit.profile') }}?username={{
-                       user.username }}">Edit profile</a>
-    {% endif %}
-
-    {% if request.user['_id'] == user['_id'] %}
-      <p>
-        <a href="{{ request.urlgen('mediagoblin.submit.start') }}">Submit an item</a> 
-      </p>
-    {% endif %}
+   <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'] %}
+        <a href="{{ request.urlgen('mediagoblin.edit.profile') }}?username={{
+                        user.username }}">Edit profile</a>
+     {% endif %}
+   </div>
+   <div class="grid_10 omega">
+     {% set pagination_base_url = user_gallery_url %}
+     {% include "mediagoblin/utils/object_gallery.html" %}
+     <div class="clear"></div>
+     <p><a href="{{ user_gallery_url }}">View all of {{ user.username }}'s media</a></p>
+      <a href={{ request.urlgen(
+                     'mediagoblin.user_pages.atom_feed',
+                     user=user.username) }}>atom feed</a>
+      {% else %}
+      {# This *should* not occur as the view makes sure we pass in a user. #}
+      <p>Sorry, no such user found.<p/>
     </div>
-    <div class="grid_10 omega">
-
-    {% set pagination_base_url = user_gallery_url %}
-    {% include "mediagoblin/utils/object_gallery.html" %}
-
-    <div class="clear"></div>
-
-    <p><a href="{{ user_gallery_url }}">View all of {{ user.username }}'s media</a></p>
-
-    <a href={{ request.urlgen(
-                   'mediagoblin.user_pages.atom_feed',
-                   user=user.username) }}>atom feed</a>
-  {% else %}
-    {# This *should* not occur as the view makes sure we pass in a user. #}
-    <p>Sorry, no such user found.<p/>
   {% endif %}
-  
-    </div>
 {% endblock %}
-- 
cgit v1.2.3


From 8d74ec4dde8b7afca11f3e8fad3d775849f5b06a Mon Sep 17 00:00:00 2001
From: Jef van Schendel <jefvanschendel@gmail.com>
Date: Fri, 8 Jul 2011 16:01:07 +0200
Subject: Fix logo styling, positioning

---
 mediagoblin/templates/mediagoblin/base.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mediagoblin/templates')

diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html
index d6890ac0..40bb085e 100644
--- a/mediagoblin/templates/mediagoblin/base.html
+++ b/mediagoblin/templates/mediagoblin/base.html
@@ -38,7 +38,7 @@
           <div class="container_16">
             <div class="grid_16">
               {% block mediagoblin_logo %}
-                <a class="mediagoblin_logo" href="{{ request.urlgen('index') }}"></a>
+                <a class="mediagoblin_logo" href="{{ request.urlgen('index') }}"><img src="{{ request.staticdirect('/images/logo.png') }}" alt="Mediagoblin logo" /></a>
               {% endblock %}
               {% if request.user %}
               <a class="header_submit" href="{{ request.urlgen('mediagoblin.submit.start') }}">Submit media</a>
-- 
cgit v1.2.3