Merge remote-tracking branch 'refs/remotes/origin/533-new-dropdown'

Conflicts:
	mediagoblin/templates/mediagoblin/base.html
	mediagoblin/templates/mediagoblin/root.html

diff --cc mediagoblin/static/css/base.css
Simple merge

diff --cc mediagoblin/templates/mediagoblin/base.html
index 0a9a56d3ef1a4fd30d3252241d8157a489055480,904a69d94eb2422558cc01869c538ee327fed36d..173bf668766d3ac93a55f5e0559e0b0643957e39
--- 1/mediagoblin/templates/mediagoblin/base.html
--- 2/mediagoblin/templates/mediagoblin/base.html
+++ b/mediagoblin/templates/mediagoblin/base.html
@@@ -60,14 -62,45 +54,53 @@@
                                   user=request.user.username) }}"
                     class="button_action_highlight">
                 {% trans %}Verify your email!{% endtrans %}</a>
+                or <a href="{{ request.urlgen('mediagoblin.auth.logout') }}">{% trans %}log out{% endtrans %}</a>
                {% endif %}
              {% else %}
 -              <a href="{{ request.urlgen('mediagoblin.auth.login') }}">
 +              <a href="{{ request.urlgen('mediagoblin.auth.login') }}?next={{
 +                                                request.base_url|urlencode }}">
                  {% trans %}Log in{% endtrans %}</a>
              {% endif %}
            </div>
            <div class="clear"></div>
 -              <p><span class="dropdown_title">
 -                <a href="{{ request.urlgen('mediagoblin.user_pages.user_home', user= request.user.username) }}">{{ request.user.username }}</a>{% trans %}'s account{% endtrans %}</span>
 -                (<a href="{{ request.urlgen('mediagoblin.auth.logout') }}">{% trans %}log out{% endtrans %}</a>)</p>
+           {% if request.user and request.user.status == '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>
++                (<a href="{{ request.urlgen('mediagoblin.auth.logout') }}">{% trans %}log out{% endtrans %}</a>)
++              </p>
+             <ul>
+               <li><a class="button_action" href="{{ request.urlgen('mediagoblin.submit.start') }}">
+                 {%- trans %}Add media{% endtrans -%}
+               </a></li>
+               <li><a class="button_action" 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">