From 5a42915b6893457045db205a905dc743283c510a Mon Sep 17 00:00:00 2001
From: Jef van Schendel <mail@jefvanschendel.nl>
Date: Sun, 2 Dec 2012 02:13:22 +0100
Subject: [PATCH] First commit to add header dropdown

---
 mediagoblin/static/css/base.css             |  4 ++-
 mediagoblin/templates/mediagoblin/base.html | 31 +++++++++++++++++++++
 mediagoblin/templates/mediagoblin/root.html | 27 ------------------
 3 files changed, 34 insertions(+), 28 deletions(-)

diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css
index f8a9e014..7a4fbb1e 100644
--- a/mediagoblin/static/css/base.css
+++ b/mediagoblin/static/css/base.css
@@ -112,7 +112,9 @@ input, textarea {
 }
 
 header {
-  width: 100%;
+  width: 940px;
+  margin-left: auto;
+  margin-right: auto;
   padding: 0;
   margin-bottom: 42px;
   background-color: #303030;
diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html
index e1fa0191..0717e7ba 100644
--- a/mediagoblin/templates/mediagoblin/base.html
+++ b/mediagoblin/templates/mediagoblin/base.html
@@ -57,6 +57,8 @@
               (<a href="{{ request.urlgen('mediagoblin.auth.logout') }}">{% trans %}log out{% endtrans %}</a>)
               {% if request.user and request.user.status == 'active' %}
                 <a class="button_action" href="{{ request.urlgen('mediagoblin.submit.start') }}">{% trans %}Add media{% endtrans %}</a>
+                <div class="temp_button">&#9660;</div>
+                <div class="temp_button_2">&#9650;</div>
               {% elif request.user and request.user.status == "needs_email_verification" %}
               {# the following link should only appear when verification is needed #}
                 <a href="{{ request.urlgen('mediagoblin.user_pages.user_home',
@@ -70,6 +72,35 @@
             {% endif %}
           </div>
           <div class="clear"></div>
+          {% if request.user.status == 'active' %}
+            <div class="temp">
+            <h1>{% trans %}Actions{% endtrans %}</h1>
+            <ul>
+              <li><a href="{{ request.urlgen('mediagoblin.submit.start') }}">
+                {%- trans %}Add media{% endtrans -%}
+              </a></li>
+              <li><a href="{{ request.urlgen('mediagoblin.submit.collection') }}">
+                {%- trans %}Create new collection{% endtrans -%}
+              </a></li>
+              <li><a href="{{ request.urlgen('mediagoblin.edit.account') }}">
+                {%- trans %}Change account settings{% endtrans -%}
+              </a></li>
+              <li><a href="{{ request.urlgen('mediagoblin.user_pages.processing_panel',
+                                             user=request.user.username) }}">
+                {%- trans %}Media processing panel{% endtrans -%}
+              </a></li>
+              {% if request.user.is_admin %}
+                <li>Admin:
+                  <ul>
+                    <li><a href="{{ request.urlgen('mediagoblin.admin.panel') }}">
+                      {%- trans %}Media processing panel{% endtrans -%}
+                    </a></li>
+                  </ul>
+                </li>
+              {% endif %}
+            </ul>
+            </div>
+          {% endif %}
         </header>
       {% endblock %}
     <div class="container">
diff --git a/mediagoblin/templates/mediagoblin/root.html b/mediagoblin/templates/mediagoblin/root.html
index 047dd2bb..5c6eb52f 100644
--- a/mediagoblin/templates/mediagoblin/root.html
+++ b/mediagoblin/templates/mediagoblin/root.html
@@ -21,33 +21,6 @@
 
 {% block mediagoblin_content %}
   {% if request.user %}
-    {% if request.user.status == 'active' %}
-      <h1>{% trans %}Actions{% endtrans %}</h1>
-      <ul>
-        <li><a href="{{ request.urlgen('mediagoblin.submit.start') }}">
-          {%- trans %}Add media{% endtrans -%}
-        </a></li>
-        <li><a href="{{ request.urlgen('mediagoblin.submit.collection') }}">
-          {%- trans %}Create new collection{% endtrans -%}
-        </a></li>
-        <li><a href="{{ request.urlgen('mediagoblin.edit.account') }}">
-          {%- trans %}Change account settings{% endtrans -%}
-        </a></li>
-        <li><a href="{{ request.urlgen('mediagoblin.user_pages.processing_panel',
-                                       user=request.user.username) }}">
-          {%- trans %}Media processing panel{% endtrans -%}
-        </a></li>
-        {% if request.user.is_admin %}
-          <li>Admin:
-            <ul>
-              <li><a href="{{ request.urlgen('mediagoblin.admin.panel') }}">
-                {%- trans %}Media processing panel{% endtrans -%}
-              </a></li>
-            </ul>
-          </li>
-        {% endif %}
-      </ul>
-    {% endif %}
     <h1>{% trans %}Explore{% endtrans %}</h1>
   {% else %}
     <h1>{% trans %}Hi there, welcome to this MediaGoblin site!{% endtrans %}</h1>