heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CSS edits to dropdown menu; added log out button for unverified users

Browse Source
This commit is contained in:
Jef van Schendel 2013-01-17 16:15:03 +01:00
parent 75a086dafa
commit 10d2419764
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
mediagoblin/static/css/base.css
View File

@ -127,21 +127,16 @@ header {
float: right; float: right;
} }
.header_right ul { .header_dropdown {
display: none; margin-bottom: 20px;
position: absolute;
top: 42px;
right: 0px;
background: #252525;
padding: 20px;
} }
.header_right li { .header_dropdown li {
list-style: none; list-style: none;
} }
.header_dropdown { .dropdown_title {
margin: 20px; font-size: 20px;
} }
a.logo { a.logo {
@ -151,7 +146,7 @@ a.logo {
.logo img { .logo img {
vertical-align: middle; vertical-align: middle;
margin: 6px 8px; margin: 6px 8px 6px 0;
} }
.mediagoblin_content { .mediagoblin_content {

6
mediagoblin/templates/mediagoblin/base.html
View File

@ -62,6 +62,7 @@
user=request.user.username) }}" user=request.user.username) }}"
class="button_action_highlight"> class="button_action_highlight">
{% trans %}Verify your email!{% endtrans %}</a> {% trans %}Verify your email!{% endtrans %}</a>
or <a href="{{ request.urlgen('mediagoblin.auth.logout') }}">{% trans %}log out{% endtrans %}</a>
{% endif %} {% endif %}
{% else %} {% else %}
<a href="{{ request.urlgen('mediagoblin.auth.login') }}"> <a href="{{ request.urlgen('mediagoblin.auth.login') }}">
@ -71,8 +72,9 @@
<div class="clear"></div> <div class="clear"></div>
{% if request.user and request.user.status == 'active' %} {% if request.user and request.user.status == 'active' %}
<div class="header_dropdown"> <div class="header_dropdown">
<a href="{{ request.urlgen('mediagoblin.user_pages.user_home', user= request.user.username) }}">{{ request.user.username }}</a>{% trans %}'s account{% endtrans %} <p><span class="dropdown_title">
(<a href="{{ request.urlgen('mediagoblin.auth.logout') }}">{% trans %}log out{% endtrans %}</a>) <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>
<ul> <ul>
<li><a class="button_action" href="{{ request.urlgen('mediagoblin.submit.start') }}"> <li><a class="button_action" href="{{ request.urlgen('mediagoblin.submit.start') }}">
{%- trans %}Add media{% endtrans -%} {%- trans %}Add media{% endtrans -%}