summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrédéric Buclin <LpSolit@gmail.com>2010-10-16 16:22:03 +0200
committerFrédéric Buclin <LpSolit@gmail.com>2010-10-16 16:22:03 +0200
commit7c03516e0ed331a98e7a9a8984d7b7abec0e9318 (patch)
treeb760b4f58858baffe4d9c3f8392ccb42d1c2dfc2
parent4754b82f103754876d80a805c9cd0deeebb69f24 (diff)
downloadbugzilla-7c03516e0ed331a98e7a9a8984d7b7abec0e9318.tar.gz
bugzilla-7c03516e0ed331a98e7a9a8984d7b7abec0e9318.tar.xz
Bug 596079: Merge content-types.html.tmpl with createformcontents.html.tmpl
r=timello a=LpSolit
-rw-r--r--template/en/default/attachment/content-types.html.tmpl27
-rw-r--r--template/en/default/attachment/createformcontents.html.tmpl18
2 files changed, 17 insertions, 28 deletions
diff --git a/template/en/default/attachment/content-types.html.tmpl b/template/en/default/attachment/content-types.html.tmpl
deleted file mode 100644
index 471222ac4..000000000
--- a/template/en/default/attachment/content-types.html.tmpl
+++ /dev/null
@@ -1,27 +0,0 @@
-[%# 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 Original Code is the Bugzilla Bug Tracking System.
- #
- # The Initial Developer of the Original Code is Netscape Communications
- # Corporation. Portions created by Netscape are
- # Copyright (C) 1998 Netscape Communications Corporation. All
- # Rights Reserved.
- #
- # Contributor(s): Myk Melez <myk@mozilla.org>
- #%]
-
- <option value="text/plain">plain text (text/plain)</option>
- <option value="text/html">HTML source (text/html)</option>
- <option value="application/xml">XML source (application/xml)</option>
- <option value="image/gif">GIF image (image/gif)</option>
- <option value="image/jpeg">JPEG image (image/jpeg)</option>
- <option value="image/png">PNG image (image/png)</option>
- <option value="application/octet-stream">binary file (application/octet-stream)</option>
diff --git a/template/en/default/attachment/createformcontents.html.tmpl b/template/en/default/attachment/createformcontents.html.tmpl
index 9d2fa9f48..42169796e 100644
--- a/template/en/default/attachment/createformcontents.html.tmpl
+++ b/template/en/default/attachment/createformcontents.html.tmpl
@@ -72,7 +72,7 @@
<label for="list">select from list</label>:
<select name="contenttypeselection" id="contenttypeselection"
onchange="this.form.contenttypemethod[1].checked = true;">
- [% PROCESS "attachment/content-types.html.tmpl" %]
+ [% PROCESS content_types %]
</select><br>
<input type="radio" id="manual"
name="contenttypemethod" value="manual">
@@ -90,3 +90,19 @@
[% END %]
</td>
</tr>
+
+[% BLOCK content_types %]
+ [% mimetypes = [{type => "text/plain", desc => "plain text"},
+ {type => "text/html", desc => "HTML source"},
+ {type => "application/xml", desc => "XML source"},
+ {type => "image/gif", desc => "GIF image"},
+ {type => "image/jpeg", desc => "JPEG image"},
+ {type => "image/png", desc => "PNG image"},
+ {type => "application/octet-stream", desc => "binary file"}]
+ %]
+ [% Hook.process("mimetypes", "attachment/createformcontents.html.tmpl") %]
+
+ [% FOREACH m = mimetypes %]
+ <option value="[% m.type FILTER html %]">[% m.desc FILTER html %] ([% m.type FILTER html %])</option>
+ [% END %]
+[% END %]