[Koha-cvs] koha catalogue/search.pl koha-tmpl/intranet-tmp... [rel_3_0]

paul poulain paul at koha-fr.org
Thu Nov 2 12:07:46 CET 2006 

CVSROOT:	/sources/koha
Module name:	koha
Branch:		rel_3_0
Changes by:	paul poulain <tipaul>	06/11/02 11:07:46

Modified files:
	catalogue      : search.pl 
	koha-tmpl/intranet-tmpl/prog/en/catalogue: advsearch.tmpl 

Log message:
	some changes to the template, to have
	- 5 itemtypes per line
	- label on unimarc coded fields.
	
	note : unimarc coded fields are in french. It's on our todo list to translate them to english, but if someone else volunteer...

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/catalogue/search.pl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.4&r2=1.1.2.5
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/prog/en/catalogue/advsearch.tmpl?cvsroot=koha&only_with_tag=rel_3_0&r1=1.1.2.7&r2=1.1.2.8

Patches:
Index: catalogue/search.pl
===================================================================
RCS file: /sources/koha/koha/catalogue/Attic/search.pl,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -b -r1.1.2.4 -r1.1.2.5
--- catalogue/search.pl	30 Oct 2006 13:26:08 -0000	1.1.2.4
+++ catalogue/search.pl	2 Nov 2006 11:07:46 -0000	1.1.2.5
@@ -2,7 +2,7 @@
 # Script to perform searching
 # For documentation try 'perldoc /path/to/search'
 #
-# $Header: /sources/koha/koha/catalogue/Attic/search.pl,v 1.1.2.4 2006/10/30 13:26:08 toins Exp $
+# $Header: /sources/koha/koha/catalogue/Attic/search.pl,v 1.1.2.5 2006/11/02 11:07:46 tipaul Exp $
 #
 # Copyright 2006 LibLime
 #
@@ -231,6 +231,7 @@
                 code => $thisitemtype,
                 selected => $selected,
                 description => $itemtypes->{$thisitemtype}->{'description'},
+                count5 => $cnt % 5,
             );
     $selected = 0 if ($selected) ;
     push @itemtypesloop, \%row;

Index: koha-tmpl/intranet-tmpl/prog/en/catalogue/advsearch.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/prog/en/catalogue/Attic/advsearch.tmpl,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -b -r1.1.2.7 -r1.1.2.8
--- koha-tmpl/intranet-tmpl/prog/en/catalogue/advsearch.tmpl	2 Nov 2006 10:39:13 -0000	1.1.2.7
+++ koha-tmpl/intranet-tmpl/prog/en/catalogue/advsearch.tmpl	2 Nov 2006 11:07:46 -0000	1.1.2.8
@@ -85,11 +85,15 @@
     <!-- /TMPL_LOOP -->
     </fieldset>
 <!-- /BOOLEAN SEARCH OPTIONS -->
-<fieldset>
+<fieldset style="margin-right:20%">
     <legend>Itemtype to: match any of the following </legend>
+    <p>
       <!--TMPL_LOOP Name="itemtypeloop"-->
-        <input type="checkbox" id="mt-<!--TMPL_VAR Name="number" -->" name="limit" value="mt:<!--TMPL_VAR Name="code" -->"/><label for="mt-<!--TMPL_VAR Name="number" -->" title="<!--TMPL_VAR Name="description" -->"><img border="0" src="<!--TMPL_VAR Name="imageurl" -->" alt="<!--TMPL_VAR Name="description" -->" /></label>
+        <input type="checkbox" id="mt-<!--TMPL_VAR Name="number" -->" name="limit" value="mt:<!--TMPL_VAR Name="code" -->"/><img border="0" src="<!--TMPL_VAR Name="imageurl" -->" alt="<!--TMPL_VAR Name="description" -->" title="<!--TMPL_VAR Name="description" -->"/>
+        <!-- TMPL_UNLESS name="count5" --></p><p><!-- /TMPL_UNLESS -->
       <!--/TMPL_LOOP-->
+      </p>
+    </p>
 </fieldset>
 
 <!-- TMPL_IF NAME="expanded_options" -->
@@ -194,8 +198,9 @@
 <div id="sidebar">
 <!-- SUBTYPE LIMITS -->
 		<fieldset>
-		<legend>Champs Cod&eacute;s</legend><p>
-		
+		<legend>Champs Cod&eacute;s</legend>
+		<p>
+		<label>Public</label>
 		<select name="limit" class="subtype">
             <option value=" " SELECTED="selected" class="menuheader">Tout public</option>
 			<option value="aud:a">Jeunesse en g&eacute;n&eacute;ral</option>
@@ -207,9 +212,11 @@
 			<option value="aud:m">fiction ou vulg adulte</option>
 			<option value="aud:u">inconnu</option>
 		</select>
-		
+		</p>
+		<p>
+		<label>Format</label>
         <select name="limit" class="subtype">
-			<option value="" selected="selected" class="menuheader">Tout Format</option>
+			<option value="" selected="selected" class="menuheader">Tout format</option>
 				<option value="Material-type:r">Impression normale</option>
 				<option value="Material-type:d">Impression en gros caractere</option>
 				<option value="Material-type:e">Journal</option>
@@ -220,8 +227,9 @@
 				<option value="Material-type:j">Impression en reduction</option>
 				<option value="Material-type:z">Autres formes de presentation</option>
 		</select>
-		
-		
+		</p>
+		<p>
+		<label>Forme</label>
 		<select name="limit" class="subtype">
 			<option value="" selected="selected" class="menuheader">Toute forme</option>
             <option value="Literature-Code:a">fiction, roman</option>
@@ -235,8 +243,9 @@
             <option value="Literature-Code:y">Il ne s'agit pas d'un texte litteraire</option>
             <option value="Literature-Code:z">formes vari&eacute;es ou autres formes litteraires</option>
 		</select>
-		
-        
+		</p>
+        <p>
+		<label>Biographie</label>
         <select name="limit" class="subtype" size="1">
             <option value=" ">Tout type de biographie</option>
             <option value="Biography-code:y">C'est pas une biographie</option>
@@ -245,9 +254,11 @@
             <option value="Biography-code:c">Biographie collective</option>
             <option value="Biography-code:d">Contient des informations biographiques</option>
 		</select>
-        
+        </p>
+        <p>
+		<label>Illustration</label>
         <select name="limit" class="subtype" size="1">
-				<option value=" ">Code Illustration</option>
+            <option value=" ">Tout type d'illustration</option>
 				<option value="Illustration-Code:a">Illustrations</option>
 				<option value="Illustration-Code:b">Cartes</option>
 				<option value="Illustration-Code:c">Portraits</option>
@@ -265,10 +276,11 @@
 				<option value="Illustration-Code:o">Enluminures</option>
 				<option value="Illustration-Code:y">Sans illustrations</option>
 			</select>
-
-		
+        </p>
+		<p>
+		<label>Contenu</label>
 		<select name="limit" class="subtype">
-			<option value="" >Code de contenu</option>
+			<option value="" >Tout type de contenu</option>
                 <option value="ctype:a" >Bibliographie</option>
 				<option value="ctype:b" >Catalogue</option>
 				<option value="ctype:c" >index</option>
@@ -291,10 +303,11 @@
 				<option value="ctype:t" >Bande dessinee</option>
 				<option value="ctype:z" >Autres</option>
 		</select>
-        
-
+        </p>
+        <p>
+		<label>Type vid&eacute;o</label>
 		<select name="limit" class="subtype">
-            <option value=" ">Video</option>
+            <option value=" ">Tout type video</option>
 			<option value="Video-mt:a">Film</option>
 			<option value="Video-mt:b">Document &agrave; projeter</option>
 			<option value="Video-mt:c">Enregistrement video</option>
@@ -303,6 +316,8 @@
 		</fieldset>
 		<fieldset>
 		<legend>P&eacute;riodique</legend><p>
+		<p>
+		<label>Type periodique</label>
 		<select name="limit" class="subtype">
            <option value=" ">Tout type de periodique</option>
            <option value="Type-Of-Serial:a">Periodique</option>
@@ -310,8 +325,11 @@
 			<option value="Type-Of-Serial:c">Journal</option>
 			<option value="Type-Of-Serial:z">autres</option>
 		</select>
+		</p>
+		<p>
+		<label>P&eacute;riodicit&eacute;</label>
 		<select name="limit" class="subtype">
-			<option value="">P&eacute;riodicit&eacute;</option>
+			<option value="">Toute P&eacute;riodicit&eacute;</option>
 				<option value="Frequency-code:a">Quotidien</option>
 				<option value="Frequency-code:b">Bihebdomadaire</option>
 				<option value="Frequency-code:c">Hebdomadaire</option>
@@ -331,6 +349,9 @@
 				<option value="Frequency-code:y">Sans periodicite</option>
 				<option value="Frequency-code:i">Autre</option>
 		</select>
+		</p>
+		<p>
+		<label>Toute R&eacute;gularit&eacute;</label>
 		<select name="limit" class="subtype">
             <option value="">R&eacute;gularit&eacute;</option>
 				<option value="Regularity-code:u">Inconnu</option>
@@ -383,13 +404,15 @@
 <!--/TMPL_IF-->
 <!-- AVAILABILITY LIMITS -->
     <fieldset><legend>Location and availability: </legend>
-        <p><select name="limit" id="branchloop">
+        <p>
+        <label>Branch</label><select name="limit" id="branchloop">
         <!-- TMPL_LOOP NAME="branchloop" -->
         <option value="<!-- TMPL_VAR NAME='value' -->"><!-- TMPL_VAR NAME='branchname' --></option>
         <!-- /TMPL_LOOP -->
         </select>
-
-        <input type="checkbox" id="available-items" name="limit" value="datedue:0000-00-00"/><label for="available-items">Only items currently available</label></p>
+        </p>
+        <p>
+        <label for="available-items">Only items currently available</label><input type="checkbox" id="available-items" name="limit" value="datedue:0000-00-00"/></p>
     </fieldset>
 <!-- /AVAILABILITY LIMITS -->

More information about the Koha-cvs mailing list