Move "Add collection" and "Change account settings" links to root.html

diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html
index b6ba8818837145b52f3afa88aef7a22048d64b1b..5620debd5e3770a004d440741c4eba8db667300d 100644 (file)
--- a/mediagoblin/templates/mediagoblin/base.html
+++ b/mediagoblin/templates/mediagoblin/base.html
@@ -64,7 +64,6 @@
                 <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/root.html b/mediagoblin/templates/mediagoblin/root.html
index 5c6eb52f3663881f2f559908856ae44d8c4066f8..99d3269f394af7fa33c07e0fad25ab48a3b9a499 100644 (file)
--- 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 a58d745fa672d088d538585c54abb7ca9235cb8c..4f7b1208fb87cff70f6f51ae0a0d4dc0e576e851 100644 (file)
--- a/mediagoblin/templates/mediagoblin/user_pages/user.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/user.html
@@ -119,12 +119,6 @@
           </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() %}