Attachment 5095 Details for Bug 6458 – Bug 6458: Incorrect translation processing / cataloguing/...

[patch] Bug 6458: Incorrect translation processing / cataloguing/...

Bug-6458-Incorrect-translation-processing--catalog.patch (text/plain), 5.12 KB, created by Katrin Fischer on 2011-08-22 22:14:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2011-08-22 22:14:14 UTC

Size: 5.12 KB

patch

obsolete

>From 4103cdfb0d45ae293f5378972983e9da39bad1cc Mon Sep 17 00:00:00 2001
>From: Katrin Fischer <Katrin.Fischer.83@web.de>
>Date: Tue, 23 Aug 2011 00:06:00 +0200
>Subject: [PATCH] Bug 6458: Incorrect translation processing / cataloguing/...
>Content-Type: text/plain; charset="utf-8"
>
>Patch removes template directives from within HTML tags from
>  - cataloging > new record
>  - cataloging
>  - UNIMARC plugin for 4XX
>
>There is one problem remaining in the UNIMARC plugin:
>
><option value="[% frameworkcodeloo.value %]" [% frameworkcodeloo.selected %]>
>    [% frameworkcodeloo.frameworktext %]
></option>
>---
> .../prog/en/modules/cataloguing/addbiblio.tt       |    3 ++-
> .../prog/en/modules/cataloguing/addbooks.tt        |    3 ++-
> .../cataloguing/value_builder/unimarc_field_4XX.tt |    6 ++++--
> 3 files changed, 8 insertions(+), 4 deletions(-)
>
>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 ffe7d3c..fc1b17b 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
>@@ -856,7 +856,8 @@ function unHideSubfield(index,labelindex) { // FIXME :: is it used ?
>             <div class="subfield_line" style="[% subfield_loo.visibility %]; float: left; clear: left; width: 100%;" id="subfield[% subfield_loo.tag %][% subfield_loo.subfield %][% subfield_loo.random %]">
>             
>                 [% UNLESS ( subfield_loo.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 ( subfield_loo.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 a5e2a96..2d5609d 100644
>--- 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..969b50c 100644
>--- 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,7 +178,8 @@
>                                                     [% 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 %]>
>-- 
>1.7.4.1

Actions: View | Diff | Splinter Review

Attachments on bug 6458: 4695 | 4697 | 4699 | 4729 | 4968 | 5070 | 5071 | 5072 | 5074 | 5078 | 5079 | 5080 | 5081 | 5082 | 5090 | 5091 | 5092 | 5093 | 5094 | 5095 | 5096 | 5121 | 5125 | 5126 | 5127 | 5128 | 5129 | 5130 | 5131 | 5132 | 5133 | 5147 | 5148 | 5149 | 5150 | 5152 | 5153 | 5155 | 5156 | 5157 | 5158 | 5159 | 5160 | 5168 | 5169 | 5170 | 5258 | 5259 | 5260 | 5261 | 5262 | 5263 | 5273 | 5274 | 5286 | 5287 | 5288 | 5289 | 5292 | 5293 | 5299 | 5300 | 5416 | 5417 | 5418 | 5419 | 5420 | 5425 | 5426 | 5427