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

Merge remote-tracking branch 'elrond/for-schendje'

Browse Source
This commit is contained in:
Christopher Allan Webber 2012-11-26 12:50:17 -06:00
commit dc0b39b747
2 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,12 +23,30 @@
{% if request.user %}
{% if request.user.status == 'active' %}
<h1>{% trans %}Actions{% endtrans %}</h1>
<p><a href="{{ request.urlgen('mediagoblin.submit.collection') }}">
{% trans %}Create new collection{% endtrans %}
</a></p>
<p><a href="{{ request.urlgen('mediagoblin.edit.account') }}">
{%- trans %}Change account settings{% endtrans -%}
</a></p>
<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 %}

4
mediagoblin/templates/mediagoblin/user_pages/media.html
View File

@ -197,7 +197,9 @@
<p>
<a type="submit" href="{{ request.urlgen('mediagoblin.user_pages.media_collect',
user=media.get_uploader.username,
media=media._id) }}" class="button_action button_collect" >
media=media._id) }}"
class="button_action button_collect"
title="{% trans %}Add media to collection{% endtrans %}">
</a>
</p>
{% endif %}