From de313c7a491d415403698afc7d561143aa0b3a4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20Buclin?= Date: Wed, 8 Jan 2014 20:35:30 +0100 Subject: Bug 546838: Upgrade Bugzilla to HTML5 r/a=justdave --- .../en/default/attachment/diff-header.html.tmpl | 21 +++++++++++---------- template/en/default/global/header.html.tmpl | 3 +-- template/en/default/list/list-simple.html.tmpl | 3 +-- template/en/default/list/server-push.html.tmpl | 1 + .../en/default/reports/duplicates-simple.html.tmpl | 3 +-- template/en/default/reports/report-simple.html.tmpl | 7 ++----- template/en/default/rest.html.tmpl | 4 ++-- template/en/default/setup/strings.txt.pl | 3 +-- template/en/default/whine/mail.html.tmpl | 2 +- 9 files changed, 21 insertions(+), 26 deletions(-) diff --git a/template/en/default/attachment/diff-header.html.tmpl b/template/en/default/attachment/diff-header.html.tmpl index 9e5cd4466..63fe7345e 100644 --- a/template/en/default/attachment/diff-header.html.tmpl +++ b/template/en/default/attachment/diff-header.html.tmpl @@ -41,18 +41,19 @@ Interdiff of #[% oldid %] and #[% newid %] for [% terms.bug %] #[% bugid %] javascript_urls = "js/attachment.js" style_urls = ['skins/standard/attachment.css'] %] [% ELSE %] + - - - - - - + + + + + + [% END %] - + [%# If we have attachid, we are in diff, otherwise we're in interdiff %] [% IF attachid %] [%# HEADER %] diff --git a/template/en/default/global/header.html.tmpl b/template/en/default/global/header.html.tmpl index ea00eeef5..7d39ab909 100644 --- a/template/en/default/global/header.html.tmpl +++ b/template/en/default/global/header.html.tmpl @@ -75,8 +75,7 @@ # set header's default value here only if it is undefined. %] [% IF !header.defined %][% header = title %][% END %] - + [% Hook.process("start") %] diff --git a/template/en/default/list/list-simple.html.tmpl b/template/en/default/list/list-simple.html.tmpl index 24e2bcf5a..01f784d59 100644 --- a/template/en/default/list/list-simple.html.tmpl +++ b/template/en/default/list/list-simple.html.tmpl @@ -12,8 +12,8 @@ [% DEFAULT title = "$terms.Bug List" %] + - [% title FILTER html %] @@ -28,5 +28,4 @@ [% PROCESS list/table.html.tmpl %] [% END %] - diff --git a/template/en/default/list/server-push.html.tmpl b/template/en/default/list/server-push.html.tmpl index f19d6cbe0..f666d9c8c 100644 --- a/template/en/default/list/server-push.html.tmpl +++ b/template/en/default/list/server-push.html.tmpl @@ -11,6 +11,7 @@ # query: string. The SQL query which makes the buglist. #%] + [% terms.Bugzilla %] is pondering your search diff --git a/template/en/default/reports/duplicates-simple.html.tmpl b/template/en/default/reports/duplicates-simple.html.tmpl index 6f586546a..95185c414 100644 --- a/template/en/default/reports/duplicates-simple.html.tmpl +++ b/template/en/default/reports/duplicates-simple.html.tmpl @@ -10,8 +10,7 @@ # You need to fulfill the interface to duplicates-table.html.tmpl. #%] - + [% IF product.size %] [% title = BLOCK %] diff --git a/template/en/default/reports/report-simple.html.tmpl b/template/en/default/reports/report-simple.html.tmpl index 17b87c6a6..9be2f0113 100644 --- a/template/en/default/reports/report-simple.html.tmpl +++ b/template/en/default/reports/report-simple.html.tmpl @@ -10,16 +10,13 @@ # You need to fulfill the interface to report-table.html.tmpl. #%] + - - [% title = "$terms.Bug List" %] - - [% title FILTER html %] + [% "$terms.Bug List" FILTER html %] [% PROCESS "reports/report-table.html.tmpl" %] - diff --git a/template/en/default/rest.html.tmpl b/template/en/default/rest.html.tmpl index 0b8321dd1..2afd50a40 100644 --- a/template/en/default/rest.html.tmpl +++ b/template/en/default/rest.html.tmpl @@ -5,8 +5,8 @@ # This Source Code Form is "Incompatible With Secondary Licenses", as # defined by the Mozilla Public License, v. 2.0. #%] - + + Bugzilla::REST::API diff --git a/template/en/default/setup/strings.txt.pl b/template/en/default/setup/strings.txt.pl index a7d687fe0..7ac013feb 100644 --- a/template/en/default/setup/strings.txt.pl +++ b/template/en/default/setup/strings.txt.pl @@ -360,8 +360,7 @@ WARNING: We are about to convert your table storage format to UTF-8. This recommend that you stop checksetup.pl NOW and run contrib/recode.pl. END no_checksetup_from_cgi => < + checksetup.pl cannot run from a web browser diff --git a/template/en/default/whine/mail.html.tmpl b/template/en/default/whine/mail.html.tmpl index 3a2fc65a6..ed030237d 100644 --- a/template/en/default/whine/mail.html.tmpl +++ b/template/en/default/whine/mail.html.tmpl @@ -18,7 +18,7 @@ # recipient: user object for the intended recipient of the message #%] - + -- cgit v1.2.1