[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en/circ returns.tmpl,1.2.2.1,1.2.2.2

Owen Leonard oleonard at users.sourceforge.net
Wed Aug 10 23:10:23 CEST 2005


Update of /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/circ
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23870/koha-tmpl/intranet-tmpl/npl/en/circ

Modified Files:
      Tag: rel_2_2
	returns.tmpl 
Log Message:
Adding:
 - alerting librarian about whether reserved item is at destination branch
 - displaying borrower email in reserve notification (link is active for items at their home branch)
 - displaying debarred and gonenoaddress flags (if present) in reserve notification

Index: returns.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/circ/returns.tmpl,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -r1.2.2.1 -r1.2.2.2
*** returns.tmpl	30 Mar 2005 22:53:13 -0000	1.2.2.1
--- returns.tmpl	10 Aug 2005 21:10:19 -0000	1.2.2.2
***************
*** 18,24 ****
  			<!-- TMPL_VAR Name="borcity" -->  <!-- TMPL_VAR NAME="borzip" --></li>
  			<li><!-- TMPL_VAR Name="borphone" --></li>
! 			<!-- Display for NPL // <!-- TMPL_IF NAME="boremail" --><li><a href="/intranet-intranet-reserve-notify.php?bornum=<!-- TMPL_VAR NAME="bornum" -->&amp;biblionum=<!-- TMPL_VAR NAME="itembiblionumber" -->" onclick="window.open('/intranet-reserve-notify.php?bornum=<!-- TMPL_VAR NAME="bornum" -->&amp;biblionum=<!-- TMPL_VAR NAME="itembiblionumber" -->','notify','width=650,height=450,location=no,menubar=no,toolbar=no,scrollbars=yes'); return false;"><!-- TMPL_VAR Name="boremail" --></a></li><!-- /TMPL_IF --> // Display for NPL -->
  			</ul></td></tr>
! 	<tr><th>Transfer to:</th><td><!-- TMPL_VAR Name="branchname" --></td></tr>
  		</table></div><form method="post" action="returns.pl" name="mainform" id="mainform">
  			<input type="submit" value="Confirm" class="submit" /><!-- TMPL_LOOP Name="inputloop" -->
--- 18,27 ----
  			<!-- TMPL_VAR Name="borcity" -->  <!-- TMPL_VAR NAME="borzip" --></li>
  			<li><!-- TMPL_VAR Name="borphone" --></li>
! 			<!-- Display for NPL <!-- TMPL_IF NAME="boremail" --><li><!-- TMPL_UNLESS NAME="intransit" --><a href="/intranet-intranet-reserve-notify.php?bornum=<!-- TMPL_VAR NAME="bornum" -->&amp;biblionum=<!-- TMPL_VAR NAME="itembiblionumber" -->" onclick="window.open('/intranet-reserve-notify.php?bornum=<!-- TMPL_VAR NAME="bornum" -->&amp;biblionum=<!-- TMPL_VAR NAME="itembiblionumber" -->','notify','width=650,height=450,location=no,menubar=no,toolbar=no,scrollbars=yes'); return false;"><!-- /TMPL_UNLESS --><!-- TMPL_VAR Name="boremail" --><!-- TMPL_UNLESS NAME="intransit" --></a><!-- /TMPL_UNLESS --></li><!-- /TMPL_IF -->  // Display for NPL -->
! <!-- Hide from NPL --><!-- TMPL_IF NAME="boremail" --><li><!-- TMPL_UNLESS NAME="intransit" --><a href="mailto:<!-- TMPL_VAR Name="boremail" -->"><!-- /TMPL_UNLESS --><!-- TMPL_VAR Name="boremail" --><!-- TMPL_UNLESS NAME="intransit" --></a><!-- /TMPL_UNLESS --></li><!-- /TMPL_IF --><!-- /Hide from NPL -->
! <!-- 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></div><form method="post" action="returns.pl" name="mainform" id="mainform">
  			<input type="submit" value="Confirm" class="submit" /><!-- TMPL_LOOP Name="inputloop" -->
***************
*** 59,69 ****
  			<ul>
  						<li><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->"><!-- TMPL_VAR Name="borcnum" --></a></li>
! 			<li><!-- TMPL_VAR Name="borfirstname" --> <!-- TMPL_VAR Name="borsurname" --></li>
  			<li><!-- TMPL_VAR Name="borstraddress" --><br />
  			<!-- TMPL_VAR Name="borcity" --> <!-- TMPL_VAR NAME="borzip" --></li>
  			<li><!-- TMPL_VAR Name="borphone" --></li>
! 			<!-- Display for NPL // <!-- TMPL_IF NAME="boremail" --><li><a href="/intranet-reserve-notify.php?bornum=<!-- TMPL_VAR NAME="bornum" -->&amp;biblionum=<!-- TMPL_VAR NAME="itembiblionumber" -->" onclick="window.open('/intranet-reserve-notify.php?bornum=<!-- TMPL_VAR NAME="bornum" -->&amp;biblionum=<!-- TMPL_VAR NAME="itembiblionumber" -->','notify','width=650,height=450,location=no,menubar=no,toolbar=no,scrollbars=yes'); return false;"><!-- TMPL_VAR Name="boremail" --></a></li><!-- /TMPL_IF --> // Display for NPL -->
  			</ul></td></tr>
! 			<tr><th>Transfer to: </th><td><!-- TMPL_VAR Name="branchname" --></td></tr></table>
  			</div> <form method="post" action="returns.pl" name="mainform" id="mainform">
  			<input type="submit" class="submit" value="Confirm" />
--- 62,75 ----
  			<ul>
  						<li><a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR NAME="bornum" -->"><!-- TMPL_VAR Name="borcnum" --></a></li>
! 			<li><!-- TMPL_VAR Name="borsurname" -->, <!-- TMPL_VAR Name="borfirstname" --> </li>
  			<li><!-- TMPL_VAR Name="borstraddress" --><br />
  			<!-- TMPL_VAR Name="borcity" --> <!-- TMPL_VAR NAME="borzip" --></li>
  			<li><!-- TMPL_VAR Name="borphone" --></li>
! 			<!-- Display for NPL <!-- TMPL_IF NAME="boremail" --><li><!-- TMPL_UNLESS NAME="intransit" --><a href="/intranet-intranet-reserve-notify.php?bornum=<!-- TMPL_VAR NAME="bornum" -->&amp;biblionum=<!-- TMPL_VAR NAME="itembiblionumber" -->" onclick="window.open('/intranet-reserve-notify.php?bornum=<!-- TMPL_VAR NAME="bornum" -->&amp;biblionum=<!-- TMPL_VAR NAME="itembiblionumber" -->','notify','width=650,height=450,location=no,menubar=no,toolbar=no,scrollbars=yes'); return false;"><!-- /TMPL_UNLESS --><!-- TMPL_VAR Name="boremail" --><!-- TMPL_UNLESS NAME="intransit" --></a><!-- /TMPL_UNLESS --></li><!-- /TMPL_IF --> // Display for NPL -->
! <!-- Hide from NPL --><!-- TMPL_IF NAME="boremail" --><li><!-- TMPL_UNLESS NAME="intransit" --><a href="mailto:<!-- TMPL_VAR Name="boremail" -->"><!-- /TMPL_UNLESS --><!-- TMPL_VAR Name="boremail" --><!-- TMPL_UNLESS NAME="intransit" --></a><!-- /TMPL_UNLESS --></li><!-- /TMPL_IF --><!-- /Hide from NPL -->
! <!-- 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>
  			</div> <form method="post" action="returns.pl" name="mainform" id="mainform">
  			<input type="submit" class="submit" value="Confirm" />
***************
*** 147,153 ****
  				<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->">
  					<!-- TMPL_VAR Name="borcnum" -->
! 				</a> <!-- TMPL_VAR Name="borfirstname" --> <!-- TMPL_VAR Name="borsurname" -->
  			<!-- TMPL_ELSE -->
! 								<a href="/cgi-bin/koha/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->"><!-- TMPL_VAR Name="borcnum" --></a> <!-- TMPL_VAR Name="borfirstname" --> <!-- TMPL_VAR Name="borsurname" -->
  			<!-- /TMPL_IF -->
  			</td></tr>
--- 153,159 ----
  				<a href="/cgi-bin/koha/members/moremember.pl?bornum=<!-- TMPL_VAR Name="bornum" -->">
  					<!-- TMPL_VAR Name="borcnum" -->
! 				</a> <!-- TMPL_VAR Name="borsurname" -->, <!-- TMPL_VAR Name="borfirstname" --> 
  			<!-- TMPL_ELSE -->
! 			Not on issue.
  			<!-- /TMPL_IF -->
  			</td></tr>





More information about the Koha-cvs mailing list