changeset 2442:bf19865c6e0b

moves comment and transclusions buttons into the user actions panel
author sharky93 <rishabhr123@gmail.com>
date Sun, 08 Sep 2013 14:24:35 +0530
parents aa5d6575f7ee
children 96a7b1321da5
files MoinMoin/themes/basic/static/css/basic.css MoinMoin/themes/basic/static/custom-less/basic.less MoinMoin/themes/basic/templates/show.html
diffstat 3 files changed, 58 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/themes/basic/static/css/basic.css	Sun Sep 01 15:16:28 2013 +0530
+++ b/MoinMoin/themes/basic/static/css/basic.css	Sun Sep 08 14:24:35 2013 +0530
@@ -4208,6 +4208,38 @@
     display: none !important;
   }
 }
+.moin-user-action-special {
+  position: relative;
+  display: block;
+  padding: 10px 30px 10px 15px;
+  margin-bottom: -1px;
+  background-color: #ffffff;
+  width: 100%;
+  color: #428bca;
+  border: 1px solid #dddddd;
+  border-radius: 0;
+}
+.moin-user-action-special:first-child {
+  border-top-right-radius: 4px;
+  border-top-left-radius: 4px;
+}
+.moin-user-action-special:last-child {
+  margin-bottom: 0;
+  border-bottom-right-radius: 4px;
+  border-bottom-left-radius: 4px;
+}
+.moin-user-action-special > .badge {
+  float: right;
+  margin-right: -15px;
+}
+.moin-user-action-special:hover,
+.moin-user-action-special:focus,
+.moin-user-action-special:active,
+.moin-user-action-special.active {
+  color: #2a6496;
+  background-color: #f5f5f5;
+  border: 1px solid #dddddd;
+}
 .moin-diff-added {
   background-color: #ccffcc;
 }
--- a/MoinMoin/themes/basic/static/custom-less/basic.less	Sun Sep 01 15:16:28 2013 +0530
+++ b/MoinMoin/themes/basic/static/custom-less/basic.less	Sun Sep 08 14:24:35 2013 +0530
@@ -1,5 +1,21 @@
 @import "bootstrap.less";
 
+.moin-user-action-special {
+  .list-group-item;
+  width: 100%;
+  color: @link-color;
+  &:hover,
+  &:focus,
+  &:active,
+  &.active {
+    color: @link-hover-color;
+    background-color: @list-group-hover-bg;
+    border: 1px solid @list-group-border;
+  }
+  border: 1px solid @list-group-border;
+  border-radius: 0;
+}
+
 .moin-diff-added {
   background-color: @moin-diff-added;
 }
--- a/MoinMoin/themes/basic/templates/show.html	Sun Sep 01 15:16:28 2013 +0530
+++ b/MoinMoin/themes/basic/templates/show.html	Sun Sep 08 14:24:35 2013 +0530
@@ -23,18 +23,6 @@
 
 {% block content %}
 
-    <div class="row">
-        <div class="col-lg-12">
-            <div class="btn-group pull-right" data-toggle="buttons">
-              <label class="btn btn-primary moin-toggle-comments-button">
-                <input type="checkbox"> Comments
-              </label>
-              <label class="btn btn-primary moin-transclusions-button">
-                <input type="checkbox"> Transclusions
-              </label>
-            </div>
-        </div>
-    </div>
     {% block content_data %}
         {% if data_rendered %}
         <div id="moin-content-data">
@@ -62,7 +50,16 @@
         <!-- user, site, item actions -->
     <div class="list-group">
         {{ self.user_actions() }}
-
+            <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>
         {{ self.item_navigation() }}
 
         {{ self.item_actions() }}