changeset 2453:303fed8f1f56

adds translatable strings, cleanup of item_navigation block from show.html
author sharky93 <rishabhr123@gmail.com>
date Sun, 08 Sep 2013 22:26:00 +0530
parents 83978026479a
children d4d377f4e56f
files MoinMoin/themes/basic/templates/layout.html MoinMoin/themes/basic/templates/show.html
diffstat 2 files changed, 9 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/themes/basic/templates/layout.html	Sun Sep 08 22:17:28 2013 +0530
+++ b/MoinMoin/themes/basic/templates/layout.html	Sun Sep 08 22:26:00 2013 +0530
@@ -13,11 +13,8 @@
 {% endif %}
 
 {# Helper macro to generate the local panel #}
-{% macro local_panel_main(panelname, paneltitle) -%}
+{% macro local_panel_main(panelname) -%}
     {% for endpoint, href, iconcls, label, title in panelname %}
-        {% if loop.first %}
-            <div class="list-group-item">{{ _(paneltitle) }}</div>
-        {% endif %}
         <a class="list-group-item{% if href == current_url %} active{% endif %}" href="{{ href }}" title="{{ title }}" rel="nofollow">
             {% if iconcls %}
                 <i class="{{ iconcls }} icon-fixed-width"></i>
@@ -109,12 +106,13 @@
                     {% set quicklinks = 'false' %}
                     {% if navibar_items %}
 
-                    <div class="list-group-item"> Site Navigation </div>
+                    <div class="list-group-item"> {{ _("Site Navigation") }} </div>
                     {% for cls, url, text, title in navibar_items if cls != 'userlink' %}
                         <a class="list-group-item {{ cls }}{% if url == current_url %} active{% endif %}" href="{{ url }}" {% if title %}title="{{ title }}"{% endif %}>{{ text|shorten_item_name }}</a>
                     {% endfor %}
                     
-                    {{ local_panel_main(item_navigation, "Supplementation") }}
+                    <div class="list-group-item"> {{ _("Supplementation") }} </div>
+                    {{ local_panel_main(item_navigation) }}
 
                     {% endif %}
                     
--- a/MoinMoin/themes/basic/templates/show.html	Sun Sep 08 22:17:28 2013 +0530
+++ b/MoinMoin/themes/basic/templates/show.html	Sun Sep 08 22:26:00 2013 +0530
@@ -20,21 +20,18 @@
 {% endblock %}
 
 {% block user_actions %}
-    {{ local_panel_main(user_actions,"User Actions") }}
-{% endblock %}
-
-{% block item_navigation %}
-    {{ local_panel_main(item_navigation, "Item Navigation") }}
+    {{ local_panel_main(user_actions) }}
 {% endblock %}
 
 {% block item_actions %}
-    {{ local_panel_main(item_actions, "Item Actions") }}
+    {{ local_panel_main(item_actions) }}
 {% endblock %}
 
 {% block local_panel %}
         
         <!-- user, site, item actions -->
     <div class="list-group">
+        <div class="list-group-item"> {{ _("User Actions") }} </div>
         {{ self.user_actions() }}
 
         <div class="list-group-item">View Options</div>
@@ -56,7 +53,8 @@
                 Transclusions
             </span>
         </button>
-
+                    
+        <div class="list-group-item"> {{ _("Item Actions") }} </div>
         {{ self.item_actions() }}
     </div>