[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Koha-cvs] koha/koha-tmpl/intranet-tmpl/npl/en/barcodes la... [rel_2_2]
|
From: |
Owen Leonard |
|
Subject: |
[Koha-cvs] koha/koha-tmpl/intranet-tmpl/npl/en/barcodes la... [rel_2_2] |
|
Date: |
Wed, 18 Jul 2007 14:33:46 +0000 |
CVSROOT: /sources/koha
Module name: koha
Branch: rel_2_2
Changes by: Owen Leonard <oleonard> 07/07/18 14:33:46
Modified files:
koha-tmpl/intranet-tmpl/npl/en/barcodes: label-edit-layout.tmpl
label-home.tmpl
Log message:
Fixes for Bug 1366.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/barcodes/label-edit-layout.tmpl?cvsroot=koha&only_with_tag=rel_2_2&r1=1.1.4.2&r2=1.1.4.3
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.10&r2=1.1.2.11
Patches:
Index: label-edit-layout.tmpl
===================================================================
RCS file:
/sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/barcodes/Attic/label-edit-layout.tmpl,v
retrieving revision 1.1.4.2
retrieving revision 1.1.4.3
diff -u -b -r1.1.4.2 -r1.1.4.3
--- label-edit-layout.tmpl 10 Jul 2007 10:57:56 -0000 1.1.4.2
+++ label-edit-layout.tmpl 18 Jul 2007 14:33:46 -0000 1.1.4.3
@@ -6,33 +6,24 @@
<div id="main">
<form name="input" action="/cgi-bin/koha/barcodes/label-manager.pl"
method="get">
-
-
<h3>Layout Name</h3>
-<input type="textbox" name="layoutname" SIZE="20" value="<!-- TMPL_VAR
NAME="layoutname" -->">
-
-
-<p>
-<p>
-<p>
-
-
+<input type="textbox" name="layoutname" size="20" value="<!-- TMPL_VAR
NAME="layoutname" -->" />
-<h3>
- Choose Order Of Fields to Print
-</h3>
+<h3>Choose Order Of Fields to Print</h3>
<table summary="fields to print">
<tr>
-
-
-
-
<td>
<select name="tx_title">
<!-- TMPL_LOOP Name="tx_title" -->
- <option value="<!-- TMPL_VAR Name="num" -->"<!-- TMPL_IF
Name="selected" --> selected <!-- /TMPL_IF -->>
+ <!-- TMPL_IF Name="selected" -->
+ <option value="<!-- TMPL_VAR Name="num" -->"
selected="selected">
<!-- TMPL_VAR Name="num" -->
</option>
+ <!-- TMPL_ELSE -->
+ <option value="<!-- TMPL_VAR Name="num" -->">
+ <!-- TMPL_VAR Name="num" -->
+ </option>
+ <!-- /TMPL_IF -->
<!-- /TMPL_LOOP -->
</select>
<label>Title</label>
@@ -41,9 +32,15 @@
<td>
<select name="tx_author">
<!-- TMPL_LOOP Name="tx_author" -->
- <option value="<!-- TMPL_VAR Name="num" -->"<!-- TMPL_IF
Name="selected" --> selected <!-- /TMPL_IF -->>
+ <!-- TMPL_IF Name="selected" -->
+ <option value="<!-- TMPL_VAR Name="num" -->"
selected="selected">
+ <!-- TMPL_VAR Name="num" -->
+ </option>
+ <!-- TMPL_ELSE -->
+ <option value="<!-- TMPL_VAR Name="num" -->">
<!-- TMPL_VAR Name="num" -->
</option>
+ <!-- /TMPL_IF -->
<!-- /TMPL_LOOP -->
</select>
<label>Author</label>
@@ -52,9 +49,15 @@
<td>
<select name="tx_isbn">
<!-- TMPL_LOOP Name="tx_isbn" -->
- <option value="<!-- TMPL_VAR Name="num" -->"<!-- TMPL_IF
Name="selected" --> selected <!-- /TMPL_IF -->>
+ <!-- TMPL_IF Name="selected" -->
+ <option value="<!-- TMPL_VAR Name="num" -->"
selected="selected">
+ <!-- TMPL_VAR Name="num" -->
+ </option>
+ <!-- TMPL_ELSE -->
+ <option value="<!-- TMPL_VAR Name="num" -->">
<!-- TMPL_VAR Name="num" -->
</option>
+ <!-- /TMPL_IF -->
<!-- /TMPL_LOOP -->
</select>
<label>ISBN</label>
@@ -63,9 +66,15 @@
<td>
<select name="tx_issn">
<!-- TMPL_LOOP Name="tx_issn" -->
- <option value="<!-- TMPL_VAR Name="num" -->"<!-- TMPL_IF
Name="selected" --> selected <!-- /TMPL_IF -->>
+ <!-- TMPL_IF Name="selected" -->
+ <option value="<!-- TMPL_VAR Name="num" -->"
selected="selected">
+ <!-- TMPL_VAR Name="num" -->
+ </option>
+ <!-- TMPL_ELSE -->
+ <option value="<!-- TMPL_VAR Name="num" -->">
<!-- TMPL_VAR Name="num" -->
</option>
+ <!-- /TMPL_IF -->
<!-- /TMPL_LOOP -->
</select>
<label>ISSN</label>
@@ -75,9 +84,15 @@
<td>
<select name="tx_itemtype">
<!-- TMPL_LOOP Name="tx_itemtype" -->
- <option value="<!-- TMPL_VAR Name="num" -->"<!-- TMPL_IF
Name="selected" --> selected <!-- /TMPL_IF -->>
+ <!-- TMPL_IF Name="selected" -->
+ <option value="<!-- TMPL_VAR Name="num" -->"
selected="selected">
+ <!-- TMPL_VAR Name="num" -->
+ </option>
+ <!-- TMPL_ELSE -->
+ <option value="<!-- TMPL_VAR Name="num" -->">
<!-- TMPL_VAR Name="num" -->
</option>
+ <!-- /TMPL_IF -->
<!-- /TMPL_LOOP -->
</select>
<label>Itemtype</label>
@@ -89,9 +104,15 @@
<td>
<select name="tx_dewey">
<!-- TMPL_LOOP Name="tx_dewey" -->
- <option value="<!-- TMPL_VAR Name="num" -->"<!-- TMPL_IF
Name="selected" --> selected <!-- /TMPL_IF -->>
+ <!-- TMPL_IF Name="selected" -->
+ <option value="<!-- TMPL_VAR Name="num" -->"
selected="selected">
<!-- TMPL_VAR Name="num" -->
</option>
+ <!-- TMPL_ELSE -->
+ <option value="<!-- TMPL_VAR Name="num" -->">
+ <!-- TMPL_VAR Name="num" -->
+ </option>
+ <!-- /TMPL_IF -->
<!-- /TMPL_LOOP -->
</select>
<label>Dewey</label>
@@ -100,9 +121,15 @@
<td>
<select name="tx_barcode">
<!-- TMPL_LOOP Name="tx_barcode" -->
- <option value="<!-- TMPL_VAR Name="num" -->"<!-- TMPL_IF
Name="selected" --> selected <!-- /TMPL_IF -->>
+ <!-- TMPL_IF Name="selected" -->
+ <option value="<!-- TMPL_VAR Name="num" -->"
selected="selected">
+ <!-- TMPL_VAR Name="num" -->
+ </option>
+ <!-- TMPL_ELSE -->
+ <option value="<!-- TMPL_VAR Name="num" -->">
<!-- TMPL_VAR Name="num" -->
</option>
+ <!-- /TMPL_IF -->
<!-- /TMPL_LOOP -->
</select>
<label>Barcode</label>
@@ -112,9 +139,15 @@
<td>
<select name="tx_classif">
<!-- TMPL_LOOP Name="tx_classif" -->
- <option value="<!-- TMPL_VAR Name="num" -->"<!-- TMPL_IF
Name="selected" --> selected <!-- /TMPL_IF -->>
+ <!-- TMPL_IF Name="selected" -->
+ <option value="<!-- TMPL_VAR Name="num" -->"
selected="selected">
<!-- TMPL_VAR Name="num" -->
</option>
+ <!-- TMPL_ELSE -->
+ <option value="<!-- TMPL_VAR Name="num" -->">
+ <!-- TMPL_VAR Name="num" -->
+ </option>
+ <!-- /TMPL_IF -->
<!-- /TMPL_LOOP -->
</select>
<label>Classification</label>
@@ -127,91 +160,72 @@
<td>
<select name="tx_subclass">
<!-- TMPL_LOOP Name="tx_subclass" -->
- <option value="<!-- TMPL_VAR Name="num" -->"<!-- TMPL_IF
Name="selected" --> selected <!-- /TMPL_IF -->>
+ <!-- TMPL_IF Name="selected" -->
+ <option value="<!-- TMPL_VAR Name="num" -->"
selected="selected">
<!-- TMPL_VAR Name="num" -->
</option>
+ <!-- TMPL_ELSE -->
+ <option value="<!-- TMPL_VAR Name="num" -->">
+ <!-- TMPL_VAR Name="num" -->
+ </option>
+ <!-- /TMPL_IF -->
<!-- /TMPL_LOOP -->
</select>
<label>Subclass</label>
</td>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
<td>
<select name="tx_itemcallnumber">
<!-- TMPL_LOOP Name="tx_itemcallnumber" -->
- <option value="<!-- TMPL_VAR Name="num" -->"<!-- TMPL_IF
Name="selected" --> selected <!-- /TMPL_IF -->>
+ <!-- TMPL_IF Name="selected" -->
+ <option value="<!-- TMPL_VAR Name="num" -->"
selected="selected">
<!-- TMPL_VAR Name="num" -->
</option>
+ <!-- TMPL_ELSE -->
+ <option value="<!-- TMPL_VAR Name="num" -->">
+ <!-- TMPL_VAR Name="num" -->
+ </option>
+ <!-- /TMPL_IF -->
<!-- /TMPL_LOOP -->
</select>
<label>Call Number</label>
</td>
-
-
</tr>
-
-
-
-
-
-
-
-
</table>
-<p>
-
-
<h3>Confirm Barcode Type</h3>
<select name="barcodetype">
<!-- TMPL_LOOP NAME="barcode_types" -->
- <option value="<!-- TMPL_VAR NAME="code" -->"
- <!-- TMPL_IF NAME="active" --> selected <!-- /TMPL_IF -->
- ><!-- TMPL_VAR NAME="desc" --></option>
+ <!-- TMPL_IF NAME="active" -->
+ <option value="<!-- TMPL_VAR NAME="code" -->" selected="selected"><!--
TMPL_VAR NAME="desc" --></option>
+ <!-- TMPL_ELSE -->
+ <option value="<!-- TMPL_VAR NAME="code" -->"><!-- TMPL_VAR
NAME="desc" --></option>
+ <!-- /TMPL_IF -->
<!-- /TMPL_LOOP -->
</select>
-
-
<h3>Confirm Layout Type</h3>
<select name="printingtype">
<!-- TMPL_LOOP NAME="printingtypes" -->
- <option value="<!-- TMPL_VAR NAME="code" -->"
- <!-- TMPL_IF NAME="active" --> selected <!-- /TMPL_IF -->
- ><!-- TMPL_VAR NAME="desc" --></option>
- <!-- /TMPL_LOOP -->
-</select>
+ <!-- TMPL_IF NAME="active" -->
+ <option value="<!-- TMPL_VAR NAME="code" -->" selected="selected"><!--
TMPL_VAR NAME="desc" --></option>
+ <!-- TMPL_ELSE -->
+ <option value="<!-- TMPL_VAR NAME="code" -->"><!-- TMPL_VAR
NAME="desc" --></option>
+ <!-- /TMPL_IF -->
+ <!-- /TMPL_LOOP -->
+</select>
-<h3>
- Start printing from Label number:<input type="textbox"
name="startlabel" SIZE="1" value=" <!-- TMPL_VAR NAME="startlabel" --> ">
+<h3>Start printing from Label number:<input type="textbox" name="startlabel"
size="1" value="<!-- TMPL_VAR NAME="startlabel" -->"></h3>
-</h3>
+ <h3>Draw Guide Boxes <!-- TMPL_IF NAME="guidebox"--><input type="checkbox"
name="guidebox" value="1" checked="checked" />
+ <!-- TMPL_ELSE -->
+ <input type="checkbox" name="guidebox"
value="1" /><!-- /TMPL_IF --></h3>
+
-<p>
-<p>
- <h3>Draw Guide Boxes<input type="checkbox" name="guidebox" value=1
- <!-- TMPL_IF NAME="guidebox"-->
- checked
- <!-- /TMPL_IF --> ></h3>
-<p>
-<p>
<p>
<input type="submit" value="Submit">
<input type="hidden" name=op value="save_layout">
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.10
retrieving revision 1.1.2.11
diff -u -b -r1.1.2.10 -r1.1.2.11
--- label-home.tmpl 16 Jul 2007 21:48:34 -0000 1.1.2.10
+++ label-home.tmpl 18 Jul 2007 14:33:46 -0000 1.1.2.11
@@ -6,57 +6,59 @@
<div id="main">
<form name="input" action="/cgi-bin/koha/barcodes/label-manager.pl"
method="get">
-<h3>
- Choose Fields to Print
-</h3>
+<h3>Choose Fields to Print</h3>
<table summary="fields to print">
<tr>
<td>
- <input type="checkbox" name="itemtype" value=1
<!-- TMPL_IF NAME="itemtype"-->
- checked
- <!-- /TMPL_IF --> >
+ <input type="checkbox" name="itemtype" value="1"
checked="checked" />
+ <!-- TMPL_ELSE -->
+ <input type="checkbox" name="itemtype" value="1" />
+ <!-- /TMPL_IF -->
<label for="itemtype">Item Type</label>
</td>
<td>
- <input type="checkbox" name="isbn" value=1
<!-- TMPL_IF NAME="isbn" -->
- checked
- <!-- /TMPL_IF -->>
+ <input type="checkbox" name="isbn" value="1" checked="checked"
/>
+ <!-- TMPL_ELSE -->
+ <input type="checkbox" name="isbn" value="1" />
+ <!-- /TMPL_IF -->
<label for="isbn">ISBN</label>
</td>
</tr>
<tr>
<td>
- <input type="checkbox" name="dcn" value=1
<!-- TMPL_IF NAME="dewey" -->
- checked
- <!-- /TMPL_IF -->>
+ <input type="checkbox" name="dcn" value="1" checked="checked"
/>
+ <!-- TMPL_ELSE -->
+ <input type="checkbox" name="dcn" value="1" />
+ <!-- /TMPL_IF -->
<label for="dcn">Dewey / Call Number</label>
</td>
<td>
- <input type="checkbox" name="classif" value=1
<!-- TMPL_IF NAME="class" -->
- checked
- <!-- /TMPL_IF -->>
+ <input type="checkbox" name="classif" value="1"
checked="checked" />
+ <!-- TMPL_ELSE -->
+ <input type="checkbox" name="classif" value="1" />
+ <!-- /TMPL_IF -->
<label for="classif">Classification</label>
</td>
</tr>
<tr>
- <td>
- <input type="checkbox" name="itemcallnumber" value=1
- <!-- TMPL_IF NAME="itemcallnumber" -->
- checked
- <!-- /TMPL_IF -->>
+ <td><!-- TMPL_IF NAME="itemcallnumber" -->
+ <input type="checkbox" name="itemcallnumber" value="1"
checked="checked" />
+ <!-- TMPL_ELSE -->
+ <input type="checkbox" name="itemcallnumber"
value="1" />
+ <!-- /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 -->>
+ <td><!-- TMPL_IF NAME="subclass" -->
+ <input type="checkbox" name="subclass" value="1"
checked="checked" />
+ <!-- TMPL_ELSE -->
+ <input type="checkbox" name="subclass" value="1" />
+ <!-- /TMPL_IF -->
<label for="subclass">Sub-Class</label>
</td>
</tr>
@@ -66,116 +68,113 @@
<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_IF NAME="active" -->
+ <option value="<!-- TMPL_VAR NAME="tmpl_id" -->"
selected="selected"><!-- TMPL_VAR NAME="tmpl_code" --></option>
+ <!-- TMPL_ELSE -->
+ <option value="<!-- TMPL_VAR NAME="tmpl_id" -->"><!-- TMPL_VAR
NAME="tmpl_code" --></option>
+ <!-- /TMPL_IF -->
<!-- /TMPL_LOOP -->
</select>
<h3>Confirm Barcode Type</h3>
<select name="barcodetype">
- <option value="COOP2of5"
<!-- TMPL_IF NAME="COOP2of5_checked" -->
- selected
+ <option value="COOP2of5" selected="selected">COOP2of5</option>
+ <!-- TMPL_ELSE -->
+ <option value="COOP2of5">COOP2of5</option>
<!--/TMPL_IF -->
- >COOP2of5</option>
- <option value="Code39"
<!-- TMPL_IF NAME="Code39_checked" -->
- selected
+ <option value="Code39" selected="selected">Code39</option>
+ <!-- TMPL_ELSE -->
+ <option value="Code39">Code39</option>
<!-- /TMPL_IF -->
- >Code39</option>
- <option value="Code39sum"
<!-- TMPL_IF NAME="Code39sum_checked" -->
- selected
+ <option value="Code39sum"
selected="selected">Code39 + modulo43</option>
+ <!-- TMPL_ELSE -->
+ <option value="Code39sum">Code39 +
modulo43</option>
<!-- /TMPL_IF -->
- >Code39 + modulo43</option>
- <option value="EAN13"
<!-- TMPL_IF NAME="EAN13_checked" -->
- selected
+ <option value="EAN13" selected="selected">EAN13(JAN13)</option>
+ <!-- TMPL_ELSE -->
+ <option value="EAN13">EAN13(JAN13)</option>
<!-- /TMPL_IF -->
- >EAN13(JAN13)</option>
- <option value="EAN8"
<!-- TMPL_IF NAME="EAN8_checked" -->
- selected<!-- /TMPL_IF -->
- >EAN8(JAN8)</option>
- <option value="ITF"
+ <option value="EAN8" selected="selected">EAN8(JAN8)</option>
+ <!-- TMPL_ELSE -->
+ <option value="EAN8">EAN8(JAN8)</option><!-- /TMPL_IF -->
<!-- TMPL_IF NAME="ITF_checked" -->
- selected
+ <option value="ITF"
selected="selected">ITF(Interleaved2of5)</option>
+ <!-- TMPL_ELSE -->
+ <option value="ITF">ITF(Interleaved2of5)</option>
<!-- /TMPL_IF -->
- >ITF(Interleaved2of5)</option>
- <option value="Industrial2of5"
<!-- TMPL_IF NAME="Industrial2of5_checked" -->
- selected
+ <option value="Industrial2of5"
selected="selected">Industrial2of5</option>
+ <!-- TMPL_ELSE -->
+ <option value="Industrial2of5">Industrial2of5</option>
<!-- /TMPL_IF -->
- >Industrial2of5</option>
- <option value="Matrix2of5"
<!-- TMPL_IF NAME="Matrix2of5_checked" -->
- selected
+ <option value="Matrix2of5"
selected="selected">Matrix2of5</option>
+ <!-- TMPL_ELSE -->
+ <option value="Matrix2of5">Matrix2of5</option>
<!-- /TMPL_IF -->
- >Matrix2of5</option>
- <option value="NW7"
<!-- TMPL_IF NAME="NW7_checked" -->
- selected
+ <option value="NW7" selected="selected">NW7</option>
+ <!-- TMPL_ELSE -->
+ <option value="NW7">NW7</option>
<!-- /TMPL_IF -->
- >NW7</option>
- <option value="QRcode"
<!-- TMPL_IF NAME="QRcode_checked" -->
- selected
+ <option value="QRcode" selected="selected">QRcode</option>
+ <!-- TMPL_ELSE -->
+ <option value="QRcode">QRcode</option>
<!-- /TMPL_IF -->
- >QRcode</option>
- <option value="UPC-A"
<!-- TMPL_IF NAME="UPC-A_checked" -->
- selected
+ <option value="UPC-A" selected="selected">UPC-A</option>
+ <!-- TMPL_ELSE -->
+ <option value="UPC-A">UPC-A</option>
<!-- /TMPL_IF -->
- >UPC-A</option>
- <option value="UPC-E"
<!-- TMPL_IF NAME="UPC-E_checked" -->
- selected
+ <option value="UPC-E" selected="selected">UPC-E</option>
+ <!-- TMPL_ELSE -->
+ <option value="UPC-E">UPC-E</option>
<!-- /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
+<input type="radio" name="printingtype" value="spine" checked="checked" />
+ <!-- TMPL_ELSE -->
+<input type="radio" name="printingtype" value="spine" />
+ <!--/TMPL_IF -->Spine Labels
+ <!-- TMPL_IF NAME="printingtype_barcode" -->
+<input type="radio" name="printingtype" value="barcode" checked="checked" />
+ <!-- TMPL_ELSE -->
+<input type="radio" name="printingtype" value="barcode" />
+ <!--/TMPL_IF -->Barcode Labels
-<h3>
- Start printing from Label number:<input type="textbox"
name="startlabel" SIZE="1"
- value="<!-- TMPL_VAR NAME="startlabel" -->">
+ <!-- TMPL_IF NAME="printingtype_both" -->
+<input type="radio" name="printingtype" value="both" checked="checked" />
+ <!-- TMPL_ELSE -->
+<input type="radio" name="printingtype" value="both" />
+ <!--/TMPL_IF -->Both Labels
-</h3>
+<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 -->>
+ <input type="checkbox" name="guidebox" value="1"
checked="checked" />
+ <!-- TMPL_ELSE -->
+ <input type="checkbox" name="guidebox" value="1" />
+ <!-- /TMPL_IF -->
<label for="guidebox">Draw Guide Boxes</label>
+</p>
+
<p>
-<p>
-<p>
- <input type="submit" value="Submit">
- <input type="hidden" name=op value="save_conf">
+ <input type="submit" value="Submit" class="submit" />
+ <input type="hidden" name="op" value="save_conf" />
</p>
</form>
</div>