diff options
| -rw-r--r-- | skins/standard/search_form.css | 8 | ||||
| -rw-r--r-- | template/en/default/search/boolean-charts.html.tmpl | 18 | ||||
| -rw-r--r-- | template/en/default/search/search-advanced.html.tmpl | 8 | ||||
| -rw-r--r-- | template/en/default/search/search-report-graph.html.tmpl | 15 | ||||
| -rw-r--r-- | template/en/default/search/search-report-table.html.tmpl | 21 |
5 files changed, 40 insertions, 30 deletions
diff --git a/skins/standard/search_form.css b/skins/standard/search_form.css index 541a8ea73..7258b880b 100644 --- a/skins/standard/search_form.css +++ b/skins/standard/search_form.css @@ -176,6 +176,14 @@ div.bz_section_title span { font-weight: bold; } +#queryform, #reportform { + margin-bottom: 2em; +} + +#knob { + margin-top: 2em; +} + .hide_people_filter #people_filter_section, .hide_history_filter #history_filter_section, .hide_detailed_information #detailed_information_section 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", ] %] - - <h3 id="chart"> - Custom Search <span class="section_help">Didn't find what +<script type="text/javascript"> + TUI_alternates['custom_search_query'] = '►'; + TUI_hide_default('custom_search_query'); +</script> +<div class="bz_section_title" id="custom_search_filter"> + <div id="custom_search_query_controller" class="arrow">▼</div> + <a href="javascript:TUI_toggle_class('custom_search_query')" > + Custom Search</a> <span class="section_help">Didn't find what you're looking for above? This area allows for ANDs, ORs, and other more complex searches.</span> - </h3> - + </div> + <div id="custom_search_filter_section" class="bz_search_section custom_search_query" > [%# 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 %] </table> - <hr> + [% "<hr>" IF NOT loop.last %] [% END %] +</div>
\ 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" // --> </script> -<form method="post" action="buglist.cgi" name="queryform"> +<form method="post" action="buglist.cgi" name="queryform" id="queryform"> [% PROCESS search/form.html.tmpl %] -[% PROCESS search/knob.html.tmpl %] - -<hr> - [% PROCESS "search/boolean-charts.html.tmpl" %] +[% PROCESS search/knob.html.tmpl %] + </form> 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" %] -<form method="get" action="report.cgi" name="reportform"> +<form method="get" action="report.cgi" name="reportform" id="reportform"> <table align="center"> <tr> @@ -130,14 +130,13 @@ var queryform = "reportform" [% PROCESS search/form.html.tmpl %] -<br> -<input type="submit" id="[% button_name FILTER css_class_quote %]" - value="[% button_name FILTER html %]"> -<input type="hidden" name="action" value="wrap"> -<hr> - [% PROCESS "search/boolean-charts.html.tmpl" %] + <div id="knob"> + <input type="submit" id="[% button_name FILTER css_class_quote %]" + value="[% button_name FILTER html %]"> + <input type="hidden" name="action" value="wrap"> + </div> </form> [% 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" %] -<form method="get" action="report.cgi" name="reportform"> +<form method="get" action="report.cgi" name="reportform" id="reportform"> <table align="center"> <tr> @@ -80,17 +80,16 @@ var queryform = "reportform" <hr> -[% PROCESS search/form.html.tmpl %] + [% PROCESS search/form.html.tmpl %] -<br> -<input type="submit" id="[% button_name FILTER css_class_quote %]" - value="[% button_name FILTER html %]"> -<input type="hidden" name="format" value="table"> -<input type="hidden" name="action" value="wrap"> -<hr> - -[% PROCESS "search/boolean-charts.html.tmpl" %] + [% PROCESS "search/boolean-charts.html.tmpl" %] + <div id="knob"> + <input type="submit" id="[% button_name FILTER css_class_quote %]" + value="[% button_name FILTER html %]"> + <input type="hidden" name="format" value="table"> + <input type="hidden" name="action" value="wrap"> + </div> </form> [% PROCESS global/footer.html.tmpl %] |