[Koha-cvs] koha/koha-tmpl/intranet-tmpl/default/en/circ re... [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:06:28

Modified files:
        koha-tmpl/intranet-tmpl/default/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/default/en/circ/returns.tmpl.diff?only_with_tag=rel_2_2&tr1=1.17.2.6&tr2=1.17.2.7&r1=text&r2=text

Patches:
Index: koha/koha-tmpl/intranet-tmpl/default/en/circ/returns.tmpl
diff -u koha/koha-tmpl/intranet-tmpl/default/en/circ/returns.tmpl:1.17.2.6 
koha/koha-tmpl/intranet-tmpl/default/en/circ/returns.tmpl:1.17.2.7
--- koha/koha-tmpl/intranet-tmpl/default/en/circ/returns.tmpl:1.17.2.6  Wed Dec 
14 13:15:41 2005
+++ koha/koha-tmpl/intranet-tmpl/default/en/circ/returns.tmpl   Thu Mar  9 
18:06:28 2006
@@ -13,7 +13,7 @@
                        <!-- TMPL_IF Name="waiting" -->
                                <h2 class="circulation">Item marked 
Waiting:</h2>
                        <p>Item <!-- TMPL_VAR NAME="itemtitle" --> (<!-- 
TMPL_VAR NAME="itemauthor" -->)
-               is marked waiting at <b><!-- TMPL_VAR NAME="branchname" --></b> 
for <!-- TMPL_VAR NAME="name" --> (<a 
href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" 
-->" onclick="openWindow('/cgi-bin/koha/members/moremember.pl?bornum=<!-- 
TMPL_VAR NAME="bornum" -->', 'Member'); return false;"><!-- TMPL_VAR 
NAME="borcnum" --></a>).
+               is marked waiting at <b><!-- TMPL_VAR NAME="tobranchname" 
--></b> for <!-- TMPL_VAR NAME="name" --> (<a 
href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" 
-->" onclick="openWindow('/cgi-bin/koha/members/moremember.pl?bornum=<!-- 
TMPL_VAR NAME="bornum" -->', 'Member'); return false;"><!-- TMPL_VAR 
NAME="borcnum" --></a>).
                                        <form method="post" action="returns.pl">
                                        <!-- TMPL_LOOP Name="inputloop" -->
                                                <input type="hidden" 
name="ri-<!-- TMPL_VAR NAME="counter" -->" value="<!-- TMPL_VAR NAME="barcode" 
-->">
@@ -28,7 +28,7 @@
                                <h2 class="circulation">Item marked 
Waiting:</h2>
                                <p>
                                        Item: <!-- TMPL_VAR NAME="itemtitle" 
--> (<!-- TMPL_VAR NAME="itemauthor" -->)
-                                       needs to be transfered to <b><!-- 
TMPL_VAR NAME="branchname" --></b>
+                                       needs to be transfered to <b><!-- 
TMPL_VAR NAME="tobranchname" --></b>
                                        to be picked up by 
                                        <!-- TMPL_VAR NAME="name" --> 
                                        (<a 
href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" 
-->" onclick="openWindow('/cgi-bin/koha/members/moremember.pl?bornum=<!-- 
TMPL_VAR NAME="bornum" -->', 'Member'); return false;"><!-- TMPL_VAR 
NAME="borcnum" --></a>).
@@ -53,7 +53,7 @@
                                <a href="/cgi-bin/koha/detail.pl?bib=<!-- 
TMPL_VAR NAME="itembiblionumber" -->&amp;type=intra" 
onclick="openWindow('/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR 
NAME="itembiblionumber" -->&amp;type=intra', 'Item'); return false;">
                                        <!-- TMPL_VAR NAME="itembarcode" -->
                                </a>
-                               for <!-- TMPL_VAR NAME="name" --> (<a 
href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" 
-->" onclick="openWindow('/cgi-bin/koha/members/moremember.pl?bornum=<!-- 
TMPL_VAR NAME="bornum" -->', 'Member'); return false"><!-- TMPL_VAR 
NAME="borcnum" --></a>) to be collected at <b><!-- TMPL_VAR NAME="branchname" 
--></b>.
+                               for <!-- TMPL_VAR NAME="name" --> (<a 
href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" 
-->" onclick="openWindow('/cgi-bin/koha/members/moremember.pl?bornum=<!-- 
TMPL_VAR NAME="bornum" -->', 'Member'); return false"><!-- TMPL_VAR 
NAME="borcnum" --></a>) to be collected at <b><!-- TMPL_VAR NAME="tobranchname" 
--></b>.
                                </p>
                                <p>
                                Change status to waiting and print <a href="" 
class="circulation" onclick="alert(document.forms['f'].resslip.value); return 
false">slip</a>? </p>
@@ -73,7 +73,7 @@
        ITEM RESERVED:<!-- TMPL_VAR NAME="itemtitle" --> (<!-- TMPL_VAR 
NAME="itemauthor" -->)
        barcode: <!-- TMPL_VAR NAME="itembarcode" -->
        itemtype: <!-- TMPL_VAR NAME="itemtype" -->
-       COLLECT AT: <!-- TMPL_VAR NAME="branchname" -->
+       COLLECT AT: <!-- TMPL_VAR NAME="tobranchname" -->
        
        BORROWER:
        <!-- TMPL_VAR NAME="bortitle" --> <!-- TMPL_VAR NAME="borfirstname" --> 
<!-- TMPL_VAR NAME="borsurname" -->