Commits

Julian Brost  committed 1feb55f

* Added tags to metadata in the footer
* Reformatted credits to use bullet char as seperator
* Removed surrounding spaces from editor_info macro

  • Participants
  • Parent commits d953860

Comments (0)

Files changed (4)

File MoinMoin/templates/layout.html

 <div id="moin-footer">
 {% block footer %}
     {% block footer_hr %}<hr/>{% endblock %}
-    <ul id="moin-credits">
+    <p id="moin-credits">
         {% for credit in cfg.credits -%}
-            <li> {{ credit }} </li>
+		{{ credit }}{% if not loop.last %} <span>&bull;</span>{% endif %}
         {% endfor %}
-    </ul>
+    </p>
 {% endblock %}
 </div>
 

File MoinMoin/templates/show.html

     {{ editbar }}
     {% if rev %}
     <p id="moin-pageinfo" lang="{{ theme_supp.ui_lang }}" dir="{{ theme_supp.ui_dir }}">
-        {% if cfg.show_interwiki %}{{ cfg.interwikiname }}:{% endif %}{{ item_name }} (rev {{rev.revno}})
-        {{ _("modified") }} {{ rev.timestamp|datetimeformat }} by {{ utils.editor_info(rev) }}
+        {% if cfg.show_interwiki %}{{ cfg.interwikiname }}:{% endif %}{{ item_name }} (rev {{rev.revno}}),
+        {{ _("modified") }} {{ rev.timestamp|datetimeformat }} by {{ utils.editor_info(rev) }}{% if rev.tags %},
+        {{ _("tagged") }}
+        {% for tag in rev.tags -%}
+        <a href="{{ url_for('frontend.tagged_items', tag=tag)|e }}">{{ tag|e }}</a>{% if not loop.last %}, {% endif %}
+        {%- endfor -%}
+    {%- endif -%}.
     </p>
     {% endif %}
     {{ super() }}

File MoinMoin/templates/utils.html

 {% macro editor_info(rev) %}
-  {% set info = get_editor_info(rev) %}
-  {% if info.uri -%}
+  {%- set info = get_editor_info(rev) -%}
+  {%- if info.uri -%}
       <a href="{{ info.uri|e }}" class="{{ info.css }}" title="{{ info.title|e }}">
   {%- elif info.email -%}
       <a href="mailto:{{ info.email|e }}" class="{{ info.css }}" title="{{ info.title|e }}">
   {{ info.text|e }}
   {%- if info.uri or info.email -%}
     </a>
-  {%- elif info.css %}
+  {%- elif info.css -%}
     </span>
-  {%- endif %}
+  {%- endif -%}
 {% endmacro %}

File MoinMoin/themes/modernized/static/css/screen.css

 #moin-credits,
 #moin-version,
 #moin-timings{ margin: 10px 20px; text-align: left; font-size: 0.7em; color: #6C7680; }
-#moin-credits li,
 #moin-timings li { display: inline-block; margin: 0 20px 0 0; }
 #moin-credits img { vertical-align: middle; }
+#moin-credits span {display: inline-block; margin: 0 5px; }
 
 /* wikiconfig -- page_footer1/2 and page_header1/2 if defined */
 /* placeholder, not working yet */