Merge branch 'custom'

This is a slightly strange merge commit.

This merges two separate branches which were used on our live
bugzilla in two different ways.

The first ('master' here) was web/templates/bugzilla/extensions/Mageia/
in SVN. This was an 'Extension' for Bugzilla which applied our basic
theme (i.e. the look and feel).

The second ('custom' here) was web/templates/bugzilla/trunk/ in SVN and
actually made changes such as using the Guided form by default and
changing the email template and such like.

When converting to git, only the Extension was initially migrated, but
upon deployment it was realised that the 'custom' folder was also still
needed and it was checked out directly from subversion.

Back then I didn't have the time to consolidate this into one single
repo, so this merge commit is my attempt at doing that now.

The subversion was imported and a tree-filter applied to correct up the
path. Hopefully everything works as expected!

1 files changed, 36 insertions, 0 deletions

diff --git a/template/en/default/email/bugmail-header.txt.tmpl b/template/en/default/email/bugmail-header.txt.tmpl
new file mode 100644
index 0000000..cdda89a
--- /dev/null
+++ b/template/en/default/email/bugmail-header.txt.tmpl
@@ -0,0 +1,36 @@
+[%# This Source Code Form is subject to the terms of the Mozilla Public
+  # License, v. 2.0. If a copy of the MPL was not distributed with this
+  # file, You can obtain one at http://mozilla.org/MPL/2.0/.
+  #
+  # This Source Code Form is "Incompatible With Secondary Licenses", as
+  # defined by the Mozilla Public License, v. 2.0.
+  #%]
+  
+[% PROCESS "global/reason-descs.none.tmpl" %]
+[% isnew = bug.lastdiffed ? 0 : 1 %]
+[% show_new = isnew
+              && (to_user.settings.bugmail_new_prefix.value == 'on') %]
+
+From: [% Param('mailfrom') %]
+To: [% to_user.email %]
+Subject: [[% terms.Bug %] [%+ bug.id %]] [% '[New]: ' IF show_new %][%+ bug.short_desc %]
+Date: [% date %]
+X-Bugzilla-Reason: [% reasonsheader %]
+X-Bugzilla-Type: [% isnew ? 'new' : 'changed' %]
+X-Bugzilla-Watch-Reason: [% reasonswatchheader %]
+[% IF Param('useclassification') %]
+X-Bugzilla-Classification: [% bug.classification %]
+[% END %]
+X-Bugzilla-Product: [% bug.product %]
+X-Bugzilla-Component: [% bug.component %]
+X-Bugzilla-Version: [% bug.version %]
+X-Bugzilla-Keywords: [% bug.keywords %]
+X-Bugzilla-Severity: [% bug.bug_severity %]
+X-Bugzilla-Who: [% changer.login %]
+X-Bugzilla-Status: [% bug.bug_status %]
+X-Bugzilla-Priority: [% bug.priority %]
+X-Bugzilla-Assigned-To: [% bug.assigned_to.login %]
+X-Bugzilla-Target-Milestone: [% bug.target_milestone %]
+X-Bugzilla-Flags:[% FOREACH flag = bug.flags %] [%+ flag.name %][% flag.status %][% END %]
+X-Bugzilla-Changed-Fields: [% changedfields.join(" ") %]
+[%+ threadingmarker %]