From b2d476aa5c43acf78487598b1863ed93f00f0c4d Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
Date: Mon, 10 Sep 2007 15:09:18 -0500
Subject: [PATCH] Continuing integration of breadcrumbs and resident search
 form, now on member pages. The search form tabs need to be handled in a more
 sane manner given that they might have multiple options. Either a custom
 handling script for the different includes or a js-library-based system that
 will handle all of them.

Signed-off-by: Chris Cormack <crc@liblime.com>
---
 .../intranet-tmpl/prog/en/includes/header.inc |  2 +-
 .../prog/en/includes/members-menu.inc         |  5 +--
 .../prog/en/includes/members-search.inc       |  4 +-
 .../prog/en/modules/members/boraccount.tmpl   |  6 ++-
 .../en/modules/members/borrowers_details.tmpl | 44 +++++++------------
 .../prog/en/modules/members/deletemem.tmpl    | 17 ++++---
 .../en/modules/members/guarantor_search.tmpl  | 20 +--------
 .../prog/en/modules/members/mancredit.tmpl    |  6 ++-
 .../prog/en/modules/members/maninvoice.tmpl   |  6 ++-
 .../prog/en/modules/members/member-flags.tmpl | 14 ++++--
 .../en/modules/members/member-password.tmpl   |  8 ++--
 .../members/member-quicksearch-results.tmpl   |  7 +--
 .../modules/members/member-quicksearch.tmpl   |  7 +--
 .../prog/en/modules/members/member.tmpl       |  6 ++-
 .../prog/en/modules/members/memberentryA.tmpl | 28 ++++++------
 .../prog/en/modules/members/memberentryC.tmpl |  6 ++-
 .../prog/en/modules/members/memberentryI.tmpl |  6 ++-
 .../prog/en/modules/members/memberentryP.tmpl |  6 ++-
 .../en/modules/members/moremember-print.tmpl  |  8 +---
 .../modules/members/moremember-receipt.tmpl   |  7 +--
 .../prog/en/modules/members/moremember.tmpl   | 15 +++----
 .../prog/en/modules/members/pay.tmpl          |  6 ++-
 .../prog/en/modules/members/readingrec.tmpl   |  6 ++-
 .../prog/en/modules/reserve/request.tmpl      |  6 ++-
 members/member-flags.pl                       |  2 +-
 25 files changed, 115 insertions(+), 133 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
index 064bc7ed76..e2542fac91 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
@@ -15,4 +15,4 @@
 </ul>
 </div>
 	
-<div id="login"><!-- TMPL_IF NAME="loggedinusername" --><span class="loggedinusername"><!-- TMPL_VAR NAME="loggedinusername" --></span> <!-- TMPL_IF NAME="AutoLocation" --><strong><!-- TMPL_VAR NAME="LoginBranchname" --></strong><!-- TMPL_ELSE --><a href="/cgi-bin/koha/circ/selectbranchprinter.pl"><strong><!-- TMPL_VAR NAME="LoginBranchname" --></strong></a><!-- /TMPL_IF --> | <a href="/cgi-bin/koha/mainpage.pl?logout.x=1">Log Out</a> | <!-- TMPL_ELSE -->You are not logged in | <!-- /TMPL_IF --><a href="/cgi-bin/koha/help.pl" id="helper" onclick="window.open('/cgi-bin/koha/help.pl','Koha_Help','width=600,height=600,toolbar=false,scrollbars=yes');">[ ? ]</a></div></div>
+<div id="login"><!-- TMPL_IF NAME="loggedinusername" --><span class="loggedinusername"><!-- TMPL_VAR NAME="loggedinusername" --></span> <!-- TMPL_IF NAME="AutoLocation" --><strong><!-- TMPL_VAR NAME="LoginBranchname" --></strong><!-- TMPL_ELSE --><a href="/cgi-bin/koha/circ/selectbranchprinter.pl"><strong><!-- TMPL_VAR NAME="LoginBranchname" --></strong></a><!-- /TMPL_IF --> | <a href="/cgi-bin/koha/mainpage.pl?logout.x=1">Log Out</a> | <!-- TMPL_ELSE -->You are not logged in | <!-- /TMPL_IF --><a href="/cgi-bin/koha/help.pl" id="helper" onclick="window.open('/cgi-bin/koha/help.pl','Koha_Help','width=600,height=600,toolbar=false,scrollbars=yes'); return false;">[ ? ]</a></div></div>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/members-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/members-menu.inc
index 67712e9d28..10d2452556 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/members-menu.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/members-menu.inc
@@ -1,7 +1,6 @@
-<div class="yui-b"><ul id="navigation">
+<ul id="navigation">
 	<li>    <a href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;category_type=A">Add adult</a></li>
 	<li>    <a href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;category_type=C">Add child</a></li>
 	<li>    <a href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;category_type=P">Add professional</a></li>
 	<li>    <a href="/cgi-bin/koha/members/memberentry.pl?op=add&amp;category_type=I">Add organisation</a></li>
-</ul>
-</div>
\ No newline at end of file
+</ul>
\ No newline at end of file
diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/members-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/members-search.inc
index d4590b66bb..ea1d1ce99d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/members-search.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/members-search.inc
@@ -3,9 +3,9 @@
 	<div class="tip" id="residenttip">Enter patron card number or partial name:</div>
 	<div id="patron_search">
 	<form action="/cgi-bin/koha/members/member.pl" method="post">
-    <input id="member" size="25" name="member" type="text" />
+    <input id="searchmember" size="25" name="member" type="text" />
     order by:
-    <select name="orderby" id="orderby">
+    <select name="orderby" id="searchorderby">
     <option value="surname,firstname">Surname</option>
     <option value="cardnumber">Cardnumber</option>
     </select>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tmpl
index 5a91c41650..dd1f735fc5 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tmpl
@@ -12,7 +12,7 @@
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
+	<div class="yui-b">
 
 <!-- The manual invoice and credit buttons -->
 <div id="action">
@@ -55,9 +55,11 @@
   </tfoot>
 </table>
 
-</div>
 </div>
 </div>
 
+<div class="yui-b">
 <!-- TMPL_INCLUDE NAME="members-menu.inc" -->
+</div>
+</div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/borrowers_details.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/borrowers_details.tmpl
index fbd3f98b94..6c0dad0c3d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/borrowers_details.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/borrowers_details.tmpl
@@ -3,55 +3,50 @@
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
 <body>
-<!-- TMPL_INCLUDE NAME="header.inc" -->
 
-<div id="doc3" class="yui-t2">
-   
+<div id="doc" class="yui-t7">
    <div id="bd">
-	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
 
-	<h1>PATRON DETAILS</h1>
+	<h1>Patron Details</h1>
 	
 	<form name="form" method="post" action="/cgi-bin/members/borrowers_details.pl">
-	<div >
 	<!-- TMPL_IF NAME="Institution"-->	
 		
 		<p>
 		
-			<label>Patron category</label>		
-			<input  type="text" name="description" size="20" value="<!-- TMPL_VAR NAME="description" -->" />
+			<label for="description">Patron category</label>		
+			<input  type="text" id="description" name="description" size="20" value="<!-- TMPL_VAR NAME="description" -->" />
 		</p>
 		<p>
 			
-			<label>Organisation name</label>
-			<input  style="text-transform:uppercase;" type="text" name="surname" size="20" value="<!-- TMPL_VAR NAME="surname" -->" />
+			<label for="surname">Organisation name</label>
+			<input style="text-transform:uppercase;" type="text" id="surname" name="surname" size="20" value="<!-- TMPL_VAR NAME="surname" -->" />
 		</p>
 		
 	<!-- TMPL_ELSE -->	
 
 		<p>
-			<label>Patron category</label>
-			<input  type="text" name="description" size="20" value="<!-- TMPL_VAR NAME="description" -->" />
+			<label for="description">Patron category</label>
+			<input  type="text" name="description" id="description" size="20" value="<!-- TMPL_VAR NAME="description" -->" />
 			</p>
 		<p>
-			<label>Title</label>
-			<input  type="text" name="title" size="20" value="<!-- TMPL_VAR NAME="title" -->" />
+			<label for="title">Title</label>
+			<input  type="text" name="title" id="title" size="20" value="<!-- TMPL_VAR NAME="title" -->" />
 			
 		</p>
 		<p>
-			<label>Surname</label>
-			<input  style="text-transform:uppercase;" type="text" name="surname" size="20" value="<!-- TMPL_VAR NAME="surname" -->" />
+			<label for="surname">Surname</label>
+			<input  style="text-transform:uppercase;" type="text" id="surname" name="surname" size="20" value="<!-- TMPL_VAR NAME="surname" -->" />
 		</p>
 			
 		<p>	
 			
-			<label>Firstname</label>
-			<input  style="text-transform:capitalize;" type="text" name="firstname" size="20" value="<!-- TMPL_VAR NAME="firstname" -->" />
+			<label for="firstname">Firstname</label>
+			<input  style="text-transform:capitalize;" type="text" id="firstname" name="firstname" size="20" value="<!-- TMPL_VAR NAME="firstname" -->" />
 		</p>
 		<p>
-			<label>Date of birth </label>
-			<input  type="text" name="dateofbirth" size="20" value="<!-- TMPL_VAR NAME="dateofbirth" -->" />
+			<label for="dateofbirth">Date of birth </label>
+			<input  type="text" name="dateofbirth" id="dateofbirth" size="20" value="<!-- TMPL_VAR NAME="dateofbirth" -->" />
 		</p>		
 		
 		
@@ -59,17 +54,10 @@
 		
 	<!-- /TMPL_IF -->
 	<p>
-		<div align="center">
 		<a href="#" onclick="window.close()">Close Window</a>
-		</div>
 	</p>
 	
 	</form>
 
-
-</div>
 </div>
-</div>
-
-<!-- TMPL_INCLUDE NAME="mainmenu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tmpl
index f060f42544..e100213924 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tmpl
@@ -4,28 +4,31 @@
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
+<!-- TMPL_INCLUDE NAME="members-search.inc" -->
 
 <div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>  &rsaquo; Cannot Delete Patron</div>
 <div id="doc3" class="yui-t2">
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
+	<div class="yui-b">
 
 	<h3>Cannot Delete Patron</h3>
-		<!-- TMPL_IF name="ItemsOnIssues" -->
-			Patron has <!-- TMPL_VAR name="ItemsOnIssues" --> item(s) checked out.
+		<ul><!-- TMPL_IF name="ItemsOnIssues" -->
+			<li>Patron has <!-- TMPL_VAR name="ItemsOnIssues" --> item(s) checked out.</li>
 		<!-- /TMPL_IF -->
 		<!-- TMPL_IF name="charges -->
-			Patron has <!-- TMPL_VAR name="charges" --> in fines.
+			<li>Patron has <!-- TMPL_VAR name="charges" --> in fines.</li>
 		<!-- /TMPL_IF -->
 		<!-- TMPL_IF name="guarantees" -->
-			Patron's record has guaranteed accounts attached.
-		<!-- /TMPL_IF -->
+			<li>Patron's record has guaranteed accounts attached.</li>
+		<!-- /TMPL_IF --></ul>
 
 </div>
 </div>
-</div>
 
+<div class="yui-b">
 <!-- TMPL_INCLUDE NAME="members-menu.inc" -->
+</div>
+</div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/guarantor_search.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/guarantor_search.tmpl
index 94f039cf9c..330146cb6e 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/guarantor_search.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/guarantor_search.tmpl
@@ -3,14 +3,10 @@
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
 <body>
-<!-- TMPL_INCLUDE NAME="header.inc" -->
-<!-- TMPL_INCLUDE NAME="members-search.inc" -->
-
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>  &rsaquo; Guarantor Search</div>
 
 <div id="doc" class="yui-t7">
    <div id="bd">
-	<div class="yui-g">
+	
 
 <h1>Search for guarantor</h1>
 	<form action="/cgi-bin/koha/members/guarantor_search.pl" method="post">
@@ -21,7 +17,6 @@
 		</select>
 		<input type="submit" class="button" value="Search" />
 	</form>
-</div>
 
 <!--TMPL_IF NAME="results" -->
 	<p>Searched for <!-- TMPL_VAR NAME="member" -->, <!-- TMPL_VAR Name ="numresults" --> borrower(s) found:</p>
@@ -34,11 +29,7 @@
 			<th>Address</th>
 		</tr>
 		<!-- TMPL_LOOP NAME="resultsloop" -->
-			<!-- TMPL_IF NAME="background" -->
-				<tr bgcolor="#ffffcc">
-			<!-- TMPL_ELSE -->
-				<tr bgcolor="white">
-			<!-- /TMPL_IF -->
+			<tr>
 				<td><!-- TMPL_VAR NAME="cardnumber" --></td>
 				<td><p><a href="javascript:window.opener.document.form.guarantorid.value=<!-- TMPL_VAR NAME="borrowernumber" -->;window.opener.document.form.guarantorsearch.value='Modify Guarantor';window.opener.document.form.guarantorinfo.value='<!-- TMPL_VAR NAME="guarantorinfo" -->';self.close();"><!-- TMPL_VAR NAME="surname" --></a></p>
 				<td><b><!-- TMPL_VAR NAME="firstname" --></b></td> 
@@ -47,14 +38,7 @@
 			</tr>
 		<!-- /TMPL_LOOP -->
 	</table>
-</div>
-</div>
 <!--/TMPL_IF-->
 
-
-</div>
 </div>
-</div>
-
-<!-- TMPL_INCLUDE NAME="members-menu.inc" -->
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tmpl
index 322dff3b92..2e3f7513b9 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tmpl
@@ -12,7 +12,7 @@
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
+	<div class="yui-b">
 
 <h2>Manual Credit</h2>
 <form action="/cgi-bin/koha/members/mancredit.pl" method="post">
@@ -35,9 +35,11 @@
 <form action="/cgi-bin/koha/members/boraccount.pl" method="get"><input type="hidden" value="<!-- TMPL_VAR Name="borrowernumber" -->" name="borrowernumber" /><input type="submit" value="Cancel" /></form>
 
 
-</div>
 </div>
 </div>
 
+<div class="yui-b">
 <!-- TMPL_INCLUDE NAME="members-menu.inc" -->
+</div>
+</div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tmpl
index 357079e175..6b516393d2 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tmpl
@@ -12,7 +12,7 @@
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
+	<div class="yui-b">
 
 <!-- TMPL_IF NAME="ERROR" -->
 <!-- TMPL_IF NAME="ITEMNUMBER" -->
@@ -42,9 +42,11 @@
 
 <!-- /TMPL_IF -->
 
-</div>
 </div>
 </div>
 
+<div class="yui-b">
 <!-- TMPL_INCLUDE NAME="members-menu.inc" -->
+</div>
+</div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tmpl
index 92fc809160..e8b17d4a76 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-flags.tmpl
@@ -1,5 +1,5 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Set Privileges for <!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --></title>
+<title>Koha &rsaquo; Patrons &rsaquo; Set Privileges for <!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
 <body>
@@ -12,7 +12,7 @@
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
+	<div class="yui-b">
 
 <form method="post" action="/cgi-bin/koha/members/member-flags.pl">
     <input type="hidden" name="member" value="<!-- TMPL_VAR NAME="member" -->" />
@@ -23,7 +23,11 @@
     <!-- TMPL_LOOP NAME="loop" -->
         <tr>
             <td>
-                <input type="checkbox" id="flag-<!-- TMPL_VAR NAME="bit" -->" name="flag-<!-- TMPL_VAR NAME="bit" -->" <!-- TMPL_VAR NAME="checked" --> />
+			<!-- TMPL_IF NAME="checked" -->
+			   <input type="checkbox" id="flag-<!-- TMPL_VAR NAME="bit" -->" name="flag-<!-- TMPL_VAR NAME="bit" -->" checked="checked" />
+			<!-- TMPL_ELSE -->
+				<input type="checkbox" id="flag-<!-- TMPL_VAR NAME="bit" -->" name="flag-<!-- TMPL_VAR NAME="bit" -->" />
+			<!-- /TMPL_IF -->
             </td>
             <td>
                 <label for="flag-<!-- TMPL_VAR NAME="bit" -->"><!-- TMPL_VAR NAME="flag" --></label>
@@ -40,7 +44,9 @@
 </form>
 </div>
 </div>
-</div>
 
+<div class="yui-b">
 <!-- TMPL_INCLUDE NAME="members-menu.inc" -->
+</div>
+</div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tmpl
index e4cde01f64..0e0841d82d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-password.tmpl
@@ -1,5 +1,5 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title><!-- TMPL_IF NAME="newpassword" -->Password Updated <!-- TMPL_ELSE -->Update Password for <!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --><!-- /TMPL_IF --></title>
+<title>Koha &rsaquo; Patrons &rsaquo; <!-- TMPL_IF NAME="newpassword" -->Password Updated <!-- TMPL_ELSE -->Update Password for <!-- TMPL_VAR NAME="surname" -->, <!-- TMPL_VAR NAME="firstname" --><!-- /TMPL_IF --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
 <body>
@@ -12,7 +12,7 @@
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
+	<div class="yui-b">
 
 <!-- TMPL_IF NAME="newpassword" -->
 <h1>Password Updated</h1>
@@ -38,9 +38,11 @@
 <p><input type="submit" value="Confirm Password" /></p>
 </form><!-- /TMPL_IF -->
 
-</div>
 </div>
 </div>
 
+<div class="yui-b">
 <!-- TMPL_INCLUDE NAME="members-menu.inc" -->
+</div>
+</div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-quicksearch-results.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-quicksearch-results.tmpl
index 1783a63801..2e1aff7253 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-quicksearch-results.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-quicksearch-results.tmpl
@@ -19,11 +19,8 @@
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 
-<div id="doc3" class="yui-t2">
-   
+<div id="doc" class="yui-t7">
    <div id="bd">
-	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
 
 <div class="searchresults">
 <table>
@@ -51,7 +48,5 @@
   <!-- TMPL_ELSE -->No results found<!-- /TMPL_IF -->
 
 </div>
-</div>
-</div>
 
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-quicksearch.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-quicksearch.tmpl
index a8bce56cf6..3dc45b3ae3 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-quicksearch.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member-quicksearch.tmpl
@@ -4,11 +4,8 @@
 </head>
 <body>
 
-<div id="doc3" class="yui-t2">
-   
+<div id="doc" class="yui-t7">
    <div id="bd">
-	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
 
 <!-- TMPL_INCLUDE NAME="header.inc" -->    <form action="/cgi-bin/koha/members/member.pl" method="post" id="mainform" class="mainform">
     <label for="member">Patron Search:</label><input id="member" type="text" size="25" name="member" /><input type="hidden" name="quicksearch" value="1" />
@@ -16,7 +13,5 @@
     </form>
 
 </div>
-</div>
-</div>
 
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl
index 2187e4e094..e58e51387d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tmpl
@@ -12,7 +12,7 @@
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
+	<div class="yui-b">
 
 <form name="f" action="/cgi-bin/koha/members/member.pl" method="post">
     <label for="member">Search by name or barcode:</label>
@@ -97,9 +97,11 @@ No results found
 document.f.member.focus();
 </script>
 
-</div>
 </div>
 </div>
 
+<div class="yui-b">
 <!-- TMPL_INCLUDE NAME="members-menu.inc" -->
+</div>
+</div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentryA.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentryA.tmpl
index 2c42633c82..bf86e4afc2 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentryA.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentryA.tmpl
@@ -1,5 +1,5 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Adult Patron Management</title>
+<title>Koha &rsaquo; Adult Patron Management</title> 
 <script type="text/javascript" src="<!-- TMPL_VAR NAME="themelang" -->/js/members.js"></script>
 <!-- TMPL_INCLUDE NAME="calendar.inc" -->
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
@@ -14,7 +14,7 @@
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
+	<div class="yui-b">
 
 	<!-- TMPL_IF NAME="opadd" -->
 	<h1>
@@ -28,7 +28,7 @@
 	<!-- TMPL_IF NAME="check_member" -->
 		<!-- TMPL_IF NAME="step_2" -->
 		<p>
-		<form name="form_double">
+		<form name="form_double" action="/cgi-bin/koha/memberentry.pl" method="post">
 			<div id="problem">
 				Duplicate suspected
 				<a href="javascript:Dopop('borrowers_details.pl?borrowernumber=<!--TMPL_VAR NAME="check_member"-->');" >Detail</a>
@@ -36,7 +36,7 @@
 				<a href="/cgi-bin/koha/members/memberentry.pl?borrowernumber=<!--TMPL_VAR NAME="check_member"-->&category_type=<!--TMPL_VAR NAME="check_categorytype"-->">Yes</a> 
 				&nbsp;&nbsp;&nbsp; No, it is not
 				<!-- TMPL_IF NAME="checked"-->
-					<input type="checkbox" checked name="answernodouble" />
+					<input type="checkbox" checked="checked" name="answernodouble" />
 				<!-- TMPL_ELSE -->
 					<input type="checkbox" name="answernodouble" />
 				<!-- /TMPL_IF -->
@@ -64,7 +64,7 @@
 	
 
 	<!-- TMPL_IF NAME="step_1"-->
-<form name="form"  action="/cgi-bin/koha/members/memberentry.pl" method="post"> 
+<form name="form" action="/cgi-bin/koha/members/memberentry.pl" method="post"> 
 <!-- 		field always hidden in different form (1,2,3) -->
 	<input type="hidden" name="BorrowerMandatoryField" value="<!--TMPL_VAR NAME="BorrowerMandatoryField"-->" />
 	<input type="hidden" name="FormFieldList" value="surname|select_city|othernames|initials|title|cardnumber|firstname|dateofbirth|sort1|sort2" />
@@ -95,12 +95,12 @@
 	<input type="hidden" name="mobile" value="<!-- TMPL_VAR NAME="mobile" -->" />	
 	<input type="hidden" name="fax" value="<!-- TMPL_VAR NAME="fax" -->" /> 
 	<input type="hidden" name="email" value="<!-- TMPL_VAR NAME="email" -->" />
-	<input type="hidden" name="emailpro" value="<!-- TMPL_VAR NAME="emailpro" -->" >
+	<input type="hidden" name="emailpro" value="<!-- TMPL_VAR NAME="emailpro" -->" />
 	
 <!-- 	from form 3	 -->
 	<input type="hidden" name="dateenrolled" size="20" value="<!-- TMPL_VAR NAME="dateenrolled" -->" />
 	<input type="hidden" name="dateexpiry" size="20" value="<!-- TMPL_VAR NAME="dateexpiry" -->" />
-	<textarea  style="display:none;" name="opacnote" cols="70" rows="3"><!-- TMPL_VAR NAME="opacnote"--></textarea>
+	<textarea style="display:none;" name="opacnote" cols="70" rows="3"><!-- TMPL_VAR NAME="opacnote"--></textarea>
 	<textarea style="display:none;" name="borrowernotes" cols="70" rows="3"><!-- TMPL_VAR NAME="borrowernotes" --></textarea>
 	<input type="hidden" name="userid" size="20" value="<!-- TMPL_VAR NAME="userid" -->" />
 	<input type="hidden" name="password" size="20" value="<!-- TMPL_VAR NAME="password" -->" />	
@@ -116,7 +116,7 @@
 	<!-- TMPL_ELSE -->
 		<input type="hidden" name="op" value="modify" />
 	<!-- /TMPL_IF -->
-	<fieldset id="memberentry_identity">
+	<fieldset>
 		<legend>Patron identity</legend>
 		<p>
 		<!-- TMPL_IF NAME="female" -->
@@ -204,7 +204,7 @@
 			<input style="text-transform:uppercase;" type="text" name="othernames" size="20" value="<!-- TMPL_VAR NAME="othernames" -->" />
 		</p>
 	</fieldset>
-	<fieldset id="memberentry_identity">
+	<fieldset>
 		<legend>Patron type</legend>
 		<p>
 		<!-- TMPL_IF NAME="catcodepopup" -->
@@ -249,7 +249,7 @@
 		<!--TMPL_IF NAME="CGIsort2" -->	
 			<!-- TMPL_VAR NAME="CGIsort2" -->
 		<!--TMPL_ELSE-->
-			<input  type="text" name="sort2" size="20" value="<!-- TMPL_VAR NAME="sort2" -->"/ >
+			<input  type="text" name="sort2" size="20" value="<!-- TMPL_VAR NAME="sort2" -->" />
 		<!-- /TMPL_IF -->	
 		</p>
 	</fieldset>
@@ -273,7 +273,7 @@
 	<input type="hidden" name="select_roadtype" value="<!-- TMPL_VAR NAME="select_roadtype" -->" />
 	<input type="hidden" name="destination" value="<!-- TMPL_VAR NAME="destination" -->" />
 	<input type="hidden" name="check_member" value="<!-- TMPL_VAR NAME="check_member" -->" />
-	<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->">
+	<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
 	<input type="hidden" name="nodouble"  value="<!-- TMPL_VAR NAME="nodouble" -->" />
 
 <!-- 	from form 1	 -->
@@ -498,7 +498,7 @@
 	<input type="hidden" name="select_roadtype" value="<!-- TMPL_VAR NAME="select_roadtype" -->" />
 	<input type="hidden" name="destination" value="<!-- TMPL_VAR NAME="destination" -->" />
 	<input type="hidden" name="check_member" value="<!-- TMPL_VAR NAME="check_member" -->" />
-	<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->">
+	<input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" />
 	<input type="hidden" name="nodouble"  value="<!-- TMPL_VAR NAME="nodouble" -->" />
 
 <!-- 	from form 1	 -->
@@ -631,7 +631,9 @@
 
 </div>
 </div>
-</div>
 
+<div class="yui-b">
 <!-- TMPL_INCLUDE NAME="members-menu.inc" -->
+</div>
+</div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentryC.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentryC.tmpl
index 312d92399f..07eb332430 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentryC.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentryC.tmpl
@@ -14,7 +14,7 @@
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
+	<div class="yui-b">
 
 	<!-- TMPL_IF NAME="add" -->
 	<h1>
@@ -678,7 +678,9 @@
 <!-- /TMPL_IF -->
 </div>
 </div>
-</div>
 
+<div class="yui-b">
 <!-- TMPL_INCLUDE NAME="members-menu.inc" -->
+</div>
+</div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentryI.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentryI.tmpl
index b5ce9e39a4..6dbcb8cd20 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentryI.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentryI.tmpl
@@ -14,7 +14,7 @@
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
+	<div class="yui-b">
 
     <!-- TMPL_IF NAME="opadd" -->
         <h1>
@@ -486,7 +486,9 @@
 <!-- /TMPL_IF -->
 </div>
 </div>
-</div>
 
+<div class="yui-b">
 <!-- TMPL_INCLUDE NAME="members-menu.inc" -->
+</div>
+</div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentryP.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentryP.tmpl
index 44225bb78f..efa3244406 100755
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentryP.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/memberentryP.tmpl
@@ -14,7 +14,7 @@
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
+	<div class="yui-b">
 
     <!-- TMPL_IF NAME="opadd" -->
     <h1>Add professional patron (step <!-- TMPL_VAR NAME="step" -->) <!-- TMPL_VAR NAME="surname" --> <!-- TMPL_VAR name="firstname" --></h1>
@@ -677,7 +677,9 @@
 <!-- /TMPL_IF -->
 </div>
 </div>
-</div>
 
+<div class="yui-b">
 <!-- TMPL_INCLUDE NAME="members-menu.inc" -->
+</div>
+</div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tmpl
index a68fcb1d0b..22aa813949 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tmpl
@@ -3,13 +3,9 @@
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
 <body>
-<!-- TMPL_INCLUDE NAME="header.inc" -->
 
-<div id="doc3" class="yui-t2">
-   
+<div id="doc3">
    <div id="bd">
-	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
 
 <h3><a href="/cgi-bin/koha/circ/circulation.pl?findborrower=<!-- TMPL_VAR NAME="cardnumber" -->">Account Summary: <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --> (<!-- TMPL_VAR NAME="cardnumber" -->)</a></h3>
 
@@ -66,8 +62,6 @@
 
 <!-- endmenu -->
 
-</div>
-</div>
 </div>
 
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tmpl
index ed3c6ae8b2..f318cbf99d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-receipt.tmpl
@@ -3,13 +3,10 @@
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
 <body>
-<!-- TMPL_INCLUDE NAME="header.inc" -->
 
-<div id="doc3" class="yui-t2">
+<div id="doc3">
    
    <div id="bd">
-	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
 
 <h3>Library</h3>
 <!-- TMPL_IF NAME="branchname" --><!-- TMPL_VAR NAME="branchname" --><br /><!-- /TMPL_IF -->
@@ -50,8 +47,6 @@ Issued To <a href="/cgi-bin/koha/circ/circulation.pl?findborrower=<!-- TMPL_VAR
 
 <!-- endmenu -->
 
-</div>
-</div>
 </div>
 
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
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 0dfeb4ab96..cbf2b34cd0 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember.tmpl
@@ -24,20 +24,17 @@ function confirm_reregistration() {
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="members-search.inc" -->
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>  &rsaquo; Patron Details for <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></div>
-
-
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a>  &rsaquo; Patron Details for <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --> (<!-- TMPL_VAR NAME="cardnumber" -->)</div>
 
 <div id="doc3" class="yui-t2">
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
+	<div class="yui-b">
 
 <!-- TMPL_IF NAME="unknowuser" -->
     This patron doesn't exist.<a href="javascript:back();">Go Back</a>
 <!-- TMPL_ELSE -->
-<a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/members/members-home.pl">Patrons</a> &rsaquo; <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->">Details for <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --> (<!-- TMPL_VAR NAME="cardnumber" -->)</a>
 
 <form action="" name="form">
 <input type="hidden" name="reregistration" value="<!-- TMPL_VAR NAME="reregistration"-->" /> 
@@ -200,7 +197,7 @@ function confirm_reregistration() {
        
 	 <!-- TMPL_IF name="isguarantee" -->
             <!-- TMPL_IF NAME="guaranteeloop" -->
-                <p><label>Guarantees:</label><ul><!-- tmpl_loop name="guaranteeloop" --><li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="name" -->  </a></li><!-- /tmpl_loop --></ul></p>
+                <p><label>Guarantees:</label></p><ul><!-- tmpl_loop name="guaranteeloop" --><li><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->"><!-- TMPL_VAR NAME="name" -->  </a></li><!-- /tmpl_loop --></ul>
             <!-- /TMPL_IF -->
         <!-- TMPL_ELSE -->
             <!-- TMPL_IF name="guarantorborrowernumber" -->
@@ -261,7 +258,7 @@ function confirm_reregistration() {
             <td>
                 <!-- TMPL_VAR NAME="itemtype_description" -->
                 <!-- TMPL_IF NAME="itemtype_image" -->
-                <img src="<!-- TMPL_VAR NAME="itemtype_image" -->" />
+                <img src="<!-- TMPL_VAR NAME="itemtype_image" -->" alt="" />
                 <!-- /TMPL_IF -->
             </td>
             <td><!-- TMPL_VAR NAME="charge" --></td>
@@ -360,7 +357,9 @@ function confirm_reregistration() {
 <!-- /TMPL_IF --> <!-- unknowuser -->
 </div>
 </div>
-</div>
 
+<div class="yui-b">
 <!-- TMPL_INCLUDE NAME="members-menu.inc" -->
+</div>
+</div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tmpl
index 94821207d7..e799f512d7 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tmpl
@@ -12,7 +12,7 @@
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
+	<div class="yui-b">
 
 <h1>Pay Fines for <!-- TMPL_VAR name="firstname" --> <!-- TMPL_VAR name="surname" --></h1>
 <form action="/cgi-bin/koha/members/pay.pl" method="post">
@@ -67,9 +67,11 @@
 <input type="submit" name="submit"  value="Make Payment" class="submit" /></form>
 <form action="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR name="borrowernumber" -->" method="get"><input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" /> <input type="submit" value="Return to Patron Record" /></form>
 
-</div>
 </div>
 </div>
 
+<div class="yui-b">
 <!-- TMPL_INCLUDE NAME="members-menu.inc" -->
+</div>
+</div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tmpl
index 5c300169cc..c54375c0fe 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tmpl
@@ -12,7 +12,7 @@
    
    <div id="bd">
 	<div id="yui-main">
-	<div class="yui-b"><div class="yui-g">
+	<div class="yui-b">
 
 <!-- TMPL_IF NAME="showfulllink" -->
 <ul>
@@ -82,9 +82,11 @@
 </table>
 <form action="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!-- TMPL_VAR name="borrowernumber" -->" method="get"><input type="hidden" name="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" /> <input type="submit" value="Return to Patron Record" /></form>
 
-</div>
 </div>
 </div>
 
+<div class="yui-b">
 <!-- TMPL_INCLUDE NAME="members-menu.inc" -->
+</div>
+</div>
 <!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl
index 2fd0f823bd..cd2599fbca 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl
@@ -1,7 +1,8 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Koha &rsaquo; Circulation</title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
-<script language="JavaScript">
+<script type="text/css">
+// <![CDATA[ 
 function check() {
 	var msg = "";
 	var count_reserv = 0;
@@ -47,6 +48,7 @@ if (alreadyreserved > "0"){
 		return(false);
 	}
 }
+// ]]>
 </script>
 </head>
 <body>
@@ -215,7 +217,7 @@ if (alreadyreserved > "0"){
                     <!-- TMPL_IF NAME="nocancel" -->
                             Can't be cancelled, when item on transfert
                             <!-- TMPL_ELSE -->
-                            <a class="info" href="modrequest.pl?CancelBiblioNumber=<!-- TMPL_VAR NAME="biblionumber" -->&CancelBorrowerNumber=<!-- TMPL_VAR NAME="ReservedForBorrowernumber" -->&CancelItemnumber=<!--  TMPL_VAR NAME="itemnumber"-->"  onclick="if (window.confirm('You will delete a reserve, are you sure ?'))    
+                            <a class="info" href="modrequest.pl?CancelBiblioNumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;CancelBorrowerNumber=<!-- TMPL_VAR NAME="ReservedForBorrowernumber" -->&amp;CancelItemnumber=<!--  TMPL_VAR NAME="itemnumber"-->"  onclick="if (window.confirm('You will delete a reserve, are you sure ?'))    
                                     {return true;}
                     else {return false;}">Cancel A reserve
                     <span> Item reserved for :
diff --git a/members/member-flags.pl b/members/member-flags.pl
index 36a240a889..7437f6a997 100755
--- a/members/member-flags.pl
+++ b/members/member-flags.pl
@@ -61,7 +61,7 @@ if ($input->param('newflags')) {
     while (my ($bit, $flag, $flagdesc) = $sth->fetchrow) {
 	my $checked='';
 	if ($accessflags->{$flag}) {
-	    $checked='checked';
+	    $checked= 1;
 	}
 	my %row = ( bit => $bit,
 		 flag => $flag,
-- 
2.20.1