---
.../intranet-tmpl/prog/en/css/staff-global.css | 8 ++++--
.../prog/en/modules/acqui/basket.tmpl | 6 ++--
.../prog/en/modules/acqui/lateorders.tmpl | 2 +
.../prog/en/modules/acqui/orderreceive.tmpl | 2 +-
.../prog/en/modules/acqui/parcel.tmpl | 7 +++--
.../prog/en/modules/admin/branches.tmpl | 14 +++++-----
.../prog/en/modules/admin/currency.tmpl | 2 +-
.../prog/en/modules/cataloguing/addbooks.tmpl | 4 +-
.../prog/en/modules/labels/label-manager.tmpl | 2 +-
.../prog/en/modules/reports/catalogue_out.tmpl | 7 ++---
.../intranet-tmpl/prog/en/modules/tags/review.tmpl | 8 +++---
.../opac-tmpl/prog/en/includes/opac-facets.inc | 6 ++--
.../opac-tmpl/prog/en/modules/opac-reserve.tmpl | 24 ++++++++++----------
.../prog/en/modules/opac-results-grouped.tmpl | 2 +-
.../opac-tmpl/prog/en/modules/opac-results.tmpl | 20 ++++++++--------
.../opac-tmpl/prog/en/modules/opac-review.tmpl | 8 +++---
16 files changed, 63 insertions(+), 59 deletions(-)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
index cad0234..af7f857 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
+++ b/koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
@@ -861,9 +861,11 @@ fieldset.rows .inputnote {
padding-left : 15px;
}
-.error {
- background-color : #FFFF99;
- color: red;
+.error,
+.error a,
+.error a:link,
+.error a:visited {
+ color: #cc0000;
}
div.error {
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl
index 91e890c..8c3216f 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl
@@ -52,10 +52,10 @@
<!-- TMPL_IF NAME="sort_loop" -->
<!-- TMPL_LOOP NAME="sort_loop" -->
<!-- TMPL_IF name="error" -->
- <div class="error">ERROR: Illegal sort requested by
"<!-- TMPL_VAR NAME="string" -->".
- <br />You will need to use valid sort criteria
to return valid results.</div>
+ <div class="dialog alert">ERROR: Illegal sort requested
by "<!-- TMPL_VAR NAME="string" -->".
+ <br />Please use valid sort criteria. <a
href="/cgi-bin/koha/acqui/basket.pl?basketno=<!-- TMPL_VAR NAME="basketno"
-->">Return to default results.</a></div>
<!-- TMPL_ELSE -->
- <div class="sortmsg">Sorted by "<!-- TMPL_VAR
NAME="string" -->".</div>
+ <div class="dialog message">Sorted by "<!--
TMPL_VAR NAME="string" -->".</div>
<!-- /TMPL_IF -->
<!-- /TMPL_LOOP -->
<!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tmpl
index 16788ba..a0ba875 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tmpl
@@ -90,6 +90,7 @@
</div>
</div>
<div class="yui-b">
+<!-- TMPL_IF NAME="lateorders" -->
<form action="lateorders.pl" method="get">
<fieldset class="brief">
<h4>Filter Results:</h4>
@@ -108,6 +109,7 @@
<fieldset class="action"><input type="submit" value="filter"
/></fieldset>
</fieldset>
</form>
+<!-- /TMPL_IF -->
<!-- TMPL_INCLUDE NAME="acquisitions-menu.inc" -->
</div>
</div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tmpl
index 4d32af4..a1b1fbc 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tmpl
@@ -41,7 +41,7 @@
<div id="itemblock">
<ol>
<li> <label for="volinf">Volume/Copy (for serials): </label>
- <input type="text" size="20" name="volinf" id="volinf" /></li></ol>
+ <input type="text" size="20" name="volinf" id="volinf" /></li>
<li> <label for="barcode">Item barcode: </label>
<input type="text" size="20" name="barcode" id="barcode" value="<!--
TMPL_VAR NAME="barcode" -->" /></li>
<li> <label for="homebranch">Home library: </label>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl
index 6db1616..e4585d4 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tmpl
@@ -20,12 +20,13 @@
<div id="yui-main">
<div class="yui-b">
<!-- TMPL_IF NAME="receive_error" -->
- <div id="page_error" class="error">
+ <div class="dialog alert">
<h3>Error adding items:</h3>
<ul>
<!-- TMPL_LOOP NAME="error_loop" -->
- <li><!-- TMPL_VAR NAME="error_param" --> : <!-- TMPL_IF
NAME="error_duplicate_barcode" -->Duplicate Barcode<!-- /TMPL_IF --> <!-- todo:
other error conditions come here. --></li>
+ <li><!-- TMPL_VAR NAME="error_param" --><!-- TMPL_IF
NAME="error_duplicate_barcode" -->Duplicate Barcode<!-- /TMPL_IF --> <!-- todo:
other error conditions come here. --></li>
<!-- /TMPL_LOOP -->
+ </ul>
</div>
<!-- /TMPL_IF -->
<h1>
@@ -132,7 +133,7 @@
<!-- TMPL_IF NAME="author" --><br />author :<!-- TMPL_VAR
NAME="author" --><!--/TMPL_IF-->
<!-- TMPL_IF NAME="publishercode" --><br />Publisher :<!--
TMPL_VAR NAME="publishercode" --><!--/TMPL_IF-->
</td>
- <td><a href="/cgi-bin/koha/catalogue/showmarc.pl?id=<!--
TMPL_VAR NAME="biblionumber" -->" title="MARC"
rel="gb_page_center[600,500]">MARC</a> | <a
href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&id=<!-- TMPL_VAR
NAME="biblionumber" -->" title="MARC"
rel="gb_page_center[600,500]">Card</a></td>
+ <td><a href="/cgi-bin/koha/catalogue/showmarc.pl?id=<!--
TMPL_VAR NAME="biblionumber" -->" title="MARC"
rel="gb_page_center[600,500]">MARC</a> | <a
href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&id=<!-- TMPL_VAR
NAME="biblionumber" -->" title="MARC"
rel="gb_page_center[600,500]">Card</a></td>
<td> <!-- TMPL_VAR NAME="quantity" --></td>
<td><!-- TMPL_VAR NAME="ecost" --></td>
<td><!-- TMPL_VAR NAME="ordertotal" --></td>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl
index 3b16826..7a43013 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl
@@ -82,16 +82,16 @@
<label for="branchname">Name</label>
<input type="text" name="branchname" id="branchname" size="40"
maxlength="80" value="<!-- TMPL_VAR name="branch_name" escape="HTML" -->"
/>
</li>
- <li><fieldset><legend>Group(s):</legend>
+ <!-- TMPL_IF NAME="categoryloop"
--><li><fieldset><legend>Group(s):</legend>
<ol>
<!-- TMPL_LOOP name="categoryloop" -->
<li><label for="<!-- TMPL_VAR name="categorycode" -->"><!--
TMPL_VAR name="categoryname" --></label>
<input type="checkbox" id="<!-- TMPL_VAR name="categorycode"
-->" name="<!-- TMPL_VAR name="categorycode" -->" <!-- TMPL_VAR name="checked"
--> /> <span class="hint"><!-- TMPL_VAR name="codedescription" --></span>
</li>
- <!-- /TMPL_LOOP --></fieldset>
+ <!-- /TMPL_LOOP -->
</ol>
- </li>
- <li><label for="branchaddress1">Address Line 1</label><input
type="text" name="branchaddress1" id="branchaddress1" value="<!-- TMPL_VAR
name="branchaddress1" escape="HTML" -->" /></li>
+ </fieldset></li><!-- /TMPL_IF -->
+ <li><label for="branchaddress1">Address Line 1</label><input
type="text" name="branchaddress1" id="branchaddress1" value="<!-- TMPL_VAR
name="branchaddress1" escape="HTML" -->" /></li>
<li><label for="branchaddress2">Address Line 2</label><input
type="text" name="branchaddress2" id="branchaddress2" value="<!-- TMPL_VAR
name="branchaddress2" escape="HTML" -->" /></li>
<li><label for="branchaddress3">Address Line 3</label><input
type="text" name="branchaddress3" id="branchaddress3" value="<!-- TMPL_VAR
name="branchaddress3" escape="HTML" -->" /></li>
<li><label for="branchphone">Phone</label><input type="text"
name="branchphone" id="branchphone" value="<!-- TMPL_VAR name="branchphone"
escape="HTML" -->" /></li>
@@ -113,7 +113,7 @@
-->
</ol>
</fieldset>
- <fieldset class="action"><input type="submit" value="Submit"
/></fieldset>
+ <fieldset class="action"><input type="submit" value="Submit" /> <a
class="cancel" href="/cgi-bin/koha/admin/branches.pl">Cancel</a></fieldset>
</form>
<!-- /TMPL_IF -->
@@ -191,10 +191,10 @@
<!-- TMPL_VAR NAME="branchprinter" -->
</td> -->
<td>
- <a href="<!-- TMPL_VAR name="action"
-->?op=edit&branchcode=<!-- TMPL_VAR name="value" escape="HTML"
-->">Edit</a>
+ <a href="<!-- TMPL_VAR name="action"
-->?op=edit&branchcode=<!-- TMPL_VAR name="value" escape="url" -->">Edit</a>
</td>
<td>
- <a href="<!-- TMPL_VAR name="action" -->?branchcode=<!--
TMPL_VAR name="value" escape="HTML" -->&branchname=<!-- TMPL_VAR
NAME="branch_name" escape="HTML" -->&op=delete">Delete</a>
+ <a href="<!-- TMPL_VAR name="action" -->?branchcode=<!--
TMPL_VAR name="value" escape="url" -->&branchname=<!-- TMPL_VAR
NAME="branch_name" escape="url" -->&op=delete">Delete</a>
</td>
</tr>
<!-- /TMPL_LOOP --></tbody>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl
index d1fa60d..73cefe1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl
@@ -136,7 +136,7 @@
</ol>
</fieldset>
- <fieldset class="action"><input type="submit" value="Submit"
onclick="Check(this.form)" /> </fieldset>
+ <fieldset class="action"><input type="submit" value="Submit"
onclick="Check(this.form)" /> <a class="cancel"
href="/cgi-bin/koha/admin/currency.pl">Cancel</a> </fieldset>
</form>
<!-- /TMPL_IF -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl
index 6fe30db..2da5c1d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl
@@ -109,9 +109,9 @@
</div>
<!-- TMPL_ELSE -->
<!-- TMPL_IF name='query'-->
- <b>No results found</b>
+ <!-- TMPL_IF NAME="error" --><div class="dialog alert"><!-- /TMPL_IF
--><b>No results found</b>
<!-- TMPL_IF NAME="error" -->
- Error: <span class="error"><!-- TMPL_VAR NAME="error" --></span>
+ Error: <span class="error"><!-- TMPL_VAR NAME="error"
--></span></div>
<!-- /TMPL_IF -->
<!-- /TMPL_IF -->
<!-- /TMPL_IF -->
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 056a639..58ca5ce 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
@@ -64,7 +64,7 @@
<!-- /TMPL_LOOP -->
</table>
<!-- TMPL_ELSE -->
- <span class="error">Error: Unknown Batch Type "<!-- TMPL_VAR
NAME="batch_type" -->"
+ <div class="dialog alert">Error: Unknown Batch Type "<!-- TMPL_VAR
NAME="batch_type" -->"</div>
<!-- /TMPL_IF -->
</div>
<div class="yui-u">
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tmpl
index 2b762d6..e9f565e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/catalogue_out.tmpl
@@ -50,11 +50,11 @@
<tr><th>TOTAL</th><th></th><th><!-- TMPL_VAR
NAME="total_looptable_count" --></th><th><!-- TMPL_VAR
NAME="total_coltitle_count" --></th>
</tr>
</table>
- <hr />
+
<!-- /TMPL_IF-->
<!-- TMPL_LOOP NAME="looptables" -->
- <h3><a name="table<!-- TMPL_VAR NAME="coltitle" -->"></a>
- Table <!-- TMPL_VAR NAME="__counter__"--> - <!--
TMPL_VAR NAME="coltitle" -->
+ <h3><a id="table<!-- TMPL_VAR NAME="coltitle" -->"></a>
+ <!-- TMPL_VAR NAME="coltitle" -->
</h3>
<table>
<tr>
@@ -80,7 +80,6 @@
</tr>
<!-- /TMPL_IF-->
</table>
- <hr />
<!-- /TMPL_LOOP -->
<!-- /TMPL_LOOP -->
<!-- TMPL_ELSE -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tmpl
b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tmpl
index c8678b8..32bd034 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tmpl
@@ -85,7 +85,7 @@ td input,td input[type="submit"] { font-size: 85%; padding:
1px; }
}
$(document).ready(function() {
$('.ajax_buttons' ).css({visibility:"visible"});
- $("p.check").html("<strong>Select: </strong><a id=\"CheckAll\"
href=\"/cgi-bin/koha/tags/review.pl\">All</a> <a id=\"CheckPending\"
href=\"/cgi-bin/koha/tags/review.pl\">Pending</a> <a id=\"CheckNone\"
href=\"/cgi-bin/koha/tags/review.pl\">None</a>");
+ $("p.check").html("<strong>Select: <\/strong><a id=\"CheckAll\"
href=\"/cgi-bin/koha/tags/review.pl\">All<\/a> <a id=\"CheckPending\"
href=\"/cgi-bin/koha/tags/review.pl\">Pending<\/a> <a id=\"CheckNone\"
href=\"/cgi-bin/koha/tags/review.pl\">None<\/a>");
$("#CheckAll").click(function(){
$(".checkboxed").checkCheckboxes();
return false;
@@ -242,10 +242,10 @@ Calendar.setup({
</div>
<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="message_loop" -->
- <div class="error" id="main_error">
+ <div class="dialog alert" id="main_error">
<!-- TMPL_LOOP NAME="message_loop" -->
- <!-- TMPL_IF NAME="date_from" -->ERROR: Date from is not a
legal value (<!-- TMPL_VAR NAME="date_from" -->).
- <!-- TMPL_ELSIF NAME="date_to" -->ERROR: Date to is not a
legal value (<!-- TMPL_VAR NAME="date_to" -->).
+ <!-- TMPL_IF NAME="date_from" -->ERROR: <em>Date from</em>
is not a legal value ("<!-- TMPL_VAR NAME="date_from" -->").
+ <!-- TMPL_ELSIF NAME="date_to" -->ERROR: <em>Date to</em> is
not a legal value ("<!-- TMPL_VAR NAME="date_to" -->").
<!-- TMPL_ELSIF NAME="failed_ok" -->ERROR: Failed to approve
term (<!-- TMPL_VAR NAME="failed_ok" -->).
<!-- TMPL_ELSIF NAME="failed_rej" -->ERROR: Failed to reject
term (<!-- TMPL_VAR NAME="failed_rej" -->).
<!-- TMPL_ELSIF NAME="approver" -->ERROR: No match for user
(<!-- TMPL_VAR NAME="approver" -->). FILTER REQUIRES BORROWERNUMBER (not name).
diff --git a/koha-tmpl/opac-tmpl/prog/en/includes/opac-facets.inc
b/koha-tmpl/opac-tmpl/prog/en/includes/opac-facets.inc
index aba1e3b..9b4f83a 100644
--- a/koha-tmpl/opac-tmpl/prog/en/includes/opac-facets.inc
+++ b/koha-tmpl/opac-tmpl/prog/en/includes/opac-facets.inc
@@ -3,7 +3,7 @@
<div id="search-facets">
<h4>Refine your search</h4>
<ul>
- <li>Availability<ul><li><!-- TMPL_IF NAME="available" -->Showing only
<strong>available</strong> items. <a href="/cgi-bin/koha/opac-search.pl?<!--
TMPL_VAR NAME="query_cgi" --><!-- TMPL_VAR NAME="limit_cgi_not_availablity"
--><!-- TMPL_IF NAME="sort_by" -->&sort_by=<!-- TMPL_VAR NAME="sort_by"
--><!-- /TMPL_IF -->">Show all items</a><!-- TMPL_ELSE -->Limit to <a
href="/cgi-bin/koha/opac-search.pl?<!-- TMPL_VAR NAME="query_cgi" --><!--
TMPL_VAR NAME="limit_cgi" --><!-- TMPL_IF NAME="sort_by" -->&sort_by=<!--
TMPL_VAR NAME="sort_by" --><!-- /TMPL_IF -->&limit=available">currently
available items.</a><!-- /TMPL_IF --></li></ul>
+ <li>Availability<ul><li><!-- TMPL_IF NAME="available" -->Showing only
<strong>available</strong> items. <a href="/cgi-bin/koha/opac-search.pl?<!--
TMPL_VAR NAME="query_cgi" escape="url" --><!-- TMPL_VAR
NAME="limit_cgi_not_availablity" --><!-- TMPL_IF NAME="sort_by"
-->&sort_by=<!-- TMPL_VAR NAME="sort_by" escape="url" --><!-- /TMPL_IF
-->">Show all items</a><!-- TMPL_ELSE -->Limit to <a
href="/cgi-bin/koha/opac-search.pl?<!-- TMPL_VAR NAME="query_cgi" escape="url"
--><!-- TMPL_VAR NAME="limit_cgi" escape="url" --><!-- TMPL_IF NAME="sort_by"
-->&sort_by=<!-- TMPL_VAR NAME="sort_by" escape="url" --><!-- /TMPL_IF
-->&limit=available">currently available items.</a><!-- /TMPL_IF
--></li></ul>
<!-- TMPL_IF NAME="related" --> <li>(related searches: <!-- TMPL_LOOP
NAME="related" --><!-- TMPL_VAR NAME="related_search" --><!-- /TMPL_LOOP
-->)</li><!-- /TMPL_IF -->
</li>
@@ -18,8 +18,8 @@
<!-- TMPL_IF NAME="type_label_Libraries" -->Libraries<!-- /TMPL_IF -->
<!-- /TMPL_UNLESS -->
<ul>
- <!-- TMPL_LOOP NAME="facets" --><li><a
href="/cgi-bin/koha/opac-search.pl?<!-- TMPL_VAR NAME="query_cgi" --><!--
TMPL_VAR NAME="limit_cgi" --><!-- TMPL_IF NAME="sort_by" -->&sort_by=<!--
TMPL_VAR NAME="sort_by" --><!-- /TMPL_IF -->&limit=<!-- TMPL_VAR
NAME="type_link_value" -->:<!-- TMPL_VAR NAME="facet_link_value" -->"
title="<!-- TMPL_VAR NAME="facet_title_value" ESCAPE="HTML" -->"><!-- TMPL_VAR
NAME="facet_label_value" --></a> <!-- (<!-- TMPL_VAR NAME="facet_count" -->)
--></li><!-- /TMPL_LOOP --><!-- TMPL_IF NAME="expandable" -->
- <li class="showmore"><a href="/cgi-bin/koha/opac-search.pl?<!--
TMPL_VAR NAME="query_cgi" -->&expand=<!-- TMPL_VAR NAME="expand" -->#<!--
TMPL_VAR NAME="type_id" -->">Show More</a></li>
+ <!-- TMPL_LOOP NAME="facets" --><li><a
href="/cgi-bin/koha/opac-search.pl?<!-- TMPL_VAR NAME="query_cgi" escape="url"
--><!-- TMPL_VAR NAME="limit_cgi" escape="url" --><!-- TMPL_IF NAME="sort_by"
-->&sort_by=<!-- TMPL_VAR NAME="sort_by" escape="url" --><!-- /TMPL_IF
-->&limit=<!-- TMPL_VAR NAME="type_link_value" escape="url" -->:<!--
TMPL_VAR NAME="facet_link_value" escape="url" -->" title="<!-- TMPL_VAR
NAME="facet_title_value" ESCAPE="HTML" -->"><!-- TMPL_VAR
NAME="facet_label_value" --></a> <!-- (<!-- TMPL_VAR NAME="facet_count" -->)
--></li><!-- /TMPL_LOOP --><!-- TMPL_IF NAME="expandable" -->
+ <li class="showmore"><a href="/cgi-bin/koha/opac-search.pl?<!--
TMPL_VAR NAME="query_cgi" escape="url" -->&expand=<!-- TMPL_VAR
NAME="expand" -->#<!-- TMPL_VAR NAME="type_id" -->">Show More</a></li>
<!-- /TMPL_IF -->
</ul></li>
<!-- /TMPL_LOOP -->
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tmpl
b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tmpl
index f3dfe53..c3314a3 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tmpl
@@ -51,7 +51,7 @@
</div>
<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="debarred" -->
- <p class="error">
+ <div class="dialog alert">
<strong>Sorry</strong>, you cannot place holds because your account
has been frozen.
</div>
<div class="dialog alert">Usually the reason for freezing an account is
old overdues or damage fees. If <a href="/cgi-bin/koha/opac-user.pl">your
account page</a> shows your account to be clear, please consult a librarian.
@@ -93,8 +93,8 @@
<!-- TMPL_IF NAME="select_item_types" -->
<!-- The first time round you select which bibitems you want -->
<form action="/cgi-bin/koha/opac-reserve.pl" method="post">
- <input type="hidden" name="item_types_selected" value="1">
- <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR
NAME="biblionumber" -->">
+ <input type="hidden" name="item_types_selected" value="1" />
+ <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR
NAME="biblionumber" -->" />
<h3>Place a hold on <a
href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR
NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" --></a><!-- TMPL_IF
NAME="author" -->, by <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF --></h3>
<!-- TMPL_IF NAME="OPACItemHolds" --> <!-- TMPL_LOOP name="bibitemloop" -->
@@ -128,7 +128,7 @@
<!-- TMPL_IF NAME="forloan" -->
<!-- TMPL_IF NAME="OPACItemHolds" --><li> <label
for="requestany">Place a hold on the next available copy </label>
- <input type="checkbox" id="requestany" name="request"
id="requestany" checked="checked" value="Any" />
+ <input type="checkbox" id="requestany" name="request"
checked="checked" value="Any" />
</li><!-- TMPL_ELSE --><input type="hidden" name="request"
value="Any" /><!-- /TMPL_IF -->
</ol>
</fieldset>
@@ -136,7 +136,7 @@
<fieldset class="action"> <input type="hidden" name="biblioitem"
value="<!-- TMPL_VAR NAME="biblioitemnumber" -->" />
<input type="submit" value="Place Hold" />
- <input type="hidden" name="all" value="1" /></p>
+ <input type="hidden" name="all" value="1" />
<input type="hidden" name="place_reserve" value="1" /></fieldset>
<!-- /TMPL_IF -->
@@ -214,28 +214,28 @@
<!-- TMPL_IF NAME="item_types_selected" -->
<!-- if the bibitems have already been selected -->
<form action="/cgi-bin/koha/opac-reserve.pl" method="post">
-<input type="hidden" name="place_reserve" value="1">
-<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR
NAME="biblionumber" -->"><h3>Confirm Reservation</h3>
+<input type="hidden" name="place_reserve" value="1" />
+<input type="hidden" name="biblionumber" value="<!-- TMPL_VAR
NAME="biblionumber" -->" /><h3>Confirm Reservation</h3>
<div class="details">
<table>
<tr><th>Title: </th><td><span class="title"><!-- TMPL_VAR NAME="title"
--></span></td></tr>
<!-- TMPL_IF NAME="all" -->
- <tr><th>Item Type: </th><td>Any<input type="hidden" name="all"
value="1"></td></tr>
+ <tr><th>Item Type: </th><td>Any<input type="hidden" name="all"
value="1" /></td></tr>
<!-- TMPL_ELSE -->
<tr><th>Item Types: </th><td><!-- TMPL_LOOP NAME="TYPES" -->
-<input type="hidden" name="itemtype" value="<!-- TMPL_VAR NAME="itemtype"
-->"><!-- TMPL_VAR NAME="description" -->;
+<input type="hidden" name="itemtype" value="<!-- TMPL_VAR NAME="itemtype" -->"
/><!-- TMPL_VAR NAME="description" -->;
<!-- /TMPL_LOOP --></td></tr>
<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="singleBranchMode" -->
- <input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch"
-->">
+ <input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch"
-->" />
<!-- TMPL_ELSE -->
- <tr><th>Pick up From: </th><td><!-- TMPL_VAR NAME="branchname"
--><input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch"
-->"></td></tr>
+ <tr><th>Pick up From: </th><td><!-- TMPL_VAR NAME="branchname"
--><input type="hidden" name="branch" value="<!-- TMPL_VAR NAME="branch" -->"
/></td></tr>
<!-- /TMPL_IF -->
</table>
</div>
-<p><input type="submit" value="Finish and Place Reservation" class="submit"
onclick="this.value='Please wait...'; this.disabled=true;
this.form.submit();"></p>
+<p><input type="submit" value="Finish and Place Reservation" class="submit"
onclick="this.value='Please wait...'; this.disabled=true; this.form.submit();"
/></p>
</form>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results-grouped.tmpl
b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results-grouped.tmpl
index ff7d064..4571863 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results-grouped.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results-grouped.tmpl
@@ -77,7 +77,7 @@ $(document).ready(function(){
<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="query_error" -->
-<div class="error">
+<div class="dialog alert">
<h4>Error:</h4>
<!-- TMPL_VAR NAME="query_error" -->
</div>
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl
b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl
index 8279eac..f44383e 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl
@@ -13,14 +13,14 @@
<script type="text/javascript">
//<![CDATA[
$(document).ready(function(){
- var param1 = "<label for=\"addto\">Add to: </label><select
name=\"addto\" id=\"addto\"><option value=\"\"></option>"<!-- TMPL_IF
name="opacbookbag" -->+"<option value=\"addtocart\">Cart</option>"+<!--
/TMPL_IF --><!-- TMPL_IF NAME="virtualshelves" --><!-- TMPL_IF
NAME="loggedinusername" -->"<optgroup label=\"Your Lists:\">"+<!-- TMPL_IF
NAME="addbarshelves" --><!-- TMPL_LOOP NAME="addbarshelvesloop" -->"<option
id=\"s<!-- TMPL_VAR NAME="shelfnumber" -->\" value=\"addtolist\"><!-- TMPL_VAR
NAME="shelfname" ESCAPE="html"--></option>"+<!-- /TMPL_LOOP --><!-- /TMPL_IF
-->"</optgroup>";
- param1 += "<optgroup label=\"Public Lists:\">"+<!-- TMPL_IF
NAME="addpubshelves" --><!-- TMPL_LOOP NAME="addpubshelvesloop" -->"<option
id=\"s<!-- TMPL_VAR NAME="shelfnumber" -->\" value=\"addtolist\"><!-- TMPL_VAR
NAME="shelfname" ESCAPE="html"--></option>"+<!-- /TMPL_LOOP --><!-- /TMPL_IF
-->"</optgroup><option value=\"newlist\">[ New List ]</option>"+<!-- TMPL_ELSE
-->"<optgroup label=\"Public Lists:\">"+<!-- TMPL_IF NAME="addpubshelves"
--><!-- TMPL_LOOP NAME="addpubshelvesloop" -->"<option id=\"s<!-- TMPL_VAR
NAME="shelfnumber" -->\" value=\"addtolist\"><!-- TMPL_VAR NAME="shelfname"
ESCAPE="html"--></option>"+<!-- /TMPL_LOOP --><!-- /TMPL_IF
-->"</optgroup>"+<!-- /TMPL_IF --><!-- /TMPL_IF -->"</select> <input
type=\"submit\" class=\"submit\" value=\"Save\" />";
+ var param1 = "<label for=\"addto\">Add to: <\/label><select
name=\"addto\" id=\"addto\"><option value=\"\"><\/option>"<!-- TMPL_IF
name="opacbookbag" -->+"<option value=\"addtocart\">Cart<\/option>"+<!--
/TMPL_IF --><!-- TMPL_IF NAME="virtualshelves" --><!-- TMPL_IF
NAME="loggedinusername" -->"<optgroup label=\"Your Lists:\">"+<!-- TMPL_IF
NAME="addbarshelves" --><!-- TMPL_LOOP NAME="addbarshelvesloop" -->"<option
id=\"s<!-- TMPL_VAR NAME="shelfnumber" -->\" value=\"addtolist\"><!-- TMPL_VAR
NAME="shelfname" ESCAPE="html"--><\/option>"+<!-- /TMPL_LOOP --><!-- /TMPL_IF
-->"<\/optgroup>";
+ param1 += "<optgroup label=\"Public Lists:\">"+<!-- TMPL_IF
NAME="addpubshelves" --><!-- TMPL_LOOP NAME="addpubshelvesloop" -->"<option
id=\"s<!-- TMPL_VAR NAME="shelfnumber" -->\" value=\"addtolist\"><!-- TMPL_VAR
NAME="shelfname" ESCAPE="html"--><\/option>"+<!-- /TMPL_LOOP --><!-- /TMPL_IF
-->"<\/optgroup><option value=\"newlist\">[ New List ]<\/option>"+<!--
TMPL_ELSE -->"<optgroup label=\"Public Lists:\">"+<!-- TMPL_IF
NAME="addpubshelves" --><!-- TMPL_LOOP NAME="addpubshelvesloop" -->"<option
id=\"s<!-- TMPL_VAR NAME="shelfnumber" -->\" value=\"addtolist\"><!-- TMPL_VAR
NAME="shelfname" ESCAPE="html"--><\/option>"+<!-- /TMPL_LOOP --><!-- /TMPL_IF
-->"<\/optgroup>"+<!-- /TMPL_IF --><!-- /TMPL_IF -->"<\/select> <input
type=\"submit\" class=\"submit\" value=\"Save\" />";
$('#sortsubmit').hide();
$('#sort_by').change(function() {
$('#bookbag_form').submit();
});
- $("span.clearall").html("<a id=\"CheckNone\" href=\"#\">Clear All</a>");
- $("span.checkall").html("<a id=\"CheckAll\" href=\"#\">Select All</a>");
+ $("span.clearall").html("<a id=\"CheckNone\" href=\"#\">Clear
All<\/a>");
+ $("span.checkall").html("<a id=\"CheckAll\" href=\"#\">Select
All<\/a>");
$("span.addto").html(param1);
$("#addto").change(function(){
cartList();
@@ -84,7 +84,7 @@ $(document).ready(function(){
<!-- /TMPL_IF -->
<!-- TMPL_IF NAME="query_error" -->
-<div class="error">
+<div class="dialog alert">
<h4>Error:</h4>
<!-- TMPL_VAR NAME="query_error" -->
</div>
@@ -201,17 +201,17 @@ $(document).ready(function(){
<!-- TMPL_IF NAME="XSLTResultsDisplay" -->
<!-- TMPL_VAR NAME="XSLTResultsRecord" -->
<!-- TMPL_ELSE -->
- <!-- TMPL_IF name="BiblioDefaultViewmarc" --><a
class="title" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=<!-- TMPL_VAR
NAME="biblionumber" ESCAPE="URL" -->" title="View details for this title"><!--
TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="subtitle" --></a>
+ <!-- TMPL_IF name="BiblioDefaultViewmarc" --><a
class="title" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=<!-- TMPL_VAR
NAME="biblionumber" ESCAPE="URL" -->" title="View details for this title"><!--
TMPL_VAR NAME="title" escape="html" --> <!-- TMPL_VAR NAME="subtitle"
escape="html" --></a>
<!-- TMPL_ELSE -->
- <!-- TMPL_IF name="BiblioDefaultViewisbd"
--><a class="title" href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=<!--
TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->" title="View details for this
title"><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="subtitle" --></a>
- <!-- TMPL_ELSE --><a class="title"
href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR
NAME="biblionumber" ESCAPE="URL" -->" title="View details for this title"><!--
TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="subtitle" --></a>
+ <!-- TMPL_IF name="BiblioDefaultViewisbd"
--><a class="title" href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=<!--
TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->" title="View details for this
title"><!-- TMPL_VAR NAME="title" escape="html" --> <!-- TMPL_VAR
NAME="subtitle" escape="html" --></a>
+ <!-- TMPL_ELSE --><a class="title"
href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR
NAME="biblionumber" ESCAPE="URL" -->" title="View details for this title"><!--
TMPL_VAR NAME="title" escape="html" --> <!-- TMPL_VAR NAME="subtitle"
escape="html" --></a>
<!-- /TMPL_IF -->
<!-- /TMPL_IF -->
- <!-- TMPL_IF NAME="author" -->by <a
href="/cgi-bin/koha/opac-search.pl?q=au:<!-- TMPL_VAR NAME="author_nospan"
ESCAPE="URL" -->" title="Search for works by this author"><!-- TMPL_VAR
NAME="author" --></a>
+ <!-- TMPL_IF NAME="author" -->by <a
href="/cgi-bin/koha/opac-search.pl?q=au:<!-- TMPL_VAR NAME="author_nospan"
ESCAPE="URL" -->" title="Search for works by this author"><!-- TMPL_VAR
NAME="author" escape="html" --></a>
<!-- TMPL_ELSE -->
<!-- /TMPL_IF -->
<span class="results_summary"><span
class="label">Publication:</span>
- <!-- TMPL_IF name="place" --><!-- TMPL_VAR
name="place" --> <!-- /TMPL_IF --><!-- TMPL_IF name="publishercode" --><!--
TMPL_VAR name="publishercode" --><!-- /TMPL_IF --><!-- TMPL_IF
name="publicationyear" --> <!-- TMPL_VAR name="publicationyear" -->
+ <!-- TMPL_IF name="place" --><!-- TMPL_VAR
name="place" --> <!-- /TMPL_IF --><!-- TMPL_IF name="publishercode" --><!--
TMPL_VAR name="publishercode" escape="html" --><!-- /TMPL_IF --><!-- TMPL_IF
name="publicationyear" --> <!-- TMPL_VAR name="publicationyear" -->
<!-- TMPL_ELSE --><!-- TMPL_IF name="copyrightdate" -->
<!-- TMPL_VAR name="copyrightdate" --><!-- /TMPL_IF --><!-- /TMPL_IF -->
<!-- TMPL_IF name="pages" -->. <!-- TMPL_VAR
name="pages" --><!-- /TMPL_IF -->
<!-- TMPL_IF name="notes" -->, <!-- TMPL_VAR
name="notes" --><!-- /TMPL_IF -->
diff --git a/koha-tmpl/opac-tmpl/prog/en/modules/opac-review.tmpl
b/koha-tmpl/opac-tmpl/prog/en/modules/opac-review.tmpl
index 3fdd217..2ae4d82 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-review.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-review.tmpl
@@ -11,7 +11,7 @@
<!-- TMPL_IF NAME="cgi_debug" -->alert("injecting OLD
comment: " +comment);<!-- /TMPL_IF -->
parent.opener.$('#c<!-- TMPL_VAR NAME="reviewid" -->
p').prev("small").prev("h5").html("Your Edited Comment (preview, pending
approval)");
parent.opener.$('#c<!-- TMPL_VAR NAME="reviewid" -->
p').html(comment);
- parent.opener.$('#c<!-- TMPL_VAR NAME="reviewid" -->
p').append(" <a href=\"#comment\"
onclick=\"Dopop(\'/cgi-bin/koha/opac-review.pl?biblionumber=<!-- TMPL_VAR
NAME="biblionumber"-->&reviewid=<!-- TMPL_VAR NAME="reviewid"
-->\');\">Edit</a>");
+ parent.opener.$('#c<!-- TMPL_VAR NAME="reviewid" -->
p').append(" <a href=\"#comment\"
onclick=\"Dopop(\'/cgi-bin/koha/opac-review.pl?biblionumber=<!-- TMPL_VAR
NAME="biblionumber"-->&reviewid=<!-- TMPL_VAR NAME="reviewid"
-->\');\">Edit<\/a>");
<!-- /TMPL_IF -->
return 1;
};
@@ -19,9 +19,9 @@
<!-- TMPL_IF NAME="cgi_debug" -->alert("injecting NEW
comment: " +comment);<!-- /TMPL_IF -->
parent.opener.$('#newcomment').attr("class","yours");
parent.opener.$('#newcomment').html(
- "<h5>Your Comment (preview, pending
approval)</h5>" +
- "<p>"+comment+"</p>" +
- "<a href=\"#comment\"
onclick=\"Dopop(\'/cgi-bin/koha/opac-review.pl?biblionumber=<!-- TMPL_VAR
NAME="biblionumber"-->\');\">Edit</a></p>"
+ "<h5>Your Comment (preview, pending
approval)<\/h5>" +
+ "<p>"+comment+"<\/p>" +
+ "<a href=\"#comment\"
onclick=\"Dopop(\'/cgi-bin/koha/opac-review.pl?biblionumber=<!-- TMPL_VAR
NAME="biblionumber"-->\');\">Edit<\/a><\/p>"
);
parent.opener.$("#addcomment").prev("p").remove();
parent.opener.$("#addcomment").remove();
--
1.5.5.GIT
_______________________________________________
Koha-patches mailing list
[email protected]
http://lists.koha.org/mailman/listinfo/koha-patches
