From 840bfeae940b12f848ef01a06c8e349c0b7c41d3 Mon Sep 17 00:00:00 2001 From: Guy Pyrzak Date: Sun, 29 Aug 2010 14:19:27 -0700 Subject: Bug 571637: Put the Custom Search (formerly "Boolean Charts") UI behind a show/hide widget r=mkanat, a=mkanat --- template/en/default/search/boolean-charts.html.tmpl | 18 ++++++++++++------ .../en/default/search/search-advanced.html.tmpl | 8 +++----- .../en/default/search/search-report-graph.html.tmpl | 15 +++++++-------- .../en/default/search/search-report-table.html.tmpl | 21 ++++++++++----------- 4 files changed, 32 insertions(+), 30 deletions(-) (limited to 'template/en') diff --git a/template/en/default/search/boolean-charts.html.tmpl b/template/en/default/search/boolean-charts.html.tmpl index 8fc7457bc..6a94b3f1a 100644 --- a/template/en/default/search/boolean-charts.html.tmpl +++ b/template/en/default/search/boolean-charts.html.tmpl @@ -48,13 +48,18 @@ "matches", "notmatches", ] %] - -

- Custom Search Didn't find what + +
+
+ + Custom Search Didn't find what you're looking for above? This area allows for ANDs, ORs, and other more complex searches. -

- + +
[%# Whoever wrote the original version of boolean charts had a seriously twisted mind %] [% jsmagic = "onclick=\"this.form.action='query.cgi#chart'; this.form.method='POST'; return 1;\"" %] @@ -133,5 +138,6 @@ [% END %] -
+ [% "
" IF NOT loop.last %] [% END %] +
\ No newline at end of file diff --git a/template/en/default/search/search-advanced.html.tmpl b/template/en/default/search/search-advanced.html.tmpl index fa9819c35..0afa1437f 100644 --- a/template/en/default/search/search-advanced.html.tmpl +++ b/template/en/default/search/search-advanced.html.tmpl @@ -66,16 +66,14 @@ var queryform = "queryform" // --> -
+ [% PROCESS search/form.html.tmpl %] -[% PROCESS search/knob.html.tmpl %] - -
- [% PROCESS "search/boolean-charts.html.tmpl" %] +[% PROCESS search/knob.html.tmpl %] +
diff --git a/template/en/default/search/search-report-graph.html.tmpl b/template/en/default/search/search-report-graph.html.tmpl index c41c0da1b..3c894cf73 100644 --- a/template/en/default/search/search-report-graph.html.tmpl +++ b/template/en/default/search/search-report-graph.html.tmpl @@ -34,7 +34,7 @@ var queryform = "reportform" onload = "doOnSelectProduct(0); chartTypeChanged()" yui = [ 'autocomplete', 'calendar' ] javascript = js_data - javascript_urls = [ "js/productform.js", "js/TUI.js", "js/field.js" ] + javascript_urls = [ "js/util.js", "js/productform.js", "js/TUI.js", "js/field.js" ] style_urls = [ "skins/standard/search_form.css" ] doc_section = "reporting.html#reports" %] @@ -65,7 +65,7 @@ var queryform = "reportform" [% button_name = "Generate Report" %] -
+ @@ -130,14 +130,13 @@ var queryform = "reportform" [% PROCESS search/form.html.tmpl %] -
- - -
- [% PROCESS "search/boolean-charts.html.tmpl" %] +
+ + +
[% PROCESS global/footer.html.tmpl %] diff --git a/template/en/default/search/search-report-table.html.tmpl b/template/en/default/search/search-report-table.html.tmpl index 8c92adccb..7e087e7fe 100644 --- a/template/en/default/search/search-report-table.html.tmpl +++ b/template/en/default/search/search-report-table.html.tmpl @@ -34,7 +34,7 @@ var queryform = "reportform" onload = "doOnSelectProduct(0)" yui = [ 'autocomplete', 'calendar' ] javascript = js_data - javascript_urls = [ "js/productform.js", "js/TUI.js", "js/field.js" ] + javascript_urls = [ "js/util.js", "js/productform.js", "js/TUI.js", "js/field.js" ] style_urls = [ "skins/standard/search_form.css" ] doc_section = "reporting.html#reports" %] @@ -48,7 +48,7 @@ var queryform = "reportform" [% button_name = "Generate Report" %] - +
@@ -80,17 +80,16 @@ var queryform = "reportform"
-[% PROCESS search/form.html.tmpl %] + [% PROCESS search/form.html.tmpl %] -
- - - -
- -[% PROCESS "search/boolean-charts.html.tmpl" %] + [% PROCESS "search/boolean-charts.html.tmpl" %] +
+ + + +
[% PROCESS global/footer.html.tmpl %] -- cgit v1.2.3-24-g4f1b