From 94ca631aa0edb1822125ca38942f011214ecdcef Mon Sep 17 00:00:00 2001
From: Bill Erickson <berick@esilibrary.com>
Date: Wed, 8 Jan 2014 16:29:15 -0500
Subject: [PATCH] tpac wcat : myopac/main

Signed-off-by: Bill Erickson <berick@esilibrary.com>
---
 Open-ILS/src/templates/opac/myopac/main.tt2        |  8 +++++
 Open-ILS/src/templates/opac/parts/myopac/base.tt2  | 41 +++++++++++++---------
 .../src/templates/opac/parts/myopac/main_base.tt2  | 33 ++++++++++-------
 3 files changed, 53 insertions(+), 29 deletions(-)

diff --git a/Open-ILS/src/templates/opac/myopac/main.tt2 b/Open-ILS/src/templates/opac/myopac/main.tt2
index 38d5b4f171..b5451cb598 100644
--- a/Open-ILS/src/templates/opac/myopac/main.tt2
+++ b/Open-ILS/src/templates/opac/myopac/main.tt2
@@ -8,7 +8,12 @@
         myopac_cc_allowed = 1;
     END
 %]
+[%  IF myopac_cc_allowed;
+    # http://www.w3.org/TR/WCAG20-TECHS/H32.html
+    # avoid forms w/ no submit action %]
 <form action="[% ctx.opac_root %]/myopac/main_payment_form" method="get">
+[% END %]
+
     [% IF ctx.fines.circulation.size > 0 %]
     <div id='myopac_circ_trans_div'>
         <table width='100%' class='data_grid'>
@@ -180,5 +185,8 @@
             class="opac-button" />
     </div>
     [% END %]
+[% IF myopac_cc_allowed %]
 </form>
 [% END %]
+
+[% END %]
diff --git a/Open-ILS/src/templates/opac/parts/myopac/base.tt2 b/Open-ILS/src/templates/opac/parts/myopac/base.tt2
index 3dae62fdcd..17d0996fec 100644
--- a/Open-ILS/src/templates/opac/parts/myopac/base.tt2
+++ b/Open-ILS/src/templates/opac/parts/myopac/base.tt2
@@ -27,25 +27,32 @@
                     class="[% cls_which %]">[% page.name; %]</a>
                 [% END %]
             </div>
-            <!- Select box navigation for media view ->
-	    <div id="acct_select">
-	       <form name="acct_nav">
-	         <select name="acct_url" aria-label="Select an account page" onchange="window.location.href=document.acct_nav.acct_url.options[document.acct_nav.acct_url.selectedIndex].value">
-                   <option value="" selected="selected">Go to...</option>
-               [% FOREACH page IN myopac_pages;
-                  IF page.url != myopac_page; %]
-                    <option value="[% mkurl(ctx.opac_root _ '/myopac/' _ page.url, {}, ['bbid', 'offset', 'limit']) %]">[% page.name; %]</option>
-	         [% ELSE; %]
-		   <option value="" disabled>[% page.name; %]</option>
-	       [% END;
-               END; %] 
-	       </select>
-	    </div>
-	   </form>
-	</div>
+
+            <!-- Select box navigation for media view -->
+            <div id="acct_select">
+               <form name="acct_nav">
+
+                 [%# forms should have submit actions, even if they are not visible
+                     http://www.w3.org/TR/WCAG20-TECHS/H32.html %]
+                 <input type="submit" style="position: absolute; left: -9999px"/>
+
+                 <select name="acct_url" aria-label="Select an account page" 
+                   onchange="window.location.href=document.acct_nav.acct_url.options[document.acct_nav.acct_url.selectedIndex].value">
+                    <option value="" selected="selected">Go to...</option>
+                    [% FOREACH page IN myopac_pages;
+                      IF page.url != myopac_page; %]
+                        <option value="[% mkurl(ctx.opac_root _ '/myopac/' _ page.url, {}, ['bbid', 'offset', 'limit']) %]">[% page.name; %]</option>
+                    [% ELSE; %]
+                        <option value="" disabled>[% page.name; %]</option>
+                    [% END;
+                   END; %] 
+                 </select>
+	            </form>
+            </div>
+	    </div><!-- myopac_tabs -->
         <div id="main-content">
             [% content %]
             <div class="common-full-pad"></div>
         </div>
-    </div>
+    </div> <!-- content-wrapper -->
 [% END %]
diff --git a/Open-ILS/src/templates/opac/parts/myopac/main_base.tt2 b/Open-ILS/src/templates/opac/parts/myopac/main_base.tt2
index 420bd3ec4d..430bc36170 100644
--- a/Open-ILS/src/templates/opac/parts/myopac/main_base.tt2
+++ b/Open-ILS/src/templates/opac/parts/myopac/main_base.tt2
@@ -59,22 +59,31 @@
             </div>
             <table class="acct_sum_table">
                 <tr>
-                        <td>[% l("Items Currently Checked out ([_1])", ctx.user_stats.checkouts.total_out) %]</td>
-                        <td align="right">
-                            <a href="[% mkurl(ctx.opac_root _ '/myopac/circs') %]">[% l("View All") %]</a>
-                        </td>
+                    <td>[% l("Items Currently Checked out ([_1])", ctx.user_stats.checkouts.total_out) %]</td>
+                    <td align="right">
+                        <a href="[% mkurl(ctx.opac_root _ '/myopac/circs') %]"
+                            title="[% l('View My Checked Out Items') %]">
+                            [% l("View All") %]
+                        </a>
+                    </td>
                 </tr>
                 <tr>
-                        <td>[% l('Items Currently on Hold ([_1])', ctx.user_stats.holds.total) %]</td>
-                        <td align="right">
-                            <a href="[% mkurl(ctx.opac_root _ '/myopac/holds') %]">[% l('View All') %]</a>
-                        </td>
+                    <td>[% l('Items Currently on Hold ([_1])', ctx.user_stats.holds.total) %]</td>
+                    <td align="right">
+                        <a href="[% mkurl(ctx.opac_root _ '/myopac/holds') %]"
+                            title="[% l('View My Holds') %]">
+                            [% l('View All') %]
+                        </a>
+                    </td>
                 </tr>
                 <tr>
-                        <td>[% l('Items ready for pickup ([_1])', ctx.user_stats.holds.ready) %]</td>
-                        <td align="right">
-                            <a href="[% mkurl(ctx.opac_root _ '/myopac/holds', {available => 1}) %]">[% l('View All') %]</a>
-                        </td>
+                    <td>[% l('Items ready for pickup ([_1])', ctx.user_stats.holds.ready) %]</td>
+                    <td align="right">
+                        <a href="[% mkurl(ctx.opac_root _ '/myopac/holds', {available => 1}) %]"
+                            title="[% l('View My Holds Ready for Pickup') %]">
+                            [% l('View All') %]
+                        </a>
+                    </td>
                 </tr>
             </table>
         </div>
-- 
2.11.0