diff options
Diffstat (limited to 'mediagoblin/templates')
6 files changed, 22 insertions, 37 deletions
diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html index b6ba8818..e1fa0191 100644 --- a/mediagoblin/templates/mediagoblin/base.html +++ b/mediagoblin/templates/mediagoblin/base.html @@ -47,29 +47,23 @@ <a class="logo" href="{{ request.urlgen('index') }}" ><img src="{{ request.staticdirect('/images/logo.png') }}" - alt="{% trans %}MediaGoblin logo{% endtrans %}" /></a> + alt="{% trans %}MediaGoblin logo{% endtrans %}" /> + </a> {% endblock mediagoblin_logo %} {% block mediagoblin_header_title %}{% endblock %} <div class="header_right"> {% if request.user %} + <a href="{{ request.urlgen('mediagoblin.user_pages.user_home', user= request.user.username) }}">{{ request.user.username }}</a>{% trans %}'s account{% endtrans %} + (<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> + {% elif request.user and request.user.status == "needs_email_verification" %} {# the following link should only appear when verification is needed #} - {% if request.user.status == "needs_email_verification" %} <a href="{{ request.urlgen('mediagoblin.user_pages.user_home', - user=request.user.username) }}" + user=request.user.username) }}" class="button_action_highlight"> - {% trans %}Verify your email!{% endtrans %}</a> + {% trans %}Verify your email!{% endtrans %}</a> {% endif %} - <div class="dropdown"> - {{ request.user.username }} ▾ - <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> - </div> - </div> {% else %} <a href="{{ request.urlgen('mediagoblin.auth.login') }}"> {% trans %}Log in{% endtrans %}</a> diff --git a/mediagoblin/templates/mediagoblin/media_displays/image.html b/mediagoblin/templates/mediagoblin/media_displays/image.html index 86725cca..30c2a90d 100644 --- a/mediagoblin/templates/mediagoblin/media_displays/image.html +++ b/mediagoblin/templates/mediagoblin/media_displays/image.html @@ -19,15 +19,4 @@ {% extends 'mediagoblin/user_pages/media.html' %} {% block mediagoblin_sidebar %} - {% if 'original' in media.media_files %} - <h3>{% trans %}Download{% endtrans %}</h3> - <p> - <a href="{{ request.app.public_store.file_url( - media.media_files['original']) }}"> - {%- trans -%} - Original - {%- endtrans -%} - </a> - </p> - {% endif %} {% endblock %} diff --git a/mediagoblin/templates/mediagoblin/root.html b/mediagoblin/templates/mediagoblin/root.html index 5c6eb52f..99d3269f 100644 --- a/mediagoblin/templates/mediagoblin/root.html +++ b/mediagoblin/templates/mediagoblin/root.html @@ -21,6 +21,15 @@ {% block mediagoblin_content %} {% 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> + {% endif %} <h1>{% trans %}Explore{% endtrans %}</h1> {% else %} <h1>{% trans %}Hi there, welcome to this MediaGoblin site!{% endtrans %}</h1> diff --git a/mediagoblin/templates/mediagoblin/user_pages/user.html b/mediagoblin/templates/mediagoblin/user_pages/user.html index c74535d7..eb3bde48 100644 --- a/mediagoblin/templates/mediagoblin/user_pages/user.html +++ b/mediagoblin/templates/mediagoblin/user_pages/user.html @@ -40,7 +40,7 @@ {% block mediagoblin_content -%} {# If no user... #} {% if not user %} - <p>{% trans %}Sorry, no such user found.{% endtrans %}<p/> + <p>{% trans %}Sorry, no such user found.{% endtrans %}</p> {# User exists, but needs verification #} {% elif user.status == "needs_email_verification" %} @@ -119,18 +119,12 @@ </a> {% endif %} {% endif %} - - {% if request.user and (request.user._id == user._id) %} - <a href="{{ request.urlgen('mediagoblin.edit.account') }}"> - {%- trans %}Change account settings{% endtrans -%} - </a> - {% endif %} </div> {% if media_entries.count() %} <div class="profile_showcase"> {{ object_gallery(request, media_entries, pagination, - pagination_base_url=user_gallery_url, col_number=3) }} + pagination_base_url=user_gallery_url, col_number=2) }} {% include "mediagoblin/utils/object_gallery.html" %} <div class="clear"></div> <p> diff --git a/mediagoblin/templates/mediagoblin/utils/object_gallery.html b/mediagoblin/templates/mediagoblin/utils/object_gallery.html index 81506a84..bfd19ee6 100644 --- a/mediagoblin/templates/mediagoblin/utils/object_gallery.html +++ b/mediagoblin/templates/mediagoblin/utils/object_gallery.html @@ -34,8 +34,7 @@ entry.media_files['thumb']) }}" /> </a> {% if entry.title %} - <br /> - <a href="{{ entry_url }}">{{ entry.title }}</a> + <a class="thumb_entry_title" href="{{ entry_url }}">{{ entry.title }}</a> {% endif %} </td> {% endfor %} diff --git a/mediagoblin/templates/mediagoblin/utils/profile.html b/mediagoblin/templates/mediagoblin/utils/profile.html index 945bd0bb..7a3af01c 100644 --- a/mediagoblin/templates/mediagoblin/utils/profile.html +++ b/mediagoblin/templates/mediagoblin/utils/profile.html @@ -19,7 +19,7 @@ {% block profile_content -%} {% if user.bio %} {% autoescape False %} - <p>{{ user.bio_html }}</p> + {{ user.bio_html }} {% endautoescape %} {% endif %} {% if user.url %} |