changeset 1892:cbaa6b764de5

merge
author Roger Haase <crosseyedpenguin@yahoo.com>
date Mon, 17 Dec 2012 08:59:53 -0700
parents 9a6a2ea3ffcf (current diff) 20acc70355f3 (diff)
children 7f04d451cd7b 25e8221e99af
files
diffstat 4 files changed, 4 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/templates/modify_text.html	Mon Dec 17 08:56:38 2012 -0700
+++ b/MoinMoin/templates/modify_text.html	Mon Dec 17 08:59:53 2012 -0700
@@ -2,10 +2,6 @@
 
 {% macro data_editor(form, item_name) %}
 {{ base_editor(form) }}
-{% if direction %}
-    {{ gen.textarea(form['data_text'], lang=lang, dir=direction, rows=form.rows|string, cols=form.cols|string) }}
-{% else %}
-    {{ gen.textarea(form['data_text'], lang=lang, rows=form.rows|string, cols=form.cols|string) }}
-{% endif %}
+{{ gen.textarea(form['data_text'], rows=form.rows|string, cols=form.cols|string) }}
 <br />
 {% endmacro %}
--- a/MoinMoin/templates/modify_text_html.html	Mon Dec 17 08:56:38 2012 -0700
+++ b/MoinMoin/templates/modify_text_html.html	Mon Dec 17 08:59:53 2012 -0700
@@ -6,5 +6,5 @@
 {% endmacro %}
 
 {% macro data_editor(form, item_name) %}
-{{ gen.textarea(form['data_text'], class='ckeditor', lang=lang, dir=direction, rows=form.rows|string, cols=form.cols|string) }}
+{{ gen.textarea(form['data_text'], class='ckeditor', rows=form.rows|string, cols=form.cols|string) }}
 {% endmacro %}
--- a/MoinMoin/themes/modernized/static/css/common.css	Mon Dec 17 08:56:38 2012 -0700
+++ b/MoinMoin/themes/modernized/static/css/common.css	Mon Dec 17 08:59:53 2012 -0700
@@ -274,7 +274,7 @@
 .moin-form button,.moin-form input[type="submit"]{clear:both;display:table;margin:auto}
 form[name="delete_item"] dd input,form[name="rename_item"] dd input,form[name="destroy_item"] dd input{width:100%}
 form[name="delete_item"] dt,form[name="rename_item"] dt,form[name="destroy_item"] dt{width:20%}
-#moin-modify dd{width:100%;}
+#moin-modify dd{width:100%;float:none;}
 #moin-modify dd input{width:99%}
 #moin-modify dt{width:auto;text-align:left}
 #moin-modify textarea{width:99.5%}
--- a/MoinMoin/themes/modernized/static/css/stylus/main.styl	Mon Dec 17 08:56:38 2012 -0700
+++ b/MoinMoin/themes/modernized/static/css/stylus/main.styl	Mon Dec 17 08:59:53 2012 -0700
@@ -415,6 +415,7 @@
 #moin-modify
     dd
         width 100%
+        float none
         input
             width 99%
     dt