From 7834fbf656adfa48344a6246611c3498831dc850 Mon Sep 17 00:00:00 2001 From: Dylan William Hardison Date: Mon, 5 Jan 2015 13:27:48 -0500 Subject: Bug 1050232 - Improve layout of guided bug entry product selection --- .../en/default/bug/create/comment-guided.txt.tmpl | 3 + .../template/en/default/guided/guided.html.tmpl | 121 ++++++++++++--------- .../template/en/default/guided/products.html.tmpl | 36 ++---- 3 files changed, 82 insertions(+), 78 deletions(-) (limited to 'extensions/GuidedBugEntry/template/en') diff --git a/extensions/GuidedBugEntry/template/en/default/bug/create/comment-guided.txt.tmpl b/extensions/GuidedBugEntry/template/en/default/bug/create/comment-guided.txt.tmpl index 6b0de9466..31408b538 100644 --- a/extensions/GuidedBugEntry/template/en/default/bug/create/comment-guided.txt.tmpl +++ b/extensions/GuidedBugEntry/template/en/default/bug/create/comment-guided.txt.tmpl @@ -3,6 +3,9 @@ User Agent: [% cgi.param('user_agent') %] [% IF cgi.param('build_id') %] Build ID: [% cgi.param('build_id') %][% END %] +[% IF cgi.param('firefox_for_android') %] +Firefox for Android +[% END %] [% IF cgi.param('bug_steps') %] Steps to reproduce: diff --git a/extensions/GuidedBugEntry/template/en/default/guided/guided.html.tmpl b/extensions/GuidedBugEntry/template/en/default/guided/guided.html.tmpl index 5b57a0900..9a1c09e6f 100644 --- a/extensions/GuidedBugEntry/template/en/default/guided/guided.html.tmpl +++ b/extensions/GuidedBugEntry/template/en/default/guided/guided.html.tmpl @@ -14,15 +14,12 @@ 'extensions/ProdCompSearch/web/js/prod_comp_search.js', 'js/field.js', 'js/TUI.js', 'js/bug.js' ] %] -[% yui_modules = [ 'history', 'datatable', 'container' ] %] -[% yui_modules.push('autocomplete') %] - [% PROCESS global/header.html.tmpl title = "Enter A Bug" javascript_urls = js_urls style_urls = [ 'extensions/GuidedBugEntry/web/style/guided.css', 'js/yui/assets/skins/sam/container.css' ] - yui = yui_modules + yui = [ 'history', 'datatable', 'container', 'autocomplete' ] %] @@ -103,19 +100,15 @@ dupes.setLabels( show = "all" %] - +
- -

- Or search for a Product: -

+ onclick="guided.setStep('otherProducts')" %] +Other Mozilla products which aren't listed here +[% END %] +
[% PROCESS prodcompsearch/form.html.tmpl @@ -123,7 +116,6 @@ dupes.setLabels( format = "guided" script_name = "enter_bug.cgi" %]
- [% END %] @@ -141,32 +133,24 @@ dupes.setLabels( [% END %] [% END %] [% END %] - - - - - -

- + + + [% caption FILTER html %] +

+ [% IF content %] + [% content FILTER none %] [% ELSE %] - onclick="product.select('[% name FILTER js %]')" + [% desc FILTER html_light %] [% END %] - >[% caption FILTER html %] -

-

- [% desc FILTER html_light %]

- - + + [% END %] [%############################################################################%] @@ -300,11 +284,25 @@ Product: ?:

- - - + + + + + + + + + + +
+ + + + is poorly translated into my native language. + +
@@ -358,7 +356,7 @@ explain how to write effective [% terms.bug %] reports. - + - + - + - + - + - + - + - + - + - + - + - +
Summary: @@ -374,7 +372,7 @@ explain how to write effective [% terms.bug %] reports.
Product: @@ -392,7 +390,7 @@ explain how to write effective [% terms.bug %] reports.
Component: @@ -415,7 +413,7 @@ explain how to write effective [% terms.bug %] reports.
What did you do? (steps to reproduce) [% PROCESS help id="steps_help" %] @@ -433,12 +431,12 @@ explain how to write effective [% terms.bug %] reports.
 
What happened? (actual results) [% PROCESS help id="actual_help" %] @@ -446,12 +444,12 @@ explain how to write effective [% terms.bug %] reports. What happened after you performed the steps above?
 
What should have happened? (expected results) [% PROCESS help id="expected_help" %] @@ -459,12 +457,12 @@ explain how to write effective [% terms.bug %] reports. What should the software have done instead?
 
Attach a file: @@ -479,13 +477,13 @@ explain how to write effective [% terms.bug %] reports.
File Description:  
Security: @@ -503,7 +501,26 @@ explain how to write effective [% terms.bug %] reports. - + + + + + + +
 
Additional Details: + + + + + +
+ + + +
+ 		+   +
  diff --git a/extensions/GuidedBugEntry/template/en/default/guided/products.html.tmpl b/extensions/GuidedBugEntry/template/en/default/guided/products.html.tmpl index f4e7b81ff..67ad392a1 100644 --- a/extensions/GuidedBugEntry/template/en/default/guided/products.html.tmpl +++ b/extensions/GuidedBugEntry/template/en/default/guided/products.html.tmpl @@ -6,22 +6,18 @@ # defined by the Mozilla Public License, v. 2.0. #%] -[% INCLUDE product_block +[% WRAPPER product_block name="Firefox" icon="firefox.png" %] +For [% terms.bugs %] in Firefox, the Mozilla Foundation's web browser. + +(more info) +[% END %] [% INCLUDE product_block name="Firefox OS" icon="firefox_os.png" %] -[% INCLUDE product_block - name="Firefox for Android" - icon="firefox_android.png" -%] -[% INCLUDE product_block - name="Marketplace" - icon="marketplace.png" -%] [% INCLUDE product_block name="Webmaker" icon="webmaker.png" @@ -30,21 +26,9 @@ name="Thunderbird" icon="thunderbird.png" %] -[% INCLUDE product_block - name="SeaMonkey" - icon="seamonkey.png" -%] -[% INCLUDE product_block - name="Core" - icon="component.png" -%] -[% INCLUDE product_block - name="Mozilla Localizations" - icon="localization.png" - caption="Localizations" -%] -[% INCLUDE product_block - name="Mozilla Services" - icon="sync.png" - caption="Services" +[% WRAPPER product_block + name="Marketplace" + icon="marketplace.png" %] +Mozilla's website to bring personalized discovery, worldwide distribution, and easy payments to the largest platform for app development: the Web. (more info) +[% END %] -- cgit v1.2.3-24-g4f1b