From 09de3de190a692dfbc2533ceee8f31648905b91a Mon Sep 17 00:00:00 2001 From: Byron Jones Date: Fri, 17 Apr 2015 12:56:18 +0800 Subject: Bug 1154730: rewrite product/component searching to use jquery-ui instead of yui --- .../en/default/global/choose-product.html.tmpl | 293 ++++++++++----------- 1 file changed, 143 insertions(+), 150 deletions(-) (limited to 'extensions/BMO') diff --git a/extensions/BMO/template/en/default/global/choose-product.html.tmpl b/extensions/BMO/template/en/default/global/choose-product.html.tmpl index 9f7232178..32883beef 100644 --- a/extensions/BMO/template/en/default/global/choose-product.html.tmpl +++ b/extensions/BMO/template/en/default/global/choose-product.html.tmpl @@ -1,21 +1,9 @@ -[%# The contents of this file are subject to the Mozilla Public - # License Version 1.1 (the "License"); you may not use this file - # except in compliance with the License. You may obtain a copy of - # the License at http://www.mozilla.org/MPL/ +[%# This Source Code Form is subject to the terms of the Mozilla Public + # License, v. 2.0. If a copy of the MPL was not distributed with this + # file, You can obtain one at http://mozilla.org/MPL/2.0/. # - # Software distributed under the License is distributed on an "AS - # IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or - # implied. See the License for the specific language governing - # rights and limitations under the License. - # - # The Original Code is the Bugzilla Bug Tracking System. - # - # The Initial Developer of the Original Code is Netscape Communications - # Corporation. Portions created by Netscape are - # Copyright (C) 1998 Netscape Communications Corporation. All - # Rights Reserved. - # - # Contributor(s): Gervase Markham + # This Source Code Form is "Incompatible With Secondary Licenses", as + # defined by the Mozilla Public License, v. 2.0. #%] [%# INTERFACE: @@ -27,26 +15,35 @@ # format: the desired format to display the target. #%] -[% PROCESS global/variables.none.tmpl %] - -[% style_urls = [ "extensions/BMO/web/styles/choose_product.css" ] %] - -[% IF target == "enter_bug.cgi" %] - [% title = "Enter $terms.Bug" %] - [% h2 = "Which product is affected by the problem you would like to report?" %] -[% ELSIF target == "describecomponents.cgi" %] - [% title = "Browse" %] - [% h2 = "Which product would you like to have described?" %] -[% END %] - -[% javascript_urls = [ "js/yui3/yui/yui-min.js", - "extensions/ProdCompSearch/web/js/prod_comp_search.js" ] +[% + USE Bugzilla; + PROCESS global/variables.none.tmpl; + + IF target == "enter_bug.cgi"; + title = "Enter $terms.Bug"; + h2 = "Which product is affected by the problem you would like to report?"; + is_describe = 0; + ELSIF target == "describecomponents.cgi"; + title = "Browse"; + h2 = "Which product and component would you like to have described?"; + is_describe = 1; + ELSE; + title = "Choose a Product"; + is_describe = 0; + END; + + style_urls = [ + "extensions/BMO/web/styles/choose_product.css", + "extensions/ProdCompSearch/web/styles/prod_comp_search.css", + ]; + javascript_urls = [ "extensions/ProdCompSearch/web/js/prod_comp_search.js" ]; + + cgi = Bugzilla.cgi; + classification = cgi.param('classification'); + + PROCESS global/header.html.tmpl + generate_api_token = 1; %] -[% onload = "document.getElementById('prod_comp_search').focus();" %] -[% style_urls.push("extensions/ProdCompSearch/web/styles/prod_comp_search.css") %] - -[% DEFAULT title = "Choose a Product" %] -[% PROCESS global/header.html.tmpl %]
@@ -62,135 +59,131 @@
[% PROCESS prodcompsearch/form.html.tmpl - input_label = "Find product:" - format = format - cloned_bug_id = cloned_bug_id - script_name = target %] + input_label = "Find product and component:" + format = format + cloned_bug_id = cloned_bug_id + script_name = target + anchor_component = is_describe + auto_focus = 1 + %]

or choose from the following selections

-[% USE Bugzilla %] -[% cgi = Bugzilla.cgi %] -[% SET classification = cgi.param('classification') %] [% IF NOT ((cgi.param("full")) OR (user.settings.product_chooser.value == 'full_product_chooser')) %] - -[% INCLUDE easyproduct - name="Core" - icon="component.png" -%] -[% INCLUDE easyproduct - name="Firefox" - icon="firefox.png" -%] -[% INCLUDE easyproduct - name="Firefox OS" - icon="firefox_os.png" -%] -[% INCLUDE easyproduct - name="Firefox for Android" - icon="firefox_android.png" -%] -[% INCLUDE easyproduct - name="Firefox for iOS" - icon="firefox_ios.png" -%] -[% INCLUDE easyproduct - name="Marketplace" - icon="marketplace.png" -%] -[% INCLUDE easyproduct - name="Webmaker" - icon="webmaker.png" -%] -[% INCLUDE easyproduct - name="Toolkit" - icon="component.png" -%] -[% INCLUDE easyproduct - name="Thunderbird" - icon="thunderbird.png" -%] -[% INCLUDE easyproduct - name="SeaMonkey" - icon="seamonkey.png" -%] -[% INCLUDE easyproduct - name="Mozilla Localizations" - icon="localization.png" -%] -[% INCLUDE easyproduct - name="Mozilla Services" - icon="sync.png" -%] - - - - -
-

- Other Products

-

Other Mozilla products which aren't listed here

-
-[% ELSE %] - - - -[% FOREACH c = classifications %] - [% IF c.object %] +
+ [% INCLUDE easyproduct + name="Core" + icon="component.png" + %] + [% INCLUDE easyproduct + name="Firefox" + icon="firefox.png" + %] + [% INCLUDE easyproduct + name="Firefox OS" + icon="firefox_os.png" + %] + [% INCLUDE easyproduct + name="Firefox for Android" + icon="firefox_android.png" + %] + [% INCLUDE easyproduct + name="Firefox for iOS" + icon="firefox_ios.png" + %] + [% INCLUDE easyproduct + name="Marketplace" + icon="marketplace.png" + %] + [% INCLUDE easyproduct + name="Webmaker" + icon="webmaker.png" + %] + [% INCLUDE easyproduct + name="Toolkit" + icon="component.png" + %] + [% INCLUDE easyproduct + name="Thunderbird" + icon="thunderbird.png" + %] + [% INCLUDE easyproduct + name="SeaMonkey" + icon="seamonkey.png" + %] + [% INCLUDE easyproduct + name="Mozilla Localizations" + icon="localization.png" + %] + [% INCLUDE easyproduct + name="Mozilla Services" + icon="sync.png" + %] - - + + - [% END %] +

[% c.object.name FILTER html %]

[%+ c.object.description FILTER html_light %] +

+ Other Products

+

Other Mozilla products which aren't listed here

+
+ +[% ELSE %] - [% FOREACH p = c.products %] - [% class = "" %] - [% has_entry_groups = 0 %] - [% FOREACH gid = p.group_controls.keys %] - [% IF p.group_controls.$gid.entry %] - [% has_entry_groups = 1 %] - [% class = class _ " group_$gid" %] + + [% FOREACH c = classifications %] + [% IF c.object %] + + + + [% END %] - [% END %] - - + + + [% END %] - - - + [% END %] +

[% c.object.name FILTER html %]

[%+ c.object.description FILTER html_light %]
- [% IF p.name == "Mozilla PR" AND target == "enter_bug.cgi" AND NOT format AND NOT cgi.param("debug") %] - - [% p.name FILTER html FILTER no_break %]:  - [% ELSE %] - - [% p.name FILTER html FILTER no_break %]:  + + [% FOREACH p = c.products %] + [% class = "" %] + [% has_entry_groups = 0 %] + [% FOREACH gid = p.group_controls.keys %] + [% IF p.group_controls.$gid.entry %] + [% has_entry_groups = 1 %] + [% class = class _ " group_$gid" %] + [% END %] + [% END %] +
+ [% IF p.name == "Mozilla PR" AND target == "enter_bug.cgi" AND NOT format AND NOT cgi.param("debug") %] + + [% p.name FILTER html FILTER no_break %]:  + [% ELSE %] + + [% p.name FILTER html FILTER no_break %]:  + [% END %] + [% p.description FILTER html_light %]
[% p.description FILTER html_light %]
+
+ [% IF target == "enter_bug.cgi" AND user.settings.product_chooser.value != 'full_product_chooser' %] +

You can choose to get this screen by default when you click "New [% terms.Bug %]" + by changing your preferences.

[% END %] [% END %] - -
-[% IF target == "enter_bug.cgi" AND user.settings.product_chooser.value != 'full_product_chooser' %] -

You can choose to get this screen by default when you click "New [% terms.Bug %]" -by changing your preferences.

-[% END %] -[% END %] -
-
-- cgit v1.2.3-24-g4f1b