changeset 2604:600a9b4de684

merged
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Mon, 26 May 2014 21:26:41 +0200
parents cf66bb9ea54e (current diff) 085033abcf39 (diff)
children fc19564ce83b 93789e187aae adce8b829df1
files MoinMoin/static/js/common.js MoinMoin/themes/basic/static/css/basic.css MoinMoin/themes/basic/static/custom-less/basic.less MoinMoin/themes/modernized/static/css/common.css
diffstat 4 files changed, 71 insertions(+), 28 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/static/js/common.js	Tue May 20 15:24:06 2014 -0700
+++ b/MoinMoin/static/js/common.js	Mon May 26 21:26:41 2014 +0200
@@ -629,7 +629,9 @@
 
     moin.selected_link();
     moin.initTransclusionOverlays();
-    moin.QuicklinksExpander();
+    if(document.getElementById('moin-navibar')!=null) {
+        moin.QuicklinksExpander();
+    }
 
     $('.moin-insertname-action').click(function () {
         var fullname = $(this).data('name');
@@ -640,6 +642,21 @@
         moin.toggleSubtree(this);
     });
 
+    $('.moin-useractions').click(function () {
+        $('#user-actions').toggleClass('hidden');
+        return false;
+    });
+
+    $('.moin-viewoptions').click(function () {
+        $('#view-options').toggleClass('hidden');
+        return false;
+    });
+
+    $('.moin-itemactions').click(function () {
+        $('#item-actions').toggleClass('hidden');
+        return false;
+    });
+
     moin.enhanceUserSettings();
     moin.enhanceEdit();
     // placing initToggleComments after enhanceEdit prevents odd autoscroll issue when editing hidden comments
--- a/MoinMoin/themes/basic/static/css/basic.css	Tue May 20 15:24:06 2014 -0700
+++ b/MoinMoin/themes/basic/static/css/basic.css	Mon May 26 21:26:41 2014 +0200
@@ -4605,7 +4605,7 @@
 .list-group-item {
   position: relative;
   display: block;
-  padding: 10px 15px;
+  padding: 5px 15px;
   margin-bottom: -1px;
   background-color: #ffffff;
   border: 1px solid #dddddd;
@@ -5900,7 +5900,7 @@
 .moin-user-action-special {
   position: relative;
   display: block;
-  padding: 10px 15px;
+  padding: 5px 15px;
   margin-bottom: -1px;
   background-color: #ffffff;
   width: 100%;
@@ -6133,7 +6133,7 @@
 }
 .moin-quicklink {
   position: relative;
-  padding: 10px 15px 10px 15px;
+  padding: 5px 15px 5px 15px;
   border: 1px solid #dddddd;
   margin-bottom: -1px;
 }
@@ -6326,3 +6326,9 @@
 .moin-thead {
   background-color: silver;
 }
+.moin-viewoptions, .moin-itemactions, .moin-useractions {
+  float: right;
+}
+.list-group-item {
+  padding: 5px 15px;
+}
--- a/MoinMoin/themes/basic/static/custom-less/basic.less	Tue May 20 15:24:06 2014 -0700
+++ b/MoinMoin/themes/basic/static/custom-less/basic.less	Mon May 26 21:26:41 2014 +0200
@@ -82,6 +82,15 @@
   }
   border: 1px solid @list-group-border;
   border-radius: 0;
+  padding: 5px 15px;
+}
+
+.moin-viewoptions, .moin-itemactions, .moin-useractions {
+  float: right;
+}
+
+.list-group-item {
+  padding: 5px 15px;
 }
 
 .moin-diff-added {
@@ -157,7 +166,7 @@
 
 .moin-quicklink {
   position: relative;
-  padding: 10px 15px 10px 15px;
+  padding: 5px 15px 5px 15px;
   border: 1px solid @list-group-border;
   margin-bottom: -1px;
 
--- a/MoinMoin/themes/basic/templates/show.html	Tue May 20 15:24:06 2014 -0700
+++ b/MoinMoin/themes/basic/templates/show.html	Mon May 26 21:26:41 2014 +0200
@@ -32,33 +32,44 @@
         <!-- user, site, item actions -->
     <div class="list-group">
         {% if user_actions %}
-            <div class="list-group-item moin-list-heading"> {{ _("User Actions") }} </div>
-            {{ self.user_actions() }}
+            <div class="list-group-item moin-list-heading">
+                {{ _("User Actions") }}
+                <a class="moin-showhide moin-useractions" href="#" >[+]</a>
+            </div>
+            <div id="user-actions" class="hidden">{{ self.user_actions() }}</div>
         {% endif %}
 
-        <div class="list-group-item moin-list-heading">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>
+        <div class="list-group-item moin-list-heading">
+            View Options
+            <a class="moin-showhide moin-viewoptions" href="#">[+]</a>
+        </div>
+        <div id="view-options" class="hidden">
+            <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>
+        </div>
 
         {% if item_actions %}
-            <div class="list-group-item moin-list-heading"> {{ _("Item Actions") }} </div>
-            {{ self.item_actions() }}
+            <div class="list-group-item moin-list-heading">
+                {{ _("Item Actions") }}
+                <a class="moin-showhide moin-itemactions" href="#" >[+]</a>
+            </div>
+            <div id="item-actions" class="hidden">{{ self.item_actions() }}</div>
         {% endif %}
     </div>