Merge remote branch 'remotes/schendje/master'

mediagoblin/static/css/base.css

@@ -1,6 +1,6 @@
 body {
-  background-color: #272727;
+  background-color: #1F1F1F;
-  color: #f7f7f7;
+  color: #aaa;
   font-family: sans-serif;
   padding:none;
   margin:0px;
@@ -18,7 +18,7 @@ form {
   font-family: 'Carter One';
   font-style: normal;
   font-weight: normal;
-  src: local('CarterOne'), url('http://themes.googleusercontent.com/font?kit=VjW2qt1pkqVtO22ObxgEBRsxEYwM7FgeyaSgU71cLG0') format('woff');
+  src: local('CarterOne'), url('http://themes.googleusercontent.com/font?kit=FWNn6ITYqL6or7ZTmBxRhq3fkYX5z1QtDUdIWoaaD_k') format('woff');
 }
 
 /* text styles */
@@ -33,13 +33,8 @@ h2{
   margin-top:20px;
 }
 
-p {
-  font-family: sans-serif;
-  font-size:16px;
-}
-
 a {
-  color: #86D4B1;
+  color: #fff;
 }
 
 label {
@@ -56,15 +51,33 @@ label {
 .mediagoblin_header {
   width:100%;
   height:36px;
-  background-color:#393939;
+  background-color:#2F2F2F;
   padding-top:14px;
   margin-bottom:40px;
 }
 
+.header_submit{
+  color:#272727;
+  background-color:#aaa;
+  background-image: -webkit-gradient(linear, left top, left bottom, from(##D2D2D2), to(#aaa)); 
+  background-image: -webkit-linear-gradient(top, #D2D2D2, #aaa); 
+  background-image:    -moz-linear-gradient(top, #D2D2D2, #aaa); 
+  background-image:     -ms-linear-gradient(top, #D2D2D2, #aaa); 
+  background-image:      -o-linear-gradient(top, #D2D2D2, #aaa); 
+  background-image:         linear-gradient(top, #D2D2D2, #aaa);
+  box-shadow:0px 0px 4px #000;
+  border-radius:5px 5px 5px 5px;
+  margin:8px;
+  padding:3px 8px;
+  text-decoration:none;
+  border:medium none;
+  font-family:'Carter One',arial,serif;
+}
+
 .mediagoblin_footer {
   width:100%;
-  height:26px;
+  height:30px;
-  background-color:#393939;
+  background-color:#2F2F2F;
   bottom:0px;
   padding-top:8px;
   position:absolute;
@@ -77,19 +90,6 @@ label {
   padding-bottom:74px;
 }
 
-a.mediagoblin_logo {
-  width:34px;
-  height:25px;
-  margin-right:10px;
-  background-image:url('../images/icon.png');
-  background-position:0px 0px;
-  display:inline-block;
-}
-
-a.mediagoblin_logo:hover {
-  background-position:0px -28px;
-}
-
 .mediagoblin_header_right {
   float:right;
 }
@@ -122,6 +122,10 @@ a.mediagoblin_logo:hover {
 text-align:center;
 }
 
+.pagination_arrow{
+  margin:5px;
+}
+
 /* forms */
 
 .form_box {
@@ -130,7 +134,7 @@ text-align:center;
   background-repeat:repeat-x;
   font-size:18px;
   padding-bottom:30px;
-  padding-top:1px;
+  padding-top:30px;
   margin-left:auto;
   margin-right:auto;
   display:block;
@@ -160,6 +164,7 @@ text-align:center;
 
 .form_field_error {
   background-color:#87453b;
+  color:#fff;
   border:none;
   font-size:16px;
   padding:9px;
@@ -204,14 +209,14 @@ img.media_icon{
 /* navigation */
 
 .navigation_button{
-  width: 139px;
+  width:139px;
   display:block;
   float:left;
-  text-align: center;
+  text-align:center;
-  background-color: #393939;
+  background-color:#393939;
-  text-decoration: none;
+  text-decoration:none;
-  padding: 6px 0pt;
+  padding:12px 0pt;
-  font-family: 'Carter One', arial, serif;
+  font-family:'Carter One', arial, serif;
   font-size:2em;
   margin:0 0 20px
 }
@@ -257,11 +262,3 @@ ul.mediagoblin_messages {
   background-color: #f7f7f7;
   color:#272727;
 }
-
-/* profile stuff */
-
-.profile_content {
-  padding: 6px;
-  background-color: #393939;
-  margin-bottom: 10px;
-}

mediagoblin/templates/mediagoblin/base.html

@@ -38,8 +38,12 @@
           <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 %}{% 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',

mediagoblin/templates/mediagoblin/user_pages/user.html

@@ -26,33 +26,25 @@
 
 {% block mediagoblin_content -%}
   {% if user %}
-    <h1>{{ user.username }}'s profile</h1>
+   <h1>{{ user.username }}'s profile</h1>
-
+   <div class="grid_6 alpha">
-    {% include "mediagoblin/utils/profile.html" %}
+     {% include "mediagoblin/utils/profile.html" %}
-
+     {% if request.user['_id'] == user['_id'] or request.user['is_admin'] %}
-    {% if request.user['_id'] == user['_id'] or request.user['is_admin'] %}
+        <a href="{{ request.urlgen('mediagoblin.edit.profile') }}?username={{
-       <a href="{{ request.urlgen('mediagoblin.edit.profile') }}?username={{
+                        user.username }}">Edit profile</a>
-                       user.username }}">Edit profile</a>
+     {% endif %}
-    {% endif %}
+   </div>
-
+   <div class="grid_10 omega">
-    {% if request.user['_id'] == user['_id'] %}
+     {% set pagination_base_url = user_gallery_url %}
-      <p>
+     {% include "mediagoblin/utils/object_gallery.html" %}
-        <a href="{{ request.urlgen('mediagoblin.submit.start') }}">Submit an item</a> 
+     <div class="clear"></div>
-      </p>
+     <p><a href="{{ user_gallery_url }}">View all of {{ user.username }}'s media</a></p>
-    {% endif %}
+      <a href={{ request.urlgen(
-
+                     'mediagoblin.user_pages.atom_feed',
-    {% set pagination_base_url = user_gallery_url %}
+                     user=user.username) }}>atom feed</a>
-    {% include "mediagoblin/utils/object_gallery.html" %}
+      {% else %}
-
+      {# This *should* not occur as the view makes sure we pass in a user. #}
-    <div class="clear"></div>
+      <p>Sorry, no such user found.<p/>
-
+    </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 %}
 {% endblock %}

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

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>

mediagoblin/templates/mediagoblin/utils/profile.html

@@ -17,19 +17,14 @@
 #}
 
 {% block profile_content -%}
-  {% if user.url or user.bio %}
+  {% if user.bio %}
-    <div class="profile_content">
+    <p>
-      {% if user.url %}
+      {{ user.bio }}
-        <div class="profile_homepage">
+    </p>
-          <a href="{{ user.url }}">{{ user.url }}</a>
-        </div>
-      {% endif %}
-    
-      {% if user.bio %}
-        <div class="profile_bio">
-          {{ user.bio }}
-        </div>
-      {% endif %}
-    </div>
   {% endif %}
-{% endblock %}    
+  {% if user.url %}
+    <p>
+      <a href="{{ user.url }}">{{ user.url }}</a>
+    </p>
+  {% endif %}
+{% endblock %}