[Koha-patches] [PATCH] Some markup corrections, breadcrumb improvement, and other minor changes.
Owen Leonard
oleonard at myacpl.org
Tue Apr 1 22:58:43 CEST 2008
---
.../en/includes/tools-labels-batches-toolbar.inc | 32 ++++++++++---------
.../prog/en/modules/labels/label-home.tmpl | 2 +-
.../prog/en/modules/labels/label-manager.tmpl | 14 ++++----
.../en/modules/labels/pcard-members-search.tmpl | 30 ++++++++----------
4 files changed, 39 insertions(+), 39 deletions(-)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-labels-batches-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-labels-batches-toolbar.inc
index d5ffb61..e91daf3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-labels-batches-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/tools-labels-batches-toolbar.inc
@@ -5,6 +5,7 @@
function Plugin(batch_id, batch_type) {
window.open("label-item-search.pl?batch_id="+batch_id+"&type="+batch_type+"",'FindABibIndex','width=640,height=400,toolbar=no,scrollbars=yes');
+return false;
}
// prepare DOM for YUI Toolbar
@@ -18,12 +19,12 @@
function yuiToolbar() {
new YAHOO.widget.Button({
- id: "additems",
- type: "button",
- label: "Add item(s) to batch",
- container: "additemsc",
- onclick: {fn:function(){Plugin(<!-- TMPL_VAR NAME="batch_id" -->,"<!-- TMPL_VAR NAME="type" -->")}}
- });
+ id: "additems",
+ type: "link",
+ label: _("Add item(s) to batch"),
+ container: "additemsc",
+onclick: {fn:function(){Plugin(<!-- TMPL_VAR NAME="batch_id" -->,"<!-- TMPL_VAR NAME="type" -->")}}
+ });
new YAHOO.widget.Button("deletebatch");
new YAHOO.widget.Button("dedup");
new YAHOO.widget.Button("generate");
@@ -32,7 +33,7 @@
//]]>
</script>
<ul class="toolbar">
- <li id="additemsc"><a id="additems" href="#" onclick="Plugin(<!-- TMPL_VAR NAME="batch_id" -->, "<!-- TMPL_VAR NAME="type" -->"); return false;">Add item(s) to batch</a></li>
+ <li id="additemsc"><a id="additems" href="#">Add item(s) to batch</a></li>
<li><a id="deletebatch" href="/cgi-bin/koha/labels/label-manager.pl?op=delete_batch&batch_id=<!-- TMPL_VAR NAME="batch_id" -->&type=<!-- TMPL_VAR NAME="type" -->">Delete current batch</a></li>
<!-- FIXME: should use POST to change server state, not GET -->
<li><a id="dedup" href="/cgi-bin/koha/labels/label-manager.pl?op=deduplicate&batch_id=<!-- TMPL_VAR NAME="batch_id" -->&type=<!-- TMPL_VAR NAME="type" -->">Remove duplicate barcodes</a></li>
@@ -45,7 +46,7 @@
function Plugin(batch_id, batch_type) {
// window.open("label-item-search.pl?batch_id="+batch_id+"",'FindABibIndex','width=640,height=400,toolbar=no,scrollbars=yes');
- window.open("pcard-member-search.pl?batch_id="+batch_id+"&type="+batch_type+"",'FindAPatronIndex','width=1280,height=400,toolbar=no,scrollbars=yes');
+ window.open("pcard-member-search.pl?batch_id="+batch_id+"&type="+batch_type+"",'FindAPatronIndex','width=640,height=400,toolbar=no,scrollbars=yes');
}
// prepare DOM for YUI Toolbar
@@ -59,12 +60,13 @@
function yuiToolbar() {
new YAHOO.widget.Button({
- id: "addpatrons",
- type: "button",
- label: "Add patron(s) to batch",
- container: "addpatronsc",
- onclick: {fn:function(){Plugin(<!-- TMPL_VAR NAME="batch_id" -->,"<!-- TMPL_VAR NAME="type" -->")}}
- });
+ id: "addpatrons",
+ type: "link",
+ href: "#",
+ label: _("Add patron(s) to batch"),
+ container: "addpatronsc",
+onclick: {fn:function(){Plugin(<!-- TMPL_VAR NAME="batch_id" -->,"<!-- TMPL_VAR NAME="type" -->"); }}
+ });
new YAHOO.widget.Button("deletebatch");
new YAHOO.widget.Button("dedup");
new YAHOO.widget.Button("generate");
@@ -73,7 +75,7 @@
//]]>
</script>
<ul class="toolbar">
- <li id="addpatronsc"><a id="addpatrons" href="#" onclick="Plugin(<!-- TMPL_VAR NAME="batch_id" -->,"<!-- TMPL_VAR NAME="type" -->"); return false;">Add item(s) to batch</a></li>
+ <li id="addpatronsc"><a id="addpatrons" href="#">Add item(s) to batch</a></li>
<li><a id="deletebatch" href="/cgi-bin/koha/labels/label-manager.pl?op=delete_batch&batch_id=<!-- TMPL_VAR NAME="batch_id" -->&type=<!-- TMPL_VAR NAME="type" -->">Delete current batch</a></li>
<!-- FIXME: should use POST to change server state, not GET -->
<li><a id="dedup" href="/cgi-bin/koha/labels/label-manager.pl?op=deduplicate&batch_id=<!-- TMPL_VAR NAME="batch_id" -->&type=<!-- TMPL_VAR NAME="type" -->">Remove duplicate patrons</a></li>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tmpl
index dc191fb..2a52ce6 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-home.tmpl
@@ -5,7 +5,7 @@
<!-- TMPL_INCLUDE NAME="header.inc" -->
<!-- TMPL_INCLUDE NAME="cat-search.inc" -->
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › Labels</div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> › Labels</div>
<div id="doc3" class="yui-t2">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manager.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manager.tmpl
index fc1214a..1ac48c3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manager.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/label-manager.tmpl
@@ -1,11 +1,11 @@
-<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><title>Koha › <!-- TMPL_IF EXPR="(type eq 'labels')" -->Labels<!-- TMPL_ELSIF EXPR="(type eq 'patroncards')" -->Patron Cards<!-- /TMPL_IF --></title>
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><title>Koha › Tools › Labels › <!-- TMPL_IF EXPR="(type eq 'labels')" -->Label Batch<!-- TMPL_ELSIF EXPR="(type eq 'patroncards')" -->Patron Card Batch<!-- /TMPL_IF --></title>
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
</head>
<body>
<!-- TMPL_INCLUDE NAME="header.inc" -->
<!-- TMPL_INCLUDE NAME="cat-search.inc" -->
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <!-- TMPL_IF EXPR="(type eq 'labels')" -->Labels<!-- TMPL_ELSIF EXPR="(type eq 'patroncards')" -->Patron Cards<!-- /TMPL_IF --></div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › <a href="/cgi-bin/koha/tools/tools-home.pl">Tools</a> › <a href="/cgi-bin/koha/labels/label-home.pl">Labels</a> › <!-- TMPL_IF EXPR="(type eq 'labels')" -->Label Batch<!-- TMPL_ELSIF EXPR="(type eq 'patroncards')" -->Patron Card Batch<!-- /TMPL_IF --></div>
<div id="doc3" class="yui-t2">
<div id="bd">
<div id="yui-main">
@@ -13,7 +13,7 @@
<!-- TMPL_IF NAME="message" -->
<!-- TMPL_LOOP NAME="message_loop" -->
- <div style="color: red; margin: 5pt; font-weight: bold;" class="message"><!-- TMPL_VAR NAME="message_text" --></div>
+ <div class="dialog message"><!-- TMPL_VAR NAME="message_text" --></div>
<!-- /TMPL_LOOP -->
<!-- /TMPL_IF -->
@@ -25,9 +25,9 @@
<h2>Items to be Printed for Batch <!-- TMPL_VAR NAME="batch_id" --> (<!-- TMPL_VAR NAME="batch_count" --> items)</h2>
<table>
<tr>
- <th>Label<br />Num.</th>
+ <th>Label Num.</th>
<th>Summary</th>
- <th>Item<br />Type</th>
+ <th>Item Type</th>
<th>Barcode</th>
<th>Delete</th>
</tr>
@@ -58,10 +58,10 @@
<!-- TMPL_LOOP NAME="resultsloop" -->
<tr>
<td><!-- TMPL_VAR NAME="cardno" --></td>
- <td><b><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->"> <!-- TMPL_VAR NAME="title" -->. <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></a></b></td>
+ <td><b><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->"> <!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></a></b></td>
<td><!-- TMPL_VAR NAME="borrowernumber" --></td>
<td><!-- TMPL_VAR NAME="cardnumber" --></td>
- <td><a href="/cgi-bin/koha/labels/label-manager.pl?op=delete&cardid=<!-- TMPL_VAR NAME="cardid" -->&batch_id=<!-- TMPL_VAR NAME="batch_id" -->&type=patroncards">Delete</a></td>
+ <td><a href="/cgi-bin/koha/labels/label-manager.pl?op=delete&cardid=<!-- TMPL_VAR NAME="cardid" -->&batch_id=<!-- TMPL_VAR NAME="batch_id" -->&type=patroncards">Remove</a></td>
<!-- FIXME: should use POST to change server state, not GET -->
</tr>
<!-- /TMPL_LOOP -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/pcard-members-search.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/pcard-members-search.tmpl
index 628fb29..4d3dc9a 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/labels/pcard-members-search.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/labels/pcard-members-search.tmpl
@@ -1,6 +1,9 @@
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
<title>Koha › Patrons <!-- TMPL_IF NAME="searching" -->› Search Results<!-- /TMPL_IF --></title>
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+ <style type="text/css">
+ #custom-doc { width:47.23em;*width:46.04em;min-width:600px; margin:auto; text-align:left; }
+ </style>
<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/jquery/plugins/jquery.checkboxes.pack.js"></script>
<script type="text/javascript">
//<![CDATA[
@@ -41,16 +44,12 @@ function add_item3(borrowernumber){
//]]>
</script>
</head>
-</head>
<body>
-<div id="breadcrumbs">Home › <!-- TMPL_IF NAME="searching" --><a href="/cgi-bin/koha/labels/pcard-member-search.pl">Patrons</a> › Search Results<!-- TMPL_ELSE -->Patrons<!-- /TMPL_IF --></div>
-<div id="doc2"><!-- class="yui-t4">-->
-
-<!-- <div id="bd"> -->
-<!-- <div id="yui-main"> -->
-<!-- <div class="yui-g"> -->
-
+<div id="custom-doc" class="yui-t7">
+ <div id="bd">
+ <div class="yui-g">
+<h3>Patron Search</h3>
<div class="browse">
Browse by last name:
@@ -85,8 +84,8 @@ function add_item3(borrowernumber){
<!-- TMPL_IF NAME="resultsloop" -->
<div id="searchheader"> <h3>Results <!-- TMPL_VAR Name ="from" --> to <!-- TMPL_VAR Name ="to" --> of <!-- TMPL_VAR Name ="numresults" --> found for '<span class="ex"><!-- TMPL_VAR NAME="member" --></span>'</h3></div>
-<form name="resultform" class="checkboxed"><div style="float: right; margin-top: .5em;"><input type="submit" class="icon addchecked" value="Add checked" onclick="add_item('checked',<!-- TMPL_VAR NAME="batch_id" -->,'<!-- TMPL_VAR NAME="type" -->'); return false" /> <input type="button" class="close" value="Done" /></div>
-<div style="line-height: 2em; margin-left: .7em;"><a id="CheckAll" href="/cgi-bin/koha/labels/pcard-member-search.pl">Select All</a></span><span class="clearall"><a id="CheckNone" href="/cgi-bin/koha/labels/pcard-member-search.pl">Clear All</a></div>
+<form name="resultform" action="/cgi-bin/koha/labels/pcard-member-search.pl" method="get" class="checkboxed"><div style="float: right; margin-top: .5em;"><input type="submit" class="icon addchecked" value="Add checked" onclick="add_item('checked',<!-- TMPL_VAR NAME="batch_id" -->,'<!-- TMPL_VAR NAME="type" -->'); return false" /> <input type="button" class="close" value="Done" /></div>
+<div style="line-height: 2em; margin-left: .7em;"><a id="CheckAll" href="/cgi-bin/koha/labels/pcard-member-search.pl">Select All</a><a id="CheckNone" href="/cgi-bin/koha/labels/pcard-member-search.pl">Clear All</a></div>
<div class="searchresults">
<table style="float: left; margin: .5em 0;">
@@ -102,27 +101,26 @@ function add_item3(borrowernumber){
</tr>
<!-- TMPL_LOOP NAME="resultsloop" -->
<tr>
- <td align="center"> <input type="checkbox" name="borrowernumber" id="patron<!-- TMPL_VAR NAME="borrowernumber" -->" value="<!-- TMPL_VAR NAME="borrowernumber" -->" /> </td>
+ <td> <input type="checkbox" name="borrowernumber" id="patron<!-- TMPL_VAR NAME="borrowernumber" -->" value="<!-- TMPL_VAR NAME="borrowernumber" -->" /> </td>
<td><!-- TMPL_VAR NAME="cardnumber" --></td>
<td style="white-space: nowrap;"><a href="/cgi-bin/koha/members/morepcard-member-search.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --></a> <br /> <!-- TMPL_VAR NAME="address" --><!-- TMPL_IF NAME="address2" --><br /><!-- TMPL_VAR NAME="address2" --><!-- /TMPL_IF --><!-- TMPL_IF NAME="city" --><br /><!-- TMPL_VAR NAME=city --><!-- /TMPL_IF --></td>
<td><!-- TMPL_VAR NAME="category_description" --> (<!-- TMPL_VAR name="category_type" -->)</td>
<td><!-- TMPL_VAR NAME="branchcode" --></td>
<td><!-- TMPL_VAR NAME="dateexpiry" --></td>
<td><!-- TMPL_VAR NAME="borrowernotes" --></td>
- <td align="center"><a onclick="add_item('<!-- TMPL_VAR NAME="borrowernumber" -->',<!-- TMPL_VAR NAME="batch_id" -->,'<!-- TMPL_VAR NAME="type" -->'); return false" href="/cgi-bin/koha/barcodes/label-manager.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&batch_id=<!-- TMPL_VAR name="batch_id" -->&type=<!-- TMPL_VAR NAME="type" -->&op=add">Add</a></td>
+ <td><a onclick="add_item('<!-- TMPL_VAR NAME="borrowernumber" -->',<!-- TMPL_VAR NAME="batch_id" -->,'<!-- TMPL_VAR NAME="type" -->'); return false" href="/cgi-bin/koha/barcodes/label-manager.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&batch_id=<!-- TMPL_VAR name="batch_id" -->&type=<!-- TMPL_VAR NAME="type" -->&op=add">Add</a></td>
</tr>
<!-- /TMPL_LOOP -->
</table>
+ </div>
</form>
-<!-- </div> -->
+
<!-- TMPL_ELSE -->
<!-- TMPL_IF NAME="searching" -->
No results found
<!-- /TMPL_IF -->
<!-- /TMPL_IF -->
-<!-- </div> -->
-<!-- </div> -->
-
+</div>
</div>
<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
--
1.5.2.1
More information about the Koha-patches
mailing list