diff options
| author | Dave Lawrence <dlawrence@mozilla.com> | 2012-01-17 19:06:23 +0100 |
|---|---|---|
| committer | Dave Lawrence <dlawrence@mozilla.com> | 2012-01-17 19:06:23 +0100 |
| commit | bf6d6d8c00c8026825f5134a437e2302d6a6d1be (patch) | |
| tree | b08f70a79ace8c9cdfbe1beefa417bc878bf9202 /template/en/default | |
| parent | 49b2e80891800a6e0badfbf1d27625d38baafa36 (diff) | |
| parent | e4206816f0392538934de85323b9f0616cd5fcd7 (diff) | |
| download | bugzilla-bf6d6d8c00c8026825f5134a437e2302d6a6d1be.tar.gz bugzilla-bf6d6d8c00c8026825f5134a437e2302d6a6d1be.tar.xz | |
merged with bugzilla/4.2
Diffstat (limited to 'template/en/default')
| -rw-r--r-- | template/en/default/attachment/list.html.tmpl | 4 | ||||
| -rw-r--r-- | template/en/default/bug/create/create.html.tmpl | 3 | ||||
| -rw-r--r-- | template/en/default/bug/field.html.tmpl | 4 | ||||
| -rw-r--r-- | template/en/default/filterexceptions.pl | 2 |
4 files changed, 4 insertions, 9 deletions
diff --git a/template/en/default/attachment/list.html.tmpl b/template/en/default/attachment/list.html.tmpl index 4ad5e528a..fa8e4774e 100644 --- a/template/en/default/attachment/list.html.tmpl +++ b/template/en/default/attachment/list.html.tmpl @@ -19,7 +19,7 @@ # Frédéric Buclin <LpSolit@gmail.com> #%] -[% RETURN UNLESS attachments.size || Param("maxattachmentsize") %] +[% RETURN UNLESS attachments.size || Param("maxattachmentsize") || Param("maxlocalattachment") %] <script type="text/javascript"> <!-- @@ -160,7 +160,7 @@ function toggle_display(link) { [% END %] </span> [% END %] - [% IF Param("maxattachmentsize") %] + [% IF Param("maxattachmentsize") || Param("maxlocalattachment") %] <a href="attachment.cgi?bugid=[% bugid %]&action=enter">Add an attachment</a> (proposed patch, testcase, etc.) [% END %] diff --git a/template/en/default/bug/create/create.html.tmpl b/template/en/default/bug/create/create.html.tmpl index 7f2ddc42f..d6911770a 100644 --- a/template/en/default/bug/create/create.html.tmpl +++ b/template/en/default/bug/create/create.html.tmpl @@ -544,8 +544,7 @@ TUI_hide_default('attachment_text_field'); </tr> </tbody> -<tbody> - [% IF Param("maxattachmentsize") %] + [% IF Param("maxattachmentsize") || Param("maxlocalattachment") %] <tr> <th>Attachment:</th> <td colspan="3"> diff --git a/template/en/default/bug/field.html.tmpl b/template/en/default/bug/field.html.tmpl index 582853d0c..29cf82a62 100644 --- a/template/en/default/bug/field.html.tmpl +++ b/template/en/default/bug/field.html.tmpl @@ -33,10 +33,6 @@ # the field value. # no_tds: boolean; if true, don't display the label <th> or the # wrapping <td> for the field. - # desc_url: string; Normally the label of a non-custom field links to - # fields.html. If you want it to link elsewhere, specify the - # relative URL you want to link to, here. Remember to call - # url_quote on any query string arguments. # bug (optional): The current Bugzilla::Bug being displayed, or a hash # with default field values being displayed on a page. #%] diff --git a/template/en/default/filterexceptions.pl b/template/en/default/filterexceptions.pl index b4986e1f7..7a542f427 100644 --- a/template/en/default/filterexceptions.pl +++ b/template/en/default/filterexceptions.pl @@ -34,7 +34,7 @@ # [% foo.push() %] # TT loop variables - [% loop.count %] # Already-filtered stuff - [% wibble FILTER html %] -# where the filter is one of html|csv|js|url_quote|quoteUrls|time|uri|xml|none +# where the filter is one of html|csv|js|quoteUrls|time|uri|xml|none %::safe = ( |