Bug 6458: Incorrect translation processing / cataloguing/...

Patch removes template directives from within HTML tags from
  - cataloging > new record
  - cataloging
  - UNIMARC plugin for 4XX

There is one problem remaining in addbiblio:

<option value="[% frameworkcodeloo.value %]" [% frameworkcodeloo.selected %]>
    [% frameworkcodeloo.frameworktext %]
</option>

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
index 37e6212..a69a1f4 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
@@ -858,6 +858,8 @@ function unHideSubfield(index,labelindex) { // FIXME :: is it used ?
             
                 [% UNLESS advancedMARCEditor %]
                     <label for="tag_[% subfield_loo.tag %]_subfield_[% subfield_loo.subfield %]_[% subfield_loo.index %]_[% subfield_loo.index_subfield %]" [% IF ( subfield_loo.fixedfield ) %] style="display:none;" [% END %] class="labelsubfield">
+                    [% IF ( subfield_loo.fixedfield ) %]<label for="tag_[% subfield_loo.tag %]_subfield_[% subfield_loo.subfield %]_[% subfield_loo.index %]_[% subfield_loo.index_subfield %]" style="display:none;" class="labelsubfield">
+                    [% ELSE %]<label for="tag_[% subfield_loo.tag %]_subfield_[% subfield_loo.subfield %]_[% subfield_loo.index %]_[% subfield_loo.index_subfield %]" class="labelsubfield">[% END %]
                 [% END %] 
                 
                 [% UNLESS hide_marc %]

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt
index 750498e..a57da61 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt
@@ -142,7 +142,8 @@
                 <td> <a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.id %]" title="MARC" rel="gb_page_center[600,500]">MARC</a> | <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;importid=[% breeding_loo.id %]" title="MARC" rel="gb_page_center[600,500]">Card</a>
                                </td>
                 <td>
-                       <a href="/cgi-bin/koha/cataloguing/addbiblio.pl?breedingid=[% breeding_loo.id %]" [% UNLESS ( CAN_user_editcatalogue_edit_catalogue ) %] class="disabled" onclick="return false;"[% END %]>Add biblio</a>
+                    [% UNLESS ( CAN_user_editcatalogue_edit_catalogue ) %]<a href="/cgi-bin/koha/cataloguing/addbiblio.pl?breedingid=[% breeding_loo.id %]" class="disabled" onclick="return false;">Add biblio</a>
+                    [% ELSE %]<a href="/cgi-bin/koha/cataloguing/addbiblio.pl?breedingid=[% breeding_loo.id %]">Add biblio</a>[% END %]
                 </td>
             </tr>
             [% END %]

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_4XX.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_4XX.tt
index a04e75c..00296dd 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_4XX.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_4XX.tt
@@ -164,7 +164,8 @@
                                [% FOREACH resul IN result %]
                                [% IF ( resul.title ) %]
                                <tr>
-                                    <td[% IF ( resul.even ) %] class="hilighted"[% END %]>
+                                    [% IF ( resul.even ) %]<td class="hilighted">
+                                    [% ELSE %]<td>[% END %]
                                                             [% IF ( resul.MARC_ON ) %]
                                                                     <a_class="transparent resultlist" href="/cgi-bin/koha/MARCdetail.pl?biblionumber=[% resul.biblionumber |url %]">[% resul.title |html %]</a>
                                                             [% ELSE %]
@@ -177,10 +178,12 @@
                                                     [% IF ( resul.size ) %] ; [% resul.size %][% END %]
                                             </p>
                                        </td>
-                                       <td align="center" [% IF ( resul.even ) %] class="hilighted"[% END %]>
+                    [% IF ( resul.even ) %]<td align="center" class="hilighted">
+                    [% ELSE %]<td align="center">[% END %]
                                                [% resul.totitem %]
                                        </td>
-                                       <td [% IF ( resul.even ) %]class="hilighted"[% END %]>
+                    [% IF ( resul.even ) %]<td class="hilighted">
+                    [% ELSE %]<td>[% END %]
                                                [% resul.CN %]
                                        </td>
                                        <td>