aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElrond <elrond+mediagoblin.org@samba-tng.org>2012-11-26 00:29:39 +0100
committerElrond <elrond+mediagoblin.org@samba-tng.org>2012-11-26 00:36:07 +0100
commit9498e3e73bb2715f72a75937b9c0e4721e7fc26d (patch)
tree44ae57f15b2d9dfaa21e1ee4e5e9832190f4c4ee
parent9abd664bf2b1de34fc6de0f3b323727e47470e52 (diff)
downloadmediagoblin-9498e3e73bb2715f72a75937b9c0e4721e7fc26d.tar.lz
mediagoblin-9498e3e73bb2715f72a75937b9c0e4721e7fc26d.tar.xz
mediagoblin-9498e3e73bb2715f72a75937b9c0e4721e7fc26d.zip
Some small template changes
1) Change the "dashboard": - Add a bunch of new links: Processing panel, Add media - Use <ul>+<li> for the *list* of possible actions 2) Add a title attribute to the "add media to collection" link
-rw-r--r--mediagoblin/templates/mediagoblin/root.html30
-rw-r--r--mediagoblin/templates/mediagoblin/user_pages/media.html4
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 %}