diff options
Diffstat (limited to 'template/en/default/search')
| -rw-r--r-- | template/en/default/search/field.html.tmpl | 38 | ||||
| -rw-r--r-- | template/en/default/search/form.html.tmpl | 108 | ||||
| -rw-r--r-- | template/en/default/search/knob.html.tmpl | 10 | ||||
| -rw-r--r-- | template/en/default/search/search-create-series.html.tmpl | 14 | ||||
| -rw-r--r-- | template/en/default/search/search-instant.html.tmpl | 7 | ||||
| -rw-r--r-- | template/en/default/search/search-report-graph.html.tmpl | 2 | ||||
| -rw-r--r-- | template/en/default/search/search-report-select.html.tmpl | 4 | ||||
| -rw-r--r-- | template/en/default/search/search-report-table.html.tmpl | 2 | ||||
| -rw-r--r-- | template/en/default/search/search-specific.html.tmpl | 8 | ||||
| -rw-r--r-- | template/en/default/search/tabs.html.tmpl | 4 | ||||
| -rw-r--r-- | template/en/default/search/type-select.html.tmpl | 4 |
11 files changed, 98 insertions, 103 deletions
diff --git a/template/en/default/search/field.html.tmpl b/template/en/default/search/field.html.tmpl index 456cf088a..fe0eb2144 100644 --- a/template/en/default/search/field.html.tmpl +++ b/template/en/default/search/field.html.tmpl @@ -26,10 +26,10 @@ # type_selected: used by the free text to indicate which type of text # search was selected for a particular field #%] - + [% SWITCH field.type %] [% CASE [ constants.FIELD_TYPE_FREETEXT, - constants.FIELD_TYPE_TEXTAREA, + constants.FIELD_TYPE_TEXTAREA, constants.FIELD_TYPE_UNKNOWN ] %] [% INCLUDE "bug/field-label.html.tmpl" field = field @@ -38,14 +38,14 @@ %] [% INCLUDE "search/type-select.html.tmpl" name = field.name _ "_type", - types = types, + types = types, selected = type_selected - %] - <input name="[% field.name FILTER html %]" + %] + <input name="[% field.name FILTER html %]" id="[% field.name FILTER html %]" size="40" [% IF autofocus %] autofocus[% END %] [% IF onchange %] onchange="[% onchange FILTER html %]"[% END %] - value="[% value FILTER html %]"> + value="[% value FILTER html %]"> [% CASE constants.FIELD_TYPE_KEYWORDS %] [% INCLUDE "bug/field-label.html.tmpl" field = field @@ -54,7 +54,7 @@ %] [% INCLUDE "search/type-select.html.tmpl" name = field.name _ "_type", - types = types, + types = types, selected = type_selected %] <input name="[% field.name FILTER html %]" @@ -77,20 +77,20 @@ tag_name = "span" editable = 1 %] - from <input name="[% field.name FILTER html %]from" - id="[% field.name FILTER html %]" + from <input name="[% field.name FILTER html %]from" + id="[% field.name FILTER html %]" size="10" maxlength="10" - value="[% value.0 FILTER html %]" + value="[% value.0 FILTER html %]" onchange="updateCalendarFromField(this);[% onchange FILTER html %]"> <button type="button" class="calendar_button" id="button_calendar_[% field.name FILTER html %]" onclick="showCalendar('[% field.name FILTER js %]')"> <span>Calendar</span> </button> - <span id="con_calendar_[% field.name FILTER html %]"></span> - to <input name="[% field.name FILTER html %]to" + <span id="con_calendar_[% field.name FILTER html %]"></span> + to <input name="[% field.name FILTER html %]to" id="[% field.name FILTER html %]to" size="10" maxlength="10" - value="[% value.1 FILTER html %]" + value="[% value.1 FILTER html %]" onchange="updateCalendarFromField(this);[% onchange FILTER html %]"> <button type="button" class="calendar_button" id="button_calendar_[% field.name FILTER html %]to" @@ -98,22 +98,22 @@ <span>Calendar</span> </button> <small>(YYYY-MM-DD or relative dates)</small> - + <span id="con_calendar_[% field.name FILTER html %]to"></span> <script [% script_nonce FILTER none %]> createCalendar('[% field.name FILTER js %]'); createCalendar('[% field.name FILTER js %]to'); </script> - [% CASE [ constants.FIELD_TYPE_SINGLE_SELECT, + [% CASE [ constants.FIELD_TYPE_SINGLE_SELECT, constants.FIELD_TYPE_MULTI_SELECT ] %] - <div id="container_[% field.name FILTER html %]" class="search_field_grid"> + <div id="container_[% field.name FILTER html %]" class="search_field_grid"> [% INCLUDE "bug/field-label.html.tmpl" field = field editable = 1 tag_name = "span" %] - <select name="[% field.name FILTER html%]" - id="[% field.name FILTER html %]" + <select name="[% field.name FILTER html%]" + id="[% field.name FILTER html %]" [% IF onchange %] onchange="[% onchange FILTER html %]"[% END %] multiple="multiple" size="9"> [% legal_values = ${field.name} %] @@ -122,7 +122,7 @@ [% END %] [% FOREACH current_value = legal_values %] [% IF current_value.id %] - [%# current_value is a hash instead of a value which + [%# current_value is a hash instead of a value which only applies for Resolution really, everywhere else current_value is just the value %] [% v = current_value.name OR '---' -%] diff --git a/template/en/default/search/form.html.tmpl b/template/en/default/search/form.html.tmpl index 4d78a53da..a9cf3ab89 100644 --- a/template/en/default/search/form.html.tmpl +++ b/template/en/default/search/form.html.tmpl @@ -49,7 +49,7 @@ var tms = new Array(); [%- FOREACH item = user.get_selectable_products(c.id) -%] [%- IF item.components.size -%] [%- sep FILTER js %]'[% item.name FILTER js %]' - [%- sep = ',' -%] + [%- sep = ',' -%] [%- END -%] [%- END -%] ]; [% nclass = nclass+1 %] @@ -76,7 +76,7 @@ var tms = new Array(); [% END %] /* - * doOnSelectProduct determines which selection should get updated + * doOnSelectProduct determines which selection should get updated * * - selectmode = 0 - init * selectmode = 1 - classification selected @@ -87,7 +87,7 @@ var tms = new Array(); */ function doOnSelectProduct(selectmode) { var f = document.forms[queryform]; - var milestone = (typeof(f.target_milestone) == "undefined" ? + var milestone = (typeof(f.target_milestone) == "undefined" ? null : f.target_milestone); if (selectmode == 0) { // If there is no classification selected, give us a chance to fill @@ -106,7 +106,7 @@ function doOnSelectProduct(selectmode) { // Hide the Advanced Fields by default, unless the user has a cookie // that specifies otherwise. -// ▸ and ▾ are both utf8 escaped characters for right +// ▸ and ▾ are both utf8 escaped characters for right // and down facing arrows respectivly. TUI_alternates['history_query'] = '►'; TUI_alternates['people_query'] = '►'; @@ -139,7 +139,7 @@ TUI_hide_default('information_query'); field = bug_fields.short_desc types = query_types value = default.short_desc.0 - type_selected = default.short_desc_type.0 + type_selected = default.short_desc_type.0 accesskey = "s" autofocus = 1 %] @@ -151,38 +151,38 @@ TUI_hide_default('information_query'); </div> [%# *** Classification Product Component *** %] - + [% Hook.process('before_selects_top') %] [% IF Param('useclassification') %] [% fake_classfication = { name => bug_fields.classification.name, type => constants.FIELD_TYPE_SINGLE_SELECT } %] - [% INCLUDE "search/field.html.tmpl" + [% INCLUDE "search/field.html.tmpl" field => fake_classfication accesskey => "c" - onchange => "doOnSelectProduct(1);" + onchange => "doOnSelectProduct(1);" value => default.classification - %] + %] [% END %] -[% INCLUDE "search/field.html.tmpl" +[% INCLUDE "search/field.html.tmpl" field => bug_fields.product accesskey => "p" - onchange => "doOnSelectProduct(2);" + onchange => "doOnSelectProduct(2);" value => default.product %] -[% INCLUDE "search/field.html.tmpl" +[% INCLUDE "search/field.html.tmpl" field => bug_fields.component accesskey => "m" value => default.component %] -[% INCLUDE "search/field.html.tmpl" +[% INCLUDE "search/field.html.tmpl" field => bug_fields.bug_status accesskey => "a" value => default.bug_status %] -[% INCLUDE "search/field.html.tmpl" +[% INCLUDE "search/field.html.tmpl" field => bug_fields.resolution - accesskey => "r" + accesskey => "r" value => default.resolution %] @@ -193,14 +193,14 @@ TUI_hide_default('information_query'); <a href="javascript:TUI_toggle_class('information_query')"> Detailed [% terms.Bug %] Information </a> - <span class="section_help">Narrow results by the following fields: - [%+ field_descs.longdesc FILTER html %]s, [%+ field_descs.bug_file_loc FILTER html %], + <span class="section_help">Narrow results by the following fields: + [%+ field_descs.longdesc FILTER html %]s, [%+ field_descs.bug_file_loc FILTER html %], [% IF Param('usestatuswhiteboard') %] [%+ field_descs.status_whiteboard FILTER html %], [%+ END %] [% IF use_keywords %] [%+ field_descs.keywords FILTER html %], [%+ END %] [% IF user.is_timetracker %] [%+ field_descs.deadline FILTER html %], [%+ END %] - [% terms.Bug %] Numbers, [%+ field_descs.version FILTER html %], + [% terms.Bug %] Numbers, [%+ field_descs.version FILTER html %], [% IF Param('usetargetmilestone') %] [%+ field_descs.target_milestone FILTER html %], [%+ END %] - [% field_descs.bug_severity FILTER html %], [%+ field_descs.priority FILTER html %], [%+ field_descs.rep_platform FILTER html %], + [% field_descs.bug_severity FILTER html %], [%+ field_descs.priority FILTER html %], [%+ field_descs.rep_platform FILTER html %], [%+ field_descs.op_sys FILTER html %] </span> </div> @@ -210,22 +210,22 @@ TUI_hide_default('information_query'); { field => bug_fields.longdesc, accesskey => 'c' }, { field => bug_fields.bug_file_loc, accesskey => 'u' }, { field => bug_fields.status_whiteboard, accesskey => 'w' }, - { field => bug_fields.keywords, accesskey => 'k', - qtypes => ['allwords', 'anywords', 'nowords', 'regexp', 'notregexp'] } + { field => bug_fields.keywords, accesskey => 'k', + qtypes => ['allwords', 'anywords', 'nowords', 'regexp', 'notregexp'] } ] %] [% Hook.process('before_freetext_fields') %] - + [%# loop through a bunch of free text fields and print out their text stuff %] [% FOREACH field_container = freetext_fields %] - [% NEXT IF field_container.field.name == 'status_whiteboard' - AND NOT Param('usestatuswhiteboard') + [% NEXT IF field_container.field.name == 'status_whiteboard' + AND NOT Param('usestatuswhiteboard') %] - [% NEXT IF field_container.field.name == 'keywords' + [% NEXT IF field_container.field.name == 'keywords' AND NOT use_keywords %] <div class="search_field_row"> [% type = field_container.field.name _ "_type" %] - [% INCLUDE "search/field.html.tmpl" + [% INCLUDE "search/field.html.tmpl" field => field_container.field types => field_container.qtypes || query_types accesskey => field_container.accesskey @@ -238,8 +238,8 @@ TUI_hide_default('information_query'); [%# Deadline %] [% IF user.is_timetracker %] <div class="search_field_row"> - [% INCLUDE "search/field.html.tmpl" - field = bug_fields.deadline + [% INCLUDE "search/field.html.tmpl" + field = bug_fields.deadline accesskey = "l" value = [ default.deadlinefrom.0, default.deadlineto.0 ] %] @@ -253,7 +253,7 @@ TUI_hide_default('information_query'); value="[% default.bug_id.0 FILTER html %]" size="20"> <div class="field_help">(comma-separated list)</div> </div> - should be + should be <select name="bug_id_type" id="bug_id_type"> <option value="anyexact"[% " selected" IF default.bug_id_type.0 == "anyexact" %]>only included in</option> <option value="nowords"[% " selected" IF default.bug_id_type.0 == "nowords" %]>excluded from</option> @@ -261,44 +261,44 @@ TUI_hide_default('information_query'); </div> [% Hook.process('after_freetext_fields') %] - + [%# *** Status Resolution Severity Priority Hardware OS *** %] <div> [% Hook.process('before_selects_bottom') %] [% fake_version_field = { name => bug_fields.version.name, type => constants.FIELD_TYPE_SINGLE_SELECT }%] - [% INCLUDE "search/field.html.tmpl" + [% INCLUDE "search/field.html.tmpl" field => fake_version_field value => default.version - %] + %] [% IF Param('usetargetmilestone') %] - [% fake_target_milestone_field = { name => bug_fields.target_milestone.name , + [% fake_target_milestone_field = { name => bug_fields.target_milestone.name , type => constants.FIELD_TYPE_SINGLE_SELECT } %] - [% INCLUDE "search/field.html.tmpl" + [% INCLUDE "search/field.html.tmpl" field => fake_target_milestone_field value => default.target_milestone %] [% END %] - [% INCLUDE "search/field.html.tmpl" + [% INCLUDE "search/field.html.tmpl" field => bug_fields.bug_severity - accesskey=> "v" + accesskey=> "v" value => default.bug_severity %] - [% INCLUDE "search/field.html.tmpl" + [% INCLUDE "search/field.html.tmpl" field => bug_fields.priority accesskey => "i" value => default.priority - %] - [% INCLUDE "search/field.html.tmpl" - field => bug_fields.rep_platform + %] + [% INCLUDE "search/field.html.tmpl" + field => bug_fields.rep_platform accesskey =>"h" value => default.rep_platform - %] - [% INCLUDE "search/field.html.tmpl" - field => bug_fields.op_sys + %] + [% INCLUDE "search/field.html.tmpl" + field => bug_fields.op_sys accesskey =>"o" value => default.op_sys - %] + %] [% Hook.process('after_selects_bottom') %] </div> </div> @@ -318,14 +318,14 @@ TUI_hide_default('information_query'); [% PROCESS role_types field = { count => n, name => "emailassigned_to", label=> "the ${terms.Bug} ${field_descs.assigned_to}" } %] [% PROCESS role_types field = { count => n, name => "emailreporter", - label=> "the ${field_descs.reporter}" } %] + label=> "the ${field_descs.reporter}" } %] [% IF Param('useqacontact') %] - [% PROCESS role_types field = { count => n, name => "emailqa_contact", + [% PROCESS role_types field = { count => n, name => "emailqa_contact", label=> "the ${field_descs.qa_contact}" } %] [% END %] - [% PROCESS role_types field = { count => n, name => "emailcc", + [% PROCESS role_types field = { count => n, name => "emailcc", label=> "a ${field_descs.cc} list member" } %] - [% PROCESS role_types field = { count => n, name => "emaillongdesc", + [% PROCESS role_types field = { count => n, name => "emaillongdesc", label=> " a ${field_descs.commenter}" } %] [% PROCESS role_types field = { count => n, name => "emailbug_mentor", label => " a ${field_descs.bug_mentor}" } %] @@ -379,15 +379,15 @@ TUI_hide_default('information_query'); </li> <li> <label for="chfieldfrom">between:</label> - <input name="chfieldfrom" id="chfieldfrom" size="10" - value="[% default.chfieldfrom.0 FILTER html %]" onchange="updateCalendarFromField(this)"> + <input name="chfieldfrom" id="chfieldfrom" size="10" + value="[% default.chfieldfrom.0 FILTER html %]" onchange="updateCalendarFromField(this)"> <button type="button" class="calendar_button" id="button_calendar_chfieldfrom" onclick="showCalendar('chfieldfrom')"><span>Calendar</span></button> - and + and <div id="con_calendar_chfieldfrom"></div> - <input name="chfieldto" size="10" id="chfieldto" - value="[% default.chfieldto.0 || "Now" FILTER html %]" + <input name="chfieldto" size="10" id="chfieldto" + value="[% default.chfieldto.0 || "Now" FILTER html %]" onchange="updateCalendarFromField(this)"> <button type="button" class="calendar_button" id="button_calendar_chfieldto" @@ -398,7 +398,7 @@ TUI_hide_default('information_query'); createCalendar('chfieldfrom'); createCalendar('chfieldto'); </script> - </li> + </li> </ul> [%############################################################################%] diff --git a/template/en/default/search/knob.html.tmpl b/template/en/default/search/knob.html.tmpl index e20822bf5..f5e317bc6 100644 --- a/template/en/default/search/knob.html.tmpl +++ b/template/en/default/search/knob.html.tmpl @@ -23,12 +23,12 @@ [%# INTERFACE: # (incomplete!) # ... - # known_name: string. Possibly known stored name for the query being + # known_name: string. Possibly known stored name for the query being # edited. This value is just passed through in a # hidden field. #%] - - + + [% PROCESS global/variables.none.tmpl %] [%# This is not necessary for English templates, but useful for localizers. %] @@ -55,7 +55,7 @@ </select> </p> -<p> +<p> <input type="submit" id="[% button_name FILTER html %]" value="[% button_name FILTER html %]"> [% IF known_name %] @@ -81,7 +81,7 @@ </label> </p> [% END %] - + [% IF userdefaultquery %] <p> <a href="query.cgi?nukedefaultquery=1&token= diff --git a/template/en/default/search/search-create-series.html.tmpl b/template/en/default/search/search-create-series.html.tmpl index e0b7ff562..ec88fb038 100644 --- a/template/en/default/search/search-create-series.html.tmpl +++ b/template/en/default/search/search-create-series.html.tmpl @@ -30,28 +30,28 @@ var queryform = "chartform"; [% END %] -[% PROCESS global/header.html.tmpl +[% PROCESS global/header.html.tmpl title = "Create New Data Set" generate_api_token = 1 onload = "doOnSelectProduct(0);" - javascript = js_data + javascript = js_data 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#charts-new-series" %] <form method="get" action="chart.cgi" name="chartform"> - + [% PROCESS search/form.html.tmpl %] <p> <input type="submit" id="action-search" name="action-search" value="Run Search"> to see which [% terms.bugs %] would be included in this data set. </p> - + <h3>Data Set Parameters</h3> - -[% PROCESS reports/series.html.tmpl + +[% PROCESS reports/series.html.tmpl button_name = "Create Data Set" %] <input type="hidden" name="action" value="create"> <input type="hidden" name="token" value="[% issue_hash_token(['create-series']) FILTER html %]"> @@ -61,7 +61,7 @@ catSelected(); checkNewState(); </script> - + <hr> [% PROCESS "search/boolean-charts.html.tmpl" %] diff --git a/template/en/default/search/search-instant.html.tmpl b/template/en/default/search/search-instant.html.tmpl index ed3942166..95d40a5eb 100644 --- a/template/en/default/search/search-instant.html.tmpl +++ b/template/en/default/search/search-instant.html.tmpl @@ -8,12 +8,7 @@ [% PROCESS global/variables.none.tmpl %] -[% javascript_urls = [ 'js/instant-search.js' ] %] -[% IF has_extension('GuidedBugEntry') %] - [% javascript_urls.import(['extensions/GuidedBugEntry/web/js/products.js']); %] -[% END %] - -[% PROCESS global/header.html.tmpl +[% PROCESS global/header.html.tmpl title = "Instant Search" generate_api_token = 1 javascript_urls = javascript_urls diff --git a/template/en/default/search/search-report-graph.html.tmpl b/template/en/default/search/search-report-graph.html.tmpl index 57ca8a8e9..d88695284 100644 --- a/template/en/default/search/search-report-graph.html.tmpl +++ b/template/en/default/search/search-report-graph.html.tmpl @@ -42,7 +42,7 @@ var queryform = "reportform" [% PROCESS "search/search-report-select.html.tmpl" %] <p> - Choose one or more fields as your axes, and then refine your set of + Choose one or more fields as your axes, and then refine your set of [% terms.bugs %] using the rest of the form. </p> diff --git a/template/en/default/search/search-report-select.html.tmpl b/template/en/default/search/search-report-select.html.tmpl index 44425898a..2eb7b797d 100644 --- a/template/en/default/search/search-report-select.html.tmpl +++ b/template/en/default/search/search-report-select.html.tmpl @@ -30,12 +30,12 @@ <select name="[% name FILTER html %]"> <option value=""><none></option> - + [% FOREACH field = report_columns.keys.sort %] [% NEXT IF field == "classification" AND !Param('useclassification') %] [% NEXT IF field == "target_milestone" AND !Param('usetargetmilestone') %] [% NEXT IF field == "qa_contact" AND !Param('useqacontact') %] - <option value="[% field FILTER html %]" + <option value="[% field FILTER html %]" [% " selected" IF default.$name.0 == field %]> [% field_descs.$field || field FILTER html %]</option> [% END %] diff --git a/template/en/default/search/search-report-table.html.tmpl b/template/en/default/search/search-report-table.html.tmpl index 7ac4ac5a0..08c6523fe 100644 --- a/template/en/default/search/search-report-table.html.tmpl +++ b/template/en/default/search/search-report-table.html.tmpl @@ -42,7 +42,7 @@ var queryform = "reportform" [% PROCESS "search/search-report-select.html.tmpl" %] <p> - Choose one or more fields as your axes, and then refine your set of + Choose one or more fields as your axes, and then refine your set of [% terms.bugs %] using the rest of the form. </p> diff --git a/template/en/default/search/search-specific.html.tmpl b/template/en/default/search/search-specific.html.tmpl index be314101f..704fcbc32 100644 --- a/template/en/default/search/search-specific.html.tmpl +++ b/template/en/default/search/search-specific.html.tmpl @@ -20,7 +20,7 @@ [% PROCESS global/variables.none.tmpl %] -[% PROCESS global/header.html.tmpl +[% PROCESS global/header.html.tmpl title = "Simple Search" style_urls = [ "skins/standard/search_form.css" ] %] @@ -28,7 +28,7 @@ [% WRAPPER search/tabs.html.tmpl %] <p> -Find a specific [% terms.bug %] by entering words that describe it. +Find a specific [% terms.bug %] by entering words that describe it. [% terms.Bugzilla %] will search [% terms.bug %] descriptions and comments for those words and return a list of matching [% terms.bugs %] sorted by relevance. @@ -54,7 +54,7 @@ for "crash secure SSL flash". { name = 'closed', label = "Closed" }, { name = 'all', label = "All" } ] %] [% FOREACH status = statuses %] - <option value="__[% status.name %]__" + <option value="__[% status.name %]__" [% " selected" IF default.bug_status.0 == "__${status.name}__" %]> [% status.label FILTER html %] </option> @@ -114,7 +114,7 @@ for "crash secure SSL flash". <tr> <td></td> <td> - + [% IF Param('search_allow_no_criteria') %] <input type="submit" id="search" value="Search"> [% ELSE %] diff --git a/template/en/default/search/tabs.html.tmpl b/template/en/default/search/tabs.html.tmpl index 26ad4f39b..74ab0ca5b 100644 --- a/template/en/default/search/tabs.html.tmpl +++ b/template/en/default/search/tabs.html.tmpl @@ -29,8 +29,8 @@ { name => 'specific', label => "Simple Search", link => "query.cgi?format=specific" }, { name => 'advanced', label => "Advanced Search", - link => "query.cgi?format=advanced" }, - { name => 'google', label => 'Google Search', + link => "query.cgi?format=advanced" }, + { name => 'google', label => 'Google Search', link => "query.cgi?format=google" } ] current_tab_name = query_format || format || "advanced" %] diff --git a/template/en/default/search/type-select.html.tmpl b/template/en/default/search/type-select.html.tmpl index 6da88202e..dc261565e 100644 --- a/template/en/default/search/type-select.html.tmpl +++ b/template/en/default/search/type-select.html.tmpl @@ -14,12 +14,12 @@ # University Foundation. Portions created by the Initial Developer are # Copyright (C) 2008 the Initial Developer. All Rights Reserved. # - # Contributor(s): + # Contributor(s): # Max Kanat-Alexander <mkanat@bugzilla.org> #%] [% PROCESS "global/field-descs.none.tmpl" %] - + <select name="[% name FILTER html %]" title="Search type" class="[% class FILTER css_class_quote %]"> [% FOREACH type = types %] |