changeset 2749:53d6f0ec8073

merged
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Mon, 18 Aug 2014 13:59:14 +0200
parents 58baea76af1e (diff) 7b87431f2d35 (current diff)
children 8c29936b3d29 e115734daf87
files MoinMoin/apps/frontend/views.py MoinMoin/themes/modernized/static/css/stylus/theme.styl MoinMoin/themes/modernized/static/css/theme.css
diffstat 11 files changed, 53 insertions(+), 57 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/apps/admin/templates/admin/item_acl_report.html	Mon Aug 18 01:34:32 2014 +0530
+++ b/MoinMoin/apps/admin/templates/admin/item_acl_report.html	Mon Aug 18 13:59:14 2014 +0200
@@ -24,15 +24,12 @@
                     <td>
                         {% if user.may.admin(item['fqname']) %}
                             <form id="moin-acl-form" action="{{ url_for('admin.modify_acl', item_name=item['fqname']) }}" method="POST">
-                                <input type="text" class="moin-acl-string" name="{{ item['itemid'] }}" value="{{ item['acl'] }}"/>
+                                <input type="text" class="moin-acl-string" {%if item['acl_default'] %}style="color:green;"{%endif%} name="{{ item['itemid'] }}" value="{{ item['acl'] }}"/>
                                 <input type="submit" value="{{ _("Modify ACL") }}"/>
                             </form>
                         {% else %}
                             {{ item['acl'] }}
                         {% endif %}
-                        {% if item['acl_default'] %}
-                            {{ _(" (Default) ") }}
-                        {% endif %}
                     </td>
                 </tr>
             {% endfor %}
--- a/MoinMoin/apps/frontend/views.py	Mon Aug 18 01:34:32 2014 +0530
+++ b/MoinMoin/apps/frontend/views.py	Mon Aug 18 13:59:14 2014 +0200
@@ -142,7 +142,7 @@
     Provides a link to all the global views.
     """
     return render_template('all.html',
-                           title_name=_(u"Global Views."),
+                           title_name=_(u"Global Views"),
                            fqname=CompositeName(u'all', NAME_EXACT, u'')
                           )
 
--- a/MoinMoin/static/css/common.css	Mon Aug 18 01:34:32 2014 +0530
+++ b/MoinMoin/static/css/common.css	Mon Aug 18 13:59:14 2014 +0200
@@ -76,7 +76,7 @@
 .four-col li{
   width: 25%;
 }
-input[type="text"], .moin-acl-string {
+input[type="text"].moin-acl-string {
   width: 70%;
 }
 .tablesorter {
--- a/MoinMoin/templates/all.html	Mon Aug 18 01:34:32 2014 +0530
+++ b/MoinMoin/templates/all.html	Mon Aug 18 13:59:14 2014 +0200
@@ -1,6 +1,6 @@
 {% extends theme("layout.html") %}
 {% block content %}
-<h1>{{ _("Global Views.") }}</h1>
+<h1>{{ _("Global Views") }}</h1>
 <ul>
     <li><a href="{{ url_for('frontend.global_history', namespace='all') }}">{{ _("History") }}</a></li>
     <li><a href="{{ url_for('frontend.global_tags', namespace='all') }}">{{ _("Tags") }}</a></li>
--- a/MoinMoin/templates/index.html	Mon Aug 18 01:34:32 2014 +0530
+++ b/MoinMoin/templates/index.html	Mon Aug 18 13:59:14 2014 +0200
@@ -68,7 +68,7 @@
     index-{{ type }}-{{ e.meta['itemid'] }}
 {%- endmacro %}
 
-{% set maxchars = 20 %}
+{% set maxchars = 16 %}
 
 {% macro render_dir_entry(e) %}
     <div>
--- a/MoinMoin/templates/link_list_no_item_panel.html	Mon Aug 18 01:34:32 2014 +0530
+++ b/MoinMoin/templates/link_list_no_item_panel.html	Mon Aug 18 13:59:14 2014 +0200
@@ -1,14 +1,20 @@
 {% extends theme("layout.html") %}
 {% block content %}
-{% if headline %}
-<h1>{{ headline }}</h1>
-{% endif %}
-{% if fq_names %}
-Total: {{ fq_names|count }}
-<ul>
-    {% for fq_name in fq_names|sort(attribute='value') %}
-    <li><a class="moin-fqname" href="{{ url_for('frontend.show_item', item_name=fq_name) }}" data-fqname="{{fq_name}}">{{ fq_name.value }}</a></li>
-    {% endfor %}
-</ul>
-{% endif %}
+    {% if headline %}
+        <h1>{{ headline }}</h1>
+    {% endif %}
+    {% if fq_names %}
+        <h2>Total: {{ fq_names|count }}</h2>
+        <ul class="one-col">
+            {% for fq_name in fq_names|sort(attribute='value') %}
+                <li>
+                    <a class="moin-fqname"
+                       href="{{ url_for('frontend.show_item', item_name=fq_name) }}"
+                       data-fqname="{{fq_name}}">
+                           {{ fq_name.value }}
+                    </a>
+                </li>
+            {% endfor %}
+        </ul>
+    {% endif %}
 {% endblock %}
--- a/MoinMoin/themes/basic/static/css/theme.css	Mon Aug 18 01:34:32 2014 +0530
+++ b/MoinMoin/themes/basic/static/css/theme.css	Mon Aug 18 13:59:14 2014 +0200
@@ -6759,9 +6759,6 @@
 input[value="X"]:hover {
   background: #f4f4f4;
 }
-input[type="text"] {
-  width: 96%;
-}
 input[type="submit"],
 input[type="button"],
 input button {
--- a/MoinMoin/themes/basic/static/custom-less/theme.less	Mon Aug 18 01:34:32 2014 +0530
+++ b/MoinMoin/themes/basic/static/custom-less/theme.less	Mon Aug 18 13:59:14 2014 +0200
@@ -476,10 +476,6 @@
     }
   }
 
-  &[type="text"] {
-    width: 96%;
-  }
-
   &[type="submit"],&[type="button"],button {
     font-weight: bold;
     font-size: .75em;
--- a/MoinMoin/themes/basic/templates/index.html	Mon Aug 18 01:34:32 2014 +0530
+++ b/MoinMoin/themes/basic/templates/index.html	Mon Aug 18 13:59:14 2014 +0200
@@ -84,7 +84,7 @@
     index-{{ type }}-{{ e.meta['itemid'] }}
 {%- endmacro %}
 
-{% set maxchars = 20 %}
+{% set maxchars = 16 %}
 
 {% macro render_dir_entry(e) %}
     <div>
--- a/MoinMoin/themes/modernized/static/css/stylus/theme.styl	Mon Aug 18 01:34:32 2014 +0530
+++ b/MoinMoin/themes/modernized/static/css/stylus/theme.styl	Mon Aug 18 13:59:14 2014 +0200
@@ -257,7 +257,6 @@
     border none
     form
         input
-            width 100%
             box-shadow none
 
 .zebra tbody tr, .zebra > tr
@@ -602,6 +601,7 @@
 
 .moin-history-time
     width 10%
+    text-align right
 
 .moin-history-contenttype
     width 18%
@@ -1057,34 +1057,34 @@
     display inline
 
 ul.moin-tags li.weight0
-    font-size 50%
-
-ul.moin-tags li.weight1
-    font-size 65%
-
-ul.moin-tags li.weight2
-    font-size 80%
-
-ul.moin-tags li.weight3
-    font-size 90%
-
-ul.moin-tags li.weight4
     font-size 100%
 
-ul.moin-tags li.weight5
+ul.moin-tags li.weight1
     font-size 120%
 
+ul.moin-tags li.weight2
+    font-size 140%
+
+ul.moin-tags li.weight3
+    font-size 160%
+
+ul.moin-tags li.weight4
+    font-size 180%
+
+ul.moin-tags li.weight5
+    font-size 200%
+
 ul.moin-tags li.weight6
-    font-size 140%
+    font-size 220%
 
 ul.moin-tags li.weight7
-    font-size 160%
+    font-size 240%
 
 ul.moin-tags li.weight8
-    font-size 180%
+    font-size 260%
 
 ul.moin-tags li.weight9
-    font-size 200%
+    font-size 280%
 
 #moin-flash
     margin -2px -15px -2px -14px
--- a/MoinMoin/themes/modernized/static/css/theme.css	Mon Aug 18 01:34:32 2014 +0530
+++ b/MoinMoin/themes/modernized/static/css/theme.css	Mon Aug 18 13:59:14 2014 +0200
@@ -250,7 +250,7 @@
 .zebra thead{background-color:#708090}
 .zebra tfoot{background-color:#dfdfdf}
 .zebra td{border:none;}
-.zebra td form input{width:100%;box-shadow:none}
+.zebra td form input{box-shadow:none}
 .zebra tbody tr,.zebra > tr{background-color:#eef1f6}
 .zebra tbody tr:nth-child(odd),.zebra > tr:nth-child(odd){background-color:#d8dfe9}
 div.moin-table-of-contents{border:1px solid #4e7da9;color:#000;background:#fff;font-size:80%;margin:.5em 0 .75em 1em;padding:.5em .75em .5em .5em;text-indent:-1em;max-width:35%;text-align:left;float:right;clear:both;box-shadow:3px 3px 6px #9d9d9b;border-radius:15px}
@@ -325,7 +325,7 @@
 #moin-page-history table thead tr th input[type="Submit"]{padding:4px 10px;box-shadow:1px 1px 2px #9d9d9b;cursor:pointer;font-size:1em;}
 #moin-page-history table thead tr th input[type="Submit"]:hover{box-shadow:1px 1px 2px #000}
 .moin-wordbreak{word-break:break-all;word-wrap:break-word}
-.moin-history-time{width:10%}
+.moin-history-time{width:10%;text-align:right}
 .moin-history-contenttype{width:18%}
 .moin-history-editorinfo{width:17%}
 .moin-history-comment{width:30%}
@@ -421,16 +421,16 @@
 #lightbox{background:#fff;opacity:.7;position:absolute;left:0;top:0;width:100%;height:100%;z-index:9;margin:0;display:none}
 ul.moin-tags{list-style:none}
 ul.moin-tags li{display:inline}
-ul.moin-tags li.weight0{font-size:50%}
-ul.moin-tags li.weight1{font-size:65%}
-ul.moin-tags li.weight2{font-size:80%}
-ul.moin-tags li.weight3{font-size:90%}
-ul.moin-tags li.weight4{font-size:100%}
-ul.moin-tags li.weight5{font-size:120%}
-ul.moin-tags li.weight6{font-size:140%}
-ul.moin-tags li.weight7{font-size:160%}
-ul.moin-tags li.weight8{font-size:180%}
-ul.moin-tags li.weight9{font-size:200%}
+ul.moin-tags li.weight0{font-size:100%}
+ul.moin-tags li.weight1{font-size:120%}
+ul.moin-tags li.weight2{font-size:140%}
+ul.moin-tags li.weight3{font-size:160%}
+ul.moin-tags li.weight4{font-size:180%}
+ul.moin-tags li.weight5{font-size:200%}
+ul.moin-tags li.weight6{font-size:220%}
+ul.moin-tags li.weight7{font-size:240%}
+ul.moin-tags li.weight8{font-size:260%}
+ul.moin-tags li.weight9{font-size:280%}
 #moin-flash{margin:-2px -15px -2px -14px}
 .moin-flash{margin:0;padding:6px 6px 6px 38px;background-color:#d8dfe9;border-bottom:1px solid #4e7da9;background-repeat:no-repeat;background-position:16px center;border-top-right-radius:9px;border-top-left-radius:9px;color:#000}
 .moin-flash-hint{background-image:url("../img/smileys/idea.png")}