changeset 2618:a8bf7c1d94fb

merged
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Sat, 07 Jun 2014 23:30:02 +0200
parents e5f2854c74c5 (diff) 01d801e328de (current diff)
children 2232ac23264b
files MoinMoin/themes/basic/static/css/basic.css
diffstat 9 files changed, 39 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/converter/audio_video_in.py	Fri Jun 06 10:08:51 2014 +0530
+++ b/MoinMoin/converter/audio_video_in.py	Sat Jun 07 23:30:02 2014 +0200
@@ -41,7 +41,11 @@
 
 from . import default_registry
 from MoinMoin.util.mime import Type, type_moin_document
+default_registry.register(Converter._factory, Type('video/mp4'), type_moin_document)
 default_registry.register(Converter._factory, Type('video/ogg'), type_moin_document)
 default_registry.register(Converter._factory, Type('video/webm'), type_moin_document)
+
+default_registry.register(Converter._factory, Type('audio/mpeg'), type_moin_document)
 default_registry.register(Converter._factory, Type('audio/ogg'), type_moin_document)
-default_registry.register(Converter._factory, Type('audio/wave'), type_moin_document)
+default_registry.register(Converter._factory, Type('audio/webm'), type_moin_document)
+default_registry.register(Converter._factory, Type('audio/x-wav'), type_moin_document)
--- a/MoinMoin/items/content.py	Fri Jun 06 10:08:51 2014 +0530
+++ b/MoinMoin/items/content.py	Sat Jun 07 23:30:02 2014 +0200
@@ -585,7 +585,7 @@
 
 @register
 class WAV(Audio):
-    contenttype = 'audio/wave'
+    contenttype = 'audio/x-wav'
     display_name = 'WAV'
 
 
--- a/MoinMoin/script/maint/index.py	Fri Jun 06 10:08:51 2014 +0530
+++ b/MoinMoin/script/maint/index.py	Sat Jun 07 23:30:02 2014 +0200
@@ -8,6 +8,7 @@
 
 from flask import current_app as app
 from flask.ext.script import Command, Option
+from flask import g as flaskg
 
 from MoinMoin import log
 logging = log.getLogger(__name__)
@@ -52,6 +53,7 @@
     ]
 
     def run(self, tmp, procs, limitmb):
+        flaskg.add_lineno_attr = False  # no need to add lineno attributes while building indexes
         app.storage.rebuild(tmp=tmp, procs=procs, limitmb=limitmb)
 
 
--- a/MoinMoin/script/maint/reduce_revisions.py	Fri Jun 06 10:08:51 2014 +0530
+++ b/MoinMoin/script/maint/reduce_revisions.py	Sat Jun 07 23:30:02 2014 +0200
@@ -18,6 +18,8 @@
 
 from MoinMoin.constants.keys import NAME, NAME_EXACT, REVID
 
+from MoinMoin.app import before_wiki
+
 
 class Reduce_Revisions(Command):
     description = "This command can be used to remove all revisions but the last one from all selected items."
@@ -27,6 +29,7 @@
     )
 
     def run(self, query):
+        before_wiki()
         if query:
             qp = app.storage.query_parser([NAME_EXACT, ])
             q = qp.parse(query_text)
--- a/MoinMoin/templates/usersettings_forms.html	Fri Jun 06 10:08:51 2014 +0530
+++ b/MoinMoin/templates/usersettings_forms.html	Sat Jun 07 23:30:02 2014 +0200
@@ -98,7 +98,7 @@
 {% macro all_usersettings_forms(form_objs) %}
 <div id="moin-usersettings">
     <div id="personal" class="moin-tab-body moin-form">
-        <h2 class="moin-settings-head"><a href="#personal">{{ _("Personal Settings") }}</a></h2>
+        <h2 class="moin-settings-head"><a href="#personal">{{ _("Personal") }}</a></h2>
         {{ personal(form_objs.personal) }}
     </div>
     <div id="password" class="moin-tab-body moin-form">
@@ -106,15 +106,15 @@
         {{ password(form_objs.password) }}
     </div>
     <div id="notification" class="moin-tab-body moin-form">
-        <h2 class="moin-settings-head"><a href="#notification">{{ _("Notification Settings") }}</a></h2>
+        <h2 class="moin-settings-head"><a href="#notification">{{ _("Notifications") }}</a></h2>
         {{ notification(form_objs.notification) }}
     </div>
     <div id="ui" class="moin-tab-body moin-form">
-        <h2 class="moin-settings-head"><a href="#ui">{{ _("Wiki Appearance Settings") }}</a></h2>
+        <h2 class="moin-settings-head"><a href="#ui">{{ _("Appearance") }}</a></h2>
         {{ ui(form_objs.ui) }}
     </div>
     <div id="navigation" class="moin-tab-body moin-form">
-        <h2 class="moin-settings-head"><a href="#navigation">{{ _("Navigation Settings") }}</a></h2>
+        <h2 class="moin-settings-head"><a href="#navigation">{{ _("Navigation") }}</a></h2>
         {{ navigation(form_objs.navigation) }}
     </div>
     <div id="options" class="moin-tab-body moin-form">
--- a/MoinMoin/themes/basic/static/css/basic.css	Fri Jun 06 10:08:51 2014 +0530
+++ b/MoinMoin/themes/basic/static/css/basic.css	Sat Jun 07 23:30:02 2014 +0200
@@ -4605,7 +4605,7 @@
 .list-group-item {
   position: relative;
   display: block;
-  padding: 5px 15px;
+  padding: 10px 15px;
   margin-bottom: -1px;
   background-color: #ffffff;
   border: 1px solid #dddddd;
@@ -5900,13 +5900,14 @@
 .moin-user-action-special {
   position: relative;
   display: block;
-  padding: 5px 15px;
+  padding: 10px 15px;
   margin-bottom: -1px;
   background-color: #ffffff;
   width: 100%;
   color: #428bca;
   border: 1px solid #dddddd;
   border-radius: 0;
+  padding: 5px 15px;
 }
 .moin-user-action-special:first-child {
   border-top-right-radius: 4px;
@@ -5931,6 +5932,14 @@
   background-color: #f5f5f5;
   border: 1px solid #dddddd;
 }
+.moin-viewoptions,
+.moin-itemactions,
+.moin-useractions {
+  float: right;
+}
+.list-group-item {
+  padding: 5px 15px;
+}
 .moin-diff-added {
   background-color: #ccffcc;
 }
--- a/MoinMoin/themes/basic/templates/usersettings.html	Fri Jun 06 10:08:51 2014 +0530
+++ b/MoinMoin/themes/basic/templates/usersettings.html	Sat Jun 07 23:30:02 2014 +0200
@@ -4,11 +4,11 @@
 {% block content %}
 <h2>{{ _("User Settings") }}</h2>
 <ul class="moin-nav nav-tabs moin-shadow">
-    <li class="active"><a href="#personal" data-toggle="tab">{{ _("Personal Settings") }}</a></li>
+    <li class="active"><a href="#personal" data-toggle="tab">{{ _("Personal") }}</a></li>
     <li><a href="#password" data-toggle="tab">{{ _("Change Password") }}</a></li>
-    <li><a href="#notification" data-toggle="tab">{{ _("Notification Settings") }}</a></li>
-    <li><a href="#ui" data-toggle="tab">{{ _("Wiki Appearance Settings") }}</a></li>
-    <li><a href="#navigation" data-toggle="tab">{{ _("Navigation Settings") }}</a></li>
+    <li><a href="#notification" data-toggle="tab">{{ _("Notifications") }}</a></li>
+    <li><a href="#ui" data-toggle="tab">{{ _("Appearance") }}</a></li>
+    <li><a href="#navigation" data-toggle="tab">{{ _("Navigation") }}</a></li>
     <li><a href="#options" data-toggle="tab">{{ _("Options") }}</a></li>
     <li><a href="#subscriptions" data-toggle="tab">{{ _("Subscriptions") }}</a></li>
 </ul>
--- a/MoinMoin/themes/foobar/templates/usersettings.html	Fri Jun 06 10:08:51 2014 +0530
+++ b/MoinMoin/themes/foobar/templates/usersettings.html	Sat Jun 07 23:30:02 2014 +0200
@@ -4,11 +4,11 @@
 {% block local_panel %}
 <div class="moin-tabs">
     <ul id="moin-usersetting-title">
-        <li class="moin-tab-title"><a href="#moin-personal">{{ _("Personal Settings") }}</a></li>
+        <li class="moin-tab-title"><a href="#moin-personal">{{ _("Personal") }}</a></li>
         <li class="moin-tab-title"><a href="#moin-password">{{ _("Change Password") }}</a></li>
-        <li class="moin-tab-title"><a href="#moin-notification">{{ _("Notification Settings") }}</a></li>
-        <li class="moin-tab-title"><a href="#moin-ui">{{ _("Wiki Appearance Settings") }}</a></li>
-        <li class="moin-tab-title"><a href="#moin-navigation">{{ _("Navigation Settings") }}</a></li>
+        <li class="moin-tab-title"><a href="#moin-notification">{{ _("Notifications") }}</a></li>
+        <li class="moin-tab-title"><a href="#moin-ui">{{ _("Appearance") }}</a></li>
+        <li class="moin-tab-title"><a href="#moin-navigation">{{ _("Navigation") }}</a></li>
         <li class="moin-tab-title"><a href="#moin-options">{{ _("Options") }}</a></li>
     </ul>
 </div>
--- a/make.py	Fri Jun 06 10:08:51 2014 +0530
+++ b/make.py	Sat Jun 07 23:30:02 2014 +0200
@@ -359,6 +359,11 @@
             print 'Success: Modernized and Foobar CSS files updated.'
         else:
             print 'Error: stylus failed to update css files, see error messages above.'
+        # stylus adds too many blank lines at end of modernized common.css, fix it by running coding_std against css directory
+        command = 'python contrib/pep8/coding_std.py MoinMoin/themes/modernized/static/css'
+        result = subprocess.call(command, shell=True)
+        if result != 0:
+            print 'Error: failure running coding_std.py against modernized css files'
 
         print 'Running lessc to update Basic theme CSS files...'
         data_loc = get_bootstrap_data_location().strip()