From cbbd45d3e5a9bf07f2e4a0f5bb9a253e9c1dcb6a Mon Sep 17 00:00:00 2001
From: Viktor Lofgren <vlofgren@gmail.com>
Date: Sat, 2 Dec 2023 18:01:03 +0100
Subject: [PATCH] (search)  Clean up filters menu a bit, improve accessibility.

---
 .../templates/search/parts/search-filters.hdb        | 12 ++++++++----
 .../templates/search/site-info/site-info.hdb         |  3 ++-
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/code/services-application/search-service/src/main/resources/templates/search/parts/search-filters.hdb b/code/services-application/search-service/src/main/resources/templates/search/parts/search-filters.hdb
index 1b022155..1c1086ed 100644
--- a/code/services-application/search-service/src/main/resources/templates/search/parts/search-filters.hdb
+++ b/code/services-application/search-service/src/main/resources/templates/search/parts/search-filters.hdb
@@ -2,13 +2,17 @@
 <ul>
     {{#with removeJsOption}}
         <li title="Exclude results with javascript"
-            class="filter-toggle-{{#if set}}on{{/if}}{{#unless set}}off{{/unless}}">
+            {{#if set}}aria-checked="true" class="current"{{/if}}
+            {{#unless set}}aria-checked="false"{{/unless}}
+            role="checkbox">
             <a href="{{url}}">{{name}}</a>
         </li>
     {{/with}}
     {{#with reduceAdtechOption}}
-        <li title="Exclude results with tracking or likely affiliate links"
-            class="filter-toggle-{{#if set}}on{{/if}}{{#unless set}}off{{/unless}}">
+    <li {{#if set}}aria-checked="true" class="current"{{/if}}
+        {{#unless set}}aria-checked="false"{{/unless}}
+        role="checkbox"
+        title="Exclude results with tracking or likely affiliate links" ">
             <a href="{{url}}">{{name}}</a>
         </li>
     {{/with}}
@@ -17,7 +21,7 @@
 <ul>
     {{#each filterGroups}}
         {{#each .}}
-            <li {{#if current}}class="current"{{/if}}><a href="{{url}}">{{displayName}}</a></li>
+            <li {{#if current}}aria-selected="true" class="current"{{/if}}><a href="{{url}}">{{displayName}}</a></li>
         {{/each}}
         <hr>
     {{/each}}
diff --git a/code/services-application/search-service/src/main/resources/templates/search/site-info/site-info.hdb b/code/services-application/search-service/src/main/resources/templates/search/site-info/site-info.hdb
index afda391c..f4b427b7 100644
--- a/code/services-application/search-service/src/main/resources/templates/search/site-info/site-info.hdb
+++ b/code/services-application/search-service/src/main/resources/templates/search/site-info/site-info.hdb
@@ -20,10 +20,11 @@
     <h2>{{domain}}</h2>
     <ul>
         <li {{#if info}}class="current"{{/if}}><a href="?view=info">Info</a></li>
-        <li {{#if report}}class="current"{{/if}}>{{#if known}}<a href="?view=report">Report</a>{{/if}}{{#unless known}}<a class="link-unavailable" title="This domain is not known by the search engine">Report</a>{{/unless}}</li>
         <li {{#if docs}}class="current"{{/if}}>{{#if known}}<a href="?view=docs">Docs</a>{{/if}}{{#unless known}}<a class="link-unavailable" title="This domain is not known by the search engine">Docs</a>{{/unless}}</li>
         <li {{#if links}}class="current"{{/if}}><a href="?view=links">Links</a></li>
         <li {{#if browse}}class="current"{{/if}}><a href="?view=similar">Similar</a></li>
+
+        <li {{#if report}}class="current"{{/if}}>{{#if known}}<a href="?view=report">Report</a>{{/if}}{{#unless known}}<a class="link-unavailable" title="This domain is not known by the search engine">Report</a>{{/unless}}</li>
     </ul>
 </nav>
 {{/with}}