aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJef van Schendel <mail@jefvanschendel.nl>2013-02-24 21:09:16 +0100
committerJef van Schendel <mail@jefvanschendel.nl>2013-02-24 21:09:16 +0100
commita5b9a066bf7f18b9707d798990560bf6b52a1a8d (patch)
tree1ff4e4f9544dcf2f6ebcf4dc1e0d9c9a1d7a48a6
parent42a8de4932df3e2de4c2e1e49ee72bb5af44c263 (diff)
downloadmediagoblin-a5b9a066bf7f18b9707d798990560bf6b52a1a8d.tar.lz
mediagoblin-a5b9a066bf7f18b9707d798990560bf6b52a1a8d.tar.xz
mediagoblin-a5b9a066bf7f18b9707d798990560bf6b52a1a8d.zip
Improved dropdown styling, part deux
-rw-r--r--mediagoblin/static/css/base.css5
-rw-r--r--mediagoblin/templates/mediagoblin/base.html29
2 files changed, 22 insertions, 12 deletions
diff --git a/mediagoblin/static/css/base.css b/mediagoblin/static/css/base.css
index 7de7a7d0..8df9f2e1 100644
--- a/mediagoblin/static/css/base.css
+++ b/mediagoblin/static/css/base.css
@@ -136,6 +136,11 @@ header {
list-style: none;
}
+.header_dropdown p {
+ margin-top: 12px;
+ margin-bottom: 10px;
+}
+
.dropdown_title {
font-size: 20px;
}
diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html
index 068af79a..13433b33 100644
--- a/mediagoblin/templates/mediagoblin/base.html
+++ b/mediagoblin/templates/mediagoblin/base.html
@@ -85,25 +85,30 @@
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',
+ </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 -%}
- </a> &middot; <a href="{{ request.urlgen('mediagoblin.auth.logout') }}">{% trans %}Log out{% endtrans %}</a>
+ {%- trans %}Media processing panel{% endtrans -%}
+ </a>
+ &middot;
+ <a href="{{ request.urlgen('mediagoblin.auth.logout') }}">{% trans %}Log out{% endtrans %}</a>
</p>
- <a class="button_action" href="{{ request.urlgen('mediagoblin.submit.start') }}">
+ <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') }}">
+ <a class="button_action" href="{{ request.urlgen('mediagoblin.submit.collection') }}">
{%- trans %}Create new collection{% endtrans -%}
</a>
-
-
{% if request.user.is_admin %}
- <a href="{{ request.urlgen('mediagoblin.admin.panel') }}">
- {%- trans %}Media processing panel{% endtrans -%}
- </a>
+ <p>
+ <span class="dropdown_title">Admin powers:</span>
+ <a href="{{ request.urlgen('mediagoblin.admin.panel') }}">
+ {%- trans %}Media processing panel{% endtrans -%}
+ </a>
+ </p>
{% endif %}
</div>
{% endif %}