X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=mediagoblin%2Ftemplates%2Fmediagoblin%2Futils%2Ftags.html;h=19ca8d2a4d34735e3e103a3ef10c3b4a88b5cf3b;hb=0b3cdd6a25f8aaa74beecb7fed32a20cc13587a8;hp=87e6a85f5fc3bb6a16e994281c67ac364f77e7b0;hpb=12a100e4d8bdda7bd2353403a7e08e3a94669498;p=mediagoblin.git

diff --git a/mediagoblin/templates/mediagoblin/utils/tags.html b/mediagoblin/templates/mediagoblin/utils/tags.html
index 87e6a85f..19ca8d2a 100644
--- a/mediagoblin/templates/mediagoblin/utils/tags.html
+++ b/mediagoblin/templates/mediagoblin/utils/tags.html
@@ -17,13 +17,20 @@
 #}
 
 {% block tags_content -%}
-  <h3>Tags</h3>
-  <ul class="mediaentry_tags">
+  <p>{% trans %}Tagged with{% endtrans %}
     {% for tag in media.tags %}
-      <li class="tag">
-        <a href="{{ request.urlgen(
+      {% if loop.last %}
+      {% trans %}and{% endtrans %} <a href="{{ request.urlgen(
                         'mediagoblin.listings.tags_listing',
-                        tag=tag['slug']) }}">{{ tag['name'] }}</li>
+                        tag=tag['slug']) }}">{{ tag['name'] }}</a>.
+      {% elif loop.revindex==2 %}
+      <a href="{{ request.urlgen(
+                        'mediagoblin.listings.tags_listing',
+                        tag=tag['slug']) }}">{{ tag['name'] }}</a> 
+      {% else %}<a href="{{ request.urlgen(
+                        'mediagoblin.listings.tags_listing',
+                        tag=tag['slug']) }}">{{ tag['name'] }}</a>, 
+      {% endif %}
     {% endfor %}
-  </ul>
+  </p>
 {% endblock %}