From a553cab1c93164fd95982dc5034b829c6dad76f4 Mon Sep 17 00:00:00 2001
From: Bill Erickson <berick@esilibrary.com>
Date: Mon, 30 Dec 2013 16:14:19 -0500
Subject: [PATCH] LP#1268636 avoid empty <ul>'s in browse

Signed-off-by: Bill Erickson <berick@esilibrary.com>
Signed-off-by: Dan Scott <dscott@laurentian.ca>
---
 Open-ILS/src/templates/opac/browse.tt2             | 29 +++++++++++++++++-----
 .../src/templates/opac/parts/advanced/expert.tt2   |  5 +++-
 .../src/templates/opac/parts/advanced/numeric.tt2  |  1 -
 3 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/Open-ILS/src/templates/opac/browse.tt2 b/Open-ILS/src/templates/opac/browse.tt2
index 9e48c92fe9..9e7b91f708 100644
--- a/Open-ILS/src/templates/opac/browse.tt2
+++ b/Open-ILS/src/templates/opac/browse.tt2
@@ -42,7 +42,10 @@
                         [% l('Browse for [_1] starting with [_2] in [_3]', control_qtype, control_bterm, control_locg) %]
 
 			<input id='search-submit-go' type="submit" value="[% l('Browse') %]" alt="[% l('Browse') %]" class="opac-button"/>
-                        <img id="browse-submit-spinner" src="[% ctx.media_prefix %]/opac/images/progressbar_green.gif" class="hidden" style="width: 16px; height: 16px;" alt="" />
+                        <img id="browse-submit-spinner" 
+                        src="[% ctx.media_prefix %]/opac/images/progressbar_green.gif" 
+                        class="hidden" style="width: 16px; height: 16px;" 
+                        alt="[% l('Search in progress icon') %]" />
                     </form>
                 </div>
 
@@ -64,7 +67,10 @@
                     <a class="opac-button" href="[% mkurl('', {bpivot => ctx.forward_pivot}) %]" onclick="$('browse-pager-spinner-[% id %]').className = '';">[%l ('Next') %] &rarr;</a>
                     [% END %]
 
-                    <img id="browse-pager-spinner-[% id %]" src="[% ctx.media_prefix %]/opac/images/progressbar_green.gif" class="hidden" style="width: 16px; height: 16px;" alt="" />
+                    <img id="browse-pager-spinner-[% id %]" 
+                        src="[% ctx.media_prefix %]/opac/images/progressbar_green.gif" 
+                        class="hidden" style="width: 16px; height: 16px;" 
+                        alt="[% l('Search in progress icon') %]" />
                 </div>
                 [% END %]
 
@@ -111,7 +117,7 @@
                                 [% END %]
                             </span>
 
-                            <ul class="browse-result-authority-headings">
+                            [% auth_headings_ul_added = 0 %];
                                 [% seenit = {}; # for headings we've rendered
                                    FOR a IN result.sees;
                                     PROCESS authority_notes authority=a;
@@ -135,7 +141,13 @@
                                             # defined when h.target is.
 
                                             IF h.target AND h.target_count AND result.list_authorities.grep('^' _ h.target _ '$').size == 0;
-                                                id = h.target; NEXT IF seenit.$id; seenit.$id = 1; %]
+                                                id = h.target; NEXT IF seenit.$id; seenit.$id = 1; 
+                                                IF !auth_headings_ul_added;
+                                                    # only add a <ul> if we have at least one <li> (WCAG 2.0)
+                                                    auth_headings_ul_added = 1; %]
+                                                <ul class="browse-result-authority-headings"> 
+                                                [% END %]
+
                                                 <li><span class="browse-result-authority-field-name">[% field.name %]</span>
                                                 <a href="[% mkurl(ctx.opac_root _ '/browse', {bterm => h.heading}, ['bpivot']) %]">[% h.heading | html %]</a>
                                                 <span class="browse-result-authority-bib-links">([% h.target_count %])</span>
@@ -166,7 +178,12 @@
                                             # defined when h.target is.
 
                                             IF h.target AND h.target_count AND result.list_sees.grep('^' _ h.target _ '$').size == 0 AND !h.main_entry;
-                                                id = h.target; NEXT IF seenit.$id; seenit.$id = 1; %]
+                                                id = h.target; NEXT IF seenit.$id; seenit.$id = 1; 
+                                                IF !auth_headings_ul_added;
+                                                    # only add a <ul> if we have at least one <li> (WCAG 2.0)
+                                                    auth_headings_ul_added = 1; %]
+                                                <ul class="browse-result-authority-headings"> 
+                                                [% END %]
                                                 <li><span class="browse-result-authority-field-name">[% field.name %]</span>
                                                 <a href="[% mkurl(ctx.opac_root _ '/results', {query => 'identifier|authority_id[' _ h.target _ ']'}) %]">[% h.heading | html %]</a>
                                                 <span class="browse-result-authority-bib-links">([% h.target_count %])</span>
@@ -175,7 +192,7 @@
                                         [% END %]
                                     [% END %]
                                 [% END %]
-                            </ul>
+                            [% IF auth_headings_ul_added %]</ul>[% END %]
                         </li>
                     [% END %]
                     </ul>
diff --git a/Open-ILS/src/templates/opac/parts/advanced/expert.tt2 b/Open-ILS/src/templates/opac/parts/advanced/expert.tt2
index 521220980f..8b8849d177 100644
--- a/Open-ILS/src/templates/opac/parts/advanced/expert.tt2
+++ b/Open-ILS/src/templates/opac/parts/advanced/expert.tt2
@@ -21,7 +21,10 @@
                 <td>
                     <a href="javascript:;" class="row-remover"
                         title="[% l('Remove row') %]" alt="[% l('Remove row') %]"
-                        onclick='return killRowIfAtLeast(1, this);'><img src="[% ctx.media_prefix %]/images/adv_row_close_btn.png" /></a>
+                        onclick='return killRowIfAtLeast(1, this);'>
+                        <img src="[% ctx.media_prefix %]/images/adv_row_close_btn.png" 
+                            alt="[% l('Remove Search Row') %]"/>
+                    </a>
                 </td>
             </tr>
         </tbody>
diff --git a/Open-ILS/src/templates/opac/parts/advanced/numeric.tt2 b/Open-ILS/src/templates/opac/parts/advanced/numeric.tt2
index 9e271566d2..4fa45f1bd8 100644
--- a/Open-ILS/src/templates/opac/parts/advanced/numeric.tt2
+++ b/Open-ILS/src/templates/opac/parts/advanced/numeric.tt2
@@ -14,7 +14,6 @@
                     <option value="identifier|tcn">[% l('TCN') %]</option>
                     <option value="item_barcode">[% l('Item Barcode') %]</option>
                 </select>
-                </label>
 	
                 <input type="text" name="query" size="16" autofocus placeholder='[% l("Identifier") %]' />
 	    <br/>
-- 
2.11.0