[Koha-patches] [PATCH] [SIGNED-OFF] Follow-up fix for Bug 5462, Fix variable names so we dont break template::toolkit

Marcel de Rooy M.de.Rooy at rijksmuseum.nl
Mon Feb 14 08:49:07 CET 2011


From: Owen Leonard <oleonard at myacpl.org>

A change was made to MARCdetail.tmpl without making a corresponding
change to MARCdetail.pl. I've reworked the original change so that
both can work together.

0XX --> tab0XX

Apparently TMPL variables can't start with a number now?

MR: Recreated patch file to recover failure to apply.

Signed-off-by: Marcel de Rooy <m.de.rooy at rijksmuseum.nl>
---
 catalogue/MARCdetail.pl                            |    2 +-
 .../prog/en/modules/catalogue/MARCdetail.tmpl      |   44 ++++++++++----------
 2 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/catalogue/MARCdetail.pl b/catalogue/MARCdetail.pl
index 2dc7b1d..d73c5d9 100755
--- a/catalogue/MARCdetail.pl
+++ b/catalogue/MARCdetail.pl
@@ -227,7 +227,7 @@ for ( my $tabloop = 0 ; $tabloop <= 10 ; $tabloop++ ) {
             undef @subfields_data;
         }
     }
-    $template->param( $tabloop . "XX" => \@loop_data );
+    $template->param( "tab" . $tabloop . "XX" => \@loop_data );
 }
 
 # now, build item tab !
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
index 1e9c1a6..f9cc90d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
@@ -45,42 +45,42 @@ function Changefwk(FwkList) {
 
 <div id="bibliotabs" class="toptabs numbered">
 	<ul>
-            <!-- TMPL_IF name="zeroXX" -->
+            <!-- TMPL_IF name="tab0XX" -->
                 <li><a href="/cgi-bin/koha/catalogue/MARCdetail.pl#tab0XX">0</a></li>
             <!-- /TMPL_IF -->
-            <!-- TMPL_IF name="oneXX" -->
+            <!-- TMPL_IF name="tab1XX" -->
                 <li><a href="/cgi-bin/koha/catalogue/MARCdetail.pl#tab1XX">1</a></li>
             <!-- /TMPL_IF -->
-            <!-- TMPL_IF name="twoXX" -->
+            <!-- TMPL_IF name="tab2XX" -->
                 <li><a href="/cgi-bin/koha/catalogue/MARCdetail.pl#tab2XX">2</a></li>
             <!-- /TMPL_IF -->
-            <!-- TMPL_IF name="threeXX" -->
+            <!-- TMPL_IF name="tab3XX" -->
                 <li><a href="/cgi-bin/koha/catalogue/MARCdetail.pl#tab3XX">3</a></li>
             <!-- /TMPL_IF -->
-            <!-- TMPL_IF name="fourXX" -->
+            <!-- TMPL_IF name="tab4XX" -->
                 <li><a href="/cgi-bin/koha/catalogue/MARCdetail.pl#tab4XX">4</a></li>
             <!-- /TMPL_IF -->
-            <!-- TMPL_IF name="fiveXX" -->
+            <!-- TMPL_IF name="tab5XX" -->
                 <li><a href="/cgi-bin/koha/catalogue/MARCdetail.pl#tab5XX">5</a></li>
             <!-- /TMPL_IF -->
-            <!-- TMPL_IF name="sixXX" -->
+            <!-- TMPL_IF name="tab6XX" -->
                 <li><a href="/cgi-bin/koha/catalogue/MARCdetail.pl#tab6XX">6</a></li>
             <!-- /TMPL_IF -->
-            <!-- TMPL_IF name="sevenXX" -->
+            <!-- TMPL_IF name="tab7XX" -->
                 <li><a href="/cgi-bin/koha/catalogue/MARCdetail.pl#tab7XX">7</a></li>
             <!-- /TMPL_IF -->
-            <!-- TMPL_IF name="eightXX" -->
+            <!-- TMPL_IF name="tab8XX" -->
                 <li><a href="/cgi-bin/koha/catalogue/MARCdetail.pl#tab8XX">8</a></li>
             <!-- /TMPL_IF -->
-            <!-- TMPL_IF name="nineXX" -->
+            <!-- TMPL_IF name="tab9XX" -->
                 <li><a href="/cgi-bin/koha/catalogue/MARCdetail.pl#tab9XX">9</a></li>
             <!-- /TMPL_IF -->
-            <!-- TMPL_IF name="tenXX" -->
+            <!-- TMPL_IF name="tab10XX" -->
                 <li><a href="/cgi-bin/koha/catalogue/MARCdetail.pl#tab10XX">Item(s)</a></li>
             <!-- /TMPL_IF -->
         </ul>
     <div id="tab0XX">
-        <!-- TMPL_LOOP NAME="zeroXX" -->
+        <!-- TMPL_LOOP NAME="tab0XX" -->
             <!-- TMPL_IF name="tag" -->
                 <div class="tag">
                 <div class="tag_title">
@@ -110,7 +110,7 @@ function Changefwk(FwkList) {
     </div>
 
     <div id="tab1XX">
-        <!-- TMPL_LOOP NAME="oneXX" -->
+        <!-- TMPL_LOOP NAME="tab1XX" -->
                 <!-- TMPL_IF name="tag" -->
                     <div class="tag">
                     <div class="tag_title">
@@ -140,7 +140,7 @@ function Changefwk(FwkList) {
     </div>
 
     <div id="tab2XX">
-        <!-- TMPL_LOOP NAME="twoXX" -->
+        <!-- TMPL_LOOP NAME="tab2XX" -->
                 <!-- TMPL_IF name="tag" -->
                     <div class="tag">
                     <div class="tag_title">
@@ -170,7 +170,7 @@ function Changefwk(FwkList) {
     </div>
 
     <div id="tab3XX">
-        <!-- TMPL_LOOP NAME="threeXX" -->
+        <!-- TMPL_LOOP NAME="tab3XX" -->
                 <!-- TMPL_IF name="tag" -->
                     <div class="tag">
                     <div class="tag_title">
@@ -200,7 +200,7 @@ function Changefwk(FwkList) {
     </div>
 
     <div id="tab4XX">
-        <!-- TMPL_LOOP NAME="fourXX" -->
+        <!-- TMPL_LOOP NAME="tab4XX" -->
                 <!-- TMPL_IF name="tag" -->
                     <div class="tag">
                     <div class="tag_title">
@@ -230,7 +230,7 @@ function Changefwk(FwkList) {
     </div>
 
     <div  id="tab5XX">
-        <!-- TMPL_LOOP NAME="fiveXX" -->
+        <!-- TMPL_LOOP NAME="tab5XX" -->
                 <!-- TMPL_IF name="tag" -->
                     <div class="tag">
                     <div class="tag_title">
@@ -260,7 +260,7 @@ function Changefwk(FwkList) {
     </div>
 
     <div id="tab6XX">
-        <!-- TMPL_LOOP NAME="sixXX" -->
+        <!-- TMPL_LOOP NAME="tab6XX" -->
                 <!-- TMPL_IF name="tag" -->
                     <div class="tag">
                     <div class="tag_title">
@@ -290,7 +290,7 @@ function Changefwk(FwkList) {
     </div>
 
     <div  id="tab7XX">
-        <!-- TMPL_LOOP NAME="sevenXX" -->
+        <!-- TMPL_LOOP NAME="tab7XX" -->
                 <!-- TMPL_IF name="tag" -->
                     <div class="tag">
                     <div class="tag_title">
@@ -320,7 +320,7 @@ function Changefwk(FwkList) {
     </div>
 
     <div id="tab8XX">
-        <!-- TMPL_LOOP NAME="eightXX" -->
+        <!-- TMPL_LOOP NAME="tab8XX" -->
                 <!-- TMPL_IF name="tag" -->
                     <div class="tag">
                     <div class="tag_title">
@@ -350,7 +350,7 @@ function Changefwk(FwkList) {
     </div>
 
     <div id="tab9XX">
-        <!-- TMPL_LOOP NAME="nineXX" -->
+        <!-- TMPL_LOOP NAME="tab9XX" -->
                 <!-- TMPL_IF name="tag" -->
                     <div class="tag">
                     <div class="tag_title">
@@ -379,7 +379,7 @@ function Changefwk(FwkList) {
         <!-- /TMPL_LOOP -->
     </div>
 
-     <!-- TMPL_IF name="tenXX" -->
+     <!-- TMPL_IF name="tab10XX" -->
     <div id="tab10XX">
         <table>
                 <tr>
-- 
1.6.0.6



More information about the Koha-patches mailing list