changeset 2699:3bc9fd6d054e

merged
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Thu, 07 Aug 2014 16:38:02 +0200
parents c66d1f0a05ba (current diff) 2f3301de742f (diff)
children 842fc45e8060 b41fae684e47
files MoinMoin/themes/basic/static/css/theme.css MoinMoin/themes/basic/static/custom-less/theme.less
diffstat 6 files changed, 51 insertions(+), 23 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/static/js/common.js	Thu Aug 07 18:43:20 2014 +0530
+++ b/MoinMoin/static/js/common.js	Thu Aug 07 16:38:02 2014 +0200
@@ -392,6 +392,7 @@
             newform.data('initialForm', newform.serialize());
             // replace the old form with the new one
             form.replaceWith(newform);
+            location.reload(true);
         }, 'json');
         return false;
     }
--- a/MoinMoin/templates/layout.html	Thu Aug 07 18:43:20 2014 +0530
+++ b/MoinMoin/templates/layout.html	Thu Aug 07 16:38:02 2014 +0200
@@ -150,8 +150,6 @@
 
 <div id="moin-page" lang="{{ theme_supp.content_lang }}" dir="{{ theme_supp.content_dir }}">
 
-    {% block subitem_navigation %}{% endblock %}
-
     {% block item -%}
         {# If you want itemviews in your template, extend from show.html, not from here. #}
         <div id="moin-content">
--- a/MoinMoin/themes/basic/static/css/theme.css	Thu Aug 07 18:43:20 2014 +0530
+++ b/MoinMoin/themes/basic/static/css/theme.css	Thu Aug 07 16:38:02 2014 +0200
@@ -6089,10 +6089,6 @@
   padding-top: 23px;
   padding-bottom: 23px;
 }
-.moin-list-heading {
-  background-color: #eeeeee;
-  font-variant: small-caps;
-}
 .moin-flash {
   padding: 15px;
   margin-bottom: 20px;
@@ -6178,6 +6174,8 @@
   padding: 10px 15px;
   margin-bottom: -1px;
   background-color: #ffffff;
+  background-color: #c8ddf1;
+  border: 1px solid #c8ddf1;
   width: 100%;
   color: #428bca;
   border: 1px solid #dddddd;
@@ -6199,6 +6197,9 @@
 .moin-user-action-special > .badge + .badge {
   margin-right: 5px;
 }
+.moin-user-action-special > a {
+  color: #c8ddf1;
+}
 .moin-user-action-special:hover,
 .moin-user-action-special:focus,
 .moin-user-action-special:active,
@@ -6214,6 +6215,17 @@
 }
 .list-group-item {
   padding: 5px 15px;
+  background-color: #c8ddf1;
+  border: 1px solid #c8ddf1;
+}
+.list-group-item > a {
+  color: #c8ddf1;
+}
+.moin-list-heading {
+  background-color: #1b436d;
+  border: 1px solid #1b436d;
+  font-variant: small-caps;
+  color: #c8ddf1;
 }
 .moin-diff-added {
   background-color: #ccffcc;
@@ -6571,7 +6583,7 @@
   font-weight: normal;
 }
 a.wikilink {
-  color: #428bca;
+  color: #1b436d;
 }
 .moin-bcs-subitems {
   z-index: 500;
@@ -7028,3 +7040,9 @@
 .menu:hover .submenu {
   display: block;
 }
+.moin-index-actions {
+  padding-left: 0;
+}
+.moin-index-actions .navbar-collapse {
+  padding-left: 0;
+}
--- a/MoinMoin/themes/basic/static/custom-less/moin-variables.less	Thu Aug 07 18:43:20 2014 +0530
+++ b/MoinMoin/themes/basic/static/custom-less/moin-variables.less	Thu Aug 07 16:38:02 2014 +0200
@@ -22,7 +22,7 @@
 @container-tablet:          728px;
 
 // Darker-Navbar and List heading background
-@navbar-bg: #eee;
+@navbar-bg: #1b436d;
 
 // Search
 // -------------------------
--- a/MoinMoin/themes/basic/static/custom-less/theme.less	Thu Aug 07 18:43:20 2014 +0530
+++ b/MoinMoin/themes/basic/static/custom-less/theme.less	Thu Aug 07 16:38:02 2014 +0200
@@ -32,11 +32,6 @@
   padding-bottom: 23px;
 }
 
-.moin-list-heading {
-  background-color: @navbar-bg;
-  font-variant: small-caps;
-}
-
 .moin-flash {
   .alert;
   &>a {
@@ -92,6 +87,18 @@
 
 .list-group-item {
   padding: 5px 15px;
+  background-color: #c8ddf1;
+  border: 1px solid #c8ddf1;
+  > a {
+    color: #c8ddf1;
+  }
+}
+
+.moin-list-heading {
+  background-color: @navbar-bg;
+  border: 1px solid @navbar-bg;
+  font-variant: small-caps;
+  color: #c8ddf1;
 }
 
 .moin-diff-added {
@@ -271,7 +278,7 @@
 }
 
 a.wikilink{
-  color: @brand-primary;
+  color: #1b436d;
 }
 .moin-bcs-subitems{
   z-index: 500;
@@ -756,4 +763,10 @@
 .menu:hover .submenu {
   display: block;
 }
+.moin-index-actions {
+  padding-left: 0;
+  .navbar-collapse {
+    padding-left: 0;
+  }
+}
 
--- a/MoinMoin/themes/basic/templates/index.html	Thu Aug 07 18:43:20 2014 +0530
+++ b/MoinMoin/themes/basic/templates/index.html	Thu Aug 07 16:38:02 2014 +0200
@@ -7,16 +7,14 @@
 {% endblock %}
 
 {% block action_bars_inner %}
+    {% if item_name %}
+        {% set title = _("Index of subitems of '%(item_name)s'", item_name=item_name) %}
+    {% else %}
+        {% set title = _("Global Index ") %}
+    {% endif %}
+    <h1>{{ title }}</h1>
     <nav class="navbar navbar-default" role="navigation">
-        <div class="container-fluid">
-            <div class="navbar-header">
-                {% if item_name %}
-                    {% set title = _("Index of subitems of '%(item_name)s'", item_name=item_name) %}
-                {% else %}
-                    {% set title = _("Global Index ") %}
-                {% endif %}
-                <a class="navbar-brand" href="#">{{ title }}</a>
-            </div>
+        <div class="container-fluid moin-index-actions">
             <div class="collapse navbar-collapse">
                 <ul class="nav navbar-nav">
                     {% if dirs or files %}