From 9b3041428e1e2d7fb1d7ff02ff8023bf6fe33b0d Mon Sep 17 00:00:00 2001 From: Frédéric Buclin Date: Tue, 26 Jun 2012 20:51:46 +0200 Subject: Bug 768573: Templates must INCLUDE bug/field.html.tmpl instead of PROCESS'ing it r=glob a=LpSolit --- template/en/default/bug/edit.html.tmpl | 2 +- template/en/default/bug/knob.html.tmpl | 4 ++-- template/en/default/bug/show-multiple.html.tmpl | 2 +- template/en/default/list/edit-multiple.html.tmpl | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'template/en') diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl index bdee83806..99f513168 100644 --- a/template/en/default/bug/edit.html.tmpl +++ b/template/en/default/bug/edit.html.tmpl @@ -919,7 +919,7 @@ [% USE Bugzilla %] [% FOREACH field = Bugzilla.active_custom_fields %] - [% PROCESS bug/field.html.tmpl value = bug.${field.name} + [% INCLUDE bug/field.html.tmpl value = bug.${field.name} editable = bug.check_can_change_field(field.name, 0, 1) value_span = 2 %] diff --git a/template/en/default/bug/knob.html.tmpl b/template/en/default/bug/knob.html.tmpl index ac14e6dc0..d79fe524a 100644 --- a/template/en/default/bug/knob.html.tmpl +++ b/template/en/default/bug/knob.html.tmpl @@ -23,7 +23,7 @@ [% PROCESS global/variables.none.tmpl %]
- [% PROCESS bug/field.html.tmpl + [% INCLUDE bug/field.html.tmpl no_tds = 1 field = bug_fields.bug_status value = bug.bug_status @@ -38,7 +38,7 @@ [% END %] - [% PROCESS bug/field.html.tmpl + [% INCLUDE bug/field.html.tmpl no_tds = 1 field = bug_fields.resolution value = bug.resolution diff --git a/template/en/default/bug/show-multiple.html.tmpl b/template/en/default/bug/show-multiple.html.tmpl index 7c2b5345e..9f2734cf0 100644 --- a/template/en/default/bug/show-multiple.html.tmpl +++ b/template/en/default/bug/show-multiple.html.tmpl @@ -195,7 +195,7 @@ [% field_counter = field_counter + 1 %] [%# Odd-numbered fields get an opening %] [% '' IF field_counter % 2 %] - [% PROCESS bug/field.html.tmpl value=bug.${field.name} editable=0 %] + [% INCLUDE bug/field.html.tmpl value=bug.${field.name} editable=0 %] [%# Even-numbered fields get a closing %] [% '' IF !(field_counter % 2) %] [% IF extra_field_item %] diff --git a/template/en/default/list/edit-multiple.html.tmpl b/template/en/default/list/edit-multiple.html.tmpl index 92e578e8f..a0adaea63 100644 --- a/template/en/default/list/edit-multiple.html.tmpl +++ b/template/en/default/list/edit-multiple.html.tmpl @@ -150,7 +150,7 @@ value="[% dontchange FILTER html %]" size="6"> - [% PROCESS bug/field.html.tmpl + [% INCLUDE bug/field.html.tmpl field = bug_fields.deadline, value = dontchange editable = 1, allow_dont_change = 1 %] @@ -285,7 +285,7 @@ [% bug = 0 %] [% FOREACH field = Bugzilla.active_custom_fields %] - [% PROCESS bug/field.html.tmpl value = dontchange + [% INCLUDE bug/field.html.tmpl value = dontchange editable = 1 allow_dont_change = 1 %] -- cgit v1.2.3-24-g4f1b From 97f5441ef1655b84f2db39a6eac10b0fb39c8c17 Mon Sep 17 00:00:00 2001 From: Simon Green Date: Fri, 29 Jun 2012 12:50:32 +0800 Subject: Bug 762783: Change dependent bugs to use POST when the url exceeds the url length limit r=glob, a=LpSolit --- template/en/default/bug/dependency-tree.html.tmpl | 26 ++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-) (limited to 'template/en') diff --git a/template/en/default/bug/dependency-tree.html.tmpl b/template/en/default/bug/dependency-tree.html.tmpl index 10279f9b2..17f00803f 100644 --- a/template/en/default/bug/dependency-tree.html.tmpl +++ b/template/en/default/bug/dependency-tree.html.tmpl @@ -81,11 +81,27 @@ [% END %] [% IF ids.size %] - ([% IF maxdepth -%]Up to [% maxdepth %] level[% "s" IF maxdepth > 1 %] deep | [% END -%] - view as [% terms.bug %] list - [% IF user.in_group('editbugs') && ids.size > 1 %] - | change several - [% END %]) + [%# 27 chars is the length of buglist.cgi?tweak=&bug_id=" %] + [% use_post = (ids.join(",").length > constants.CGI_URI_LIMIT - 27 ) ? 1 : 0 %] + [% IF use_post %] +
+ + [% END %] + + [% IF maxdepth -%]Up to [% maxdepth %] level[% "s" IF maxdepth > 1 %] deep | [% END -%] + [% IF use_post %] + + [% IF user.in_group('editbugs') && ids.size > 1 %] + | + [% END %] +
+ [% ELSE %] + view as [% terms.bug %] list + [% IF user.in_group('editbugs') && ids.size > 1 %] + | change several + [% END %] + [% END %] +
    [% INCLUDE display_tree tree=$tree_name %]
-- cgit v1.2.3-24-g4f1b From f7b9d8a20032ed7e2b5a0fc3e135c3f36954f93d Mon Sep 17 00:00:00 2001 From: Matt Selsky Date: Mon, 2 Jul 2012 01:44:23 +0200 Subject: Bug 553553 - We shouldn't be using terms.Bugzilla in the "please contribute" message. r=Wurblzap, a=LpSolit --- template/en/default/admin/params/editparams.html.tmpl | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'template/en') diff --git a/template/en/default/admin/params/editparams.html.tmpl b/template/en/default/admin/params/editparams.html.tmpl index fd38d65f0..14fba5866 100644 --- a/template/en/default/admin/params/editparams.html.tmpl +++ b/template/en/default/admin/params/editparams.html.tmpl @@ -93,11 +93,12 @@ [% ELSE %]
Note: - [%+ terms.Bugzilla %] is developed entirely by volunteers. The - best way to give back to the [% terms.Bugzilla %] project is - to contribute - yourself! You don't have to be a programmer to contribute, there are - lots of things that we need. + B[% %]ugzilla is developed entirely by volunteers. + The best way to give back to the B[% %]ugzilla project is to + contribute + yourself! + You don't have to be a programmer to contribute, there are lots of + things that we need.

-- cgit v1.2.3-24-g4f1b From c1a71191995c59f93f4e11906fcec41602e40178 Mon Sep 17 00:00:00 2001 From: Frédéric Buclin Date: Thu, 26 Jul 2012 03:31:07 +0200 Subject: Backout bug 768573 to fix bustage --- template/en/default/bug/edit.html.tmpl | 2 +- template/en/default/bug/knob.html.tmpl | 4 ++-- template/en/default/bug/show-multiple.html.tmpl | 2 +- template/en/default/list/edit-multiple.html.tmpl | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'template/en') diff --git a/template/en/default/bug/edit.html.tmpl b/template/en/default/bug/edit.html.tmpl index 99f513168..bdee83806 100644 --- a/template/en/default/bug/edit.html.tmpl +++ b/template/en/default/bug/edit.html.tmpl @@ -919,7 +919,7 @@ [% USE Bugzilla %] [% FOREACH field = Bugzilla.active_custom_fields %] - [% INCLUDE bug/field.html.tmpl value = bug.${field.name} + [% PROCESS bug/field.html.tmpl value = bug.${field.name} editable = bug.check_can_change_field(field.name, 0, 1) value_span = 2 %] diff --git a/template/en/default/bug/knob.html.tmpl b/template/en/default/bug/knob.html.tmpl index d79fe524a..ac14e6dc0 100644 --- a/template/en/default/bug/knob.html.tmpl +++ b/template/en/default/bug/knob.html.tmpl @@ -23,7 +23,7 @@ [% PROCESS global/variables.none.tmpl %]

- [% INCLUDE bug/field.html.tmpl + [% PROCESS bug/field.html.tmpl no_tds = 1 field = bug_fields.bug_status value = bug.bug_status @@ -38,7 +38,7 @@ [% END %] - [% INCLUDE bug/field.html.tmpl + [% PROCESS bug/field.html.tmpl no_tds = 1 field = bug_fields.resolution value = bug.resolution diff --git a/template/en/default/bug/show-multiple.html.tmpl b/template/en/default/bug/show-multiple.html.tmpl index 9f2734cf0..7c2b5345e 100644 --- a/template/en/default/bug/show-multiple.html.tmpl +++ b/template/en/default/bug/show-multiple.html.tmpl @@ -195,7 +195,7 @@ [% field_counter = field_counter + 1 %] [%# Odd-numbered fields get an opening %] [% '' IF field_counter % 2 %] - [% INCLUDE bug/field.html.tmpl value=bug.${field.name} editable=0 %] + [% PROCESS bug/field.html.tmpl value=bug.${field.name} editable=0 %] [%# Even-numbered fields get a closing %] [% '' IF !(field_counter % 2) %] [% IF extra_field_item %] diff --git a/template/en/default/list/edit-multiple.html.tmpl b/template/en/default/list/edit-multiple.html.tmpl index a0adaea63..92e578e8f 100644 --- a/template/en/default/list/edit-multiple.html.tmpl +++ b/template/en/default/list/edit-multiple.html.tmpl @@ -150,7 +150,7 @@ value="[% dontchange FILTER html %]" size="6"> - [% INCLUDE bug/field.html.tmpl + [% PROCESS bug/field.html.tmpl field = bug_fields.deadline, value = dontchange editable = 1, allow_dont_change = 1 %] @@ -285,7 +285,7 @@ [% bug = 0 %] [% FOREACH field = Bugzilla.active_custom_fields %] - [% INCLUDE bug/field.html.tmpl value = dontchange + [% PROCESS bug/field.html.tmpl value = dontchange editable = 1 allow_dont_change = 1 %] -- cgit v1.2.3-24-g4f1b