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

First commit to add header dropdown

Browse Source
This commit is contained in:
Jef van Schendel 2012-12-02 02:13:22 +01:00
parent d53ca5e506
commit 5a42915b68
3 changed files with 34 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -112,7 +112,9 @@ input, textarea {
}
header {
width: 100%;
width: 940px;
margin-left: auto;
margin-right: auto;
padding: 0;
margin-bottom: 42px;
background-color: #303030;

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

@ -57,6 +57,8 @@
(<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="temp_button">&#9660;</div>
<div class="temp_button_2">&#9650;</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',
@ -70,6 +72,35 @@
{% endif %}
</div>
<div class="clear"></div>
{% if request.user.status == 'active' %}
<div class="temp">
<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.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">

27
mediagoblin/templates/mediagoblin/root.html
View File

@ -21,33 +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.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>
{% endif %}
<h1>{% trans %}Explore{% endtrans %}</h1>
{% else %}
<h1>{% trans %}Hi there, welcome to this MediaGoblin site!{% endtrans %}</h1>