From ce6b850ebeeff164be4a01aa30ee35b9d7301711 Mon Sep 17 00:00:00 2001 From: Byron Jones Date: Thu, 21 Mar 2013 01:05:06 +0800 Subject: Bug 851818: Modernize the entry page for filing a bug by including, keeping, and removing products shown on the enter bug page --- .../en/default/global/choose-product.html.tmpl | 48 +++++++++++++-------- extensions/BMO/web/core.png | Bin 0 -> 7497 bytes extensions/BMO/web/marketplace.png | Bin 0 -> 7412 bytes .../template/en/default/guided/guided.html.tmpl | 28 +++++++----- .../template/en/default/guided/products.html.tmpl | 35 +++++++++------ .../web/images/products/marketplace.png | Bin 0 -> 7412 bytes extensions/GuidedBugEntry/web/images/webbug.png | Bin 0 -> 2053 bytes extensions/GuidedBugEntry/web/js/guided.js | 28 ++++++------ extensions/GuidedBugEntry/web/style/guided.css | 8 ++++ 9 files changed, 91 insertions(+), 56 deletions(-) create mode 100644 extensions/BMO/web/core.png create mode 100644 extensions/BMO/web/marketplace.png create mode 100644 extensions/GuidedBugEntry/web/images/products/marketplace.png create mode 100644 extensions/GuidedBugEntry/web/images/webbug.png (limited to 'extensions') 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 9f3aca3c0..d6d493827 100644 --- a/extensions/BMO/template/en/default/global/choose-product.html.tmpl +++ b/extensions/BMO/template/en/default/global/choose-product.html.tmpl @@ -29,7 +29,7 @@ [% PROCESS global/variables.none.tmpl %] -[% style_urls = [ "extensions/BMO/web/styles/choose_product.css" ] %] +[% style_urls = [ "extensions/BMO/web/styles/choose_product.css" ] %] [% IF target == "enter_bug.cgi" %] [% title = "Enter $terms.Bug" %] @@ -68,7 +68,7 @@ ProdCompSearch.script_name = '[% target FILTER js %]';
- [% PROCESS prodcompsearch/form.html.tmpl + [% PROCESS prodcompsearch/form.html.tmpl input_label = "Find product:" %]
@@ -90,32 +90,37 @@ icon="firefox.png" %] [% INCLUDE easyproduct - name="Thunderbird" - icon="thunderbird.png" + name="Boot2Gecko" + icon="firefox.png" + caption="Firefox OS" %] [% INCLUDE easyproduct - name="Calendar" - icon="sunbird.png" + name="Firefox for Android" + icon="firefox.png" %] [% INCLUDE easyproduct - name="Camino" - icon="camino.png" + name="Firefox for Metro" + icon="firefox.png" %] [% INCLUDE easyproduct - name="SeaMonkey" - icon="seamonkey.png" + name="Toolkit" + icon="dino.png" %] [% INCLUDE easyproduct - name="Firefox for Android" - icon="firefox.png" + name="Marketplace" + icon="marketplace.png" %] [% INCLUDE easyproduct - name="Mozilla Localizations" - icon="dino.png" + name="Thunderbird" + icon="thunderbird.png" %] [% INCLUDE easyproduct - name="Mozilla Labs" - icon="labs.png" + name="SeaMonkey" + icon="seamonkey.png" +%] +[% INCLUDE easyproduct + name="Mozilla Localizations" + icon="dino.png" %] [% INCLUDE easyproduct name="Mozilla Services" @@ -182,7 +187,7 @@
[% 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 %]" +

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

[% END %] [% END %] @@ -190,6 +195,13 @@ by changing your preferences.

+
+ + Switch to the [% terms.Bugzilla %] Helper +
+ [% PROCESS global/footer.html.tmpl %] [%###########################################################################%] @@ -208,7 +220,7 @@ by changing your preferences.

- [% p.name FILTER html FILTER no_break %]:

+ [% caption || name FILTER html FILTER no_break %]: [% IF p.description %]

[% p.description FILTER html_light %]

[% END %] diff --git a/extensions/BMO/web/core.png b/extensions/BMO/web/core.png new file mode 100644 index 000000000..b9c5053f6 Binary files /dev/null and b/extensions/BMO/web/core.png differ diff --git a/extensions/BMO/web/marketplace.png b/extensions/BMO/web/marketplace.png new file mode 100644 index 000000000..62025a2a8 Binary files /dev/null and b/extensions/BMO/web/marketplace.png differ diff --git a/extensions/GuidedBugEntry/template/en/default/guided/guided.html.tmpl b/extensions/GuidedBugEntry/template/en/default/guided/guided.html.tmpl index 50a7616be..c9bed9f41 100644 --- a/extensions/GuidedBugEntry/template/en/default/guided/guided.html.tmpl +++ b/extensions/GuidedBugEntry/template/en/default/guided/guided.html.tmpl @@ -231,10 +231,8 @@ dupes.setLabels( > - -

- I need technical support -

+ + I need technical support
For technical support or help getting your site to work with Mozilla. @@ -246,14 +244,24 @@ dupes.setLabels( > - - • Offer us ideas on how to make Firefox better
- • Report an issue with a web site that I use
- • Report an issue with Firefox on a site that I've developed
- • Provide feedback about Firefox
+ + Offer us ideas on how to make Firefox better
+ Provide feedback about Firefox
+ + + + +
+ +
+ + + Report an issue with Firefox on a site that I've developed
+ Report an issue with a web site that I use
+

None of the above; my [% terms.bug %] is in:

@@ -423,7 +431,7 @@ explain how to write effective [% terms.bug %] reports. Bad example: Mozilla crashed. You suck!
Good example: After a crash which happened when I was sorting in the Bookmark Manager, all of my top-level bookmark - folders beginning with the letters Q to Z are no longer present. + folders beginning with the letters Q to Z are no longer present. diff --git a/extensions/GuidedBugEntry/template/en/default/guided/products.html.tmpl b/extensions/GuidedBugEntry/template/en/default/guided/products.html.tmpl index 22c93a354..f775f837c 100644 --- a/extensions/GuidedBugEntry/template/en/default/guided/products.html.tmpl +++ b/extensions/GuidedBugEntry/template/en/default/guided/products.html.tmpl @@ -10,35 +10,42 @@ name="Firefox" icon="firefox.png" %] +[% INCLUDE product_block + name="Boot2Gecko" + icon="firefox.png" + caption="Firefox OS" +%] [% INCLUDE product_block name="Firefox for Android" icon="firefox.png" %] [% INCLUDE product_block - name="Thunderbird" - icon="thunderbird.png" + name="Firefox for Metro" + icon="firefox.png" %] [% INCLUDE product_block - name="Mozilla Services" - icon="dino.png" + name="Marketplace" + icon="marketplace.png" %] [% INCLUDE product_block - name="SeaMonkey" - icon="seamonkey.png" + name="Thunderbird" + icon="thunderbird.png" %] [% INCLUDE product_block - name="Mozilla Localizations" - icon="dino.png" + name="SeaMonkey" + icon="seamonkey.png" %] [% INCLUDE product_block - name="Mozilla Labs" - icon="labs.png" + name="Core" + icon="core.png" %] [% INCLUDE product_block - name="Calendar" - icon="sunbird.png" + name="Mozilla Localizations" + icon="dino.png" + caption="Localizations" %] [% INCLUDE product_block - name="Core" - icon="core.png" + name="Mozilla Services" + icon="dino.png" + caption="Services" %] diff --git a/extensions/GuidedBugEntry/web/images/products/marketplace.png b/extensions/GuidedBugEntry/web/images/products/marketplace.png new file mode 100644 index 000000000..62025a2a8 Binary files /dev/null and b/extensions/GuidedBugEntry/web/images/products/marketplace.png differ diff --git a/extensions/GuidedBugEntry/web/images/webbug.png b/extensions/GuidedBugEntry/web/images/webbug.png new file mode 100644 index 000000000..949cfbc59 Binary files /dev/null and b/extensions/GuidedBugEntry/web/images/webbug.png differ diff --git a/extensions/GuidedBugEntry/web/js/guided.js b/extensions/GuidedBugEntry/web/js/guided.js index 8eaf6b3b5..98d637d60 100644 --- a/extensions/GuidedBugEntry/web/js/guided.js +++ b/extensions/GuidedBugEntry/web/js/guided.js @@ -306,7 +306,7 @@ var dupes = { }; // DataSource can't understand a JSON-RPC error response, so // we have to modify the result data if we get one. - dataSource.doBeforeParseData = + dataSource.doBeforeParseData = function(oRequest, oFullResponse, oCallback) { if (oFullResponse.error) { oFullResponse.result = {}; @@ -316,17 +316,17 @@ var dupes = { } return oFullResponse; }; - dataSource.subscribe('dataErrorEvent', + dataSource.subscribe('dataErrorEvent', function() { dupes._currentSearchQuery = ''; } ); this._dataTable = new YAHOO.widget.DataTable( - 'dupes_list', - this._dataTableColumns, - dataSource, - { + 'dupes_list', + this._dataTableColumns, + dataSource, + { initialLoad: false, MSG_EMPTY: 'No similar issues found.', MSG_ERROR: 'An error occurred while searching for similar issues,' + @@ -517,7 +517,7 @@ var dupes = { dupes._dataTable.showTableMessage( 'Searching for similar issues...   ' + - '', YAHOO.widget.DataTable.CLASS_LOADING ); @@ -535,12 +535,12 @@ var dupes = { }; dupes._dataTable.getDataSource().sendRequest( - YAHOO.lang.JSON.stringify(json_object), + YAHOO.lang.JSON.stringify(json_object), { success: dupes._onDupeResults, failure: dupes._onDupeResults, scope: dupes._dataTable, - argument: dupes._dataTable.getState() + argument: dupes._dataTable.getState() } ); @@ -856,12 +856,12 @@ var bugForm = { }, validate: function() { - + // check mandatory fields var missing = bugForm._mandatoryMissing(); if (missing.length) { - var message = 'The following field' + + var message = 'The following field' + (missing.length == 1 ? ' is' : 's are') + ' required:\n\n'; for (var i = 0, n = missing.length; i < n; i++ ) { var id = missing[i]; @@ -888,9 +888,9 @@ var bugForm = { if (!el.id) el.id = help_id + '_parent'; el.panel = new YAHOO.widget.Panel( - help_id, - { - width: "320px", + help_id, + { + width: "320px", visible: false, close: false, context: [el.id, 'tl', 'tr', null, [5, 0]] diff --git a/extensions/GuidedBugEntry/web/style/guided.css b/extensions/GuidedBugEntry/web/style/guided.css index 55550933f..f06715eab 100644 --- a/extensions/GuidedBugEntry/web/style/guided.css +++ b/extensions/GuidedBugEntry/web/style/guided.css @@ -81,6 +81,14 @@ text-align: right; } +.exit_text, .exit_text_last { + width: 100%; +} + +.exit_text { + border-bottom: 1px dotted silver; +} + #prod_comp_search_main { width: 400px; } -- cgit v1.2.3-24-g4f1b