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

Replace dropdown in top right with regular links

Browse Source
This commit is contained in:
Jef van Schendel 2012-10-21 21:49:39 +02:00
parent 9e443248aa
commit 294979824c
3 changed files with 7 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -138,37 +138,6 @@ header {
list-style: none;
}
.dropdown {
display: inline-block;
color: #c3c3c3;
background-color: #424242;
border: 1px solid;
border-color: #464646 #2B2B2B #252525;
border-radius: 4px;
padding: 3px 8px;
font-size: 16px;
text-decoration: none;
font-style: normal;
font-weight: bold;
cursor: pointer;
position: relative;
}
.dropdown_items {
position: absolute;
right: 0px;
top: 25px;
background-color: #424242;
padding: 10px;
width: 160px;
border-radius: 5px 0 5px 5px;
box-shadow: 0 2px 1px black;
}
.dropdown_items a {
display: block;
}
a.logo {
color: #fff;
font-weight: bold;

30
mediagoblin/static/js/header_dropdown.js
View File

@ -1,30 +0,0 @@
/**
* GNU MediaGoblin -- federated, autonomous media hosting
* Copyright (C) 2011, 2012 MediaGoblin contributors. See AUTHORS.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
$(document).ready(function() {
$(".dropdown_items").hide();
$(document).mouseup(function(e) {
if($(e.target).is(".dropdown")) {
$(".dropdown_items").toggle();
} else if($(e.target).is(".dropdown_items")) {
return;
} else {
$(".dropdown_items").hide();
}
});
});

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

@ -52,23 +52,17 @@
{% block mediagoblin_header_title %}{% endblock %}
<div class="header_right">
{% if request.user %}
<a href="{{ request.urlgen('mediagoblin.user_pages.user_home', user= request.user.username) }}">{{ request.user.username }}</a>{% trans %}'s account{% endtrans %}
(<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>
{% elif request.user and request.user.status == "needs_email_verification" %}
{# the following link should only appear when verification is needed #}
{% if request.user.status == "needs_email_verification" %}
<a href="{{ request.urlgen('mediagoblin.user_pages.user_home',
user=request.user.username) }}"
user=request.user.username) }}"
class="button_action_highlight">
{% trans %}Verify your email!{% endtrans %}</a>
{% trans %}Verify your email!{% endtrans %}</a>
{% endif %}
<div class="dropdown">
{{ request.user.username }} ▾
<div class="dropdown_items">
{% if request.user and request.user.status == 'active' %}
<a href="{{ request.urlgen('mediagoblin.submit.start') }}">{% trans %}+ Add media{% endtrans %}</a>
{% endif %}
<a href="{{ request.urlgen('mediagoblin.user_pages.user_home', user= request.user.username) }}">{% trans %}View your profile{% endtrans %}</a>
<a class="button_action" href="{{ request.urlgen('mediagoblin.auth.logout') }}">{% trans %}Log out{% endtrans %}</a>
</div>
</div>
{% else %}
<a href="{{ request.urlgen('mediagoblin.auth.login') }}">
{% trans %}Log in{% endtrans %}</a>