Fix "Add to collection" button: remove icon, add text, add to collections.html

mediagoblin/templates/mediagoblin/user_pages/media.html

@@ -149,9 +149,7 @@
       {% include "mediagoblin/utils/tags.html" %}
     {% endif %}
 
-    {% if media.collections %}
     {% include "mediagoblin/utils/collections.html" %}
-    {% endif %}
 
     {% include "mediagoblin/utils/license.html" %}
 
@@ -183,19 +181,6 @@
       </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"
-           title="{% trans %}Add media to collection{% endtrans %}">
-          <img src="{{ request.staticdirect('/images/icon_collect.png') }}"
-               />
-	</a>
-      </p>
-    {% endif %}
-
     {% template_hook("media_sideinfo") %}
 
     {% block mediagoblin_sidebar %}

mediagoblin/templates/mediagoblin/utils/collections.html

@@ -17,6 +17,7 @@
 #}
 
 {% block collections_content -%}
+  {% if media.collections %}
     <h3>{% trans collected=media.collected %}Collected in{% endtrans %}</h3>
     <p>
       {% for collection in media.collections %}
@@ -33,4 +34,16 @@
         {% endif %}
       {% endfor %}
     </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"
+         title="{% trans %}Add media to collection{% endtrans %}">
+        Add to a collection
+      </a>
+    </p>
+  {% endif %}
 {% endblock %}