changeset 2842:60d98f1d7f5e

move basic theme Supplementation > Discussion to View Options > Discussion; remove Supplementation
author RogerHaase <haaserd@gmail.com>
date Wed, 22 Oct 2014 14:05:27 -0700
parents b5e7e50e552b
children 4c961707ae95
files MoinMoin/themes/basic/templates/layout.html MoinMoin/themes/basic/templates/show.html
diffstat 2 files changed, 26 insertions(+), 31 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/themes/basic/templates/layout.html	Wed Oct 22 13:10:59 2014 -0700
+++ b/MoinMoin/themes/basic/templates/layout.html	Wed Oct 22 14:05:27 2014 -0700
@@ -99,13 +99,6 @@
                         </div>
                     {% endif %}
 
-                    {% if item_navigation %}
-                        <div class="moin-list-heading">
-                            <div class="list-group-item-heading">{{ _("Supplementation") }}</div>
-                            {{ local_panel_main(item_navigation) }}
-                        </div>
-                    {% endif %}
-
                     {% for cls, url, text, title in navibar_items if cls == 'userlink' %}
                         {% if loop.first %}<div class="moin-list-heading">
                             <div class="list-group-item-heading">{{ _("Quick Links") }}</div>
--- a/MoinMoin/themes/basic/templates/show.html	Wed Oct 22 13:10:59 2014 -0700
+++ b/MoinMoin/themes/basic/templates/show.html	Wed Oct 22 14:05:27 2014 -0700
@@ -28,6 +28,32 @@
 {% endblock %}
 
 {% block local_panel %}
+
+    <div class="moin-list-heading">
+        <div class="list-group-item-heading">
+            {{ _("View Options") }}
+            <a class="moin-showhide moin-viewoptions" href="#">
+                <i class="fa fa-lg fa-caret-right"></i>
+            </a>
+        </div>
+        <div id="moin-view-options" class="hidden">
+            {# TODO: review themes/init.py and config/default.py to improve support #}
+            {{ local_panel_main(item_navigation) }} {# Discussion #}
+            <div class="moin-toggle-comments-button list-group-item" style="">
+                <a class="moin-toggle-comments-tooltip" href="#" title="Show comments">
+                    <i class="fa fa-comment-o"></i>
+                    Comments
+                </a>
+            </div>
+            <div class="moin-transclusions-button list-group-item" style="">
+                <a class="moin-transclusions-tooltip" href="#" title="Show transclusions">
+                    <i class="fa fa-paste"></i>
+                    Transclusions
+                </a>
+            </div>
+        </div>
+    </div>
+
     {% if user_actions %}
         <div class="moin-list-heading">
             <div class="list-group-item-heading">
@@ -40,30 +66,6 @@
         </div>
     {% endif %}
 
-    <div class="moin-list-heading">
-        <div class="list-group-item-heading">
-            {{ _("View Options") }}
-            <a class="moin-showhide moin-viewoptions" href="#">
-                <i class="fa fa-lg fa-caret-right"></i>
-            </a>
-        </div>
-
-        <div id="moin-view-options" class="hidden">
-            <div class="moin-toggle-comments-button list-group-item" style="">
-                <a class="moin-toggle-comments-tooltip" href="#" title="Show comments">
-                    <i class="fa fa-comment fa-fw"></i>
-                    Comments
-                </a>
-            </div>
-            <div class="moin-transclusions-button list-group-item" style="">
-                <a class="moin-transclusions-tooltip" href="#" title="Show transclusions">
-                    <i class="fa fa-paste fa-fw"></i>
-                    Transclusions
-                </a>
-            </div>
-        </div>
-    </div>
-
     {% if item_actions %}
         <div class="moin-list-heading">
             <div class="list-group-item-heading">