[Koha-cvs] koha/koha-tmpl/intranet-tmpl/npl/en/circ return... [rel_2_2]

[Owen Leonard]

CVSROOT:        /sources/koha
Module name:    koha
Branch:         rel_2_2
Changes by:     Owen Leonard <address@hidden>   06/03/09 18:04:19

Modified files:
        koha-tmpl/intranet-tmpl/npl/en/circ: returns.tmpl 

Log message:
        renaming variable so that 'branchname' can be used as current branch 
setting.  By matching circulation.pl's variable naming we can display 
branchname consistently in the header of circulation-related pages.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/npl/en/circ/returns.tmpl.diff?only_with_tag=rel_2_2&tr1=1.2.2.3&tr2=1.2.2.4&r1=text&r2=text

Patches:
Index: koha/koha-tmpl/intranet-tmpl/npl/en/circ/returns.tmpl
diff -u koha/koha-tmpl/intranet-tmpl/npl/en/circ/returns.tmpl:1.2.2.3 
koha/koha-tmpl/intranet-tmpl/npl/en/circ/returns.tmpl:1.2.2.4
--- koha/koha-tmpl/intranet-tmpl/npl/en/circ/returns.tmpl:1.2.2.3       Wed Jan 
 4 18:33:58 2006
+++ koha/koha-tmpl/intranet-tmpl/npl/en/circ/returns.tmpl       Thu Mar  9 
18:04:19 2006
@@ -22,7 +22,7 @@
 <!-- TMPL_IF NAME="debarred" --><li class="error">Patron is DEBARRED</li><!-- 
/TMPL_IF -->
 <!-- TMPL_IF NAME="gonenoaddress" --><li class="error">Patron's address is in 
doubt</li><!-- /TMPL_IF -->
                        </ul></td></tr>
-       <tr><!-- TMPL_IF NAME="intransit" 
--><th>&nbsp;</th><td><strong>Transfer</strong> to <!-- TMPL_VAR 
Name="branchname" --> </td><!-- TMPL_ELSE 
--><th>&nbsp;</th><td><strong>Hold</strong> in <!-- TMPL_VAR Name="branchname" 
--></td><!-- /TMPL_IF --></tr>
+       <tr><!-- TMPL_IF NAME="intransit" 
--><th>&nbsp;</th><td><strong>Transfer</strong> to <!-- TMPL_VAR 
Name="tobranchname" --> </td><!-- TMPL_ELSE 
--><th>&nbsp;</th><td><strong>Hold</strong> in <!-- TMPL_VAR 
Name="tobranchname" --></td><!-- /TMPL_IF --></tr>
                </table></div><form method="post" action="returns.pl" 
name="mainform" id="mainform">
                        <input type="submit" value="Confirm" class="submit" 
/><!-- TMPL_LOOP Name="inputloop" -->
                                <input type="hidden" name="ri-<!-- TMPL_VAR 
Name="counter" -->" value="<!-- TMPL_VAR Name="barcode" -->" />
@@ -70,7 +70,7 @@
 <!-- TMPL_IF NAME="debarred" --><li class="error">Patron is DEBARRED</li><!-- 
/TMPL_IF -->
 <!-- TMPL_IF NAME="gonenoaddress" --><li class="error">Patron's address is in 
doubt</li><!-- /TMPL_IF -->
                        </ul></td></tr>
-                       <tr><!-- TMPL_IF NAME="intransit" 
--><th>&nbsp;</th><td><strong>Transfer</strong> to <!-- TMPL_VAR 
Name="branchname" --> </td><!-- TMPL_ELSE 
--><th>&nbsp;</th><td><strong>Hold</strong> in <!-- TMPL_VAR Name="branchname" 
--></td><!-- /TMPL_IF --></tr></table>
+                       <tr><!-- TMPL_IF NAME="intransit" 
--><th>&nbsp;</th><td><strong>Transfer</strong> to <!-- TMPL_VAR 
Name="tobranchname" --> </td><!-- TMPL_ELSE 
--><th>&nbsp;</th><td><strong>Hold</strong> in <!-- TMPL_VAR 
Name="tobranchname" --></td><!-- /TMPL_IF --></tr></table>
                        </div> <form method="post" action="returns.pl" 
name="mainform" id="mainform">
                        <input type="submit" class="submit" value="Confirm" />
                        <!-- TMPL_LOOP Name="inputloop" -->