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

Conflicts:
	.gitmodules
	mediagoblin/static/css/base.css

2 files changed, 98 insertions, 105 deletions

diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css
index f998bbb3..ae4c42fc 100644
--- a/mediagoblin/static/css/base.css
+++ b/mediagoblin/static/css/base.css
@@ -105,17 +105,8 @@ input, textarea {
 
 /* website structure */
 
-.container {
-  margin: auto;
-/*  width: 96%;*/
-  max-width: 940px;
-}
-
 header {
   width: 100%;
-  max-width: 940px;
-  margin-left: auto;
-  margin-right: auto;
   padding: 0;
   margin-bottom: 42px;
   border-bottom: 1px solid #333;
diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html
index ecc24f89..2d6f03d9 100644
--- a/mediagoblin/templates/mediagoblin/base.html
+++ b/mediagoblin/templates/mediagoblin/base.html
@@ -54,110 +54,112 @@
     {% include 'mediagoblin/bits/body_start.html' %}
     {% block mediagoblin_body %}
       {% block mediagoblin_header %}
-        <header>
-          {%- include "mediagoblin/bits/logo.html" -%}
-          {% block mediagoblin_header_title %}{% endblock %}
-          <div class="header_right">
-            {%- if request.user %}
-              {% if request.user and 
-                    request.user.has_privilege('active') and 
-                    not request.user.is_banned() %}
+        <div class="container">
+          <header>
+            {%- include "mediagoblin/bits/logo.html" -%}
+            {% block mediagoblin_header_title %}{% endblock %}
+            <div class="header_right">
+              {%- if request.user %}
+                {% if request.user and 
+                      request.user.has_privilege('active') and 
+                      not request.user.is_banned() %}
 
-                {% set notification_count = get_notification_count(request.user.id) %}
-                {% if notification_count %}
-                  <a href="javascript:;" class="notification-gem button_action" title="Notifications">
-                  {{ notification_count }}</a>
+                  {% set notification_count = get_notification_count(request.user.id) %}
+                  {% if notification_count %}
+                    <a href="javascript:;" class="notification-gem button_action" title="Notifications">
+                    {{ notification_count }}</a>
+                  {% endif %}
+                  <a href="javascript:;" class="button_action header_dropdown_down">&#9660;</a>
+                  <a href="javascript:;" class="button_action header_dropdown_up">&#9650;</a>
+                {% elif request.user and not request.user.has_privilege('active') %}
+                {# the following link should only appear when verification is needed #}
+                  <a href="{{ request.urlgen('mediagoblin.user_pages.user_home',
+                                   user=request.user.username) }}"
+                     class="button_action_highlight">
+                 {% trans %}Verify your email!{% endtrans %}</a>
+                 or <a id="logout" href=
+                 {% if persona is not defined %}
+                   "{{ request.urlgen('mediagoblin.auth.logout') }}"
+                 {% else %}
+                   "javascript:;"
+                 {% endif %}
+                 >{% trans %}log out{% endtrans %}</a>
+                {% elif request.user and request.user.is_banned() %}
+                  <a id="logout" href=
+                 {% if persona is not defined %}
+                   "{{ request.urlgen('mediagoblin.auth.logout') }}"
+                 {% else %}
+                   "javascript:;"
+                 {% endif %}
+                 >{% trans %}log out{% endtrans %}</a>
+                {% endif %}
+              {%- elif auth %}
+              <a href=
+                {% if persona_auth is defined %}
+                  "javascript:;" id="persona_login"
+                {% else %}
+                  "{{ request.urlgen('mediagoblin.auth.login') }}"
                 {% endif %}
-                <a href="javascript:;" class="button_action header_dropdown_down">&#9660;</a>
-                <a href="javascript:;" class="button_action header_dropdown_up">&#9650;</a>
-              {% elif request.user and not request.user.has_privilege('active') %}
-              {# the following link should only appear when verification is needed #}
-                <a href="{{ request.urlgen('mediagoblin.user_pages.user_home',
-                                 user=request.user.username) }}"
-                   class="button_action_highlight">
-               {% trans %}Verify your email!{% endtrans %}</a>
-               or <a id="logout" href=
-               {% if persona is not defined %}
-                 "{{ request.urlgen('mediagoblin.auth.logout') }}"
-               {% else %}
-                 "javascript:;"
-               {% endif %}
-               >{% trans %}log out{% endtrans %}</a>
-              {% elif request.user and request.user.is_banned() %}
-                <a id="logout" href=
-               {% if persona is not defined %}
-                 "{{ request.urlgen('mediagoblin.auth.logout') }}"
-               {% else %}
-                 "javascript:;"
-               {% endif %}
-               >{% trans %}log out{% endtrans %}</a>
-              {% endif %}
-            {%- elif auth %}
-            <a href=
-              {% if persona_auth is defined %}
-                "javascript:;" id="persona_login"
-              {% else %}
-                "{{ request.urlgen('mediagoblin.auth.login') }}"
-              {% endif %}
-              >
-                {%- trans %}Log in{% endtrans -%}
-              </a>
-            {%- endif %}
-          </div>
-          <div class="clear"></div>
-          {% if request.user and request.user.has_privilege('active') %}
-            <div class="header_dropdown">
-              <p>
-                <span class="dropdown_title">
-                  {% trans user_url=request.urlgen('mediagoblin.user_pages.user_home',
-                                                    user=request.user.username),
-                           user_name=request.user.username -%}
-                    <a href="{{ user_url }}">{{ user_name }}</a>'s account
-                  {%- endtrans %}
-                </span>
-                &middot;
-                <a href="{{ request.urlgen('mediagoblin.edit.account') }}">{%- trans %}Change account settings{% endtrans -%}</a>
-                &middot;
-                <a href="{{ request.urlgen('mediagoblin.user_pages.processing_panel',
-                                             user=request.user.username) }}">
-                  {%- trans %}Media processing panel{% endtrans -%}
+                >
+                  {%- trans %}Log in{% endtrans -%}
                 </a>
-                &middot;
-                {% template_hook("blog_dashboard_home") %}
-                <a id="logout" href=
-                  {% if persona is not defined %}
-                    "{{ request.urlgen('mediagoblin.auth.logout') }}"
-                  {% else %}
-                    "javascript:;"
-                  {% endif %}
-                  >{% trans %}Log out{% endtrans %}</a>
-              </p>
-              <a class="button_action" href="{{ request.urlgen('mediagoblin.submit.start') }}">
-                {%- trans %}Add media{% endtrans -%}
-              </a>
-              <a class="button_action" href="{{ request.urlgen('mediagoblin.submit.collection') }}">
-                {%- trans %}Create new collection{% endtrans -%}
-              </a>
-              {% if request.user.has_privilege('admin','moderator') %}
+              {%- endif %}
+            </div>
+            <div class="clear"></div>
+            {% if request.user and request.user.has_privilege('active') %}
+              <div class="header_dropdown">
                 <p>
-                  <span class="dropdown_title">Moderation powers:</span>
-                  <a href="{{ request.urlgen('mediagoblin.moderation.media_panel') }}">
-                    {%- trans %}Media processing panel{% endtrans -%}
-                  </a>
+                  <span class="dropdown_title">
+                    {% trans user_url=request.urlgen('mediagoblin.user_pages.user_home',
+                                                      user=request.user.username),
+                             user_name=request.user.username -%}
+                      <a href="{{ user_url }}">{{ user_name }}</a>'s account
+                    {%- endtrans %}
+                  </span>
                   &middot;
-                  <a href="{{ request.urlgen('mediagoblin.moderation.users') }}">
-                    {%- trans %}User management panel{% endtrans -%}
-                  </a>
+                  <a href="{{ request.urlgen('mediagoblin.edit.account') }}">{%- trans %}Change account settings{% endtrans -%}</a>
                   &middot;
-                  <a href="{{ request.urlgen('mediagoblin.moderation.reports') }}">
-                    {%- trans %}Report management panel{% endtrans -%}
+                  <a href="{{ request.urlgen('mediagoblin.user_pages.processing_panel',
+                                               user=request.user.username) }}">
+                    {%- trans %}Media processing panel{% endtrans -%}
                   </a>
+                  &middot;
+                  {% template_hook("blog_dashboard_home") %}
+                  <a id="logout" href=
+                    {% if persona is not defined %}
+                      "{{ request.urlgen('mediagoblin.auth.logout') }}"
+                    {% else %}
+                      "javascript:;"
+                    {% endif %}
+                    >{% trans %}Log out{% endtrans %}</a>
                 </p>
-              {% endif %}
-              {% include 'mediagoblin/fragments/header_notifications.html' %}
-            </div>
-          {% endif %}
-        </header>
+                <a class="button_action" href="{{ request.urlgen('mediagoblin.submit.start') }}">
+                  {%- trans %}Add media{% endtrans -%}
+                </a>
+                <a class="button_action" href="{{ request.urlgen('mediagoblin.submit.collection') }}">
+                  {%- trans %}Create new collection{% endtrans -%}
+                </a>
+                {% if request.user.has_privilege('admin','moderator') %}
+                  <p>
+                    <span class="dropdown_title">Moderation powers:</span>
+                    <a href="{{ request.urlgen('mediagoblin.moderation.media_panel') }}">
+                      {%- trans %}Media processing panel{% endtrans -%}
+                    </a>
+                    &middot;
+                    <a href="{{ request.urlgen('mediagoblin.moderation.users') }}">
+                      {%- trans %}User management panel{% endtrans -%}
+                    </a>
+                    &middot;
+                    <a href="{{ request.urlgen('mediagoblin.moderation.reports') }}">
+                      {%- trans %}Report management panel{% endtrans -%}
+                    </a>
+                  </p>
+                {% endif %}
+                {% include 'mediagoblin/fragments/header_notifications.html' %}
+              </div>
+            {% endif %}
+          </header>
+        </div>
       {% endblock %}
       <div class="container">
         {% include 'mediagoblin/bits/above_content.html' %}