[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/npl/en intranet-main.tmpl,1.2,1.3 moditem.tmpl,1.2,1.3 request.tmpl,1.2,1.3 thesaurus_popup.tmpl,1.1,1.2

Owen Leonard oleonard at users.sourceforge.net
Thu Oct 21 18:38:38 CEST 2004 

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

Modified Files:
	intranet-main.tmpl moditem.tmpl request.tmpl 
	thesaurus_popup.tmpl 
Log Message:
Initial review in upgrading templates to 2.2

Index: intranet-main.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/intranet-main.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** intranet-main.tmpl	13 Apr 2004 16:50:26 -0000	1.2
--- intranet-main.tmpl	21 Oct 2004 16:38:35 -0000	1.3
***************
*** 20,37 ****
  		<input type="submit" value="Search" class="submit" />
  		</form>
! 		<ul><li><a href="/cgi-bin/koha/loadmodules.pl?module=search&amp;marc=0&amp;type=intranet">Advanced Search</a></li> 
  <li><a href="/cgi-bin/koha/loadmodules.pl?module=search&amp;marc=1&amp;type=intranet">MARC Search</a></li> </ul>
  		</dd>
! 
  <dt><a href="/cgi-bin/koha/reports-home.pl">Accounts and Reports
  			</a></dt>
  			<dd>Till reconciliation, overdues, and inventory</dd>
! 
  <dt><a href="/cgi-bin/koha/acqui.simple/addbooks.pl">Cataloging</a></dt>
  			<dd><ul>
! 
! <li><a href="/cgi-bin/koha/acqui.simple/addbiblio.pl">Advanced Cataloging</a> </li>  <li><a href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Acquisitions</a></li> </ul></dd>
!  <dt><a href="/cgi-bin/koha/admin-home.pl">Koha Administration</a></dt>
! <dd><ul><li><a href="/cgi-bin/koha/admin-home.pl">System Adminstration Home</a></li> <li><a href="/cgi-bin/koha/admin/systempreferences.pl">System Preferences</a></li></ul></dd> 
  </dl></div>
              
--- 20,37 ----
  		<input type="submit" value="Search" class="submit" />
  		</form>
! 		<ul><li><a href="/cgi-bin/koha/loadmodules.pl?module=search&amp;marc=0&amp;type=intranet">Advanced Search</a></li> <!-- Display for NPL <li><a href="/item_report.php">Format Search</a></li> /Display for NPL -->
  <li><a href="/cgi-bin/koha/loadmodules.pl?module=search&amp;marc=1&amp;type=intranet">MARC Search</a></li> </ul>
  		</dd>
! <!-- Hide from NPL -->
  <dt><a href="/cgi-bin/koha/reports-home.pl">Accounts and Reports
  			</a></dt>
  			<dd>Till reconciliation, overdues, and inventory</dd>
! <!-- /Hide from NPL -->
  <dt><a href="/cgi-bin/koha/acqui.simple/addbooks.pl">Cataloging</a></dt>
  			<dd><ul>
! <!-- Display for NPL <li><a href="/cgi-bin/koha/acqui.simple/addbiblio-simple.pl">Enter Brief Record (Temp Cards)</a> </li> /Display for NPL -->
! <li><a href="/cgi-bin/koha/acqui.simple/addbiblio.pl">Advanced Cataloging</a> </li> <!-- Hide from NPL --><li><a href="/cgi-bin/koha/loadmodules.pl?module=acquisitions">Acquisitions</a></li><li><a href="/cgi-bin/koha/bull-home.pl">Serials</a> Manage serial subscriptions and issues</li> <li><a href="/cgi-bin/koha/bookshelves/shelves.pl">Virtual shelves</a> Virtual shelves can be used by librarian or patrons to build virtual libraries inside the "real" one. The virtual shelf can be used by a teacher to help his/her students searching information on a specific topic. It can be used by a library to define "most valuable books for [some category of patron]"</li><!-- /Hide from NPL --></ul></dd>
! <!-- Hide from NPL --><dt><a href="/cgi-bin/koha/admin-home.pl">Koha Administration</a></dt>
! <dd><ul><li><a href="/cgi-bin/koha/admin-home.pl">System Adminstration Home</a></li> <li><a href="/cgi-bin/koha/admin/systempreferences.pl">System Preferences</a></li><li><a href="/cgi-bin/koha/barcodes/barcodes.pl">Barcodes generator</a></li><li><a href="/cgi-bin/koha/admin/aqbookfund.pl">Book funds</a></li><li><a href="/cgi-bin/koha/import/breeding.pl">Import to reservoir</a></li></ul></dd> <!-- /Hide from NPL -->
  </dl></div>
              

Index: moditem.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/moditem.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** moditem.tmpl	13 Apr 2004 16:50:26 -0000	1.2
--- moditem.tmpl	21 Oct 2004 16:38:35 -0000	1.3
***************
*** 32,36 ****
  </tr>
  <tr>
! <th><label for="withdrawn">Cancelled</label></th>
  <td><input type="radio" id="withdrawn" name="withdrawn" value="1"<!-- TMPL_IF Name="itemwithdrawn" --> checked="checked"<!-- /TMPL_IF -->>
  Yes
--- 32,36 ----
  </tr>
  <tr>
! <th><label for="withdrawn">Damaged</label></th>
  <td><input type="radio" id="withdrawn" name="withdrawn" value="1"<!-- TMPL_IF Name="itemwithdrawn" --> checked="checked"<!-- /TMPL_IF -->>
  Yes

Index: request.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/request.tmpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** request.tmpl	13 Apr 2004 16:50:26 -0000	1.2
--- request.tmpl	21 Oct 2004 16:38:35 -0000	1.3
***************
*** 24,31 ****
  			</td></tr>
  
! <!-- 		<tr><th>Notes</th><td><input type="text" size="20" name="notes"></tr> -->
  		<tr><th>Date</th><td><!-- TMPL_VAR name="date" --></td></tr>
  		<tr><th>Pickup</th><td><!-- TMPL_VAR name="CGIbranch" --></td></tr>
! 		<!-- <tr><th>Request</th><td><input type="checkbox" name="request" value="any">Next Available, (or choose from list below)</tr> -->
  		<tr><th>Card Number <a href="/cgi-bin/koha/member-search.pl" onclick="PopWin(this, 'newwin', 300, 400); return false;">(Quick Search)</a></th><td><input type="text" size="10" name="member" /></td></tr>
  	</table>
--- 24,31 ----
  			</td></tr>
  
! 		<!-- Hide from NPL --><tr><th>Notes</th><td><input type="text" size="20" name="notes"></tr><!-- /Hide from NPL -->
  		<tr><th>Date</th><td><!-- TMPL_VAR name="date" --></td></tr>
  		<tr><th>Pickup</th><td><!-- TMPL_VAR name="CGIbranch" --></td></tr>
! 		<tr><th>Request</th><td><input type="checkbox" name="request" value="any">Next Available, (or choose from list below)</tr>
  		<tr><th>Card Number <a href="/cgi-bin/koha/member-search.pl" onclick="PopWin(this, 'newwin', 300, 400); return false;">(Quick Search)</a></th><td><input type="text" size="10" name="member" /></td></tr>
  	</table>
***************
*** 34,48 ****
  	<div class="table"><table>
  <tr>
! 	<!-- <th>Reserve</th> -->
  	<th>Item Type</th>
  	<th>Call Number</th>
! 	<!-- <th>Volume</th> -->
! 	<!-- <th>Pubdate</th> -->
  	<th>Copies</th>
  </tr>
! <!--$bibitemrows-->
  <!-- TMPL_LOOP Name="bibitemloop" -->
  	<tr>
! 		<!-- <td>
  			<!-- TMPL_IF Name="itemlost" -->
  				Cannot be selected
--- 34,48 ----
  	<div class="table"><table>
  <tr>
! 	<!-- Hide from NPL --><th>Reserve</th><!-- /Hide from NPL -->
  	<th>Item Type</th>
  	<th>Call Number</th>
! 	<!-- Hide from NPL --><th>Volume</th><!-- /Hide from NPL -->
! 	<!-- Hide from NPL --><th>Pubdate</th><!-- /Hide from NPL -->
  	<th>Copies</th>
  </tr>
! 
  <!-- TMPL_LOOP Name="bibitemloop" -->
  	<tr>
! 		<!-- Hide from NPL --><td>
  			<!-- TMPL_IF Name="itemlost" -->
  				Cannot be selected
***************
*** 51,55 ****
  				<input type="hidden" name="biblioitem" value=<!-- TMPL_VAR Name="biblioitemnumber" -->>
  			<!-- /TMPL_IF -->
! 		</td> -->
  		<td>
  			<!-- TMPL_VAR Name="description" -->
--- 51,55 ----
  				<input type="hidden" name="biblioitem" value=<!-- TMPL_VAR Name="biblioitemnumber" -->>
  			<!-- /TMPL_IF -->
! 		</td><!-- /Hide from NPL -->
  		<td>
  			<!-- TMPL_VAR Name="description" -->
***************
*** 58,67 ****
  			<!-- TMPL_IF NAME="class" --><!-- TMPL_VAR Name="class" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF -->
  		</td>
! <!-- 		<td>
  			<!-- TMPL_IF NAME="volumedesc" --><!-- TMPL_VAR Name="volumeddesc" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF -->
! 		</td> -->
! <!-- 		<td>
  			<!-- TMPL_IF NAME="publicationyear" --><!-- TMPL_VAR Name="publicationyear" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF -->
! 		</td> -->
  		<td><ul>
  			<!-- TMPL_LOOP Name="barcodeloop" -->
--- 58,67 ----
  			<!-- TMPL_IF NAME="class" --><!-- TMPL_VAR Name="class" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF -->
  		</td>
! 		<!-- Hide from NPL --><td>
  			<!-- TMPL_IF NAME="volumedesc" --><!-- TMPL_VAR Name="volumeddesc" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF -->
! 		</td><!-- /Hide from NPL -->
! 		<!-- Hide from NPL --><td>
  			<!-- TMPL_IF NAME="publicationyear" --><!-- TMPL_VAR Name="publicationyear" --><!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF -->
! 		</td><!-- /Hide from NPL -->
  		<td><ul>
  			<!-- TMPL_LOOP Name="barcodeloop" -->
***************
*** 74,78 ****
  </table></div>
  
! <input type="submit" name="submit"  value="Place New Request" class="submit" />
  </form>
  <!-- TMPL_IF NAME="reserveloop" -->
--- 74,78 ----
  </table></div>
  
! <input type="submit" name="submit"  value="Place New Request"  class="submit" onclick="this.value='Please wait...'; this.disabled=true; this.form.submit();" />
  </form>
  <!-- TMPL_IF NAME="reserveloop" -->
***************
*** 86,92 ****
  		<th>Date</th>
  		<th>Pickup Location</th>
! 		<!-- <th>Request</th> -->
  	</tr>
! 	<!--$existingreserves-->
  	<!-- TMPL_LOOP Name="reserveloop" -->
  		<tr>
--- 86,92 ----
  		<th>Date</th>
  		<th>Pickup Location</th>
! 		<!-- Hide from NPL --><th>Request</th><!-- /Hide from NPL -->
  	</tr>
! 
  	<!-- TMPL_LOOP Name="reserveloop" -->
  		<tr>
***************
*** 96,100 ****
  			<select name="rank-request">
  				<!-- TMPL_IF Name="wait" -->
! 					<option value="W" selected="selected">Waiting</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_LOOP Name="optionloop" -->
--- 96,100 ----
  			<select name="rank-request">
  				<!-- TMPL_IF Name="wait" -->
! 					<option value="W" selected="selected">Consigned</option>
  				<!-- /TMPL_IF -->
  				<!-- TMPL_LOOP Name="optionloop" -->
***************
*** 111,115 ****
  			<td><!-- TMPL_VAR Name="date" --></td>
  			<td><!-- TMPL_IF Name="wait" -->
! 				Item waiting at <b> <!-- TMPL_VAR Name="wbrname" --></b> <input type="hidden" name="pickup" value="<!-- TMPL_VAR Name="wbrcd" -->" />
  				<!-- TMPL_ELSE -->
  					<select name="pickup">
--- 111,121 ----
  			<td><!-- TMPL_VAR Name="date" --></td>
  			<td><!-- TMPL_IF Name="wait" -->
! 				<input type="hidden" name="pickup" value="<!-- TMPL_VAR Name="wbrcode" -->" />
! 				<!-- TMPL_IF NAME="atdestination" -->
! 				<strong>Waiting</strong> at <!-- TMPL_VAR Name="wbrcode" -->
! 				<!-- TMPL_ELSE -->
! 				In transit from <!-- TMPL_VAR NAME="holdingbranch" --> to <!-- TMPL_VAR Name="wbrcode" -->
! 				<!-- /TMPL_IF -->
! 				
  				<!-- TMPL_ELSE -->
  					<select name="pickup">
***************
*** 122,126 ****
  				<!-- /TMPL_IF -->
  			</td>
! <!-- 			<td>
  				<!-- TMPL_IF Name="wait" -->
  					<a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR Name=''biblionumber" --> &amp;type=intra" onClick="openWindow(this, 'Item', 480, 640)">
--- 128,132 ----
  				<!-- /TMPL_IF -->
  			</td>
! <!-- Hide from NPL --><td>
  				<!-- TMPL_IF Name="wait" -->
  					<a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR Name=''biblionumber" --> &amp;type=intra" onClick="openWindow(this, 'Item', 480, 640)">
***************
*** 137,141 ****
  				<!-- /TMPL_IF -->
  
! 			</td> -->
  		</tr>
  	<!-- /TMPL_LOOP -->
--- 143,147 ----
  				<!-- /TMPL_IF -->
  
! 			</td><!-- /Hide from NPL -->
  		</tr>
  	<!-- /TMPL_LOOP -->

Index: thesaurus_popup.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/npl/en/thesaurus_popup.tmpl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** thesaurus_popup.tmpl	19 Feb 2004 19:22:18 -0000	1.1
--- thesaurus_popup.tmpl	21 Oct 2004 16:38:35 -0000	1.2
***************
*** 8,20 ****
  	<p><input type="text" name="search_string" value="<!-- TMPL_VAR name="search_string" -->">
  	<input type="hidden" name="category" value="<!-- TMPL_VAR name="category" -->">
  	<input type="hidden" name="index" value="<!-- TMPL_VAR name="index" -->">
  	<input type="hidden" name="op" value="search">
  	<input type="submit" value="Search">
! 	<input type="button" value="END" onClick="javascript:report()">
  	</form>
  <!-- TMPL_IF name="search_string" -->
  	<form name="f2_pop" action="thesaurus_popup.pl" method="post">
  	<!-- TMPL_VAR name="select_list" -->
! 	<input type="hidden" name="category" value="<!-- TMPL_VAR name="category" -->">
  	<input type="hidden" name="index" value="<!-- TMPL_VAR name="index" -->">
  	<input type="hidden" name="op" value="select">
--- 8,21 ----
  	<p><input type="text" name="search_string" value="<!-- TMPL_VAR name="search_string" -->">
  	<input type="hidden" name="category" value="<!-- TMPL_VAR name="category" -->">
+ 	<input type="hidden" name="nohierarchy" value="<!-- TMPL_VAR NAME="nohierarchy" -->">
  	<input type="hidden" name="index" value="<!-- TMPL_VAR name="index" -->">
  	<input type="hidden" name="op" value="search">
  	<input type="submit" value="Search">
! 	<input type="button" value="OK" onClick="javascript:report()">
  	</form>
  <!-- TMPL_IF name="search_string" -->
  	<form name="f2_pop" action="thesaurus_popup.pl" method="post">
  	<!-- TMPL_VAR name="select_list" -->
! 	<input type="hidden" name="category" value="<!-- TMPL_VAR name="category" -->">	<input type="hidden" name="nohierarchy" value="<!-- TMPL_VAR NAME="nohierarchy" -->">
  	<input type="hidden" name="index" value="<!-- TMPL_VAR name="index" -->">
  	<input type="hidden" name="op" value="select">
***************
*** 26,29 ****
--- 27,31 ----
  	<input type="hidden" name="index" value="<!-- TMPL_VAR name="index" -->">
  	<input type="hidden" name="category" value="<!-- TMPL_VAR name="category" -->">
+ 	<input type="hidden" name="nohierarchy" value="<!-- TMPL_VAR NAME="nohierarchy" -->">
  	<input type="hidden" name="op" value="add">
  	insert a new authority : <input type="text" name="insert">

More information about the Koha-cvs mailing list