changeset 2759:1934add39410

merged
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Mon, 18 Aug 2014 20:49:54 +0200
parents a43e5f300ff7 (diff) 80a0eed4da98 (current diff)
children 2d7189275f1b
files MoinMoin/static/css/stylus/ticket.styl MoinMoin/themes/basic/static/css/theme.css MoinMoin/themes/basic/static/custom-less/theme.less
diffstat 10 files changed, 64 insertions(+), 34 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/templates/basic.js	Mon Aug 18 22:12:52 2014 +0530
+++ b/MoinMoin/templates/basic.js	Mon Aug 18 20:49:54 2014 +0200
@@ -8,4 +8,7 @@
     $('ul.dropdown-menu').removeClass('submenu');
     $('.topnavcollapse').addClass('collapse');
     $('.moin-navbar-collapse').removeClass('in');
+    if ($('li.active > a.moin-modify-button').length) {
+        $('.moin-loginsettings').addClass('moin-pull-right');
+    }
 });
--- a/MoinMoin/templates/global_history.html	Mon Aug 18 22:12:52 2014 +0530
+++ b/MoinMoin/templates/global_history.html	Mon Aug 18 20:49:54 2014 +0200
@@ -25,7 +25,7 @@
                         {% set meta = rev.meta %}
                         <tr>
                             <td class="moin-action col-md-1">
-                                <span class="moin-history-{{ meta.action|lower }}"></span>
+                                <span title="{{ meta.action|title }}" class="moin-history-{{ meta.action|lower }}"></span>
                             </td>
                             <td class="moin-history-links col-md-1">
                                 <a href="{{ url_for('frontend.history', item_name=rev.fqname, bookmark=bookmark_time) }}">HIST</a>
--- a/MoinMoin/templates/utils.html	Mon Aug 18 22:12:52 2014 +0530
+++ b/MoinMoin/templates/utils.html	Mon Aug 18 20:49:54 2014 +0200
@@ -114,10 +114,9 @@
         <li class="list-group-item">Data ID: {{ meta['dataid'] }}</li>
         <li class="list-group-item">External Links:
         {% if meta['externallinks'] %}
-            {% for item in meta['externallinks'] %}
-                <a href="{{ item|safe }}">
-                    {{ item }}
-                </a>,
+            {% for item in meta['externallinks'] -%}
+                <a href="{{ item|safe }}">{{ item }}</a>
+                {%- if not loop.last -%},{% endif %}
             {% endfor %}
         {% else %}
             (None)
@@ -126,10 +125,9 @@
         <li class="list-group-item">Item ID: {{ meta['itemid'] }}</li>
         <li class="list-group-item">Item Links:
         {% if meta['itemlinks'] %}
-            {% for item in meta['itemlinks'] %}
-                <a href="{{ url_for('frontend.show_item', item_name=item) }}" {% if not theme_supp.item_exists(item) %}class="moin-nonexistent"{% endif %}>
-                    {{ item }}
-                </a>,
+            {% for item in meta['itemlinks'] -%}
+                <a href="{{ url_for('frontend.show_item', item_name=item) }}" {% if not theme_supp.item_exists(item) %}class="moin-nonexistent"{% endif %}>{{ item }}</a>
+                {%- if not loop.last -%},{% endif %}
             {% endfor %}
         {% else %}
             (None)
@@ -137,10 +135,9 @@
         </li>
         <li class="list-group-item">Item Transclusions:
         {% if meta['itemtransclusions'] %}
-            {% for item in meta['itemtransclusions'] %}
-                <a href="{{ url_for('frontend.show_item', item_name=item) }}" {% if not theme_supp.item_exists(item) %}class="moin-nonexistent"{% endif %}>
-                {{ item }}
-                </a>,
+            {% for item in meta['itemtransclusions'] -%}
+                <a href="{{ url_for('frontend.show_item', item_name=item) }}" {% if not theme_supp.item_exists(item) %}class="moin-nonexistent"{% endif %}>{{ item }}</a>
+                {%- if not loop.last -%},{% endif %}
             {% endfor %}
         {% else %}
             (None)
--- a/MoinMoin/themes/basic/static/css/theme.css	Mon Aug 18 22:12:52 2014 +0530
+++ b/MoinMoin/themes/basic/static/css/theme.css	Mon Aug 18 20:49:54 2014 +0200
@@ -6904,7 +6904,7 @@
   display: none;
 }
 .moin-content {
-  padding-bottom: 100px;
+  padding-bottom: 10%;
 }
 .moin-footer {
   bottom: 0;
@@ -6922,24 +6922,37 @@
   float: right;
   padding: 10px;
 }
+.container {
+  min-height: 100%;
+  position: relative;
+}
+@media (max-width: 992px) {
+  .container {
+    width: auto;
+  }
+  .moin-content {
+    padding-bottom: 250px;
+  }
+  .moin-footer-credits {
+    width: 100%;
+    padding-right: 30px;
+  }
+  .moin-footer-logo {
+    padding-left: 30px;
+  }
+}
 @media (min-width: 768px) {
   .container {
-    min-height: 100%;
-    position: relative;
     width: auto;
   }
 }
 @media (min-width: 992px) {
   .container {
-    min-height: 100%;
-    position: relative;
     width: auto;
   }
 }
 @media (min-width: 1200px) {
   .container {
-    min-height: 100%;
-    position: relative;
     width: auto;
   }
 }
@@ -7070,6 +7083,9 @@
 .moin-history-revert:before {
   content: url("../img/moin-revert.png");
 }
+.moin-history-container-header {
+  margin-bottom: 5px;
+}
 .moin-history-container-header > h2 {
   display: inline;
 }
--- a/MoinMoin/themes/basic/static/custom-less/theme.less	Mon Aug 18 22:12:52 2014 +0530
+++ b/MoinMoin/themes/basic/static/custom-less/theme.less	Mon Aug 18 20:49:54 2014 +0200
@@ -628,7 +628,7 @@
   display: none
 }
 .moin-content {
-  padding-bottom: 100px;
+  padding-bottom: 10%;
 }
 .moin-footer {
   bottom: 0;
@@ -646,25 +646,38 @@
     padding: 10px;
   }
 }
+.container {
+  min-height: 100%;
+  position: relative;
+}
 // set min-width to prevent search box from floating off window to right
+@media (max-width: 992px) {
+  .container {
+    width: auto;
+  }
+  .moin-content {
+    padding-bottom: 250px;
+  }
+  .moin-footer-credits {
+    width: 100%;
+    padding-right: 30px;
+  }
+  .moin-footer-logo {
+    padding-left: 30px;
+  }
+}
 @media (min-width: 768px) {
   .container {
-    min-height: 100%;
-    position: relative;
     width: auto;
   }
 }
 @media (min-width: 992px) {
   .container {
-    min-height: 100%;
-    position: relative;
     width: auto;
   }
 }
 @media (min-width: 1200px) {
   .container {
-    min-height: 100%;
-    position: relative;
     width: auto;
   }
 }
@@ -794,6 +807,7 @@
   content: url("../img/moin-revert.png");
 }
 .moin-history-container-header {
+  margin-bottom: 5px;
   > h2 {
     display: inline;
   }
--- a/MoinMoin/themes/basic/templates/highlight.html	Mon Aug 18 22:12:52 2014 +0530
+++ b/MoinMoin/themes/basic/templates/highlight.html	Mon Aug 18 20:49:54 2014 +0200
@@ -4,7 +4,7 @@
 
 {% block content %}
 {% block headline %}
-<h2>{{ title }} </h2>
+<h1>{{ title }} </h1>
 {% endblock %}
 {{ data_text }}
 {% endblock %}
--- a/MoinMoin/themes/basic/templates/history.html	Mon Aug 18 22:12:52 2014 +0530
+++ b/MoinMoin/themes/basic/templates/history.html	Mon Aug 18 20:49:54 2014 +0200
@@ -19,7 +19,7 @@
             <a href="{{ url_for('frontend.history', item_name=item_name, offset=next_offset) }}" title="{{ _("Next") }}">&raquo;</a>
         {% endif %}
     </div>
-    <h2>{{ title }}</h2>
+    <h1>{{ title }}</h1>
     <form action="{{ url_for('frontend.diff', item_name=item_name) }}" method="GET">
         <div>
         <table class="table table-hover table-condensed">
--- a/MoinMoin/themes/basic/templates/meta.html	Mon Aug 18 22:12:52 2014 +0530
+++ b/MoinMoin/themes/basic/templates/meta.html	Mon Aug 18 20:49:54 2014 +0200
@@ -13,10 +13,10 @@
 {% endblock %}
 
 {% block content %}
-<h2>
+<h1>
     {{ title }}
     {% if show_revision %}({{ _("Revision") }} {{ rev.revid | shorten_id }}){% endif %}
-</h2>
+</h1>
 {% if meta %}
 <div id="moin-content-meta">
     {{ utils.meta_info(meta) }}
--- a/MoinMoin/themes/basic/templates/modify.html	Mon Aug 18 22:12:52 2014 +0530
+++ b/MoinMoin/themes/basic/templates/modify.html	Mon Aug 18 20:49:54 2014 +0200
@@ -24,7 +24,7 @@
 {% endblock %}
 
 {% block content %}
-<h2>{{ title }}</h2>
+<h1>{{ title }}</h1>
 <div id="moin-modify" class="moin-form">
     {{ gen.form.open(form, method='post', enctype='multipart/form-data') }}
     {{ forms.render_errors(form) }}
--- a/MoinMoin/themes/basic/templates/snippets.html	Mon Aug 18 22:12:52 2014 +0530
+++ b/MoinMoin/themes/basic/templates/snippets.html	Mon Aug 18 20:49:54 2014 +0200
@@ -6,7 +6,7 @@
 
 {# Helper macro to create image links #}
 {% macro creditlogo(link, logo, alt, title) %}
-<a class="navbar-brand" href="{{ link }}" title="{{ title }}"><img src="{{ logo }}" alt="{{ alt }}" /></a>
+<a class="navbar-brand moin-footer-logo" href="{{ link }}" title="{{ title }}"><img src="{{ logo }}" alt="{{ alt }}" /></a>
 {% endmacro %}
 
 
@@ -26,7 +26,7 @@
 
 
 {# Text links in the footer #}
-{% macro credits(start='<ul class="nav navbar-nav pull-right"> <li>'|safe, end='</li> </ul>'|safe, sep='</li> <li>'|safe) %}
+{% macro credits(start='<ul class="nav navbar-nav pull-right moin-footer-credits"> <li>'|safe, end='</li> </ul>'|safe, sep='</li> <li>'|safe) %}
 {{ start }}
 {{ credit('http://moinmo.in/', 'MoinMoin Powered', 'This site uses the MoinMoin Wiki software.') }}
 {{ sep }}