[Koha-cvs] koha/koha-tmpl/intranet-tmpl/npl/en/barcodes la... [rel_2_2]

Mason James szrj1m at yahoo.com
Mon Jul 16 23:48:34 CEST 2007


CVSROOT:	/sources/koha
Module name:	koha
Branch:		rel_2_2
Changes by:	Mason James <sushi>	07/07/16 21:48:34

Modified files:
	koha-tmpl/intranet-tmpl/npl/en/barcodes: 
	                                         label-create-template.tmpl 
	                                         label-edit-template.tmpl 
	                                         label-home.tmpl 
	                                         label-manager.tmpl 
	                                         label-templates.tmpl 
	                                         result.tmpl search.tmpl 

Log message:
	rewinding rel_2_2 barcodes back to pre-july07 LibLime dev work.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/barcodes/label-create-template.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.1.4.4&r2=1.1.4.5
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/barcodes/label-edit-template.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.1.4.3&r2=1.1.4.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/barcodes/label-home.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.1.2.9&r2=1.1.2.10
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/barcodes/label-manager.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.1.2.8&r2=1.1.2.9
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/barcodes/label-templates.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.1.4.3&r2=1.1.4.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/barcodes/result.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.1.2.5&r2=1.1.2.6
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/barcodes/search.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.1.2.4&r2=1.1.2.5

Patches:
Index: label-create-template.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/barcodes/Attic/label-create-template.tmpl,v
retrieving revision 1.1.4.4
retrieving revision 1.1.4.5
diff -u -b -r1.1.4.4 -r1.1.4.5
--- label-create-template.tmpl	12 Jul 2007 07:42:56 -0000	1.1.4.4
+++ label-create-template.tmpl	16 Jul 2007 21:48:34 -0000	1.1.4.5
@@ -4,7 +4,6 @@
 <!-- TMPL_INCLUDE name="intranet-nav.inc" -->
 
 <div id="main">
-
 <form name="input" action="/cgi-bin/koha/barcodes/label-create-template.pl" method="get">
 
 <h3>
@@ -20,24 +19,24 @@
 Template Description: <textarea name="tmpl_desc" cols="40" rows="3" name="tmpl_desc" ></TEXTAREA><br>
 
 <tr>
-        <td>Page Width:</td><td><input type="text"  size="4" name="page_width"></td>
-        <td>Page Height:</td><td><input type="text" size="4" name="page_height"></td>
+        <td>Page Width:</td><td><input type="text"  size="2" name="page_width"></td>
+        <td>Page Height:</td><td><input type="text" size="2" name="page_height"></td>
 </tr>
 <tr>
-        <td>Label Width:</td><td><input type="text"  size="4" name="label_width"></td>
-        <td>Label Height:</td><td><input type="text" size="4" name="label_height"></td>
+        <td>Label Width:</td><td><input type="text"  size="2" name="label_width"></td>
+        <td>Label Height:</td><td><input type="text" size="2" name="label_height"></td>
 </tr>
 <tr>
-        <td>Top Page Margin:</td><td><input type="text" size="4" name="topmargin"></td>
-        <td>Left Page Margin:</td><td><input type="text" size="4" name="leftmargin"></td>
+        <td>Top Page Margin:</td><td><input type="text" size="2" name="topmargin"></td>
+        <td>Left Page Margin:</td><td><input type="text" size="2" name="leftmargin"></td>
 </tr>
 <tr>
-        <td>Number of Columns:</td><td><input type="text" size="4" name="cols"></td>
-        <td>Number of Rows:</td><td><input type="text" size="4" name="rows"></td>
+        <td>Number of Columns:</td><td><input type="text" size="2" name="cols"></td>
+        <td>Number of Rows:</td><td><input type="text" size="2" name="rows"></td>
 </tr>
 <tr>
-        <td>Gap between Columns:</td><td><input type="text" size="4" name="colgap"></td>
-        <td>Gap between Rows:</td><td><input type="text" size="4" name="rowgap"></td>
+        <td>Gap between Columns:</td><td><input type="text" size="2" name="colgap"></td>
+        <td>Gap between Rows:</td><td><input type="text" size="2" name="rowgap"></td>
 </tr>
 </table>
 
@@ -51,13 +50,17 @@
 
 <br>
 <br>
-Font Size: <input type="textbox" name="fontsize"  SIZE="2"  
+Font Size: <input type="textbox" name="fontsize"  SIZE="1"  
 		value="">
 <br>
 <br>
-        <input type="submit" value="Create Template">
+Active: <input type="checkbox" name="active">
+
+        <input type="hidden" name="op" value="create">
+<br>
+<br>
+        <input type="submit" value="Save">
         <input type="reset" value="Reset">
-  <input type="hidden" name=op value="create">
 </form>
 </div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: label-edit-template.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/barcodes/Attic/label-edit-template.tmpl,v
retrieving revision 1.1.4.3
retrieving revision 1.1.4.4
diff -u -b -r1.1.4.3 -r1.1.4.4
--- label-edit-template.tmpl	11 Jul 2007 12:41:20 -0000	1.1.4.3
+++ label-edit-template.tmpl	16 Jul 2007 21:48:34 -0000	1.1.4.4
@@ -60,10 +60,14 @@
 <br>
 
 
+Active: <input type="checkbox" name="active" 
+	    <!-- TMPL_IF NAME="active" --> checked <!-- /TMPL_IF --> >
+
+        <input type="hidden" name="tmpl_id" value="<!-- TMPL_VAR NAME="tmpl_id" -->">
+<p>
+<p>
         <input type="submit" value="Save">
         <input type="reset" value="Reset">
-        <input type="hidden" value="<!-- TMPL_VAR NAME="tmpl_id" -->" name="tmpl_id"
-
 </p>
 </form>
 </div>

Index: label-home.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/barcodes/Attic/label-home.tmpl,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -b -r1.1.2.9 -r1.1.2.10
--- label-home.tmpl	12 Jul 2007 07:42:56 -0000	1.1.2.9
+++ label-home.tmpl	16 Jul 2007 21:48:34 -0000	1.1.2.10
@@ -4,54 +4,180 @@
 <!-- TMPL_INCLUDE name="intranet-nav.inc" -->
 
 <div id="main">
-<!-- TMPL_INCLUDE NAME="label-active-templates.inc" -->
-
-<!-- TMPL_IF NAME="layout_loop" -->
-<h2>Select a Current Layout</h2>
 <form name="input" action="/cgi-bin/koha/barcodes/label-manager.pl" method="get">
-<table>
-<tr>
-        <th>Layout</th>
-        <th>Barcode Type</th>
-        <th>Print Type</th>
-        <th>Fields to Print</th>
-        <th>Edit</th>
-        <th>Delete</th>
-        <th>Active</th>
-</tr>
-<!-- TMPL_LOOP NAME="layout_loop" -->
+
+<h3>
+        Choose Fields to Print
+</h3>
+<table summary="fields to print">
 <tr>
-          <td><!-- TMPL_VAR NAME="layoutname" -->  </td>
-       <td>    <!-- TMPL_VAR NAME="barcodetype" -->    </td>
-       <td>   <!-- TMPL_VAR NAME="printingtype" -->    </td>
+        <td>
+                <input type="checkbox" name="itemtype" value=1 
+                <!-- TMPL_IF NAME="itemtype"-->
+                     checked
+                <!-- /TMPL_IF --> >
+                <label for="itemtype">Item Type</label>
+        </td>
 
        <td>
-                <!-- TMPL_VAR NAME="fieldlist" -->
+                <input type="checkbox" name="isbn" value=1 
+                <!-- TMPL_IF NAME="isbn" -->
+                     checked
+                <!-- /TMPL_IF -->>
+                <label for="isbn">ISBN</label>
         </td>
 
+</tr>
+<tr>
        <td>
-                <a href="/cgi-bin/koha/barcodes/label-edit-layout.pl?layout_id=<!-- TMPL_VAR NAME="id" -->">Edit</a>
+                <input type="checkbox" name="dcn" value=1 
+                <!-- TMPL_IF NAME="dewey" -->
+                     checked
+                <!-- /TMPL_IF -->>
+                <label for="dcn">Dewey / Call Number</label>
         </td>
         <td>
-                <a href="/cgi-bin/koha/label-home.pl?op=delete_layout&layout_id=<!-- TMPL_VAR NAME="id"-->">Delete</a>
+                <input type="checkbox" name="classif" value=1  
+                <!-- TMPL_IF NAME="class" -->
+                     checked
+                <!-- /TMPL_IF -->>
+                <label for="classif">Classification</label>
         </td>
-<td>
-<input type="radio" name="layout_id" value="<!-- TMPL_VAR NAME="id" -->"  
-                <!-- TMPL_IF NAME="active" -->
+</tr>
+<tr>
+        <td>
+                <input type="checkbox" name="itemcallnumber" value=1 
+                <!-- TMPL_IF NAME="itemcallnumber" -->
  checked
-                <!-- /TMPL_IF -->
- >
+                <!-- /TMPL_IF -->>
+                <label for="itemcallnumber">Item Call Number</label>
+        </td>
+        <td>
+                <input type="checkbox" name="subclass" value=1  
+                <!-- TMPL_IF NAME="subclass" -->
+                     checked
+                <!-- /TMPL_IF -->>
+                <label for="subclass">Sub-Class</label>
         </td>
 </tr>
-
-<!-- /TMPL_LOOP -->
-<tr><td colspan="7" align="right">
-     <input type="submit" value="Set Active Layout">
-        <input type="hidden" name=op value="set_active_layout">
 </table>
+<p>
+
+<h3>Confirm Label Template</h3>
+<select name="tmpl_id">
+	<!-- TMPL_LOOP NAME="label_templates" -->
+	   	<option value="<!-- TMPL_VAR NAME="tmpl_id" -->"
+			<!-- TMPL_IF NAME="active" --> selected  <!-- /TMPL_IF -->
+		><!-- TMPL_VAR NAME="tmpl_code" --></option>
+	<!-- /TMPL_LOOP -->
+</select>
+
+
+<h3>Confirm Barcode Type</h3>
+ <select name="barcodetype">
+                <option value="COOP2of5"
+                        <!-- TMPL_IF NAME="COOP2of5_checked" -->
+                             selected
+                        <!--/TMPL_IF -->
+                        >COOP2of5</option>
+                <option value="Code39"
+                        <!-- TMPL_IF NAME="Code39_checked" -->
+                             selected
+                        <!-- /TMPL_IF -->
+                        >Code39</option>
+  				<option value="Code39sum"
+                        <!-- TMPL_IF NAME="Code39sum_checked" -->
+                             selected
+                        <!-- /TMPL_IF -->
+                        >Code39 + modulo43</option>
+                <option value="EAN13"
+                        <!-- TMPL_IF NAME="EAN13_checked" -->
+                             selected
+                        <!-- /TMPL_IF -->
+                        >EAN13(JAN13)</option>
+                <option value="EAN8"
+                        <!-- TMPL_IF NAME="EAN8_checked" -->
+                             selected<!-- /TMPL_IF -->
+                        >EAN8(JAN8)</option>
+                <option value="ITF"
+                        <!-- TMPL_IF NAME="ITF_checked" -->
+                             selected
+                        <!-- /TMPL_IF -->
+                        >ITF(Interleaved2of5)</option>
+                <option value="Industrial2of5"
+                        <!-- TMPL_IF NAME="Industrial2of5_checked" -->
+                             selected
+                        <!-- /TMPL_IF -->
+                        >Industrial2of5</option>
+                <option value="Matrix2of5"
+                        <!-- TMPL_IF NAME="Matrix2of5_checked" -->
+                             selected
+                        <!-- /TMPL_IF -->
+                        >Matrix2of5</option>
+                <option value="NW7"
+                        <!-- TMPL_IF NAME="NW7_checked" -->
+                             selected
+                        <!-- /TMPL_IF -->
+                        >NW7</option>
+                <option value="QRcode"
+                        <!-- TMPL_IF NAME="QRcode_checked" -->
+                             selected
+                        <!-- /TMPL_IF -->
+                        >QRcode</option>
+                <option value="UPC-A"
+                        <!-- TMPL_IF NAME="UPC-A_checked" -->
+                             selected
+                        <!-- /TMPL_IF -->
+                        >UPC-A</option>
+                <option value="UPC-E"
+                        <!-- TMPL_IF NAME="UPC-E_checked" -->
+                             selected
+                        <!-- /TMPL_IF -->
+                        >UPC-E</option>
+        </select>
+</h3>
+
+
+<h3>Confirm Printing Type</h3>
+
+<input type="radio" name="printingtype" value="spine"
+        <!-- TMPL_IF NAME="printingtype_spine" -->
+                checked
+        <!--/TMPL_IF -->
+	>Spine Labels
+<input type="radio" name="printingtype" value="barcode"
+        <!-- TMPL_IF NAME="printingtype_barcode" -->
+                checked
+        <!--/TMPL_IF -->
+	>Barcode Labels
+<input type="radio" name="printingtype" value="both"  
+	<!-- TMPL_IF NAME="printingtype_both" -->
+		checked       
+	<!--/TMPL_IF -->
+	>Both Labels
+
+
+<h3>
+        Start printing from Label number:<input type="textbox" name="startlabel"  SIZE="1"
+        value="<!-- TMPL_VAR NAME="startlabel" -->">
+
+
+</h3>
+
+<p>
+<p>
+ <input type="checkbox" name="guidebox" value=1
+                <!-- TMPL_IF NAME="guidebox"-->
+                     checked
+                <!-- /TMPL_IF -->>
+                <label for="guidebox">Draw Guide Boxes</label>
+<p>
+<p>
+<p>
+        <input type="submit" value="Submit">
+        <input type="hidden" name=op value="save_conf">
+</p>
 </form>
-<!-- /TMPL_IF -->
-<p><a href="/cgi-bin/koha/barcodes/label-add-layout.pl">Create New Layout</a></p>
 </div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
 

Index: label-manager.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/barcodes/Attic/label-manager.tmpl,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -u -b -r1.1.2.8 -r1.1.2.9
--- label-manager.tmpl	12 Jul 2007 07:42:56 -0000	1.1.2.8
+++ label-manager.tmpl	16 Jul 2007 21:48:34 -0000	1.1.2.9
@@ -3,73 +3,20 @@
 <!-- TMPL_INCLUDE NAME="label-topmenu.inc" -->
 <!-- TMPL_INCLUDE name="intranet-nav.inc" -->
 <div id="main">
-<!-- TMPL_INCLUDE NAME="label-active-templates.inc" -->
-
-<!-- TMPL_UNLESS NAME="batch_id" -->
-<div class="details">
-<a class="button" href="/cgi-bin/koha/barcodes/label-manager.pl?op=add_batch">Create New Batch</a> 
-
-<!-- <form style="padding: 3px 30px; border-left: 1px solid black;border-right: 1px solid black;margin: 0 20px;" name="input" action="/cgi-bin/koha/barcodes/label-manager.pl" method="get">
-<select name="batch_id">
-    <!-- TMPL_LOOP NAME="batches" -->
-        <option value="<!-- TMPL_VAR NAME="batch_id" -->" <!-- TMPL_IF NAME="active" --> selected  <!-- /TMPL_IF -->>
-        <!-- TMPL_VAR NAME="batch_id" --></option>
-    <!-- /TMPL_LOOP -->
-</select>
-<input type="submit" value="Open Existing Batch">
-</form>
--->
-</div>
-<!-- TMPL_IF NAME="batches" -->
-<h2>Label Batches</h2>
-<table>
-<tr>
-        <th>Batch id</th>
-        <th>#</th>
-        <th>Edit</th>
-        <th>Delete</th>
-        <th>Print</th>
-</tr>
-<!-- TMPL_LOOP NAME="batches" -->
-<tr>
-        <td>
-                <!-- TMPL_VAR NAME="batch_id" -->
-        </td>
-        <td>
-                <!-- TMPL_VAR NAME="num" --> records
-        </td>
-        <td>
-                <a href="/cgi-bin/koha/barcodes/label-manager.pl?batch_id=<!-- TMPL_VAR NAME="batch_id" -->">Edit</a>
-        </td>
-        <td>
-                <a href="/cgi-bin/koha/barcodes/label-manager.pl?op=delete_batch&batch_id=<!-- TMPL_VAR NAME="batch_id" -->">Delete</a>
-        </td>
-          <td>
-		  <a class="button" style="float: right;"  href="/cgi-bin/koha/barcodes/label-print-pdf.pl?batch_id=<!-- TMPL_VAR NAME="batch_id" -->">Generate PDF for Batch  <!-- TMPL_VAR NAME="batch_id" --></a>
-        </td></tr>
-<!-- /TMPL_LOOP -->
-</table>
-
-<!-- /TMPL_IF -->
-
-<!-- TMPL_ELSE -->
-<div class="details">
-<br /> 
-
-        <a class="button" href="#" onclick="Plugin(<!-- TMPL_VAR NAME="batch_id" -->); return false;">Add item(s) to batch</a> &nbsp;&nbsp;&nbsp;&nbsp;
-		<a class="button" href="/cgi-bin/koha/barcodes/label-manager.pl?batch_id=">Return to batch summary</a>&nbsp;&nbsp;&nbsp;&nbsp;
-        <a class="button" style="border:2px solid #634;" href="/cgi-bin/koha/barcodes/label-manager.pl?op=delete_batch&amp;batch_id=<!-- TMPL_VAR NAME="batch_id" -->">Delete current batch (<!-- TMPL_VAR NAME="batch_id" -->)</a>&nbsp;&nbsp;&nbsp;&nbsp;
-<a class="button"  href="/cgi-bin/koha/barcodes/label-print-pdf.pl?batch_id=<!-- TMPL_VAR NAME="batch_id" -->">Generate PDF for Batch: <!-- TMPL_VAR NAME="batch_id" --></a>
-</div>
-
-<h2>Items to be Printed for Batch <!-- TMPL_VAR NAME="batch_id" -->  (<!-- TMPL_VAR NAME="batch_count" -->  items)</h2>
+<h1>Labels to be Printed</h1>
+<p>
+        Printing will start on <b>row <!-- TMPL_VAR NAME="startrow" --></b><br />
+        Printing will use <b><!-- TMPL_VAR NAME="sheets"--> sheets</b><br />
+        Currently <b><!-- TMPL_VAR NAME="labels_remaining"--> rows</b> spare on <b>sheet <!-- TMPL_VAR NAME="sheets"--></b>
+</p>
 
+<!-- TMPL_IF NAME="resultsloop" -->
+<h2>Items</h2>
 <table>
 <tr>
         <th>Label Number</th>
         <th>Summary</th>
         <th>Item Type</th>
-        <th>Barcode</th>
         <th>Delete</th>
 </tr>
 <!-- TMPL_LOOP NAME="resultsloop" -->
@@ -79,32 +26,32 @@
         </td>
         <td>
                 <b> <a href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"> <!-- TMPL_VAR NAME="title" -->:</a></b> <!-- TMPL_VAR NAME="author" -->:
-                <!-- TMPL_VAR NAME="isbn" -->         </td>
-        <td>           <!-- TMPL_VAR NAME="itemtype" -->         </td>
-        <td>          <!-- TMPL_VAR NAME="barcode" -->         </td>
+                <!-- TMPL_VAR NAME="isbn" -->: <!-- TMPL_VAR NAME="barcode" -->
+        </td>
         <td>
-                <a href="/cgi-bin/koha/barcodes/label-manager.pl?op=delete&amp;itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->&amp;batch_id=<!-- TMPL_VAR NAME="batch_id" -->">Delete</a>
+                <!-- TMPL_VAR NAME="itemtype" -->
+        </td>
+        <td>
+                <a href="/cgi-bin/koha/barcodes/label-manager.pl?op=delete&amp;itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->">Delete</a>
         </td>
 </tr>
 <!-- /TMPL_LOOP -->
 </table>
 
-
-<!-- /TMPL_UNLESS -->
-
-
-
+<p><br />
+        <a href="#" onclick="Plugin(); return false;">Add Item</a> &nbsp;&nbsp;
+        <a href="/cgi-bin/koha/barcodes/label-manager.pl?op=deleteall">Delete All</a>
+</p>
+ <!-- TMPL_ELSE -->
+        <a href="#" onclick="Plugin(); return false;">Add Item</a>
+<!-- /TMPL_IF -->
+</form>
 </div>
 
-
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
-
-
-
 <script type="text/javascript">
-function Plugin(batch_id) {
-	window.open("label-item-search.pl?batch_id="+batch_id+"",'FindABibIndex','width=600,height=460,toolbar=no,scrollbars=yes');
+function Plugin() {
+	window.open('label-item-search.pl','FindABibIndex','width=500,height=400,toolbar=no,scrollbars=yes');
 }
 </script>
 
-
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: label-templates.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/barcodes/Attic/label-templates.tmpl,v
retrieving revision 1.1.4.3
retrieving revision 1.1.4.4
diff -u -b -r1.1.4.3 -r1.1.4.4
--- label-templates.tmpl	12 Jul 2007 07:42:56 -0000	1.1.4.3
+++ label-templates.tmpl	16 Jul 2007 21:48:34 -0000	1.1.4.4
@@ -3,14 +3,13 @@
 <!-- TMPL_INCLUDE NAME="label-topmenu.inc" -->
 <!-- TMPL_INCLUDE name="intranet-nav.inc" -->
 <div id="main">
-
-<!-- TMPL_INCLUDE NAME="label-active-templates.inc" -->
+<h1>Current Templates
 
 
+</h1>
 
 <!-- TMPL_IF NAME="resultsloop" -->
 <h2>Templates</h2>
-<form name="input" action="/cgi-bin/koha/barcodes/label-templates.pl" method="get">
 <table>
 <tr>
         <th>Template Code</th>
@@ -28,32 +27,24 @@
                 <!-- TMPL_VAR NAME="tmpl_desc" -->
         </td>
    		<td>
-				<a href="/cgi-bin/koha/barcodes/label-edit-template.pl?tmpl_id=<!-- TMPL_VAR NAME="tmpl_id" -->">Edit</a>
+				<a href="/cgi-bin/koha/barcodes/label-edit-template.pl?tmpl_code=<!-- TMPL_VAR NAME="tmpl_code" -->">Edit</a>
         </td>
    		<td>
-				<a href="/cgi-bin/koha/barcodes/label-templates.pl?op=delete&tmpl_id=<!-- TMPL_VAR NAME="tmpl_id" -->">Delete</a>
+				<a href="/cgi-bin/koha/barcodes/label-templates.pl?op=delete&tmpl_code=<!-- TMPL_VAR NAME="tmpl_code" -->">Delete</a>
         </td>
 		  <td>
-<input type="radio" name="tmpl_id" value="<!-- TMPL_VAR NAME="tmpl_id" -->"  
-                <!-- TMPL_IF NAME="active" -->
- checked
-                <!-- /TMPL_IF -->
- >
-
+				<!-- TMPL_IF NAME="active" -->Active<!-- /TMPL_IF -->
         </td>
 </tr>
 <!-- /TMPL_LOOP -->
- <tr><td colspan="5" align="right">
- <input class="button" type="submit" value="Set Active Template">
-        <input type="hidden" name=op value="set_active_template">
-</td></tr>
 </table>
 
-</form>
-<!-- /TMPL_IF -->
+<p><br />
 
-<br/>
-<a href="/cgi-bin/koha/barcodes/label-create-template.pl?op=blank">Create New Label Template</a>
+				<a href="/cgi-bin/koha/barcodes/label-create-template.pl?op=blank">Create New Label Template</a>
+
+<!-- /TMPL_IF -->
+</form>
 </div>
 
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->

Index: result.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/barcodes/Attic/result.tmpl,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -b -r1.1.2.5 -r1.1.2.6
--- result.tmpl	12 Jul 2007 07:42:55 -0000	1.1.2.5
+++ result.tmpl	16 Jul 2007 21:48:34 -0000	1.1.2.6
@@ -2,9 +2,9 @@
 <div id="main-compact">
 	<h1>Search results</h1>
 	<div class="results">
-		<p >
+		<p>
 			<!-- TMPL_IF NAME=displayprev -->
-				<a href="label-item-search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;batch_id=<!-- TMPL_VAR NAME="batch_id" -->">
+				<a href="label-item-search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search">
 					&lt;&lt;
 				</a>
 			<!-- /TMPL_IF -->
@@ -12,11 +12,11 @@
 				<!-- TMPL_IF NAME=highlight -->
 					<span class="current"><!-- TMPL_VAR NAME="number" --></span>
 				<!-- TMPL_ELSE -->
-					<a href="label-item-search.pl?startfrom=<!-- TMPL_VAR NAME=startfrom -->&amp;<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;batch_id=<!-- TMPL_VAR NAME="batch_id" -->"><!-- TMPL_VAR NAME="number" --></a>
+					<a href="label-item-search.pl?startfrom=<!-- TMPL_VAR NAME=startfrom -->&amp;<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search"><!-- TMPL_VAR NAME="number" --></a>
 				<!-- /TMPL_IF -->
 			<!-- /TMPL_LOOP -->
 			<!-- TMPL_IF NAME=displaynext -->
-				<a href="label-item-search.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;batch_id=<!-- TMPL_VAR NAME="batch_id" -->">&gt;&gt;</a>
+				<a href="label-item-search.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search">&gt;&gt;</a>
 				<!-- /TMPL_IF -->
 		</p>
 		<p>
@@ -27,15 +27,11 @@
 			<!-- /TMPL_IF -->
 		</p>
 	</div>
-<form name='resultform'>
-	<span class="no"><a class="button" href="#" onclick="history.go(-1)" > &laquo; Back</a>&nbsp;&nbsp;&nbsp;&nbsp; <a class="button" href="#" onclick="window.close()">[ Done ]</a></span>
-<input type="submit" class="icon addchecked" value="Add checked" onclick="add_item('checked',<!-- TMPL_VAR NAME="batch_id" -->); return false" />
+
 	<table>
 	<tr>
-	<tr>
-		<th><a href="#" onclick="check_all()" >Check all</a></th>
-		<th>Biblio Summary</th>
-		<th>Item Summary</th>
+		<th>Summary</th>
+		<th>Item Type</th>
 		<th>Add</th>
 	</tr>
 	<!-- TMPL_LOOP name="result" -->
@@ -44,51 +40,44 @@
 		<!-- TMPL_ELSE -->
 			<tr>
 		<!-- /TMPL_IF -->
-			<td> <input type="checkbox" name="itemnumber" id="itm<!-- TMPL_VAR NAME="itemnumber" -->" value="<!-- TMPL_VAR NAME="itemnumber" -->" />	</td>
 			<td>
-					<p><b><!-- TMPL_VAR NAME="title" --></b>&nbsp;&nbsp;
-					<!-- TMPL_VAR NAME="author" -->
-					<p>[ <!-- TMPL_VAR NAME="itemtype" --> ]
+					<p><b><!-- TMPL_VAR NAME="title" --></b></p>
+					<p><!-- TMPL_VAR NAME="author" -->
 					<!-- TMPL_IF name="publishercode" -->- <!-- TMPL_VAR name="publishercode" --><!-- /TMPL_IF -->
 					<!-- TMPL_IF name="place" --> ; <!-- TMPL_VAR name="place" --><!-- /TMPL_IF -->
 					<!-- TMPL_IF name="pages" --> - <!-- TMPL_VAR name="pages" --><!-- /TMPL_IF -->
-					<!-- TMPL_IF name="notes" --> <br /> <!-- TMPL_VAR name="notes" --><!-- /TMPL_IF -->
+					<!-- TMPL_IF name="notes" --> : <!-- TMPL_VAR name="notes" --><!-- /TMPL_IF -->
+					<!-- TMPL_IF name="size" --> ; <!-- TMPL_VAR name="size" --><!-- /TMPL_IF -->
+					<!-- TMPL_IF name="barcode" --> ; <!-- TMPL_VAR name="barcode" --><!-- /TMPL_IF -->
 					</p>
 				</td>
 <!-- NEW -->
 				<td>
-					<!-- TMPL_IF name="itemcallnumber" --><!-- TMPL_VAR name="itemcallnumber" --><br /> <!-- /TMPL_IF -->
-					<!-- TMPL_IF name="dateaccessioned" -->[<!-- TMPL_VAR name="dateaccessioned" -->]<br /> <!-- /TMPL_IF -->
-					<!-- TMPL_IF name="barcode" --> <!-- TMPL_VAR name="barcode" --> <!-- /TMPL_IF -->
-
+					<!-- TMPL_VAR NAME="itemtype" -->
 				</td>
 				<td>
-					<a onclick="add_item(<!-- TMPL_VAR NAME="itemnumber" -->,<!-- TMPL_VAR NAME="batch_id" -->); return false" href="/cgi-bin/koha/barcodes/label-manager.pl?itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->&amp;batch_id=<!-- TMPL_VAR name="batch_id" -->&amp;op=add">Add</a>
-
-
-
-
+					<a onclick="add_item(<!-- TMPL_VAR NAME="itemnumber" -->); return false" href="/cgi-bin/koha/barcodes/label-manager.pl?itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->&amp;op=add">Add</a>
 
 <!-- /NEW -->
 				</td>
 			</tr>
 			<!-- /TMPL_LOOP -->
 		</table>
-</form>
+
 	<div class="results">
 		<p>
 			<!-- TMPL_IF NAME=displayprev -->
-			<a href="label-item-search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search>&amp;batch_id=<!-- TMPL_VAR NAME="batch_id" -->">&lt;&lt;</a>
+			<a href="label-item-search.pl?startfrom=<!-- TMPL_VAR NAME="startfromprev" -->&amp;<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search">&lt;&lt;</a>
 			<!-- /TMPL_IF -->
 			<!-- TMPL_LOOP NAME=numbers -->
 				<!-- TMPL_IF NAME=highlight -->
 				<span class="current"><!-- TMPL_VAR NAME="number" --></span>
 				<!-- TMPL_ELSE -->
-				<a href="label-item-search.pl?startfrom=<!-- TMPL_VAR NAME=startfrom -->&amp;<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;batch_id=<!-- TMPL_VAR NAME="batch_id" -->"><!-- TMPL_VAR NAME="number" --></a>
+				<a href="label-item-search.pl?startfrom=<!-- TMPL_VAR NAME=startfrom -->&amp;<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search"><!-- TMPL_VAR NAME="number" --></a>
 				<!-- /TMPL_IF -->
 			<!-- /TMPL_LOOP -->
 			<!-- TMPL_IF NAME=displaynext -->
-			<a href="label-item-search.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search&amp;batch_id=<!-- TMPL_VAR NAME="batch_id" -->">&gt;&gt;</a>
+			<a href="label-item-search.pl?startfrom=<!-- TMPL_VAR NAME="startfromnext" -->&amp;<!-- TMPL_LOOP NAME=searchdata --><!-- TMPL_VAR NAME="term" -->=<!-- TMPL_VAR name="val" ESCAPE=URL -->&amp;<!-- /TMPL_LOOP -->&amp;resultsperpage=<!-- TMPL_VAR NAME="resultsperpage" -->&amp;type=intranet&amp;op=do_search">&gt;&gt;</a>
 				<!-- /TMPL_IF -->
 		</p>
 	</div> 
@@ -97,38 +86,7 @@
 <script type="text/javascript">
 <!--
 
-
-function add_item(itemnum,batch_id){
-
- var getstr='';
- if (itemnum == 'checked') {
-    itms= new Array;        
-    if(document.resultform.itemnumber.length > 0) {
-        for (var i=0; i < document.resultform.itemnumber.length; i++) {
-            if (document.resultform.itemnumber[i].checked) {
-                itms.push("itemnumber=" +  document.resultform.itemnumber[i].value);
-            }
-        }
-        getstr = itms.join("&");
-    }
-  } else {
-		getstr = "itemnumber="+itemnum;
-} 
- 	var myurl = "label-manager.pl?op=add&batch_id="+batch_id+"&"+getstr;
-	window.opener.location.href = myurl;
-}
-/* # TODO  there's a checkall fcn in opac/includes.... that should be modified to accept form object. */
-function check_all()
-{
-count = document.resultform.elements.length;
-    for (i=0; i < count; i++)  
-    {   
-            document.resultform.elements[i].checked = 1;
-    }
-}
-
-function add_item3(itemnumber){
-
+function add_item(itemnumber){
  var myurl = "label-manager.pl?op=add&itemnumber="+itemnumber+"";
      window.opener.location.href = myurl;
 }

Index: search.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/barcodes/Attic/search.tmpl,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -b -r1.1.2.4 -r1.1.2.5
--- search.tmpl	12 Jul 2007 07:42:55 -0000	1.1.2.4
+++ search.tmpl	16 Jul 2007 21:48:34 -0000	1.1.2.5
@@ -1,20 +1,12 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Barcodes and Labels: Search<!-- TMPL_INCLUDE NAME="doc-head-close-calendar.inc" -->
-<!-- TMPL_INCLUDE NAME="masthead.inc" --> 
-
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->Koha -- Barcodes and Labels: Search<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <div id="main-compact">
 
-<h1>Catalog item search
-
-<!-- TMPL_IF name="batch_id" -->
- for batch <!-- TMPL_VAR NAME="batch_id" -->
-<!-- /TMPL_IF  -->
-</h1>
+<h1>Catalogue Item Search</h1>
 
 <form name="f" method="post">
 	<input type="hidden" name="op" value="do_search" />
 	<input type="hidden" name="type" value="intranet" />
 	<input type="hidden" name="nbstatements" value="<!-- TMPL_VAR NAME="nbstatements" -->" />
-	<input type="hidden" name="batch_id" value="<!-- TMPL_VAR NAME="batch_id" -->" />
 
 	<table>
 	<tr><th scope="row">
@@ -28,16 +20,6 @@
 		<input type="text" id="title" name="value" />
 	    </td></tr>
 	<tr><th scope="row">
-		<label for="isbn">ISBN</label>
-	    </th>
-	    <td>
-		<input type="hidden" name="marclist" value="biblioitems.isbn" />
-		<input type="hidden" name="and_or" value="and" />
-		<input type="hidden" name="excluding" value="" />
-		<input type="hidden" name="operator" value="=" />
-		<input type="text" name="value" id="isbn" />
-	    </td></tr>
-	<tr><th scope="row">
 		<label for="issn">ISSN</label>
 	    </th>
 	    <td>
@@ -48,68 +30,6 @@
 		<input type="text" name="value" id="issn" />
 	    </td></tr>
 	<tr><th scope="row">
-	<tr><th scope="row">
-		<label for="itemcallnumber">Item call number</label>
-	    </th>
-	    <td>
-		<input type="hidden" name="marclist" value="items.itemcallnumber" />
-		<input type="hidden" name="and_or" value="and" />
-		<input type="hidden" name="excluding" value="" />
-		<input type="hidden" name="operator" value="start" />
-		<input type="text" name="value" id="itemcallnumber" />
-	    </td></tr>
-	<tr><th scope="row">
-
-
-	<tr><th scope="row">
-		<label for="datefrom">Added on or after date</label>
-	    </th>
-	    <td>
-		<input type="hidden" name="marclist" value="items.dateaccessioned" />
-		<input type="hidden" name="and_or" value="and" />
-		<input type="hidden" name="excluding" value="" />
-		<input type="hidden" name="operator" value=">=" />
-  <input type="text" size="10" id="datefrom" name="value" value="" />                                                      
-  <img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" border="0" id="openCalendarFrom" style="cursor: pointer;" valign="top" />
-
-<script type="text/javascript">
-    Calendar.setup({
-        inputField     :    "datefrom",
-      ifFormat : "%Y-%m-%d",
-        button         :    "openCalendarFrom",
-        align          :    "Tl",
-        singleClick    :    false
-    });
-</script>
-
-
-</td>
-    </tr>
-	<tr><th scope="row">
-		<label for="dateto">Added on or before date</label>
-	    </th>
-	    <td>
-		<input type="hidden" name="marclist" value="items.dateaccessioned" />
-		<input type="hidden" name="and_or" value="and" />
-		<input type="hidden" name="excluding" value="" />
-		<input type="hidden" name="operator" value="<=" />
-  <input type="text" size="10" id="dateto" name="value" value="" />                                                      
-  <img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" border="0" id="openCalendarTo" style="cursor: pointer;" valign="top" />
-
-<script type="text/javascript">
-    Calendar.setup({
-        inputField     :    "dateto",
-      ifFormat : "%Y-%m-%d",
-        button         :    "openCalendarTo",
-        align          :    "Tl",
-    });
-</script>
-
-
-</td>
-    </tr>
-
-	<tr><th scope="row">
 		<label for="resultsperpage">Results per page:</label>
 	    </th>
 	    <td>
@@ -117,41 +37,16 @@
 			<option value="20">20</option>
 			<option value="50">50</option>
 			<option value="100">100</option>
-			<option value="1000">1000</option>
 		</select>
-    </td>
-</tr>
-
-<tr><th scope="row">
 		<label for="orderby">Ordered by</label>
-        </th>
-        <td>
 		<select name="orderby" id="orderby" size="1">
 			<option value="biblio.title">Title</option>
 			<option value="biblio.author">Author</option>
 			<option value="biblioitems.dewey">Dewey</option>
 			<option value="biblioitems.publicationyear">Publication Year</option>
 			<option value="biblioitems.publishercode">Publisher</option>
-			<option value="biblioitems.itemtype">Itemtype</option>
-			<option value="biblioitems.classification">Item Callnumber</option>
 		</select>
-</td>
-</tr>
-
-
-    <tr><th scope="row">Document Type</th>
-                <td colspan="2">
-                    <select name="Filter">
-                        <option value="">All Item Types</option>
-                        <!-- TMPL_LOOP name="itemtypeloop" -->
-                            <option value="<!-- TMPL_VAR name="value" -->" 
-                    <!-- TMPL_IF name="selected" --> selected="selected"
-                    <!-- /TMPL_IF -->><!-- TMPL_VAR name="description" --></option>
-                        <!-- /TMPL_LOOP -->
-                    </select>
-                </td>
-            </tr>
-
+	    </td></tr>
 	</table>
 <p>		<input type="submit" value="Start search" class="submit" /></p>
 </form>





More information about the Koha-cvs mailing list