From 57584dc4744fea59833ef355f7513690d246c70f Mon Sep 17 00:00:00 2001 From: David Lawrence Date: Tue, 4 Oct 2011 18:25:23 -0400 Subject: more porting work --- .../en/default/account/auth/login-small.html.tmpl | 4 +- template/en/default/account/auth/login.html.tmpl | 8 +- .../en/default/account/prefs/permissions.html.tmpl | 4 +- .../en/default/admin/params/advanced.html.tmpl | 3 + .../attachment/createformcontents.html.tmpl | 1 + template/en/default/bug/comments.html.tmpl | 53 +++-- .../en/default/bug/create/comment-guided.txt.tmpl | 2 +- .../en/default/bug/create/create-guided.html.tmpl | 48 ++--- template/en/default/bug/create/create.html.tmpl | 52 ++--- template/en/default/bug/edit.html.tmpl | 224 ++++++++++++--------- template/en/default/bug/field.html.tmpl | 24 +++ .../default/bug/process/updates-disabled.html.tmpl | 73 +++++++ template/en/default/bug/show-multiple.html.tmpl | 1 + template/en/default/bug/show.xml.tmpl | 5 +- template/en/default/config.rdf.tmpl | 3 +- template/en/default/email/bugmail.txt.tmpl | 6 + template/en/default/global/header.html.tmpl | 5 +- template/en/default/global/setting-descs.none.tmpl | 1 + template/en/default/global/user-error.html.tmpl | 34 ++++ template/en/default/global/user.html.tmpl | 3 + template/en/default/list/edit-multiple.html.tmpl | 4 +- template/en/default/list/list.html.tmpl | 5 +- template/en/default/list/table.html.tmpl | 30 ++- template/en/default/pages/bugzilla.dtd.tmpl | 179 ++++++++++++++++ template/en/default/pages/fields.html.tmpl | 61 +++--- template/en/default/request/email.txt.tmpl | 3 +- template/en/default/search/field.html.tmpl | 2 +- template/en/default/search/search-google.html.tmpl | 57 ++++++ .../en/default/search/search-specific.html.tmpl | 11 +- template/en/default/search/tabs.html.tmpl | 4 +- 30 files changed, 689 insertions(+), 221 deletions(-) create mode 100644 template/en/default/bug/process/updates-disabled.html.tmpl create mode 100644 template/en/default/pages/bugzilla.dtd.tmpl create mode 100644 template/en/default/search/search-google.html.tmpl (limited to 'template/en') diff --git a/template/en/default/account/auth/login-small.html.tmpl b/template/en/default/account/auth/login-small.html.tmpl index 39984aeaf..14efbc367 100644 --- a/template/en/default/account/auth/login-small.html.tmpl +++ b/template/en/default/account/auth/login-small.html.tmpl @@ -73,8 +73,8 @@ id="log_in[% qs_suffix %]"> + + [% DEFAULT start_at = 0 mode = "show" %] [% sort_order = user.settings.comment_sort_order.value %] @@ -52,6 +83,8 @@ [% END %] [% END %] +[% Hook.process("comment_banner") %] + @@ -65,14 +98,6 @@ [% count = count + increment %] [% END %] -[% IF user.settings.comment_box_position.value == "before_comments" && user.id %] -
- - Add Comment -
-[% END %] - [%# Note: this template is used in multiple places; if you use this hook, # make sure you are aware of this fact. #%] @@ -86,11 +111,6 @@ return false;">Collapse All Comments
  • Expand All Comments
  • - [% IF user.settings.comment_box_position.value == "after_comments" && user.id %] -
  • - Add Comment
  • - [% END %] [% END %] @@ -120,8 +140,12 @@ [% IF mode == "edit" %] + [reply] @@ -148,6 +172,7 @@ [% INCLUDE global/user.html.tmpl who = comment.author %] + [% Hook.process('user', 'bug/comments.html.tmpl') %] diff --git a/template/en/default/bug/create/comment-guided.txt.tmpl b/template/en/default/bug/create/comment-guided.txt.tmpl index df04d8fb5..67748e594 100644 --- a/template/en/default/bug/create/comment-guided.txt.tmpl +++ b/template/en/default/bug/create/comment-guided.txt.tmpl @@ -41,7 +41,7 @@ Steps to Reproduce: [%+ cgi.param("reproduce_steps") %] [% END %] -[% IF cgi.param("actual_results") -%] +[% IF cgi.param("actual_results") %] Actual Results: [%+ cgi.param("actual_results") %] [% END %] diff --git a/template/en/default/bug/create/create-guided.html.tmpl b/template/en/default/bug/create/create-guided.html.tmpl index d10314628..43437bcd7 100644 --- a/template/en/default/bug/create/create-guided.html.tmpl +++ b/template/en/default/bug/create/create-guided.html.tmpl @@ -31,22 +31,12 @@ [% PROCESS global/header.html.tmpl title = "Enter $terms.ABug" onload = "PutDescription()" - style = "#somebugs { width: 100%; height: 500px }" + style_urls = [ "skins/standard/guided.css" ] %] [% style = "" %] -

    - - This is a template used on mozilla.org. This template, and the - comment-guided.txt.tmpl template that formats the data submitted via - the form in this template, are included as a demo of what it's - possible to do with custom templates in general, and custom [% terms.bug %] - entry templates in particular. As much of the text will not apply, - you should alter it - if you want to use this form on your [% terms.Bugzilla %] installation. - -

    +[% INCLUDE 'bug/create/user-message.html.tmpl' %] [% tablecolour = "#FFFFCC" %] @@ -80,15 +70,15 @@ function PutDescription() { [%# Include other products if sensible %] [% IF product.name == "Firefox" %] - [% productstring = "product=Mozilla%20Application%20Suite&product=Firefox" %] + [% productstring = "product=Toolkit&product=Core&product=Firefox" %] [% ELSIF product.name == "Thunderbird" %] - [% productstring = "product=Mozilla%20Application%20Suite&product=Thunderbird" %] + [% productstring = "product=MailNews%20Core&product=Thunderbird" %] [% ELSE %] [% productstring = BLOCK %]product=[% product.name FILTER uri %][% END %] [% END %]

    - All-time Top 100 (loaded initially) | + All-time Top 20 (loaded initially) | Hot in the last two weeks

    @@ -112,14 +102,14 @@ function PutDescription() { [% IF product.name == "Firefox" OR product.name == "Thunderbird" OR - product.name == "Mozilla Application Suite" OR + product.name == "SeaMonkey" OR product.name == "Camino" %] - - [% END %] + + [% END %] @@ -215,7 +205,7 @@ function PutDescription() { [%# We override rep_platform and op_sys for simplicity. The values chosen are based on which are most common in the b.m.o database %] - [% rep_platform = [ "PC", "Macintosh", "All", "Other" ] %] + [% rep_platform = [ "x86", "x86_64", "PowerPC", "All", "Other" ] %]
    - [% IF product.name.match("Firefox|Camino|Mozilla Application Suite") %] + [% IF product.name.match("Firefox|Camino|SeaMonkey") %] [% matches = cgi.user_agent('Gecko/(\d+)') %] [% buildid = cgi.user_agent() IF matches %] [% END %] @@ -257,8 +247,8 @@ function PutDescription() {

    This should identify the exact version of the product you were using. If the above field is blank or you know it is incorrect, copy the - version text from the product's Help | - About menu (for browsers this will begin with "Mozilla/5.0..."). + user agent text from the product's Help | Troubleshooting Information menu + (for browsers this will begin with "Mozilla/5.0..."). If the product won't start, instead paste the complete URL you downloaded it from.

    @@ -275,7 +265,7 @@ function PutDescription() { URL that demonstrates the problem you are seeing (optional).
    IMPORTANT: if the problem is with a broken web page, you need to report it - a different way. + a different way.

    @@ -418,10 +408,7 @@ function PutDescription() { %]

    Add any additional information you feel may be - relevant to this [% terms.bug %], such as the theme you were - using (does the [% terms.bug %] still occur - with the default theme?), a - Talkback crash ID, or special + relevant to this [% terms.bug %], such as special information about your computer's configuration. Any information longer than a few lines, such as a stack trace or HTML testcase, should be added @@ -431,13 +418,12 @@ function PutDescription() { into your URL bar.

    - If you are reporting a crash, note the module in - which the software crashed (e.g., Application Violation in - gkhtml.dll). + If you are reporting a crash, please try and get a stack trace, which tells us exactly where things went wrong.

    - + [% USE Bugzilla %] - + [% FOREACH field = Bugzilla.active_custom_fields %] [% NEXT UNLESS field.enter_bug %] + [% NEXT IF cf_hidden_in_product(field.name, product.name, component.name) %] + [% SET value = ${field.name}.defined ? ${field.name} : "" %] [% INCLUDE bug/field.html.tmpl @@ -574,22 +573,6 @@ TUI_hide_default('attachment_text_field'); - [% IF user.is_insider %] - - - - - [% END %] - [% IF Param("maxattachmentsize") %] @@ -605,10 +588,20 @@ TUI_hide_default('attachment_text_field'); Add an attachment
    @@ -238,7 +228,7 @@ function PutDescription() {
    Severity diff --git a/template/en/default/bug/create/create.html.tmpl b/template/en/default/bug/create/create.html.tmpl index ee19ab5d6..52f4c3cf4 100644 --- a/template/en/default/bug/create/create.html.tmpl +++ b/template/en/default/bug/create/create.html.tmpl @@ -59,12 +59,10 @@ var flags = new Array([% product.components.size %]); comp_desc[[% count %]] = "[% c.description FILTER html_light FILTER js %]"; initialowners[[% count %]] = "[% c.default_assignee.login FILTER js %]"; [% flag_list = [] %] - [% FOREACH f = c.flag_types.bug %] - [% NEXT UNLESS f.is_active %] + [% FOREACH f = c.flag_types(is_active=>1).bug %] [% flag_list.push(f.id) %] [% END %] - [% FOREACH f = c.flag_types.attachment %] - [% NEXT UNLESS f.is_active %] + [% FOREACH f = c.flag_types(is_active=>1).attachment %] [% flag_list.push(f.id) %] [% END %] flags[[% count %]] = [[% flag_list.join(",") FILTER js %]]; @@ -358,18 +356,17 @@ TUI_hide_default('attachment_text_field'); %] - [% IF product.flag_types.bug.size > 0 %] + [% IF product.flag_types(isactive=>1).bug.size > 0 %] [% display_flag_headers = 0 %] [% any_flags_requesteeble = 0 %] - [% FOREACH flag_type = product.flag_types.bug %] - [% NEXT UNLESS flag_type.is_active %] + [% FOREACH flag_type = product.flag_types(is_active=>1).bug %] [% display_flag_headers = 1 %] [% SET any_flags_requesteeble = 1 IF flag_type.is_requestable && flag_type.is_requesteeble %] [% END %] [% IF display_flag_headers %] - [% PROCESS "flag/list.html.tmpl" flag_types = product.flag_types.bug + [% PROCESS "flag/list.html.tmpl" flag_types = product.flag_types(is_active=>1).bug any_flags_requesteeble = any_flags_requesteeble flag_table_id = "bug_flags" %] @@ -488,9 +485,11 @@ TUI_hide_default('attachment_text_field');
      -    - - -
    Attachment:
    [% PROCESS attachment/createformcontents.html.tmpl - flag_types = product.flag_types.attachment + flag_types = product.flag_types(is_active=>1).attachment any_flags_requesteeble = 1 flag_table_id ="attachment_flags" %]
    + + [% IF user.is_insider %] + + + [% END %] @@ -628,6 +621,13 @@ TUI_hide_default('attachment_text_field'); [% END %] + + Status Whiteboard: + + + + [% INCLUDE "bug/field-label.html.tmpl" field = bug_fields.dependson editable = 1 diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl index ab150dd31..b44d7c9b0 100644 --- a/template/en/default/bug/edit.html.tmpl +++ b/template/en/default/bug/edit.html.tmpl @@ -32,21 +32,13 @@