[Koha-cvs] CVS: koha/koha-tmpl/intranet-tmpl/default/en/parameters admin-home.tmpl,1.36,1.37 checkmarc.tmpl,1.10,1.11 marc_subfields_structure.tmpl,1.41,1.42 marctagstructure.tmpl,1.29,1.30 printers.tmpl,1.12,1.13 z3950servers.tmpl,1.16,1.17

Paul POULAIN tipaul at users.sourceforge.net
Mon Jun 20 16:21:04 CEST 2005


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

Modified Files:
	admin-home.tmpl checkmarc.tmpl marc_subfields_structure.tmpl 
	marctagstructure.tmpl printers.tmpl z3950servers.tmpl 
Log Message:
synch'ing 2.2 and head

Index: admin-home.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/admin-home.tmpl,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -r1.36 -r1.37
*** admin-home.tmpl	1 Jun 2005 21:41:03 -0000	1.36
--- admin-home.tmpl	20 Jun 2005 14:21:01 -0000	1.37
***************
*** 36,54 ****
  		</tr>
  
-     <tr>
-       <td valign=top width="25%"><a href="/cgi-bin/koha/admin/itemtypecategory.pl"> Item categories</a></td>
-       <td>Define item categories. (Non-Fiction, Fiction, Non-Fiction and Fiction...)</td>
-     </tr>
- 
-     <tr>
-       <td valign=top width="25%"><a href="/cgi-bin/koha/admin/itemtypesubcategory.pl"> Item subcategories</a></td>
-       <td>Define item Subcategories. (Junior Fiction, Junior Non fiction.... Adult Fiction.)</td>
-     </tr>
- 
-     <tr>
-       <td valign=top width="25%"><a href="/cgi-bin/koha/admin/mediatype.pl"> Item mediatypes</a></td>
-       <td>Define item mediatypes. (CD, Video, Book, Game...)</td>
-     </tr>
- 
  		<tr>
  			<td valign="top" width="25%"><a href="/cgi-bin/koha/admin/categorie.pl">Borrower categories</a></td>
--- 36,39 ----

Index: checkmarc.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/checkmarc.tmpl,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** checkmarc.tmpl	19 Jul 2004 19:20:29 -0000	1.10
--- checkmarc.tmpl	20 Jun 2005 14:21:01 -0000	1.11
***************
*** 36,39 ****
--- 36,51 ----
  	<!-- /TMPL_IF -->
  	<!-- -------------------------------------------------------------------------------------------------------- -->
+ 	<!-- TMPL_IF NAME="itemtags" -->
+ 		<tr>
+ 			<td><b>Item tag</b></td>
+ 			<td>There is more than 1 MARC tag related to items tab (10) : <!-- TMPL_VAR name="itemtags" --></td>
+ 		</tr>
+ 	<!-- TMPL_ELSE -->
+ 		<tr>
+ 			<td>OK</td>
+ 			<td><i>Only 1 marc tag mapped to items</i></td>
+ 		</tr>
+ 	<!-- /TMPL_IF -->
+ 	<!-- -------------------------------------------------------------------------------------------------------- -->
  	<!-- TMPL_IF NAME="itemtypes_empty" -->
  		<tr>
***************
*** 117,120 ****
--- 129,147 ----
  	<!-- /TMPL_IF -->
  	<!-- -------------------------------------------------------------------------------------------------------- -->
+ 	<!-- TMPL_IF NAME="frameworknull" -->
+ 		<tr>
+ 			<td><b>framework values</b></td>
+ 			<td>there is a null value in a frameworkcode. Check the following tables<br/>
+ 				<li>select * from marc_subfield_structure where frameworkcode is NULL</li>
+ 				<li>select * from marc_tag_structure where frameworkcode is NULL</li>
+ 				<li>select * from marc_biblio where frameworkcode is NULL</li></td>
+ 		</tr>
+ 	<!-- TMPL_ELSE -->
+ 		<tr>
+ 			<td>OK</td>
+ 			<td><i>no NULL value in frameworkcode</i></td>
+ 		</tr>
+ 	<!-- /TMPL_IF -->
+ 	<!-- -------------------------------------------------------------------------------------------------------- -->
  	<!-- TMPL_IF NAME="total" -->
  		<tr>

Index: marc_subfields_structure.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/marc_subfields_structure.tmpl,v
retrieving revision 1.41
retrieving revision 1.42
diff -C2 -r1.41 -r1.42
*** marc_subfields_structure.tmpl	1 Mar 2005 13:40:55 -0000	1.41
--- marc_subfields_structure.tmpl	20 Jun 2005 14:21:01 -0000	1.42
***************
*** 1,4 ****
- <!-- clarification needed about this page. many questions... what is Lib? a Library? -->
- 
  <!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
  
--- 1,2 ----
***************
*** 8,12 ****
  	<h1>
  	<!-- TMPL_IF NAME="use-heading-flags-p" -->
! 	<!-- TMPL_IF NAME="heading-edit-subfields-p" -->Edit MARC subfields constraints<!-- /TMPL_IF -->
  	<!-- TMPL_ELSE --><!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF -->
  	</h1>
--- 6,10 ----
  	<h1>
  	<!-- TMPL_IF NAME="use-heading-flags-p" -->
! 	<!-- TMPL_IF NAME="heading-edit-subfields-p" -->Edit MARC subfields constraints for framework <!-- TMPL_IF name="frameworkcode" --><!-- TMPL_VAR NAME="frameworkcode" --><!-- TMPL_ELSE -->default<!-- /TMPL_IF --><!-- /TMPL_IF -->
  	<!-- TMPL_ELSE --><!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF -->
  	</h1>
***************
*** 20,50 ****
  			<h2 class="parameters">Tag <!-- TMPL_VAR NAME="tagfield" -->, Subfield <!-- TMPL_VAR NAME="tagsubfield" --></h2>
  			<h3>MARC constraints</h3>
! 			<p>
! 				<label>&nbsp;</label><!-- TMPL_VAR NAME="repeatable" --> repeatable 
! 				<!-- TMPL_VAR NAME="mandatory" --> mandatory
! 			</p>
! 			<p>
! 				<label>&nbsp;</label>
! 				<label>Search also</label><input type="text" name="seealso" value="<!-- TMPL_VAR name="seealso" -->" size=20> (example for 200a : '200c','200d','200e'...)
! 			</p>
! 			<p><label>&nbsp;</label><label>Koha link:</label> <!-- TMPL_VAR NAME="kohafield" --></p>
  			<h3>Editor constaints</h3>
! 			<p> <label>&nbsp;</label>
! 				<label>Text for librarian</label>
! 				<input type="text" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" -->" size="40" maxlength="80">
! 			</p>
! 			<p>
! 				<label>&nbsp;</label>
! 				<label>Text for OPAC</label> <input type="text" name="libopac" value="<!-- TMPL_VAR NAME="libopac" -->" size="40" maxlength="80">
! 			</p>
! 			<p><label>&nbsp;</label><label>Managed in tab</label> <!-- TMPL_VAR NAME="tab" --> (ignore means that the subfield is NOT managed by Koha)</p>
! 			<p><label>&nbsp;</label><!-- TMPL_VAR NAME="hidden" --> hidden (subfield is managed, but hidden. -should be filled by a plugin or thesaurus-)</p>
! 			<p><label>&nbsp;</label><!-- TMPL_VAR NAME="isurl" --> URL (if checked, it means that the subfield is an URL and can be clicked</p>
! 			<p>
! 				<label>&nbsp;</label><label>Auth value:</label> <!-- TMPL_VAR NAME="authorised_value" -->
! 				or thesaurus: <!-- TMPL_VAR NAME="authtypes" -->
! 				or plugin: <!-- TMPL_VAR NAME="value_builder" -->
! 				or link: <input type="text" name="link" value="<!-- TMPL_VAR NAME="link" -->" size="10" maxlength="5"> (exemple :200b)
! 			</p>
  		</td>
  		</tr>
--- 18,54 ----
  			<h2 class="parameters">Tag <!-- TMPL_VAR NAME="tagfield" -->, Subfield <!-- TMPL_VAR NAME="tagsubfield" --></h2>
  			<h3>MARC constraints</h3>
! 			<ul>
! 				<p>
! 					<!-- TMPL_VAR NAME="repeatable" --> repeatable 
! 					<!-- TMPL_VAR NAME="mandatory" --> mandatory
! 				</p>
! 				<!-- TMPL_IF name="frameworkcode" -->
! 					<p>Search also: <i>(meaningful only for default framework)</i></p>
! 				<!-- TMPL_ELSE -->
! 					<p>
! 						Search also: <input type="text" name="seealso" value="<!-- TMPL_VAR name="seealso" -->" size=20> (example for 200a : '200c','200d','200e'...)
! 					</p>
! 				<!-- /TMPL_IF -->
! 				<p>Koha link:<!-- TMPL_VAR NAME="kohafield" --></p>
! 			</ul>
  			<h3>Editor constaints</h3>
! 			<ul>
! 				<p>Text for librarian: <input type="text" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" -->" size="40" maxlength="80">
! 				</p>
! 				<p>Text for OPAC: <input type="text" name="libopac" value="<!-- TMPL_VAR NAME="libopac" -->" size="40" maxlength="80">
! 				</p>
! 				<p>Managed in tab<!-- TMPL_VAR NAME="tab" --> (ignore means that the subfield is NOT managed by Koha)</p>
! 				<p><!-- TMPL_VAR NAME="hidden" --> hidden (subfield is managed, but hidden. -should be filled by a plugin or thesaurus-)</p>
! 				<p><!-- TMPL_VAR NAME="isurl" --> URL (if checked, it means that the subfield is an URL and can be clicked</p>
! 				<p>
! 					<label>Auth value:</label> <!-- TMPL_VAR NAME="authorised_value" -->
! 					or thesaurus: <!-- TMPL_VAR NAME="authtypes" -->
! 					or plugin: <!-- TMPL_VAR NAME="value_builder" -->
! 				</p>
! 				<p>
! 					<label>&nbsp;</label>Link to field :
! 					<input type="text" name="link" value="<!-- TMPL_VAR NAME="link" -->" size="10" maxlength="5"> (exemple :200b)
! 				</p>
! 			</ul>
  		</td>
  		</tr>
***************
*** 52,61 ****
  	</table>
  	<input type="submit" value="OK">
- 	<p>Note: in the last column, you can choose:
- 	<ul><li>An "authorised value": it refers to a list of authorised values for this subfield. See the corresponding admin table.</li>
- 	<li>A "thesaurus category": it refers to a thesaurus category. See the corresponding admin table.</li>
- 	<li>A "value builder": values builders are perl programs that help you select the value of the field. They are MARC-flavor dependant and sometimes fill another subfield automatically.</li>
- 	</ul>
- 	</p>
  	</form>
  <!-- /TMPL_IF -->
--- 56,59 ----

Index: marctagstructure.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/marctagstructure.tmpl,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -r1.29 -r1.30
*** marctagstructure.tmpl	14 Apr 2005 14:15:01 -0000	1.29
--- marctagstructure.tmpl	20 Jun 2005 14:21:01 -0000	1.30
***************
*** 112,155 ****
  	</form>
  <!-- /TMPL_IF -->
- 
  <!-- ------------------------------------------------------------------------ -->
  <!-- TMPL_IF NAME="else" -->
! <div id="bloc25">
! <h2 class="parameters">Select a framework</h2>
! <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
! 	<select name="frameworkcode">
! 		<option value="">Default</option>
! 	<!-- TMPL_LOOP NAME="frameworkloop" -->
! 		<option value="<!-- TMPL_VAR NAME="value" -->" <!-- TMPL_IF NAME="selected" -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="frameworktext" --></option>
! 	<!-- /TMPL_LOOP -->
! 	</select>
! 	<input type="text" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->">
! 	<input type="submit" value="OK" class="button">
! </form>
! <b>NOTE : if you change the link between a MARC subfield and a non-MARC field, ask your administrator to run misc/rebuildnonmarc.pl script.</b>
! </div>
! <div id="bloc100">
  	<table>
! 	<tr>
! 		<th>Tag</th>
! 		<th>Lib</th>
! 		<th>Repeatable</th>
! 		<th>Mandatory</th>
! 		<th>Authorised<br />value</th>
! 		<th>Subfields</th>
! 		<th>Edit</th>
! 		<th>Delete</th>
! 	<!-- TMPL_LOOP NAME="loop" -->
! 	<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
! 		<td><b><!-- TMPL_VAR NAME="tagfield" --></b></td>
! 		<td><!-- TMPL_VAR NAME="liblibrarian" --></td>
! 		<td><!-- TMPL_IF NAME="repeatable" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
! 		<td><!-- TMPL_IF NAME="mandatory" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
! 		<td><!-- TMPL_VAR NAME="authorised_value" --></td>
! 		<td><a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=<!-- TMPL_VAR NAME="tagfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->" class="button">subfields</a></td>
! 		<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;searchfield=<!-- TMPL_VAR NAME="tagfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png"  width="32" hspace="0" vspace="0" border="0"></a></td>
! 		<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&amp;searchfield=<!-- TMPL_VAR NAME="tagfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkdcode" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" width="32" hspace="0" vspace="0" border="0"></a></td>
! 	</tr>
! 	<!-- /TMPL_LOOP -->
  	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
  	<input type="hidden" name="op" value="add_form">
--- 112,186 ----
  	</form>
  <!-- /TMPL_IF -->
  <!-- ------------------------------------------------------------------------ -->
  <!-- TMPL_IF NAME="else" -->
! 	<div id="bloc25">
! 	<h2 class="parameters">Select a framework</h2>
! 	<form name="f" action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
! 		<select name="frameworkcode">
! 			<option value="">Default</option>
! 		<!-- TMPL_LOOP NAME="frameworkloop" -->
! 			<option value="<!-- TMPL_VAR NAME="value" -->" <!-- TMPL_IF NAME="selected" -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR NAME="frameworktext" --></option>
! 		<!-- /TMPL_LOOP -->
! 		</select>
! 		<input type="text" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->">
! 		<input type="submit" value="OK" class="button">
! 		<p>
! 		<i>Display only used Tags/Subfields</i> <input type="checkbox" name="select_display" value="True" <!-- TMPL_IF Name="select_display"-->checked<!--/TMPL_IF -->  OnChange="javascript:document.f.submit()">
! 		</p>
! 	</form>
! 	<b>NOTE : if you change the link between a MARC subfield and a non-MARC field, ask your administrator to run misc/rebuildnonmarc.pl script.</b>
! 	</div>
! 	<div id="bloc100">
  	<table>
! 		<tr>
! 			<th>Tag</th>
! 			<th>Lib</th>
! 			<th>Repeatable</th>
! 			<th>Mandatory</th>
! 			<th>Authorised<br />value</th>
! 			<th>Subfields</th>
! 			<th>Edit</th>
! 			<th>Delete</th>
! 		<tr>
! 	<!-- TMPL_IF NAME="select_display" -->
! 		<!-- TMPL_LOOP NAME="loop" -->
! 		<tr class="hilighted">
! 			<td><b><!-- TMPL_VAR NAME="tagfield" --></b></td>
! 			<td><!-- TMPL_VAR NAME="liblibrarian" --></td>
! 			<td><!-- TMPL_IF NAME="repeatable" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
! 			<td><!-- TMPL_IF NAME="mandatory" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
! 			<td><!-- TMPL_VAR NAME="authorised_value" --></td>
! 			<td><a href="<!-- TMPL_VAR NAME="subfield_link" -->" class="button">subfields</a></td>
! 			<td><a href="<!-- TMPL_VAR NAME="edit" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png"  width="32" hspace="0" vspace="0" border="0"></a></td>
! 			<td><a href="<!-- TMPL_VAR NAME="delete" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" width="32" hspace="0" vspace="0" border="0"></a></td>
! 		</tr>
! 		<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
! 			<td>
! 				&nbsp;
! 			</td>
! 			<td colspan=7 border=0>
! 				<!-- TMPL_LOOP NAME="subfields" -->
! 					<p><label>&nbsp;</label>
! 							Tab:<!-- TMPL_VAR NAME="tab" --> | $<!-- TMPL_VAR NAME="tagsubfield" -->
! 							<!-- TMPL_VAR NAME="liblibrarian" --> <!-- TMPL_IF NAME="kohafield" --><!-- TMPL_VAR NAME="kohafield" --><!--/TMPL_IF --><!-- TMPL_IF NAME="repeatable" -->, repeatable<!-- /TMPL_IF --><!-- TMPL_IF NAME="mandatory" -->, Mandatory<!-- /TMPL_IF --><!-- TMPL_IF NAME="seealso" -->, See <!-- TMPL_VAR name="seealso" --><!--/TMPL_IF --><!-- TMPL_IF NAME="authorised_value" -->, <!-- TMPL_VAR NAME="authorised_value" --><!--/TMPL_IF --><!-- TMPL_IF NAME="authtypecode" -->, <!-- TMPL_VAR NAME="authtypecode" --><!--/TMPL_IF --><!-- TMPL_IF NAME="value_builder" -->, <!-- TMPL_VAR NAME="value_builder" --><!--/TMPL_IF -->
! 					</p>
! 				<!-- /TMPL_LOOP -->
! 			</td>
! 		</tr>
! 		<!-- /TMPL_LOOP -->
! 	<!-- TMPL_ELSE -->
! 		<!-- TMPL_LOOP NAME="loop" -->
! 		<tr valign="top" bgcolor="<!-- TMPL_VAR NAME="bgcolor" -->">
! 			<td><b><!-- TMPL_VAR NAME="tagfield" --></b></td>
! 			<td><!-- TMPL_VAR NAME="liblibrarian" --></td>
! 			<td><!-- TMPL_IF NAME="repeatable" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
! 			<td><!-- TMPL_IF NAME="mandatory" -->Yes<!-- TMPL_ELSE -->No<!-- /TMPL_IF --></td>
! 			<td><!-- TMPL_VAR NAME="authorised_value" --></td>
! 			<td><a href="<!-- TMPL_VAR NAME="subfield_link" -->" class="button">subfields</a></td>
! 			<td><a href="<!-- TMPL_VAR NAME="edit" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/fileopen.png"  width="32" hspace="0" vspace="0" border="0"></a></td>
! 			<td><a href="<!-- TMPL_VAR NAME="delete" -->"><img src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/edittrash.png" width="32" hspace="0" vspace="0" border="0"></a></td>
! 		</tr>
! 		<!-- /TMPL_LOOP -->
! 	<!--/TMPL_IF -->
  	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
  	<input type="hidden" name="op" value="add_form">
***************
*** 160,175 ****
  		<input type="submit" class="button" value="Add Tag" title="Add Tag" alt="Add Tag" >
  		<!-- TMPL_IF NAME="isprevpage" -->
! 			<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->">
  			<input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1leftarrow.png" title="previous" alt="previous" border="0">
  			</a>
  		<!-- /TMPL_IF -->
  		<!-- TMPL_IF NAME="nextpage" -->
! 			<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="nextpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->">
  				<input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1rightarrow.png" title="next" alt="next" border="0">
  			</a>
  		<!-- /TMPL_IF -->
! 	</form>
  </div>
  <!-- /TMPL_IF -->
  </div>
  <!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->
--- 191,212 ----
  		<input type="submit" class="button" value="Add Tag" title="Add Tag" alt="Add Tag" >
  		<!-- TMPL_IF NAME="isprevpage" -->
! 			<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" --><!--TMPL_IF Name="select_display"-->&amp;select_display=True<!--/TMPL_IF -->">
  			<input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1leftarrow.png" title="previous" alt="previous" border="0">
  			</a>
  		<!-- /TMPL_IF -->
  		<!-- TMPL_IF NAME="nextpage" -->
! 			<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="nextpage" -->&amp;searchfield=<!-- TMPL_VAR NAME="searchfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" --><!--TMPL_IF Name="select_display"-->&amp;select_display=True<!--/TMPL_IF -->">
  				<input type="image" src="<!-- TMPL_VAR NAME="interface" -->/<!-- TMPL_VAR NAME="theme" -->/images/1rightarrow.png" title="next" alt="next" border="0">
  			</a>
  		<!-- /TMPL_IF -->
! </form>
! <script language="javascript" type="text/javascript">
! 	function ChangeDisplay(checkbox) {
! 		window.
! 	}
! </script>
  </div>
  <!-- /TMPL_IF -->
+ 
  </div>
  <!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->

Index: printers.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/printers.tmpl,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** printers.tmpl	19 Jul 2004 19:20:29 -0000	1.12
--- printers.tmpl	20 Jun 2005 14:21:01 -0000	1.13
***************
*** 1,205 ****
  <!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
  
! <!-- TMPL_IF NAME="add_form" -->
!         <script language="javascript" type="text/javascript">
! 	function _(s) { return s } // dummy function for gettext
!         /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
!         function isNotNull(f,noalert) {
!                 if (f.value.length ==0) {
!    return false;
!                 }
!                 return true;
!         }
!         /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
!         function toUC(f) {
!                 var x=f.value.toUpperCase();
!                 f.value=x;
!                 return true;
!         }
!         /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
!         function isNum(v,maybenull) {
!         var n = new Number(v.value);
!         if (isNaN(n)) {
!                 return false;
!                 }
!         if (maybenull==0 && v.value=='') {
!                 return false;
!         }
!         return true;
!         }
!         /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
!         function isDate(f) {
!                 var t = Date.parse(f.value);
!                 if (isNaN(t)) {
!                         return false;
!                 }
!         }
!         /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
!         function Check(f) {
!                 var ok=1;
!                 var _alertString="";
!                 var alertString2;
!                 if (f.printername.value.length==0) {
!                         _alertString += "\n- " + _("printer name missing");
!                 }
!                 if (f.printqueue.value.length==0) {
!                         _alertString += "\n- " + _("Queue missing");
!                 }
!                 if (_alertString.length==0) {
!                         document.Aform.submit();
!                 } else {
!                         alertString2  = _("Form not submitted because of the following problem(s)");
!                         alertString2 += "\n------------------------------------------------------------------------------------\n";
!                         alertString2 += _alertString;
!                         alert(alertString2);
!                 }
!         }
!         </script>
! 
! 	<!-- TMPL_IF NAME="searchfield" -->
! 		<h1>Modify printer</h1>
! 	<!-- TMPL_ELSE -->
! 		<h1>Add printer</h1>
  	<!-- /TMPL_IF -->
! 
!         <form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
!         <input type="hidden" name="op" value="add_validate">
!         
! 
! 	<table>
! 
! 	<!-- TMPL_IF NAME="searchfield" -->
! 		<tr>
! 			<td>Printer Name</td>
! 			<td>
! 				<input type="hidden" name="printername" value="<!-- TMPL_VAR NAME="searchfield" -->"><!-- TMPL_VAR NAME="searchfield" -->
! 			</td>
! 		</tr>
! 	<!-- TMPL_ELSE -->
! 		<tr>
! 			<td>Printer Name</td>
! 			<td>
! 				<input type="text" name="printername" size="50" maxlength="50">
! 			</td>
! 		</tr>
  	<!-- /TMPL_IF -->
! 
!         	<tr>
! 			<td>Queue</td>
! 			<td><input type="text" name="printqueue" size="50" maxlength="50" value="<!-- TMPL_VAR NAME="printqueue" -->"> </td>
! 		</tr>
!         	<tr>
! 			<td>Type</td>
! 			<td><input type="text" name="printtype" size="50" maxlength="50" value="<!-- TMPL_VAR NAME="printtype" -->"> </td>
! 		</tr>
!         	<tr>
! 			<td> </td>
! 			<td><input type="button" value="OK" onclick="Check(this.form)"></td>
! 		</tr>
!         </table>
!         </form>
! 
! <!-- /TMPL_IF -->
! 
! <!-- TMPL_IF NAME="add_validate" -->
! 	Data recorded
!         <form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
!         <input type="submit" value="OK">
!         </form>
! <!-- /TMPL_IF -->
! 
! <!-- TMPL_IF NAME="delete_confirm" -->
! 	<table border="0" cellspacing="0" cellpadding="5">
! 		<tr bgcolor="#99cc33">
! 			<td background="/images/background-mem.gif"><b>Printer</b></td>
! 			<td background="/images/background-mem.gif"><b><!-- TMPL_VAR NAME="searchfield" --></b></td>
! 		</tr>
! 
!         	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
! 			<input type="hidden" name="op" value="delete_confirmed">
! 			<input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->">
!         
! 		<tr>
! 			<td>Queue</td>
! 			<td><!-- TMPL_VAR NAME="printqueue" --></td>
! 		</tr>
!         	<tr>
! 			<td>Type</td>
! 			<td><!-- TMPL_VAR NAME="printtype" --></td>
! 		</tr>
!         	<tr>
! 			<td colspan="2" align="center">CONFIRM DELETION</td>
! 		</tr>
!         	<tr>
! 			<td>
! 				<input type="submit" value="YES">
! 				</form>
! 			</td>
! 			<td>
  				<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
! 				<input type="submit" value="NO">
! 				</form>
! 			</td>
! 		</tr>
! 	</table>
! <!-- /TMPL_IF -->
! 
! <!-- TMPL_IF NAME="delete_confirmed" -->
! 	Data deleted
! 	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
! 		<input type="submit" value="OK">
! 	</form>
! <!-- /TMPL_IF -->
! 
! <!-- TMPL_IF NAME="else" -->
! 	<h2>Printer admin</h2>
!         <form action="<!-- TMPL_VAR NAME="script_name">" method="post">
!                 <input type="text" name="description" value="<!-- TMPL_VAR NAME="searchfield" -->">
!                 <input type="reset" name="reset" value="clr">
!         </form>
! 
! 	<!-- TMPL_IF NAME="searchfield" -->
! 		You searched for <b><!-- TMPL_VAR NAME="searchfield" --></b>
  	<!-- /TMPL_IF -->
- 
- 	<table border="0" cellspacing="0" cellpadding="5">
- 		<tr bgcolor="#99cc33">
- 			<td background="/images/background-mem.gif"><b>Name</b></td>
- 			<td background="/images/background-mem.gif"><b>Queue</b></td>
- 			<td background="/images/background-mem.gif"><b>Type</b></td>
- 			<td background="/images/background-mem.gif"> </td>
- 			<td background="/images/background-mem.gif"> </td>
- 		</tr>
- 		<!-- TMPL_LOOP NAME="loop" -->
- 		<tr bgcolor="<!-- TMPL_VAR NAME="toggle" -->">
- 			<td><!-- TMPL_VAR NAME="printername" --></td>
- 			<td><!-- TMPL_VAR NAME="printqueue" --></td>
- 			<td><!-- TMPL_VAR NAME="printtype" --></td>
- 			<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;searchfield=<!-- TMPL_VAR NAME="printername" -->">Edit</a></td>
-                         <td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&amp;searchfield=<!-- TMPL_VAR NAME="printername" -->">Delete</a></td>
- 		</tr>
- 		<!-- /TMPL_LOOP -->
- 	</table>
- 
- 	<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
-         <input type="hidden" name="op" value="add_form">
  	
! 	<!-- TMPL_IF NAME="offsetgtzero" -->
! 		<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->">&lt;&lt; Prev</a>
  	<!-- /TMPL_IF -->
! 
! 	&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
! 
! 	<!-- TMPL_IF NAME="ltcount" -->
! 		<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="nextpage" -->">Next &gt;&gt;</a>	
! 	<!-- /TMPL_iF -->
! 
!         <br>
! 	<input type="submit" class="button" value="Add printer" alt="Add printer">
! 	<br>
!         </form>
! 
! <!-- /TMPL_IF -->
! 
  
  <!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->
--- 1,181 ----
  <!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
  
! <div id="mainbloc">
! 		<h1>Printer admin</h1>
! 	<!-- TMPL_IF NAME="add_form" -->
! 			<script language="javascript" type="text/javascript">
! 		function _(s) { return s } // dummy function for gettext
! 			/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
! 			function isNotNull(f,noalert) {
! 					if (f.value.length ==0) {
! 	return false;
! 					}
! 					return true;
! 			}
! 			/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
! 			function toUC(f) {
! 					var x=f.value.toUpperCase();
! 					f.value=x;
! 					return true;
! 			}
! 			/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
! 			function isNum(v,maybenull) {
! 			var n = new Number(v.value);
! 			if (isNaN(n)) {
! 					return false;
! 					}
! 			if (maybenull==0 && v.value=='') {
! 					return false;
! 			}
! 			return true;
! 			}
! 			/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
! 			function isDate(f) {
! 					var t = Date.parse(f.value);
! 					if (isNaN(t)) {
! 							return false;
! 					}
! 			}
! 			/////////////////////////////////////////////////////////////////////////////////////////////////////////////////
! 			function Check(f) {
! 					var ok=1;
! 					var _alertString="";
! 					var alertString2;
! 					if (f.printername.value.length==0) {
! 							_alertString += "\n- " + _("printer name missing");
! 					}
! 					if (f.printqueue.value.length==0) {
! 							_alertString += "\n- " + _("Queue missing");
! 					}
! 					if (_alertString.length==0) {
! 							document.Aform.submit();
! 					} else {
! 							alertString2  = _("Form not submitted because of the following problem(s)");
! 							alertString2 += "\n------------------------------------------------------------------------------------\n";
! 							alertString2 += _alertString;
! 							alert(alertString2);
! 					}
! 			}
! 			</script>
! 	<div id="bloc25">
! 		<!-- TMPL_IF NAME="searchfield" -->
! 			<h2 class="parameters">Modify printer</h2>
! 		<!-- TMPL_ELSE -->
! 			<h2 class="parameters">Add printer</h2>
! 		<!-- /TMPL_IF -->
! 	
! 			<form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
! 				<input type="hidden" name="op" value="add_validate">
! 				<!-- TMPL_IF NAME="searchfield" -->
! 						<p><label>Printer Name</label><input type="hidden" name="printername" value="<!-- TMPL_VAR NAME="searchfield" -->"><!-- TMPL_VAR NAME="searchfield" --></p>
! 				<!-- TMPL_ELSE -->
! 						<p><label>Printer Name</label><input type="text" name="printername" size="50" maxlength="50"></p>
! 				<!-- /TMPL_IF -->
! 				<p><label>Queue</label><input type="text" name="printqueue" size="50" maxlength="50" value="<!-- TMPL_VAR NAME="printqueue" -->"> </p>
! 				<p><label>Type</label><input type="text" name="printtype" size="50" maxlength="50" value="<!-- TMPL_VAR NAME="printtype" -->"> </p>
! 				<p><input type="button" value="OK" onclick="Check(this.form)" class="button"></p>
! 			</form>
! 	</div>
  	<!-- /TMPL_IF -->
! 	
! 	<!-- TMPL_IF NAME="add_validate" -->
! 		Data recorded
! 			<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
! 			<input type="submit" value="OK" class="button">
! 			</form>
  	<!-- /TMPL_IF -->
! 	
! 	<!-- TMPL_IF NAME="delete_confirm" -->
! 		<table border="0" cellspacing="0" cellpadding="5">
! 			<tr bgcolor="#99cc33">
! 				<td background="/images/background-mem.gif"><b>Printer</b></td>
! 				<td background="/images/background-mem.gif"><b><!-- TMPL_VAR NAME="searchfield" --></b></td>
! 			</tr>
! 	
  				<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
! 				<input type="hidden" name="op" value="delete_confirmed">
! 				<input type="hidden" name="searchfield" value="<!-- TMPL_VAR NAME="searchfield" -->">
! 			
! 			<tr>
! 				<td>Queue</td>
! 				<td><!-- TMPL_VAR NAME="printqueue" --></td>
! 			</tr>
! 				<tr>
! 				<td>Type</td>
! 				<td><!-- TMPL_VAR NAME="printtype" --></td>
! 			</tr>
! 				<tr>
! 				<td colspan="2" align="center">CONFIRM DELETION</td>
! 			</tr>
! 				<tr>
! 				<td>
! 					<input type="submit" value="YES">
! 					</form>
! 				</td>
! 				<td>
! 					<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
! 					<input type="submit" value="NO">
! 					</form>
! 				</td>
! 			</tr>
! 		</table>
  	<!-- /TMPL_IF -->
  	
! 	<!-- TMPL_IF NAME="delete_confirmed" -->
! 		Data deleted
! 		<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
! 			<input type="submit" value="OK">
! 		</form>
  	<!-- /TMPL_IF -->
! 	
! 	<!-- TMPL_IF NAME="else" -->
! 			<form action="<!-- TMPL_VAR NAME="script_name">" method="post">
! 					<input type="text" name="description" value="<!-- TMPL_VAR NAME="searchfield" -->">
! 					<input type="reset" name="reset" value="clr">
! 			</form>
! 	
! 		<!-- TMPL_IF NAME="searchfield" -->
! 			You searched for <b><!-- TMPL_VAR NAME="searchfield" --></b>
! 		<!-- /TMPL_IF -->
! 	
! 		<table border="0" cellspacing="0" cellpadding="5">
! 			<tr bgcolor="#99cc33">
! 				<td background="/images/background-mem.gif"><b>Name</b></td>
! 				<td background="/images/background-mem.gif"><b>Queue</b></td>
! 				<td background="/images/background-mem.gif"><b>Type</b></td>
! 				<td background="/images/background-mem.gif"> </td>
! 				<td background="/images/background-mem.gif"> </td>
! 			</tr>
! 			<!-- TMPL_LOOP NAME="loop" -->
! 			<tr bgcolor="<!-- TMPL_VAR NAME="toggle" -->">
! 				<td><!-- TMPL_VAR NAME="printername" --></td>
! 				<td><!-- TMPL_VAR NAME="printqueue" --></td>
! 				<td><!-- TMPL_VAR NAME="printtype" --></td>
! 				<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=add_form&amp;searchfield=<!-- TMPL_VAR NAME="printername" -->" class="button">Edit</a></td>
! 							<td><a href="<!-- TMPL_VAR NAME="script_name" -->?op=delete_confirm&amp;searchfield=<!-- TMPL_VAR NAME="printername" -->" class="button">Delete</a></td>
! 			</tr>
! 			<!-- /TMPL_LOOP -->
! 		</table>
! 	
! 		<form action="<!-- TMPL_VAR NAME="script_name" -->" method="post">
! 			<input type="hidden" name="op" value="add_form">
! 		
! 		<!-- TMPL_IF NAME="offsetgtzero" -->
! 			<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="prevpage" -->">&lt;&lt; Prev</a>
! 		<!-- /TMPL_IF -->
! 	
! 		&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
! 	
! 		<!-- TMPL_IF NAME="ltcount" -->
! 			<a href="<!-- TMPL_VAR NAME="script_name" -->?offset=<!-- TMPL_VAR NAME="nextpage" -->">Next &gt;&gt;</a>	
! 		<!-- /TMPL_iF -->
! 	
! 			<br>
! 		<input type="submit" class="button" value="Add printer" alt="Add printer">
! 		<br>
! 			</form>
! 	
! 	<!-- /TMPL_IF -->
! </div>
  
  <!-- TMPL_INCLUDE NAME="parameters-bottom.inc" -->

Index: z3950servers.tmpl
===================================================================
RCS file: /cvsroot/koha/koha/koha-tmpl/intranet-tmpl/default/en/parameters/z3950servers.tmpl,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** z3950servers.tmpl	13 Sep 2004 15:31:13 -0000	1.16
--- z3950servers.tmpl	20 Jun 2005 14:21:01 -0000	1.17
***************
*** 214,218 ****
  				</tr>
  				<!-- TMPL_LOOP NAME="loop" -->
! 				<tr bgcolor="<!-- TMPL_VAR NAME="toggle" -->">
  					<td><!-- TMPL_VAR NAME="name" --></td>
  					<td><!-- TMPL_VAR NAME="host" --></td>
--- 214,218 ----
  				</tr>
  				<!-- TMPL_LOOP NAME="loop" -->
! 				<!-- TMPL_IF NAME="toggle" --><tr><!-- TMPL_ELSE --><tr class="hilighted"><!-- /TMPL_IF -->
  					<td><!-- TMPL_VAR NAME="name" --></td>
  					<td><!-- TMPL_VAR NAME="host" --></td>





More information about the Koha-cvs mailing list