[Koha-cvs] koha/koha-tmpl/intranet-tmpl/npl/en/barcodes la... [dev_week]
Mason James
szrj1m at yahoo.com
Mon Jul 9 20:06:36 CEST 2007
CVSROOT: /sources/koha
Module name: koha
Branch: dev_week
Changes by: Mason James <sushi> 07/07/09 18:06:36
Modified files:
koha-tmpl/intranet-tmpl/npl/en/barcodes: label-add-layout.tmpl
label-home.tmpl
label-templates.tmpl
result.tmpl search.tmpl
Log message:
more misc changes for interface update
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/barcodes/label-add-layout.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/barcodes/label-home.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.2.2.12&r2=1.1.2.2.2.13
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/barcodes/label-templates.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.3&r2=1.1.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/barcodes/result.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.2.2.2&r2=1.1.2.2.2.3
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/intranet-tmpl/npl/en/barcodes/search.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.2.2.8&r2=1.1.2.2.2.9
Patches:
Index: label-add-layout.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/barcodes/Attic/label-add-layout.tmpl,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- label-add-layout.tmpl 9 Jul 2007 02:59:43 -0000 1.1.2.1
+++ label-add-layout.tmpl 9 Jul 2007 18:06:30 -0000 1.1.2.2
@@ -33,6 +33,11 @@
<option value="3">3</option>
<option value="4">4</option>
<option value="5">5</option>
+ <option value="6">6</option>
+ <option value="7">7</option>
+ <option value="8">8</option>
+ <option value="9">9</option>
+ <option value="10">10</option>
</select>
<label>Title</label>
</td>
@@ -40,11 +45,16 @@
<td>
<select name="tx_author">
<option value="0" SELECTED></option>
- <option value="1">1 </option>
- <option value="2">2 </option>
- <option value="3">3 </option>
- <option value="4">4 </option>
- <option value="5">5 </option>
+ <option value="1">1</option>
+ <option value="2">2</option>
+ <option value="3">3</option>
+ <option value="4">4</option>
+ <option value="5">5</option>
+ <option value="6">6</option>
+ <option value="7">7</option>
+ <option value="8">8</option>
+ <option value="9">9</option>
+ <option value="10">10</option>
</select>
<label>Author</label>
</td>
@@ -52,11 +62,16 @@
<td>
<select name="tx_isbn">
<option value="0" SELECTED></option>
- <option value="1">1 </option>
- <option value="2">2 </option>
- <option value="3">3 </option>
- <option value="4">4 </option>
- <option value="5">5 </option>
+ <option value="1">1</option>
+ <option value="2">2</option>
+ <option value="3">3</option>
+ <option value="4">4</option>
+ <option value="5">5</option>
+ <option value="6">6</option>
+ <option value="7">7</option>
+ <option value="8">8</option>
+ <option value="9">9</option>
+ <option value="10">10</option>
</select>
<label>ISBN</label>
</td>
@@ -64,11 +79,16 @@
<td>
<select name="tx_issn">
<option value="0" SELECTED></option>
- <option value="1">1 </option>
- <option value="2">2 </option>
- <option value="3">3 </option>
- <option value="4">4 </option>
- <option value="5">5 </option>
+ <option value="1">1</option>
+ <option value="2">2</option>
+ <option value="3">3</option>
+ <option value="4">4</option>
+ <option value="5">5</option>
+ <option value="6">6</option>
+ <option value="7">7</option>
+ <option value="8">8</option>
+ <option value="9">9</option>
+ <option value="10">10</option>
</select>
<label>ISSN</label>
</td>
@@ -77,11 +97,16 @@
<td>
<select name="tx_itemtype">
<option value="0" SELECTED></option>
- <option value="1">1 </option>
- <option value="2">2 </option>
- <option value="3">3 </option>
- <option value="4">4 </option>
- <option value="5">5 </option>
+ <option value="1">1</option>
+ <option value="2">2</option>
+ <option value="3">3</option>
+ <option value="4">4</option>
+ <option value="5">5</option>
+ <option value="6">6</option>
+ <option value="7">7</option>
+ <option value="8">8</option>
+ <option value="9">9</option>
+ <option value="10">10</option>
</select>
<label>Itemtype</label>
</td>
@@ -92,11 +117,16 @@
<td>
<select name="tx_dewey">
<option value="0" SELECTED></option>
- <option value="1">1 </option>
- <option value="2">2 </option>
- <option value="3">3 </option>
- <option value="4">4 </option>
- <option value="5">5 </option>
+ <option value="1">1</option>
+ <option value="2">2</option>
+ <option value="3">3</option>
+ <option value="4">4</option>
+ <option value="5">5</option>
+ <option value="6">6</option>
+ <option value="7">7</option>
+ <option value="8">8</option>
+ <option value="9">9</option>
+ <option value="10">10</option>
</select>
<label>Dewey</label>
</td>
@@ -104,11 +134,16 @@
<td>
<select name="tx_barcode">
<option value="0" SELECTED></option>
- <option value="1">1 </option>
- <option value="2">2 </option>
- <option value="3">3 </option>
- <option value="4">4 </option>
- <option value="5">5 </option>
+ <option value="1">1</option>
+ <option value="2">2</option>
+ <option value="3">3</option>
+ <option value="4">4</option>
+ <option value="5">5</option>
+ <option value="6">6</option>
+ <option value="7">7</option>
+ <option value="8">8</option>
+ <option value="9">9</option>
+ <option value="10">10</option>
</select>
<label>Barcode</label>
</td>
@@ -117,11 +152,16 @@
<td>
<select name="tx_classif">
<option value="0" SELECTED></option>
- <option value="1">1 </option>
- <option value="2">2 </option>
- <option value="3">3 </option>
- <option value="4">4 </option>
- <option value="5">5 </option>
+ <option value="1">1</option>
+ <option value="2">2</option>
+ <option value="3">3</option>
+ <option value="4">4</option>
+ <option value="5">5</option>
+ <option value="6">6</option>
+ <option value="7">7</option>
+ <option value="8">8</option>
+ <option value="9">9</option>
+ <option value="10">10</option>
</select>
<label>Classification</label>
</td>
@@ -129,11 +169,16 @@
<td>
<select name="tx_subclass">
<option value="0" SELECTED></option>
- <option value="1">1 </option>
- <option value="2">2 </option>
- <option value="3">3 </option>
- <option value="4">4 </option>
- <option value="5">5 </option>
+ <option value="1">1</option>
+ <option value="2">2</option>
+ <option value="3">3</option>
+ <option value="4">4</option>
+ <option value="5">5</option>
+ <option value="6">6</option>
+ <option value="7">7</option>
+ <option value="8">8</option>
+ <option value="9">9</option>
+ <option value="10">10</option>
</select>
<label>Sub-Class</label>
</td>
@@ -142,11 +187,16 @@
<td>
<select name="tx_itemcallnumber">
<option value="0" SELECTED></option>
- <option value="1">1 </option>
- <option value="2">2 </option>
- <option value="3">3 </option>
- <option value="4">4 </option>
- <option value="5">5 </option>
+ <option value="1">1</option>
+ <option value="2">2</option>
+ <option value="3">3</option>
+ <option value="4">4</option>
+ <option value="5">5</option>
+ <option value="6">6</option>
+ <option value="7">7</option>
+ <option value="8">8</option>
+ <option value="9">9</option>
+ <option value="10">10</option>
</select>
<label>Call Number</label>
</td>
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.2.2.12
retrieving revision 1.1.2.2.2.13
diff -u -b -r1.1.2.2.2.12 -r1.1.2.2.2.13
--- label-home.tmpl 9 Jul 2007 03:10:24 -0000 1.1.2.2.2.12
+++ label-home.tmpl 9 Jul 2007 18:06:34 -0000 1.1.2.2.2.13
@@ -31,10 +31,10 @@
</td>
<td>
- <a href="/cgi-bin/koha/barcodes/label-edit-template.pl?tmpl_code=<!-- TMPL_VAR NAME="tmpl_code" -->">Edit</a>
+ <a href="/cgi-bin/koha/barcodes/label-edit-layout.pl?layout_id=<!-- TMPL_VAR NAME="id" -->">Edit</a>
</td>
<td>
- <a href="/cgi-bin/koha/barcodes/label-templates.pl?op=delete&tmpl_code=<!-- TMPL_VAR NAME="tmpl_code" -->">Delete</a>
+ <a href="/cgi-bin/koha/label-home.pl?op=delete_layout&layout_id=<!-- TMPL_VAR NAME="id"-->">Delete</a>
</td>
<td>
<input type="radio" name="layout_id" value="<!-- TMPL_VAR NAME="id" -->"
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.2.3
retrieving revision 1.1.2.4
diff -u -b -r1.1.2.3 -r1.1.2.4
--- label-templates.tmpl 5 Jul 2007 03:46:13 -0000 1.1.2.3
+++ label-templates.tmpl 9 Jul 2007 18:06:34 -0000 1.1.2.4
@@ -3,7 +3,7 @@
<!-- TMPL_INCLUDE NAME="label-topmenu.inc" -->
<!-- TMPL_INCLUDE name="intranet-nav.inc" -->
<div id="main">
-<h1>Current Templates fux</h1>
+<h1>Current Templates</h1>
<!-- TMPL_IF NAME="resultsloop" -->
<h2>Templates</h2>
Index: result.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/barcodes/Attic/result.tmpl,v
retrieving revision 1.1.2.2.2.2
retrieving revision 1.1.2.2.2.3
diff -u -b -r1.1.2.2.2.2 -r1.1.2.2.2.3
--- result.tmpl 8 Jul 2007 22:14:23 -0000 1.1.2.2.2.2
+++ result.tmpl 9 Jul 2007 18:06:35 -0000 1.1.2.2.2.3
@@ -26,10 +26,14 @@
No results found.<br>
<!-- /TMPL_IF -->
</p>
+ <p><a class="button" href="#" onclick="history.go(-1)" >Back</a><a class="button" href="#" onclick="window.close()">Done</a><p>
</div>
-
+<form name='resultform'>
+<p><input type="submit" class="icon addchecked" value="Add checked" onclick="add_item('checked',<!-- TMPL_VAR NAME="batch_id" -->); return false" /></p>
<table>
<tr>
+ <tr>
+ <th><a href="#" onclick="check_all()" >Check all</a></th>
<th>Summary</th>
<th>Item Type</th>
<th>Add</th>
@@ -40,6 +44,7 @@
<!-- 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></p>
<p><!-- TMPL_VAR NAME="author" -->
@@ -48,6 +53,7 @@
<!-- TMPL_IF name="pages" --> - <!-- TMPL_VAR name="pages" --><!-- /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="dateaccessioned" --> ; [added <!-- TMPL_VAR name="dateaccessioned" -->] <!-- /TMPL_IF -->
<!-- TMPL_IF name="barcode" --> ; <!-- TMPL_VAR name="barcode" --><!-- /TMPL_IF -->
</p>
</td>
@@ -67,7 +73,7 @@
</tr>
<!-- /TMPL_LOOP -->
</table>
-
+</form>
<div class="results">
<p>
<!-- TMPL_IF NAME=displayprev -->
@@ -91,11 +97,36 @@
<!--
-function add_item(itemnumber,batch_id){
+function add_item(itemnum,batch_id){
- var myurl = "label-manager.pl?op=add&itemnumber="+itemnumber+"&batch_id="+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;
+ alert(myurl);
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){
Index: search.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/intranet-tmpl/npl/en/barcodes/Attic/search.tmpl,v
retrieving revision 1.1.2.2.2.8
retrieving revision 1.1.2.2.2.9
diff -u -b -r1.1.2.2.2.8 -r1.1.2.2.2.9
--- search.tmpl 5 Jul 2007 03:32:13 -0000 1.1.2.2.2.8
+++ search.tmpl 9 Jul 2007 18:06:35 -0000 1.1.2.2.2.9
@@ -3,10 +3,10 @@
<div id="main-compact">
-<h1>Catalogue Item Search
+<h1>Catalog item search
<!-- TMPL_IF name="batch_id" -->
- for Batch <!-- TMPL_VAR NAME="batch_id" -->
+ for batch <!-- TMPL_VAR NAME="batch_id" -->
<!-- /TMPL_IF -->
</h1>
@@ -28,7 +28,7 @@
<input type="text" id="title" name="value" />
</td></tr>
<tr><th scope="row">
- <label for="issn">ISSN</label>
+ <label for="issn">ISBN / ISSN</label>
</th>
<td>
<input type="hidden" name="marclist" value="biblioitems.issn" />
@@ -41,26 +41,21 @@
<tr><th scope="row">
- <label for="dateaccessioned">Last Date Accessed</label>
+ <label for="datefrom">Date accessioned: between</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" name="value" id="dateaccessioned" />
-
+ <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" />
-<img src="<!-- TMPL_VAR Name="themelang" -->/includes/calendar/cal.gif" id="f_trigger_c"
- style="cursor: pointer; border: 1px solid red;"
- title="Date selector"
- onmouseover="this.style.background='red';"
- onmouseout="this.style.background=''" />
<script type="text/javascript">
Calendar.setup({
- inputField : "dateaccessioned",
+ inputField : "datefrom",
ifFormat : "%Y-%m-%d",
- button : "f_trigger_c",
+ button : "openCalendarFrom",
align : "Tl",
singleClick : false
});
@@ -69,6 +64,29 @@
</td>
</tr>
+ <tr><th scope="row">
+ <label for="dateto">Date accessioned after</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>
@@ -80,8 +98,10 @@
<option value="100">100</option>
</select>
</td>
+ <td><input type="checkbox" checked='0' name='showall' id='showall' /><label for='showall'>Show All</label></td>
</tr>
- <tr><th scope="row">
+
+<tr><th scope="row">
<label for="orderby">Ordered by</label>
</th>
<td>
More information about the Koha-cvs
mailing list