diff options
| author | Christopher Allan Webber <cwebber@dustycloud.org> | 2012-11-26 12:50:17 -0600 |
|---|---|---|
| committer | Christopher Allan Webber <cwebber@dustycloud.org> | 2012-11-26 12:50:17 -0600 |
| commit | dc0b39b74741e7f4a7ba975c7ee98953bbf38816 (patch) | |
| tree | d3b80a23ebfa2ac9eda01cef3deb0e9ab8059e33 | |
| parent | f891d5fe507497e3ae6423cf9d026d7050c8f2f4 (diff) | |
| parent | 9498e3e73bb2715f72a75937b9c0e4721e7fc26d (diff) | |
| download | mediagoblin-dc0b39b74741e7f4a7ba975c7ee98953bbf38816.tar.lz mediagoblin-dc0b39b74741e7f4a7ba975c7ee98953bbf38816.tar.xz mediagoblin-dc0b39b74741e7f4a7ba975c7ee98953bbf38816.zip | |
Merge remote-tracking branch 'elrond/for-schendje'
| -rw-r--r-- | mediagoblin/templates/mediagoblin/root.html | 30 | ||||
| -rw-r--r-- | mediagoblin/templates/mediagoblin/user_pages/media.html | 4 |
2 files changed, 27 insertions, 7 deletions
diff --git a/mediagoblin/templates/mediagoblin/root.html b/mediagoblin/templates/mediagoblin/root.html index 99d3269f..047dd2bb 100644 --- a/mediagoblin/templates/mediagoblin/root.html +++ b/mediagoblin/templates/mediagoblin/root.html @@ -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 %} diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html index ac15dd2f..b870a8ae 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/media.html +++ b/mediagoblin/templates/mediagoblin/user_pages/media.html @@ -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 %} |