[Koha-patches] [PATCH] [bug_5575] Bug 5575 Markup corrections:
Owen Leonard
oleonard at myacpl.org
Thu Jan 20 18:19:29 CET 2011
- Putting attributes and identifiers table inside TMPL_IF to avoid js error
- Correcting sorting columns
- Removing duplicate IDs
- Styling error message with standard <div class="dialog alert">
- Other minor markup corrections
---
.../prog/en/modules/members/moremember.tmpl | 41 +++++++++++---------
1 files changed, 23 insertions(+), 18 deletions(-)
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
index 14d330f..fc4b7ed 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
@@ -4,7 +4,7 @@
<!-- TMPL_INCLUDE NAME="calendar.inc" -->
<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/jquery/plugins/jquery.checkboxes.min.js"></script>
-<script type="text/JavaScript" language="JavaScript">
+<script type="text/javascript">
//<![CDATA[
function Dopop(link) {
var newin=window.open(link,'popup','width=600,height=400,resizable=1,toolbar=0,scrollbars=1,top');
@@ -21,7 +21,7 @@ $(document).ready(function() {
$.tablesorter.defaults.widgets = ['zebra'];
$("#issuest").tablesorter({<!-- TMPL_IF NAME="dateformat_metric" -->
dateFormat: 'uk',<!-- /TMPL_IF -->
- headers: { 1: { sorter: 'articles' },5: { sorter: false },6:{sorter:false},7:{sorter:false},8:{sorter:false}}
+ headers: { 1: { sorter: 'articles' },6:{sorter:false},7:{sorter:false},8:{sorter:false},9:{sorter:false}}
});
$("#table_additionalattributes").tablesorter({sortList: [[1,0]]});
$("#relissuest").tablesorter({<!-- TMPL_IF NAME="dateformat_metric" -->
@@ -32,7 +32,7 @@ $(document).ready(function() {
$("#holdst").tablesorter({<!-- TMPL_IF NAME="dateformat_metric" -->
dateFormat: 'uk',<!-- /TMPL_IF -->
sortList: [[0,0]],
- headers: { 1: { sorter: 'articles' },6: { sorter: false }}
+ headers: { 1: { sorter: 'articles' },4: { sorter: false },5: { sorter: false }}
});
<!-- TMPL_IF NAME="picture" -->
// new YAHOO.widget.Button("delpicture"); // FIXME: formatting mismatch between YUI and normal button
@@ -107,7 +107,8 @@ function validate1(date) {
//]]>
</script>
<!-- TMPL_IF name="boolsuggestions" -->
-<script type="text/JavaScript">
+<script type="text/javascript">
+//<![CDATA[
/**
* displayOther.
* This function display the select or an textaera to write a reason.
@@ -130,11 +131,13 @@ $(document).ready(function() {
// functions for allsuggestionforthisborrower interactions
- $("#CheckAll").click(function(){
+ $("#CheckAll").click(function(e){
$("#allsuggestionforthisborrowert").checkCheckboxes();
+ e.preventDefault();
});
- $("#UncheckAll").click(function(){
+ $("#UncheckAll").click(function(e){
$("#allsuggestionforthisborrowert").unCheckCheckboxes();
+ e.preventDefault();
});
$("#other_reasonallsuggestionforthisborrower").hide();
$("input[name*=other_reasonallsuggestionforthisborrower]").focus(function(){ $(this).val(""); });
@@ -211,7 +214,7 @@ $(document).ready(function() {
<!-- TMPL_IF NAME="reregistration" --><div class="dialog message">Patron's account has been renewed until <!-- TMPL_VAR NAME="dateexpiry" --></div><!-- /TMPL_IF -->
<!-- TMPL_IF NAME="flagged" -->
- <div class="error">
+ <div class="dialog alert">
<ul>
<!-- TMPL_IF NAME="borrowernotes" --><li><!-- TMPL_VAR NAME="borrowernotes" --> </li><!-- /TMPL_IF -->
<!-- TMPL_IF NAME="userdebarred" -->
@@ -350,12 +353,14 @@ $(document).ready(function() {
<!-- TMPL_UNLESS NAME="no_patron_attribute_types" -->
<div id="patron-extended-attributes">
<h3>Additional attributes and identifiers</h3>
-<table id="table_additionalattributes">
- <thead>
+<!-- TMPL_IF NAME="patron_attributes" --><table id="table_additionalattributes">
+ <thead><tr>
<th>Type</th>
<th>Description</th>
<th>Value</th>
+ </tr>
</thead>
+ <tbody>
<!-- TMPL_LOOP NAME="patron_attributes" -->
<tr>
<td><!-- TMPL_VAR NAME="code" --></td>
@@ -367,7 +372,8 @@ $(document).ready(function() {
</td>
</tr>
<!-- /TMPL_LOOP -->
-</table>
+ </tbody>
+</table><!-- TMPL_ELSE -->Patron has no additional attributes and identifiers.<!-- /TMPL_IF -->
<div class="action"><a href="memberentry.pl?op=modify&borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->&step=4">Edit</a></div>
</div>
<!-- /TMPL_UNLESS -->
@@ -472,7 +478,7 @@ $(document).ready(function() {
<!-- ###################### suggestions start ######################-->
<div id="suggestions"><!-- TMPL_IF name="boolsuggestions" -->
<form name="fallsuggestionforthisborrower" method="post" action="/cgi-bin/koha/suggestion/suggestion.pl#allsuggestionforthisborrower">
-<p><a id="CheckAll" href="javascript:;">Check All</a> | <a id="UncheckAll" href="javascript:;"">Uncheck All</a></p>
+<p><a id="CheckAll" href="#">Check All</a> | <a id="UncheckAll" href="#">Uncheck All</a></p>
<table id="allsuggestionforthisborrowert">
<thead>
<tr><th> </th>
@@ -486,7 +492,7 @@ $(document).ready(function() {
</thead>
<tbody>
<!-- TMPL_LOOP Name="suggestions" --><!-- TMPL_LOOP NAME="suggestions_loop" -->
- <!-- TMPL_IF name="even" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
+ <!-- TMPL_UNLESS name="__odd__" --><tr class="highlight"><!-- TMPL_ELSE --><tr><!-- /TMPL_UNLESS -->
<td>
<input type="checkbox" name="edit_field" value="<!-- TMPL_VAR name="suggestionid" -->" />
</td>
@@ -497,7 +503,7 @@ $(document).ready(function() {
<br />
<!-- TMPL_IF name="copyrightdate" -->© <!-- TMPL_VAR name="copyrightdate" --> <!-- /TMPL_IF -->
<!-- TMPL_IF name="volumedesc" -->; Volume:<i><!-- TMPL_VAR name="volumedesc" --></i> <!-- /TMPL_IF -->
- <!-- TMPL_IF name="isbn" -->; ISBN:<i><!-- TMPL_VAR name="isbn" --></i> <!-- /TMPL_IF --><!-- TMPL_IF name="publishercode" -->; Published by <!-- TMPL_VAR name="publishercode" --> <!-- /TMPL_IF --><!-- TMPL_IF name="publicationyear" --> in <i><!-- TMPL_VAR name="publicationyear" --></i> <!-- /TMPL_IF --><!-- TMPL_IF name="place" --> in <i><!-- TMPL_VAR name="place" --></i> <!-- /TMPL_IF --><!-- TMPL_IF name="collectiontitle" -->;<!-- TMPL_VAR name="collectiontitle" --> <!-- /TMPL_IF --><!-- TMPL_IF name="itemtype" -->;<!-- TMPL_VAR name="itemtype" --> <!-- /TMPL_IF --><br /><!-- TMPL_IF name="note" --><!-- TMPL VAR NAME="note" --><!-- /TMPL_IF -->
+ <!-- TMPL_IF name="isbn" -->; ISBN:<i><!-- TMPL_VAR name="isbn" --></i> <!-- /TMPL_IF --><!-- TMPL_IF name="publishercode" -->; Published by <!-- TMPL_VAR name="publishercode" --> <!-- /TMPL_IF --><!-- TMPL_IF name="publicationyear" --> in <i><!-- TMPL_VAR name="publicationyear" --></i> <!-- /TMPL_IF --><!-- TMPL_IF name="place" --> in <i><!-- TMPL_VAR name="place" --></i> <!-- /TMPL_IF --><!-- TMPL_IF name="collectiontitle" -->; <!-- TMPL_VAR name="collectiontitle" --> <!-- /TMPL_IF --><!-- TMPL_IF name="itemtype" -->; <!-- TMPL_VAR name="itemtype" --> <!-- /TMPL_IF --><br /><!-- TMPL_IF name="note" --><!-- TMPL VAR NAME="note" --><!-- /TMPL_IF -->
</td>
<td>
<!-- TMPL_VAR name="note" -->
@@ -526,8 +532,8 @@ $(document).ready(function() {
<div id="select-reasonallsuggestionforthisborrower">
- <div id="statusallsuggestionforthisborrower">
- <label for="STATUSallsuggestionforthisborrower">Mark selected as: </label><select name="STATUS" id="STATUSallsuggestionforthisborrower">
+ <fieldset id="statusallsuggestionforthisborrower">
+ <label for="STATUS">Mark selected as: </label><select name="STATUS" id="STATUS">
<option value=""> -- Choose a status --</option>
<option value="ASKED">Requested</option>
<option value="ACCEPTED">Accepted</option>
@@ -543,13 +549,11 @@ $(document).ready(function() {
</select> <span id="other_reasonallsuggestionforthisborrower">
<input type="text" size="31" id="select-other_reasonallsuggestionforthisborrower" name="other_reasonallsuggestionforthisborrower" value="please note your reason here" /> <a href="#backallsuggestionforthisborrower">Cancel</a>
</span> <strong style="padding: 0 1em;">OR:</strong> <label for="allsuggestionforthisborrowerdelete">Delete selected</label> <input type="checkbox" name="op" id="allsuggestionforthisborrowerdelete" />
- </div>
- </div>
<input type="hidden" name="returnsuggested" id="returnsuggested" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
<input type="hidden" name="tabcode" value="allsuggestionforthisborrower" />
<input type="hidden" name="op" value="change" />
-</fieldset>
+</fieldset> </div>
<fieldset class="action">
<input type="submit" value="Submit" /></fieldset>
</form>
@@ -557,6 +561,7 @@ $(document).ready(function() {
<!-- TMPL_ELSE -->Patron has no suggestions.<!-- /TMPL_IF -->
</div>
<!-- ###################### suggestions end ######################-->
+
<div id="finesandcharges">
<!-- TMPL_IF NAME="totaldue_raw" -->
<p>Total due: <!-- TMPL_VAR NAME="totaldue" --></p>
--
1.7.3
More information about the Koha-patches
mailing list