diff options
| author | jocuri%softhome.net <> | 2004-10-07 14:12:39 +0000 |
|---|---|---|
| committer | jocuri%softhome.net <> | 2004-10-07 14:12:39 +0000 |
| commit | 1f6ed9be7b15842f750a989a909f2ec64d0fb2ad (patch) | |
| tree | 40dc124b1ade5d6dfbe14a5c21abbc837938b5b6 /template | |
| parent | 74d1dd74e77dd4c64a5d8609852da54e5a3b9803 (diff) | |
| download | bugs-1f6ed9be7b15842f750a989a909f2ec64d0fb2ad.tar bugs-1f6ed9be7b15842f750a989a909f2ec64d0fb2ad.tar.gz bugs-1f6ed9be7b15842f750a989a909f2ec64d0fb2ad.tar.bz2 bugs-1f6ed9be7b15842f750a989a909f2ec64d0fb2ad.tar.xz bugs-1f6ed9be7b15842f750a989a909f2ec64d0fb2ad.zip | |
Patch for bug 256567: Harmonize descriptions of classifications and products in terms of 'FILTER html'; patch by Marc Schumann <wurblzap@gmail.com>; r=justdave, kiko, a=justdave.
Diffstat (limited to 'template')
6 files changed, 25 insertions, 5 deletions
diff --git a/template/en/default/admin/classifications/del.html.tmpl b/template/en/default/admin/classifications/del.html.tmpl index 008971562..1430e093d 100644 --- a/template/en/default/admin/classifications/del.html.tmpl +++ b/template/en/default/admin/classifications/del.html.tmpl @@ -36,7 +36,7 @@ <td valign="top">Description:</td> <td valign="top"> [% IF description %] - [% description FILTER html %] + [% description %] [% ELSE %] <font color="red">description missing</font> [% END %] diff --git a/template/en/default/admin/classifications/edit.html.tmpl b/template/en/default/admin/classifications/edit.html.tmpl index ebc16e82e..6c58836d7 100644 --- a/template/en/default/admin/classifications/edit.html.tmpl +++ b/template/en/default/admin/classifications/edit.html.tmpl @@ -31,7 +31,7 @@ </tr> <tr> <th align="right">Description:</th> - <td><textarea rows=4 cols=64 name="description">[% description FILTER html %]</textarea></TD> + <td><textarea rows=4 cols=64 name="description">[% description %]</textarea></TD> </tr> <tr valign=top> <th align="right"><a href="editproducts.cgi?classification=[% classification FILTER html %]">Edit products</a></th> diff --git a/template/en/default/admin/classifications/reclassify.html.tmpl b/template/en/default/admin/classifications/reclassify.html.tmpl index d860f67cf..5d4cb73e4 100644 --- a/template/en/default/admin/classifications/reclassify.html.tmpl +++ b/template/en/default/admin/classifications/reclassify.html.tmpl @@ -35,7 +35,7 @@ <td valign="top">Description:</td> <td valign="top" colspan=3> [% IF description %] - [% description FILTER html %] + [% description %] [% ELSE %] <font color="red">description missing</font> [% END %] diff --git a/template/en/default/admin/classifications/select.html.tmpl b/template/en/default/admin/classifications/select.html.tmpl index 5908375d2..0c0d3d392 100644 --- a/template/en/default/admin/classifications/select.html.tmpl +++ b/template/en/default/admin/classifications/select.html.tmpl @@ -38,7 +38,7 @@ <td valign="top"><a href="editclassifications.cgi?action=edit&classification=[% cl.classification FILTER html %]"><b>[% cl.classification FILTER html %]</b></a></td> <td valign="top"> [% IF cl.description %] - [% cl.description FILTER html %] + [% cl.description %] [% ELSE %] <font color="red">none</font> [% END %] diff --git a/template/en/default/filterexceptions.pl b/template/en/default/filterexceptions.pl index 7f8ea18a7..f0267a606 100644 --- a/template/en/default/filterexceptions.pl +++ b/template/en/default/filterexceptions.pl @@ -252,6 +252,10 @@ 'VERSION', ], +'global/choose-classification.html.tmpl' => [ + 'classdesc.$p', +], + 'global/choose-product.html.tmpl' => [ 'target', 'proddesc.$p', @@ -495,6 +499,22 @@ 'c.content' ], +'admin/classifications/del.html.tmpl' => [ + 'description', +], + +'admin/classifications/edit.html.tmpl' => [ + 'description', +], + +'admin/classifications/reclassify.html.tmpl' => [ + 'description', +], + +'admin/classifications/select.html.tmpl' => [ + 'cl.description', +], + 'admin/products/groupcontrol/confirm-edit.html.tmpl' => [ 'group.count', ], diff --git a/template/en/default/global/choose-classification.html.tmpl b/template/en/default/global/choose-classification.html.tmpl index b7b8fb66e..1d52b3686 100644 --- a/template/en/default/global/choose-classification.html.tmpl +++ b/template/en/default/global/choose-classification.html.tmpl @@ -54,7 +54,7 @@ </th> [% IF classdesc.$p %] - <td valign="top"> [% classdesc.$p FILTER html %]</td> + <td valign="top"> [% classdesc.$p %]</td> [% END %] </tr> [% END %] |