changeset 1868:e73e4cd87658

fix for issue 286 search view checkbox label always wraps with modernized theme
author Roger Haase <crosseyedpenguin@yahoo.com>
date Fri, 07 Dec 2012 21:20:13 -0700
parents 6d2932f1634a
children 4f3ea3becc76
files MoinMoin/search/__init__.py MoinMoin/templates/search.html MoinMoin/themes/foobar/static/css/common.css MoinMoin/themes/foobar/static/css/stylus/main.styl MoinMoin/themes/modernized/static/css/common.css MoinMoin/themes/modernized/static/css/stylus/main.styl
diffstat 6 files changed, 15 insertions(+), 15 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/search/__init__.py	Fri Dec 07 15:57:00 2012 -0700
+++ b/MoinMoin/search/__init__.py	Fri Dec 07 21:20:13 2012 -0700
@@ -26,7 +26,7 @@
 
 class SearchForm(Form):
     q = Search
-    history = InlineCheckbox.using(label=L_('search also in non-current revisions'))
+    history = InlineCheckbox.using(label=L_('search all revisions'))
     submit = Submit.using(default=L_('Search'))
 
     validators = [ValidSearch()]
--- a/MoinMoin/templates/search.html	Fri Dec 07 15:57:00 2012 -0700
+++ b/MoinMoin/templates/search.html	Fri Dec 07 21:20:13 2012 -0700
@@ -23,18 +23,20 @@
     </p>
     {% endif %}
     {{ gen.form.open(medium_search_form, id='moin-long-searchform', method='get', action=url_for('frontend.search', item_name=item_name)) }}
-        <div>
-            {{ forms.render(medium_search_form['q']) }}
-            {{ forms.render(medium_search_form['submit']) }}
-            {{ forms.render(medium_search_form['history']) }}
-            {{ forms.render_errors(medium_search_form) }}
-        </div>
+        <p>
+        {{ forms.render(medium_search_form['q']) }}
+        {{ forms.render(medium_search_form['submit']) }}
+        </p>
+        <p>
+        {{ forms.render(medium_search_form['history']) }}
+        {{ forms.render_errors(medium_search_form) }}
+        </p>
     {{ gen.form.close() }}
     {% if results is defined %}
-        <div>
+        {% if name_suggestions or content_suggestions %}
             <p>{{ _("name term suggestions: %(termlist)s", termlist=name_suggestions) }}</p>
             <p>{{ _("content term suggestions: %(termlist)s", termlist=content_suggestions) }}</p>
-        </div>
+        {% endif %}
         {% if results %}
             <div class="searchresults">
                 <table>
--- a/MoinMoin/themes/foobar/static/css/common.css	Fri Dec 07 15:57:00 2012 -0700
+++ b/MoinMoin/themes/foobar/static/css/common.css	Fri Dec 07 21:20:13 2012 -0700
@@ -350,7 +350,7 @@
 .searchresults dd,.searchresults p{font-size:.85em}
 .searchresults td{border-width:0}
 .searchresults p.info{margin-left:2%}
-.searchresults .searchhitinfobar{color:#51d443;margin-left:15px;margin-top:0}
+.searchresults .searchhitinfobar{margin-left:15px;margin-top:0}
 .searchresults .foundtext{margin-left:15px;margin-top:0}
 p.searchstats{font-size:.8em;text-align:right;width:100%;padding:2px}
 p.searchhint{background-color:#f4f4f4;border:1px solid #9d9d9b;padding:2px}
--- a/MoinMoin/themes/foobar/static/css/stylus/main.styl	Fri Dec 07 15:57:00 2012 -0700
+++ b/MoinMoin/themes/foobar/static/css/stylus/main.styl	Fri Dec 07 21:20:13 2012 -0700
@@ -814,7 +814,6 @@
         margin-left 2%
 
 .searchresults .searchhitinfobar
-    color active_color
     margin-left 15px
     margin-top 0
 
--- a/MoinMoin/themes/modernized/static/css/common.css	Fri Dec 07 15:57:00 2012 -0700
+++ b/MoinMoin/themes/modernized/static/css/common.css	Fri Dec 07 21:20:13 2012 -0700
@@ -295,7 +295,7 @@
 .searchresults dd,.searchresults p{font-size:.85em}
 .searchresults td{border-width:0}
 .searchresults p.info{margin-left:2%}
-.searchresults .searchhitinfobar{color:#939393;margin-left:15px;margin-top:0}
+.searchresults .searchhitinfobar{margin-left:15px;margin-top:0}
 .searchresults .foundtext{margin-left:15px;margin-top:0}
 p.searchstats{font-size:.8em;text-align:right;width:100%;padding:2px}
 p.searchhint{background-color:#eef1f6;border:1px solid #4e7da9;padding:2px}
@@ -450,7 +450,7 @@
 #moin-searchform div{margin:-6px 5px 0 0}
 #moin-long-searchform{padding:0;font-size:.82em;text-align:left}
 #moin-long-searchform div{margin:0}
-#moin-search-query{width:80%}
+#moin-search-query{width:50%}
 #moin-logo{float:left;margin:2px 10px;padding:0;font-size:1.4em;line-height:1em;font-weight:bold}
 #moin-logo img{vertical-align:middle}
 #moin-logo a{color:#fff;text-decoration:none}
--- a/MoinMoin/themes/modernized/static/css/stylus/main.styl	Fri Dec 07 15:57:00 2012 -0700
+++ b/MoinMoin/themes/modernized/static/css/stylus/main.styl	Fri Dec 07 21:20:13 2012 -0700
@@ -506,7 +506,6 @@
     margin-left 2%
 
 .searchresults .searchhitinfobar
-    color nonexistent_link_color
     margin-left 15px
     margin-top 0
 
@@ -1235,7 +1234,7 @@
     margin 0
 
 #moin-search-query
-    width 80%
+    width 50%
 
 #moin-logo
     float left