[Koha-patches] [PATCH] Standardizing styling of error messages; other markup corrections.
Owen Leonard
oleonard at myacpl.org
Fri Aug 29 16:05:41 CEST 2008
---
.../intranet-tmpl/prog/en/css/staff-global.css | 9 ++++++---
.../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 | 8 ++++----
.../prog/en/modules/admin/currency.tmpl | 4 ++--
.../prog/en/modules/cataloguing/addbooks.tmpl | 8 ++++----
.../prog/en/modules/labels/label-manager.tmpl | 2 +-
.../prog/en/modules/reports/catalogue_out.tmpl | 6 ++----
.../intranet-tmpl/prog/en/modules/tags/review.tmpl | 8 ++++----
.../opac-tmpl/prog/en/modules/opac-reserve.tmpl | 2 +-
.../prog/en/modules/opac-results-grouped.tmpl | 2 +-
.../opac-tmpl/prog/en/modules/opac-results.tmpl | 2 +-
.../opac-tmpl/prog/en/modules/opac-review.tmpl | 2 +-
15 files changed, 37 insertions(+), 33 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..d7ba280 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,12 @@ 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..c991824 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl
@@ -82,15 +82,15 @@
<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>
+ </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>
@@ -194,7 +194,7 @@
<a href="<!-- TMPL_VAR name="action" -->?op=edit&branchcode=<!-- TMPL_VAR name="value" escape="HTML" -->">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="HTML" -->&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..e5a4270 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/currency.tmpl
@@ -130,9 +130,9 @@
<label for="symbol">Symbol: </label>
<input type="text" name="symbol" id="symbol" size="5" maxlength="5" value="<!-- TMPL_VAR NAME="symbol" -->" />
</li>
- <li>
+ <!-- TMPL_IF NAME="searchfield" --><li>
<label for="currency">Last Updated: </label><!-- TMPL_VAR NAME="timestamp" -->
- </li>
+ </li><!-- /TMPL_IF -->
</ol>
</fieldset>
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..d8cbc80 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tmpl
@@ -1,5 +1,5 @@
<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha › Cataloging</title>
+<title>Koha › Cataloguing</title>
<!-- TMPL_INCLUDE NAME="greybox.inc" -->
<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
<script type="text/javascript">
@@ -12,7 +12,7 @@
<!-- TMPL_INCLUDE NAME="header.inc" -->
<!-- TMPL_INCLUDE NAME="cataloging-search.inc" -->
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › Cataloging</div>
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> › Cataloguing</div>
<div id="doc" class="yui-t7">
@@ -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..1238e6c 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,10 @@
<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 id="table<!-- TMPL_VAR NAME="coltitle" -->">
+ <!-- TMPL_VAR NAME="coltitle" -->
</h3>
<table>
<tr>
@@ -80,7 +79,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/modules/opac-reserve.tmpl b/koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tmpl
index f3dfe53..2aba28a 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.
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..8c8a062 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl
@@ -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>
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..29e227a 100644
--- a/koha-tmpl/opac-tmpl/prog/en/modules/opac-review.tmpl
+++ b/koha-tmpl/opac-tmpl/prog/en/modules/opac-review.tmpl
@@ -51,7 +51,7 @@
<div class="container">
<!-- TMPL_IF NAME="cgi_debug" --><div class="debug">CGI debug is on.</div><!-- /TMPL_IF -->
<!-- TMPL_IF NAME="ERRORS" -->
- <div class="error">
+ <div class="dialog alert">
<!-- TMPL_LOOP NAME="ERRORS" -->
<p>
<!-- TMPL_IF NAME="scrubbed" -->Note: your comment contained illegal markup code.
--
1.5.5.GIT
More information about the Koha-patches
mailing list