From 78a5f25336ae1b7b9489c8ca475086e9714c43dc Mon Sep 17 00:00:00 2001 From: Dylan William Hardison Date: Tue, 22 Aug 2017 16:33:24 -0400 Subject: cleanup some stuff in new-bug (#215) --- template/en/default/bug/new_bug.html.tmpl | 301 +++++++++++++++--------------- 1 file changed, 149 insertions(+), 152 deletions(-) (limited to 'template') diff --git a/template/en/default/bug/new_bug.html.tmpl b/template/en/default/bug/new_bug.html.tmpl index bed0c5578..7acb85e21 100644 --- a/template/en/default/bug/new_bug.html.tmpl +++ b/template/en/default/bug/new_bug.html.tmpl @@ -16,175 +16,152 @@ %] [% PROCESS global/header.html.tmpl %] -[% IF user.id %] - -
- -
-
-
-
-
-

Create New [% terms.Bug %]

-

- Before reporting a [% terms.bug %], make sure you've read our - - [% terms.bug %] writing guidelines and double checked that your [% terms.bug %] hasn't already - been reported. Consult our list of - most frequently reported [% terms.bugs %] and - search through descriptions of previously reported [% terms.bugs %]. -

-
-
-
+ + + +
+
+
+
+
+

Create New [% terms.Bug %]

+

+ Before reporting a [% terms.bug %], make sure you've read our + + [% terms.bug %] writing guidelines and double checked that your [% terms.bug %] hasn't already + been reported. Consult our list of + most frequently reported [% terms.bugs %] and + search through descriptions of previously reported [% terms.bugs %]. +

+
+
-
-
+
+
+
+
+
+ [% WRAPPER bug_modal/module.html.tmpl title = "" %] + [%# summary %] + [% INCLUDE bug_modal/field.html.tmpl + field = bug_fields.short_desc + field_type = constants.FIELD_TYPE_FREETEXT + edit_only = 1 + editable = 1 + required = 1 + help = "https://wiki.mozilla.org/BMO/UserGuide/BugFields#short_desc" + %] + + [% INCLUDE new_comment %] + Many users could be harmed by this security problem: + it should be kept hidden from the public until it is resolved
+ [% END %] + [% WRAPPER bug_modal/module.html.tmpl title = "Attach a File" collapsed = 1 %] +
+ +
-
- [% WRAPPER bug_modal/module.html.tmpl title = "" %] - [%# summary %] - [% INCLUDE bug_modal/field.html.tmpl - field = bug_fields.short_desc - field_type = constants.FIELD_TYPE_FREETEXT + + + + [% END %] + +
+
+ [% WRAPPER bug_modal/module.html.tmpl title = "Status" %] + [% can_edit_product = bug.check_can_change_field("product", 0, 1) %] + [% filtered_product = bug.product_obj.name FILTER uri %] + [% filtered_component = bug.component_obj.name FILTER uri %] +
+ [% WRAPPER bug_modal/field.html.tmpl + field = bug_fields.product + field_type = constants.FIELD_TYPE_SINGLE_SELECT edit_only = 1 editable = 1 - required = 1 - help = "https://wiki.mozilla.org/BMO/UserGuide/BugFields#short_desc" + help = "describecomponents.cgi?product=$filtered_product" %] - - [% INCLUDE bug_modal/common_new_comment.html.tmpl disable_cols=1 %] - Many users could be harmed by this security problem: - it should be kept hidden from the public until it is resolved
+ + + +
+ [% bug.product FILTER html %] +
+ + [% END %] - [% WRAPPER bug_modal/module.html.tmpl title = "Attach a File" collapsed = 1 %] -
- -
- - - - [% END %] - -
-
- [% WRAPPER bug_modal/module.html.tmpl title = "Status" %] - [% can_edit_product = bug.check_can_change_field("product", 0, 1) %] - [% filtered_product = bug.product_obj.name FILTER uri %] - [% filtered_component = bug.component_obj.name FILTER uri %] -
- [% WRAPPER bug_modal/field.html.tmpl - field = bug_fields.product - field_type = constants.FIELD_TYPE_SINGLE_SELECT - edit_only = 1 - editable = 1 - help = "describecomponents.cgi?product=$filtered_product" - %] - - - -
- [% bug.product FILTER html %] -
- - - [% END %] -
- [% WRAPPER bug_modal/field.html.tmpl - field = bug_fields.product - field_type = constants.FIELD_TYPE_SINGLE_SELECT - hide_on_view = 1 - hide_on_edit = !can_edit_product - append_content = 1 - help = "describecomponents.cgi?product=$filtered_product" - %] - - [% INCLUDE prodcompsearch/form.html.tmpl - id = "pcs" - custom_select = 1 - hidden = 1 - throbber = "product-throbber" - %] - - - - - - [% END %] - - [%# component %] - [% WRAPPER bug_modal/field.html.tmpl - field = bug_fields.component - field_type = constants.FIELD_TYPE_SINGLE_SELECT - help = "describecomponents.cgi?product=$filtered_product&component=$filtered_component#$filtered_component" - edit_only = 1 - editable = 1 - %] - - -
- [% bug.component FILTER html %] -
- - - [% END %] + [% INCLUDE bug_modal/field.html.tmpl + field = bug_fields.product + field_type = constants.FIELD_TYPE_SINGLE_SELECT + hide_on_view = 1 + hide_on_edit = !can_edit_product + append_content = 1 + help = "describecomponents.cgi?product=$filtered_product" %] - [% INCLUDE bug_modal/field.html.tmpl - field = bug_fields.version + [%# component %] + [% WRAPPER bug_modal/field.html.tmpl + field = bug_fields.component field_type = constants.FIELD_TYPE_SINGLE_SELECT - help = "https://wiki.mozilla.org/BMO/UserGuide/BugFields#version" + help = "describecomponents.cgi?product=$filtered_product&component=$filtered_component#$filtered_component" edit_only = 1 editable = 1 - %] + %] + + +
+ [% bug.component FILTER html %] +
+ + [% END %] - [% WRAPPER bug_modal/module.html.tmpl title = "Tracking" %] - [%# keywords %] - [% INCLUDE bug_modal/field.html.tmpl - field = bug_fields.keywords - field_type = constants.FIELD_TYPE_MULTI_SELECT - edit_only = 1 - editable = 1 - help = "describekeywords.cgi" - %] - [% WRAPPER bug_modal/field.html.tmpl - field = bug_fields.status_whiteboard - field_type = constants.FIELD_TYPE_FREETEXT - help = "https://wiki.mozilla.org/BMO/UserGuide/Whiteboard" - edit_only = 1 - editable = 1 - %] - [% bug.status_whiteboard == "" ? "---" : bug.status_whiteboard FILTER html %] - [% END %] + [% INCLUDE bug_modal/field.html.tmpl + field = bug_fields.version + field_type = constants.FIELD_TYPE_SINGLE_SELECT + help = "https://wiki.mozilla.org/BMO/UserGuide/BugFields#version" + edit_only = 1 + editable = 1 + %] + [% END %] + [% WRAPPER bug_modal/module.html.tmpl title = "Tracking" %] + [%# keywords %] + [% INCLUDE bug_modal/field.html.tmpl + field = bug_fields.keywords + field_type = constants.FIELD_TYPE_MULTI_SELECT + edit_only = 1 + editable = 1 + help = "describekeywords.cgi" + %] + + [% WRAPPER bug_modal/field.html.tmpl + field = bug_fields.status_whiteboard + field_type = constants.FIELD_TYPE_FREETEXT + help = "https://wiki.mozilla.org/BMO/UserGuide/Whiteboard" + edit_only = 1 + editable = 1 + %] + [% bug.status_whiteboard == "" ? "---" : bug.status_whiteboard FILTER html %] [% END %] -
-
-
+ [% END %] +
+
- -[% ELSE %] -
- You need to log in - before you can file a [% terms.bug %].
-[% END %] + [% PROCESS global/footer.html.tmpl %] @@ -195,3 +172,23 @@ [% BLOCK fields_rhs %]
[% content FILTER none %]
[% END %] + +[% BLOCK new_comment %] +
+
    + + +
+
+ +
+ +
+[% END %] -- cgit v1.2.3-24-g4f1b