Merge remote-tracking branch 'refs/remotes/origin/533-new-dropdown'
Conflicts: mediagoblin/templates/mediagoblin/base.html mediagoblin/templates/mediagoblin/root.html
This commit is contained in:
Christopher Allan Webber
commit
d1d535602c
@ -113,10 +113,12 @@ input, textarea {
|
||||
|
||||
header {
|
||||
width: 100%;
|
||||
max-width: 940px;
|
||||
margin-left: auto;
|
||||
margin-right: auto;
|
||||
padding: 0;
|
||||
margin-bottom: 42px;
|
||||
background-color: #303030;
|
||||
border-bottom: 1px solid #252525;
|
||||
border-bottom: 1px solid #333;
|
||||
}
|
||||
|
||||
.header_right {
|
||||
@ -125,19 +127,18 @@ header {
|
||||
float: right;
|
||||
}
|
||||
|
||||
.header_right ul {
|
||||
display: none;
|
||||
position: absolute;
|
||||
top: 42px;
|
||||
right: 0px;
|
||||
background: #252525;
|
||||
padding: 20px;
|
||||
.header_dropdown {
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
|
||||
.header_right li {
|
||||
.header_dropdown li {
|
||||
list-style: none;
|
||||
}
|
||||
|
||||
.dropdown_title {
|
||||
font-size: 20px;
|
||||
}
|
||||
|
||||
a.logo {
|
||||
color: #fff;
|
||||
font-weight: bold;
|
||||
@ -145,7 +146,7 @@ a.logo {
|
||||
|
||||
.logo img {
|
||||
vertical-align: middle;
|
||||
margin: 6px 8px;
|
||||
margin: 6px 8px 6px 0;
|
||||
}
|
||||
|
||||
.mediagoblin_content {
|
||||
|
||||
27
mediagoblin/static/js/header_dropdown.js
Normal file
27
mediagoblin/static/js/header_dropdown.js
Normal file
@ -0,0 +1,27 @@
|
||||
/**
|
||||
* 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(){
|
||||
$(".header_dropdown").hide();
|
||||
$(".header_dropdown_up").hide();
|
||||
$(".header_dropdown_down,.header_dropdown_up").click(function() {
|
||||
$(".header_dropdown_down").toggle();
|
||||
$(".header_dropdown_up").toggle();
|
||||
$(".header_dropdown").slideToggle();
|
||||
});
|
||||
});
|
||||
@ -45,21 +45,16 @@
|
||||
{% block mediagoblin_header_title %}{% endblock %}
|
||||
<div class="header_right">
|
||||
{% if request.user %}
|
||||
{% 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 %}
|
||||
(<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="button_action header_dropdown_down">▼</div>
|
||||
<div class="button_action header_dropdown_up">▲</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',
|
||||
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') }}?next={{
|
||||
@ -68,6 +63,44 @@
|
||||
{% endif %}
|
||||
</div>
|
||||
<div class="clear"></div>
|
||||
{% 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">
|
||||
|
||||
@ -21,34 +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.user_pages.collection_list',
|
||||
user=request.user.username) }}">
|
||||
{%- trans %}Browse collections{% 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>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user