diff options
| author | Aaron Williamson <aaron@copiesofcopies.org> | 2012-08-17 00:54:40 -0400 |
|---|---|---|
| committer | Joar Wandborg <git@wandborg.com> | 2012-09-18 18:10:36 +0200 |
| commit | be5be1154fd22c548125ce5a055af1bdfdad9526 (patch) | |
| tree | db14a89519b54b0474fca795d8ab242ab8820bfd /mediagoblin/templates | |
| parent | 09e528acbb4d1321fce5cec8b22fd7fd153bf68a (diff) | |
| download | mediagoblin-be5be1154fd22c548125ce5a055af1bdfdad9526.tar.lz mediagoblin-be5be1154fd22c548125ce5a055af1bdfdad9526.tar.xz mediagoblin-be5be1154fd22c548125ce5a055af1bdfdad9526.zip | |
Added basic collection functionality
Diffstat (limited to 'mediagoblin/templates')
| -rw-r--r-- | mediagoblin/templates/mediagoblin/base.html | 1 | ||||
| -rw-r--r-- | mediagoblin/templates/mediagoblin/user_pages/media.html | 13 |
2 files changed, 14 insertions, 0 deletions
diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html index 5620debd..b6ba8818 100644 --- a/mediagoblin/templates/mediagoblin/base.html +++ b/mediagoblin/templates/mediagoblin/base.html @@ -64,6 +64,7 @@ <div class="dropdown_items"> {% if request.user and request.user.status == 'active' %} <a href="{{ request.urlgen('mediagoblin.submit.start') }}">{% trans %}+ Add media{% endtrans %}</a> + <a href="{{ request.urlgen('mediagoblin.submit.collection') }}">{% trans %}+ Add collection{% endtrans %}</a> {% endif %} <a href="{{ request.urlgen('mediagoblin.user_pages.user_home', user= request.user.username) }}">{% trans %}View your profile{% endtrans %}</a> <a class="button_action" href="{{ request.urlgen('mediagoblin.auth.logout') }}">{% trans %}Log out{% endtrans %}</a> diff --git a/mediagoblin/templates/mediagoblin/user_pages/media.html b/mediagoblin/templates/mediagoblin/user_pages/media.html index 15ac4988..ac15dd2f 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/media.html +++ b/mediagoblin/templates/mediagoblin/user_pages/media.html @@ -157,6 +157,10 @@ {% include "mediagoblin/utils/tags.html" %} {% endif %} + {% if media.collections %} + {% include "mediagoblin/utils/collections.html" %} + {% endif %} + {% include "mediagoblin/utils/license.html" %} {% include "mediagoblin/utils/geolocation_map.html" %} @@ -189,6 +193,15 @@ </p> {% endif %} + {% if request.user %} + <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" > + </a> + </p> + {% endif %} + {% block mediagoblin_sidebar %} {% endblock %} </div> |