Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 596079: Merge content-types.html.tmpl with createformcontents.html.tmpl

Browse Source 
r=timello a=LpSolit


git-svn-id: svn://10.0.0.236/trunk@261421 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mkanat%bugzilla.org
2010-10-16 14:38:35 +00:00
parent 699ab97fe8
commit a8120af556
3 changed files with 18 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/webtools/bugzilla/.bzrrev
View File

@@ -1 +1 @@
7546
7547

27
mozilla/webtools/bugzilla/template/en/default/attachment/content-types.html.tmpl
View File

@@ -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>

18
mozilla/webtools/bugzilla/template/en/default/attachment/createformcontents.html.tmpl
View File

@@ -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 %]