diff --git a/mozilla/webtools/bugzilla/Bugzilla/Template.pm b/mozilla/webtools/bugzilla/Bugzilla/Template.pm index b4e0dcb903d..800536cd513 100644 --- a/mozilla/webtools/bugzilla/Bugzilla/Template.pm +++ b/mozilla/webtools/bugzilla/Bugzilla/Template.pm @@ -35,6 +35,7 @@ package Bugzilla::Template; use strict; use Bugzilla::Constants; +use Bugzilla::Install::Requirements; use Bugzilla::Util; use Bugzilla::User; use Bugzilla::Error; @@ -57,7 +58,6 @@ use base qw(Template); # (which is how Perl implements constants) and ignoring the rest (which, if # Constants.pm exports only constants, as it should, will be nothing else). sub _load_constants { - use Bugzilla::Constants (); my %constants; foreach my $constant (@Bugzilla::Constants::EXPORT, @Bugzilla::Constants::EXPORT_OK) @@ -820,6 +820,16 @@ sub create { Bugzilla::BugMail::Send($id, $mailrecipients); }, + # These don't work as normal constants. + DB_MODULE => \&Bugzilla::Constants::DB_MODULE, + REQUIRED_MODULES => + \&Bugzilla::Install::Requirements::REQUIRED_MODULES, + OPTIONAL_MODULES => sub { + my @optional = @{OPTIONAL_MODULES()}; + @optional = sort {$a->{feature} cmp $b->{feature}} + @optional; + return \@optional; + }, }, }) || die("Template creation failed: " . $class->error()); diff --git a/mozilla/webtools/bugzilla/docs/rel_notes.txt b/mozilla/webtools/bugzilla/docs/rel_notes.txt index 35b36d0f813..64212a29262 100644 --- a/mozilla/webtools/bugzilla/docs/rel_notes.txt +++ b/mozilla/webtools/bugzilla/docs/rel_notes.txt @@ -1,3 +1,11 @@ +Release Notes for Bugzilla version 3.0 and higher are available in HTML +format, either on the bugzilla.org website, or in your current installation, +linked from the index page. + +bugzilla.org links for release notes +------------------------------------ +3.0: http://www.bugzilla.org/releases/3.0/release-notes.html + *************************************** *** The Bugzilla 2.22 Release Notes *** *************************************** diff --git a/mozilla/webtools/bugzilla/skins/standard/release-notes.css b/mozilla/webtools/bugzilla/skins/standard/release-notes.css new file mode 100644 index 00000000000..51159ae20fe --- /dev/null +++ b/mozilla/webtools/bugzilla/skins/standard/release-notes.css @@ -0,0 +1,35 @@ +/* The contents of this file are subject to the Mozilla Public + * License Version 1.1 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS + * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or + * implied. See the License for the specific language governing + * rights and limitations under the License. + * + * The Initial Developer of the Original Code is Everything Solved. + * Portions created by Everything Solved are Copyright (C) 2006 + * Everything Solved. All Rights Reserved. + * + * The Original Code is the Bugzilla Bug Tracking System. + * + * Contributor(s): Max Kanat-Alexander + */ + +#bugzilla-body { + padding: 0 1em; +} + +.req_new { + color: red; +} + +.req_table { + border-collapse: collapse; +} + +.req_table td, .req_table th { + border: 1px solid black; + padding: .25em; +} diff --git a/mozilla/webtools/bugzilla/t/009bugwords.t b/mozilla/webtools/bugzilla/t/009bugwords.t index 5b1a9d6ba87..bf3d91f26fa 100644 --- a/mozilla/webtools/bugzilla/t/009bugwords.t +++ b/mozilla/webtools/bugzilla/t/009bugwords.t @@ -77,9 +77,9 @@ foreach my $file (@testitems) { } # "Bugzilla" - if (grep /(?|USE |= )Bugzilla/, $text) { + if (grep /(?|USE |= )Bugzilla/, $text) { push(@errors, [$lineno, $text]); next; } diff --git a/mozilla/webtools/bugzilla/template/en/default/index.html.tmpl b/mozilla/webtools/bugzilla/template/en/default/index.html.tmpl index 9c3a88b2f65..a96f2b15eb9 100644 --- a/mozilla/webtools/bugzilla/template/en/default/index.html.tmpl +++ b/mozilla/webtools/bugzilla/template/en/default/index.html.tmpl @@ -95,9 +95,15 @@ function addSidebar() {
-

This is where we put in lots of nifty words explaining all about [% terms.Bugzilla %].

+

Welcome to [% terms.Bugzilla %]. To see what's new in this version + of [% terms.Bugzilla %], see the + release notes! + You may also want to read the + + [%- terms.Bugzilla %] User's Guide to find out more about + [%+ terms.Bugzilla %] and how to use it.

-

But it all boils down to a choice of:

+

Most common actions: