Merge remote-tracking branch 'upstream/skeletongobblin' into skeleton

7 files changed, 113 insertions, 40 deletions

diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css
index 950954cb..aa2987c1 100644
--- a/mediagoblin/static/css/base.css
+++ b/mediagoblin/static/css/base.css
@@ -161,6 +161,10 @@ a.logo {
   margin: 6px 8px 6px 0;
 }
 
+.welcomeimage {
+  float: right;
+}
+
 .fine_print {
   font-size: 0.8em;
 }
@@ -198,6 +202,20 @@ footer {
   display:block;
 }
 
+.media_pane {
+  border-bottom: 1px solid #333333;
+}
+
+.media_sidebar {
+  border-left: 1px solid #333333;
+  padding-left: 1em;
+  padding-top: 1em;
+}
+
+.media_comments {
+  padding-top: 1em;
+}
+
 /* common website elements */
 
 .button_action, .button_action_highlight, .button_form {
@@ -221,6 +239,17 @@ footer {
   color: #283F35;
 }
 
+.button_info {
+  background-color: #508BB5;
+  border-color: #5899C7 #437699 #427496;
+  color: #C3C3C3;
+}
+
+.button_warning {
+  background-color: #8A2D2D;
+  border-color: #913030 #451717 #431212;
+  color: #C3C3C3;
+}
 
 .button_form {
   min-width: 99px;
@@ -245,6 +274,13 @@ text-align: center;
   padding-top: 70px;
 }
 
+.no_background {
+  background-image: none;
+  height: 0;
+  padding-top: 0;
+  display: inline-block;
+}
+
 .right_align {
   float: right;
 }
@@ -274,13 +310,13 @@ text-align: center;
 }
 
 .media_sidebar h3 {
-	font-size: 1em;
-	margin: 0 0 5px;
-	border: none;
+  font-size: 1em;
+  margin: 0 0 5px;
+  border: none;
 }
 
 .media_sidebar p {
-	margin-left: 8px;
+  margin-left: 8px;
 }
 
 .alpha {
@@ -816,6 +852,7 @@ pre {
   
   .button_action, .button_action_highlight, .button_form { 
     padding: 5px 14px;
+    margin-bottom: 0.5em;
   }
     
 }
@@ -861,6 +898,25 @@ pre {
   .header_right {
     text-align: center;
   }
+
+  .welcomeimage {
+    float: none;
+    display: inherit;
+    margin-left: auto;
+    margin-right: auto;
+    margin-top: 1em;
+  }
+
+  .media_sidebar {
+    border-left: none;
+    padding-left: 0;
+    padding-top: 1em;
+    margin-top: 1em;
+  }
+
+  .media_comments {
+    border-bottom: 1px solid #333333;
+  }
 }
 
 /* Exif display */
diff --git a/mediagoblin/templates/mediagoblin/banned.html b/mediagoblin/templates/mediagoblin/banned.html
index 0b5a6884..151f2b9c 100644
--- a/mediagoblin/templates/mediagoblin/banned.html
+++ b/mediagoblin/templates/mediagoblin/banned.html
@@ -21,7 +21,7 @@
 
 {% block mediagoblin_content %}
   <img class="right_align" src="{{ request.staticdirect('/images/404.png') }}"
-       alt="{% trans %}Image of goblin stressing out{% endtrans %}" />
+       alt="{% trans %}Image of goblin stressing out{% endtrans %}" style="max-width:100%;"/>
 
   <h1>{% trans %}You have been banned{% endtrans %}
     {% if expiration_date %}
diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html
index f60d5f10..d9f66e41 100644
--- a/mediagoblin/templates/mediagoblin/base.html
+++ b/mediagoblin/templates/mediagoblin/base.html
@@ -78,7 +78,7 @@
 
                   {% set notification_count = get_notification_count(request.user.id) %}
                   {% if notification_count %}
-                    <a href="javascript:;" class="notification-gem button_action" title="Notifications">
+                    <a href="javascript:;" class="notification-gem button_action button_info" title="Notifications">
                     {{ notification_count }}</a>
                   {% endif %}
                   <a href="javascript:;" class="button_action header_dropdown_down">&#9660;</a>
diff --git a/mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html b/mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html
index 4e55e618..9d157480 100644
--- a/mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html
+++ b/mediagoblin/templates/mediagoblin/bits/frontpage_welcome.html
@@ -19,29 +19,34 @@
 {% if request.user %}
     <h1>{% trans %}Explore{% endtrans %}</h1>
   {% else %}
-    <img class="right_align" src="{{ request.staticdirect('/images/home_goblin.png') }}" />
-    <h1>{% trans %}Hi there, welcome to this MediaGoblin site!{% endtrans %}</h1>
-    <p>{% trans %}This site is running <a href="http://mediagoblin.org">MediaGoblin</a>, an extraordinarily great piece of media hosting software.{% endtrans %}</p>
-    {% if auth %}
-    <p>{% trans %}To add your own media, place comments, and more, you can log in with your MediaGoblin account.{% endtrans %}</p>
-    {% if allow_registration %}
-      <p>{% trans %}Don't have one yet? It's easy!{% endtrans %}</p>
-      <a class="button_action_highlight" href=
-        {% if persona_auth is defined %}
-          "javascript:;" id="persona_login1"
-        {% else %}
-          "{{ request.urlgen('mediagoblin.auth.register') }}"
+    <div class="row hell">
+      <div class="eleven columns">
+        <h1>{% trans %}Hi there, welcome to this MediaGoblin site!{% endtrans %}</h1>
+        <p>{% trans %}This site is running <a href="http://mediagoblin.org">MediaGoblin</a>, an extraordinarily great piece of media hosting software.{% endtrans %}</p>
+        {% if auth %}
+        <p>{% trans %}To add your own media, place comments, and more, you can log in with your MediaGoblin account.{% endtrans %}</p>
+        {% if allow_registration %}
+          <p>{% trans %}Don't have one yet? It's easy!{% endtrans %}</p>
+          <a class="button_action_highlight" href=
+            {% if persona_auth is defined %}
+              "javascript:;" id="persona_login1"
+            {% else %}
+              "{{ request.urlgen('mediagoblin.auth.register') }}"
+            {% endif %}
+            {% trans %}
+            >Create an account at this site</a>
+            or
+          {%- endtrans %}
         {% endif %}
-        {% trans %}
-        >Create an account at this site</a>
-        or
-      {%- endtrans %}
-    {% endif %}
-    {% endif %}
-      {% trans %}
-        <a class="button_action" href="http://mediagoblin.readthedocs.org/">Set up MediaGoblin on your own server</a>
-      {%- endtrans %}
-
+        {% endif %}
+          {% trans %}
+            <a class="button_action" href="http://mediagoblin.readthedocs.org/">Set up MediaGoblin on your own server</a>
+          {%- endtrans %}
+      </div>
+      <div class="four columns offset-by-one">
+        <img class="welcomeimage" src="/mgoblin_static/images/home_goblin.png">
+      </div>
+    </div>
     <div class="clear"></div>
   {% endif %}
 
diff --git a/mediagoblin/templates/mediagoblin/error.html b/mediagoblin/templates/mediagoblin/error.html
index c16b650f..a8412b24 100644
--- a/mediagoblin/templates/mediagoblin/error.html
+++ b/mediagoblin/templates/mediagoblin/error.html
@@ -21,7 +21,7 @@
 
 {% block mediagoblin_content %}
   <img class="right_align" src="{{ request.staticdirect('/images/404.png') }}"
-       alt="{% trans %}Image of goblin stressing out{% endtrans %}" />
+       alt="{% trans %}Image of goblin stressing out{% endtrans %}" style="max-width:100%;"/>
   <h1>{{ title }}</h1>
   <p>{{ err_msg|safe }}</p>
   <div class="clear"></div>
diff --git a/mediagoblin/templates/mediagoblin/moderation/user.html b/mediagoblin/templates/mediagoblin/moderation/user.html
index 67c3ae27..a98d756b 100644
--- a/mediagoblin/templates/mediagoblin/moderation/user.html
+++ b/mediagoblin/templates/mediagoblin/moderation/user.html
@@ -43,7 +43,7 @@
       </div>
     </div>
     <div class="row">
-      <div class="eight columns">
+      <div class="six columns">
   {# If no user... #}
   {% if not user %}
     <p>{% trans %}Sorry, no such user found.{% endtrans %}</p>
@@ -100,7 +100,7 @@
   {% endif %}
     </div>
   {% if user %}
-      <div class="eight columns">
+      <div class="ten columns">
         <h2>
           {%- trans username=user.username -%}
             Active Reports on {{ username }}
@@ -163,14 +163,14 @@
     <div class="row hell">
     <h2>{% trans username=user.username -%}
           {{ username }}'s Privileges{% endtrans %}</h2>
-    <div class="eight columns">
+    <div class="six columns">
     <form action="{{ request.urlgen('mediagoblin.moderation.give_or_take_away_privilege',
                user=user.username) }}"
           method=post >
     <table class="admin_side_panel">
         <tr>
           <th>{% trans %}Privilege{% endtrans %}</th>
-          <th>{% trans %}User Has Privilege{% endtrans %}</th>
+          <th>{% trans %}Granted{% endtrans %}</th>
         </tr>
         {% for privilege in privileges %}
           <tr>
@@ -201,7 +201,7 @@
     <input type=hidden name=privilege_name id=hidden_privilege_name />
     </form>
     </div>
-    <div class="eight columns">
+    <div class="five columns">
       <form method=POST action="{{ request.urlgen(
         'mediagoblin.moderation.ban_or_unban',
         user=user.username) }}">
diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html
index 4c2323cf..abdd9599 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/media.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/media.html
@@ -46,7 +46,7 @@
     {% include "mediagoblin/utils/prev_next.html" %}
   </div>
 </div>
-  <div class="media_pane eleven columns">
+  <div class="media_pane sixteen columns">
     <div class="media_image_container">
       {% block mediagoblin_media %}
         {% set display_media = request.app.public_store.file_url(
@@ -70,12 +70,14 @@
         {% endif %}
       {% endblock %}
     </div>
+    <div class="row heaven hell">
     <h2 class="media_title">
       {{ media.title }}
     </h2>
     {% if request.user and
           (media.uploader == request.user.id or
            request.user.has_privilege('admin')) %}
+    <div class="pull-right" style="padding-top:20px;">
       {% set edit_url = request.urlgen('mediagoblin.edit.edit_media',
                                  user= media.get_uploader.username,
                                  media_id=media.id) %}
@@ -83,13 +85,18 @@
       {% set delete_url = request.urlgen('mediagoblin.user_pages.media_confirm_delete',
                                  user= media.get_uploader.username,
                                  media_id=media.id) %}
-      <a class="button_action" href="{{ delete_url }}">{% trans %}Delete{% endtrans %}</a>
-
+      <a class="button_action button_warning" href="{{ delete_url }}">{% trans %}Delete{% endtrans %}</a>
+      </div>
     {% endif %}
     {% autoescape False %}
       <p>{{ media.description_html }}</p>
     {% endautoescape %}
+    </div>
+    </div>
+
+    <div class="eleven columns omega">
     {% if comments and request.user and request.user.has_privilege('commenter') %}
+    <div class="media_comments">
       {% if app_config['allow_comments'] %}
         <a
           {% if not request.user %}
@@ -163,9 +170,13 @@
       </ul>
       {{ render_pagination(request, pagination,
                  media.url_for_self(request.urlgen)) }}
+    {% else %}
+      <div class="empty_space no_background">
     {% endif %}
-  </div><!--end media_pane-->
-  <div class="five columns media_sidebar">
+  </div>
+  </div>
+
+  <div class="five columns alpha media_sidebar">
     <h3>{% trans %}Added{% endtrans %}</h3>
     <p><span title="{{ media.created.strftime("%I:%M%p %Y-%m-%d") }}">
         {%- trans formatted_time=timesince(media.created) -%}
@@ -223,6 +234,7 @@
     {% block mediagoblin_sidebar %}
     {% endblock %}
 
-  </div>
+  </div><!--end media_sidebar-->
+
   <div class="clear"></div>
 {% endblock %}