changeset 2447:3ea4fb4d4a6f

finalised position for comments and transclusion toggles and their rendering
author sharky93 <rishabhr123@gmail.com>
date Sun, 08 Sep 2013 16:33:51 +0530
parents 10666a449e7b
children 7fb6bff63aa0
files MoinMoin/templates/common.js MoinMoin/themes/basic/templates/show.html
diffstat 2 files changed, 22 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/templates/common.js	Sun Sep 08 14:54:47 2013 +0530
+++ b/MoinMoin/templates/common.js	Sun Sep 08 16:33:51 2013 +0530
@@ -50,7 +50,7 @@
 function toggleComments() {
     "use strict";
     // Toggle visibility of every tag with class "comment"
-    var buttons = $('.moin-toggle-comments-button > a');
+    var buttons = $('.moin-toggle-comments-button > a, .moin-toggle-comments-button');
     if (pageComments.is(':hidden')) {
         pageComments.show();
         {{ "buttons.attr('title', '%s');" % _("Hide comments") }}
@@ -85,7 +85,7 @@
     var overlays = $('.moin-item-overlay-ul, .moin-item-overlay-lr'),
         buttons;
     if (overlays.length > 0) {
-        buttons = $('.moin-transclusions-button > a');
+        buttons = $('.moin-transclusions-button > a, .moin-transclusions-button');
         if (overlays.is(':visible')) {
             overlays.hide();
             {{ "buttons.attr('title', '%s');" % _("Show transclusions") }}
--- a/MoinMoin/themes/basic/templates/show.html	Sun Sep 08 14:54:47 2013 +0530
+++ b/MoinMoin/themes/basic/templates/show.html	Sun Sep 08 16:33:51 2013 +0530
@@ -52,16 +52,26 @@
         {{ self.user_actions() }}
             
         {{ self.item_navigation() }}
-            <button type="button" class="btn btn-default moin-user-action-special moin-toggle-comments-button" data-toggle="button">
-                <span class="pull-left"><i class="icon-comment icon-fixed-width"></i>
-                    Comments 
-                </span>
-            </button>
-            <button type="button" class="btn btn-default moin-user-action-special moin-transclusions-button" data-toggle="button">
-                <span class="pull-left"><i class="icon-edit icon-fixed-width"></i>
-                    Transclusions
-                </span>
-            </button>
+
+        <div class="list-group-item">View Options</div>
+        <button type="button" 
+                class="btn btn-default moin-user-action-special moin-toggle-comments-button" 
+                data-toggle="button"
+                title="Show Comments">
+            <span class="pull-left">
+                <i class="icon-comment icon-fixed-width"></i>
+                Comments 
+            </span>
+        </button>
+        <button type="button" 
+                class="btn btn-default moin-user-action-special moin-transclusions-button" 
+                data-toggle="button"
+                title="Show Transclusions">
+            <span class="pull-left">
+                <i class="icon-edit icon-fixed-width"></i>
+                Transclusions
+            </span>
+        </button>
 
         {{ self.item_actions() }}
     </div>