From 87078b624321a26df48c5064e584a118b9949a82 Mon Sep 17 00:00:00 2001
From: Milos Popovic <misa01523@gmail.com>
Date: Fri, 3 Apr 2026 21:09:08 +0200
Subject: [PATCH 01/13] Added aria attributes, aria-label, aria-labelledby, 
 labels

---
 .../main/webapp/js/menupage/browseByVClass.js | 23 +++++++++++++------
 webapp/src/main/webapp/js/vitroUtils.js       |  2 ++
 .../partials/menupage/menupage-browse.ftl     |  4 ++--
 .../body/search/search-pagedResults.ftl       |  2 +-
 .../freemarker/widgets/widget-login.ftl       |  4 ++--
 .../themes/vitro/templates/page-home.ftl      |  6 ++---
 6 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/webapp/src/main/webapp/js/menupage/browseByVClass.js b/webapp/src/main/webapp/js/menupage/browseByVClass.js
index 4331e68499..5ef0a0c0f9 100644
--- a/webapp/src/main/webapp/js/menupage/browseByVClass.js
+++ b/webapp/src/main/webapp/js/menupage/browseByVClass.js
@@ -176,7 +176,7 @@ var browseByVClass = {
             pagination += '<li class="round';
             // Test for active page
             if ( pages[i].text == page) {
-                pagination += ' selected';
+                pagination += ' selected aria-current="page"';
                 anchorOpen = "";
                 anchorClose = "";
             }
@@ -197,10 +197,14 @@ var browseByVClass = {
     // Toggle the active class so it's clear which is selected
     selectedVClass: function(vclassUri) {
         // Remove active class on all vClasses
-        $('#browse-classes li a.selected').removeClass('selected');
+        $('#browse-classes li a.selected')
+            .removeClass('selected')
+            .$('aria-current', 'false');
 
         // Add active class for requested vClass
-        $('#browse-classes li a[data-uri="'+ vclassUri +'"]').addClass('selected');
+        $('#browse-classes li a[data-uri="'+ vclassUri +'"]')
+            .addClass('selected')
+            .$('aria-current', 'true');
     },
 
     // Toggle the active letter so it's clear which is selected
@@ -210,10 +214,15 @@ var browseByVClass = {
             alpha = "all";
         }
         // Remove active class on all letters
-        $('#alpha-browse-individuals li a.selected').removeClass('selected');
-
-        // Add active class for requested alpha
-        $('#alpha-browse-individuals li a[data-alpha="'+ alpha +'"]').addClass('selected');
+        // Remove active class and aria-selected on all letters
+        $('#alpha-browse-individuals li a.selected')
+            .removeClass('selected')
+            .attr('aria-current', 'false');
+
+        // Add active class and aria-selected for requested alpha
+        $('#alpha-browse-individuals li a[data-alpha="'+ alpha +'"]')
+            .addClass('selected')
+            .attr('aria-current', 'true');
 
         return alpha;
     },
diff --git a/webapp/src/main/webapp/js/vitroUtils.js b/webapp/src/main/webapp/js/vitroUtils.js
index 58fa7012eb..cb220aa7c6 100644
--- a/webapp/src/main/webapp/js/vitroUtils.js
+++ b/webapp/src/main/webapp/js/vitroUtils.js
@@ -29,6 +29,7 @@ $(document).ready(function(){
              //$(this).css('background','url(../../themes/vivo-cornell/images/filteredSearchActive.gif) no-repeat right top');
              $(this).removeClass('filter-default');
              $(this).addClass('filter-active');
+             $(this).attr('aria-expanded', 'true');
 
              //Reveal filter select list
              $searchFilterList.css('display','block');
@@ -40,6 +41,7 @@ $(document).ready(function(){
              //$('a.filter-search').css('background','url(../../themes/vivo-cornell/images/filteredSearch.gif) no-repeat right top');
              $(this).removeClass('filter-active');
              $(this).addClass('filter-default');
+             $(this).attr('aria-expanded', 'false');
 
              //Hide filter select list
              $searchFilterList.css('display','none');
diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/menupage/menupage-browse.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/menupage/menupage-browse.ftl
index bf9882b199..7a5827868d 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/partials/menupage/menupage-browse.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/partials/menupage/menupage-browse.ftl
@@ -28,9 +28,9 @@
             <h3 class="selected-class"></h3>
             <#assign alphabet = ["A", "B", "C", "D", "E", "F", "G" "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z"] />
             <ul id="alpha-browse-individuals">
-                <li><a href="#" class="selected" data-alpha="all" title="${i18n().select_all}">${i18n().all}</a></li>
+                <li><a href="#" class="selected" aria-current="false" data-alpha="all" title="${i18n().select_all}">${i18n().all}</a></li>
                 <#list alphabet as letter>
-                    <li><a href="#" data-alpha="${letter?lower_case}" title="${i18n().browse_all_starts_with(letter)}">${letter}</a></li>
+                    <li><a href="#" data-alpha="${letter?lower_case}" aria-current="false" title="${i18n().browse_all_starts_with(letter)}">${letter}</a></li>
                 </#list>
             </ul>
         </nav>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/search/search-pagedResults.ftl b/webapp/src/main/webapp/templates/freemarker/body/search/search-pagedResults.ftl
index 94294432ff..c17a5c6802 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/search/search-pagedResults.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/search/search-pagedResults.ftl
@@ -310,7 +310,7 @@ ${headScripts.add('<script type="text/javascript" src="${urls.base}/js/wNumb.min
 </#macro>
 
 <#macro createUserInput filter>
-    <input form="search-form" id="filter_input_${filter.id?html}"  placeholder="${i18n().search_field_placeholder}" class="search-vivo" type="text" name="filter_input_${filter.id?html}" value="${filter.inputText?html}" autocapitalize="none" />
+	<input form="search-form" id="filter_input_${filter.id?html}"  placeholder="${i18n().search_field_placeholder}" aria-label="${i18n().search_field_placeholder}" class="search-vivo" type="text" name="filter_input_${filter.id?html}" value="${filter.inputText?html}" autocapitalize="none" />
 </#macro>
 
 <#macro getInput filter filterValue valueID valueNumber form="search-form">
diff --git a/webapp/src/main/webapp/templates/freemarker/widgets/widget-login.ftl b/webapp/src/main/webapp/templates/freemarker/widgets/widget-login.ftl
index 99776a27d5..a7b3df7447 100644
--- a/webapp/src/main/webapp/templates/freemarker/widgets/widget-login.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/widgets/widget-login.ftl
@@ -56,10 +56,10 @@
             <div ${infoClassHide} ${infoClassShow}>
 
                 <label for="loginName">${i18n().email_capitalized}</label>
-                <input id="loginName" name="loginName" class="text-field focus" type="text" value="${loginName!}" autocapitalize="off" required autofocus />
+                <input id="loginName" name="loginName" class="text-field focus" type="text" value="${loginName!}" autocapitalize="off" autocomplete="username" required autofocus />
 
                 <label for="loginPassword">${i18n().password_capitalized}</label>
-                <input id="loginPassword" name="loginPassword" class="text-field" type="password" required />
+                <input id="loginPassword" name="loginPassword" class="text-field" type="password" autocomplete="current-password" required />
 
                 <p class="submit">
                     <input name="loginForm" class="green button" type="submit" value="${i18n().login_button}"/>
diff --git a/webapp/src/main/webapp/themes/vitro/templates/page-home.ftl b/webapp/src/main/webapp/themes/vitro/templates/page-home.ftl
index fae106ef50..cf7492d007 100644
--- a/webapp/src/main/webapp/themes/vitro/templates/page-home.ftl
+++ b/webapp/src/main/webapp/themes/vitro/templates/page-home.ftl
@@ -30,18 +30,18 @@
                 </ul>
 
                 <section id="search-home" role="region">
-                    <h3>${i18n().search_vitro} <span class="search-filter-selected">filteredSearch</span></h3>
+                    <h3 id="search-input-label">${i18n().search_vitro} <span class="search-filter-selected">filteredSearch</span></h3>
 
                     <fieldset>
                         <legend>${i18n().search_form}</legend>
                         <form id="search-homepage" action="${urls.search}" name="search-home" role="search" method="GET" >
                             <div id="search-home-field">
-                                <input type="text" name="querytext" class="search-homepage" value="${querytext!}" autocapitalize="off" />
+                                <input type="text" name="querytext" aria-label="${i18n().search_vitro}" aria-labelledby="search-input-label" class="search-homepage" value="${querytext!}" autocapitalize="off" />
+                                <a class="filter-search filter-default" href="#" aria-expanded="false" title="${i18n().filter_search}"><span class="displace">${i18n().filter_search}</span></a>
                                 <input type="submit" value="${i18n().search_button}" class="search" />
                                 <input type="hidden" name="filters_category" class="search-homepage" value="" autocapitalize="off" />
                             </div>
 
-                            <a class="filter-search filter-default" href="#" title="${i18n().filter_search}"><span class="displace">${i18n().filter_search}</span></a>
 
                             <ul id="filter-search-nav">
                                 <li><a class="active" href="">${i18n().all_capitalized}</a></li>

From 24acf26ce2689df891d5fa75cd5426882eb24806 Mon Sep 17 00:00:00 2001
From: Milos Popovic <misa01523@gmail.com>
Date: Sat, 4 Apr 2026 15:06:45 +0200
Subject: [PATCH 02/13] Updated aria current in alphabet filter for People,
 Organisation, Research List Page

---
 webapp/src/main/webapp/js/menupage/browseByVClass.js | 12 +++++++-----
 .../body/partials/menupage/menupage-browse.ftl       |  4 ++--
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/webapp/src/main/webapp/js/menupage/browseByVClass.js b/webapp/src/main/webapp/js/menupage/browseByVClass.js
index 5ef0a0c0f9..0148289a30 100644
--- a/webapp/src/main/webapp/js/menupage/browseByVClass.js
+++ b/webapp/src/main/webapp/js/menupage/browseByVClass.js
@@ -176,11 +176,13 @@ var browseByVClass = {
             pagination += '<li class="round';
             // Test for active page
             if ( pages[i].text == page) {
-                pagination += ' selected aria-current="page"';
+                pagination += ' selected" aria-current="page"';
                 anchorOpen = "";
                 anchorClose = "";
+            } else {
+                pagination += '"';
             }
-            pagination += '" role="listitem">';
+            pagination += ' role="listitem">';
             pagination += anchorOpen;
             pagination += pages[i].text;
             pagination += anchorClose;
@@ -199,12 +201,12 @@ var browseByVClass = {
         // Remove active class on all vClasses
         $('#browse-classes li a.selected')
             .removeClass('selected')
-            .$('aria-current', 'false');
+            .removeAttr('aria-current');
 
         // Add active class for requested vClass
         $('#browse-classes li a[data-uri="'+ vclassUri +'"]')
             .addClass('selected')
-            .$('aria-current', 'true');
+            .attr('aria-current', 'true');
     },
 
     // Toggle the active letter so it's clear which is selected
@@ -217,7 +219,7 @@ var browseByVClass = {
         // Remove active class and aria-selected on all letters
         $('#alpha-browse-individuals li a.selected')
             .removeClass('selected')
-            .attr('aria-current', 'false');
+            .removeAttr('aria-current');
 
         // Add active class and aria-selected for requested alpha
         $('#alpha-browse-individuals li a[data-alpha="'+ alpha +'"]')
diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/menupage/menupage-browse.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/menupage/menupage-browse.ftl
index 7a5827868d..bf9882b199 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/partials/menupage/menupage-browse.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/partials/menupage/menupage-browse.ftl
@@ -28,9 +28,9 @@
             <h3 class="selected-class"></h3>
             <#assign alphabet = ["A", "B", "C", "D", "E", "F", "G" "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z"] />
             <ul id="alpha-browse-individuals">
-                <li><a href="#" class="selected" aria-current="false" data-alpha="all" title="${i18n().select_all}">${i18n().all}</a></li>
+                <li><a href="#" class="selected" data-alpha="all" title="${i18n().select_all}">${i18n().all}</a></li>
                 <#list alphabet as letter>
-                    <li><a href="#" data-alpha="${letter?lower_case}" aria-current="false" title="${i18n().browse_all_starts_with(letter)}">${letter}</a></li>
+                    <li><a href="#" data-alpha="${letter?lower_case}" title="${i18n().browse_all_starts_with(letter)}">${letter}</a></li>
                 </#list>
             </ul>
         </nav>

From f9ad84db68ce12e55301a6d64a6eb57c99193ed1 Mon Sep 17 00:00:00 2001
From: Milos Popovic <misa01523@gmail.com>
Date: Mon, 6 Apr 2026 16:10:56 +0200
Subject: [PATCH 03/13] Added aria-current polite when there is no data in
 filter (browseByVClass)

---
 webapp/src/main/webapp/js/menupage/browseByVClass.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/webapp/src/main/webapp/js/menupage/browseByVClass.js b/webapp/src/main/webapp/js/menupage/browseByVClass.js
index 0148289a30..54a59d8c2b 100644
--- a/webapp/src/main/webapp/js/menupage/browseByVClass.js
+++ b/webapp/src/main/webapp/js/menupage/browseByVClass.js
@@ -244,9 +244,9 @@ var browseByVClass = {
         var alpha = this.selectedAlpha(alpha);
 
         if ( alpha != "all" ) {
-            nothingToSeeHere = '<p class="no-individuals">' + browseByVClass.thereAreNoEntriesStartingWith + ' <em>'+ alpha.toUpperCase() +'</em>.</p> <p class="no-individuals">' + browseByVClass.tryAnotherLetter + '</p>';
+            nothingToSeeHere = '<div aria-live="polite"><p class="no-individuals">' + browseByVClass.thereAreNoEntriesStartingWith + ' <em>'+ alpha.toUpperCase() +'</em>.</p> <p class="no-individuals">' + browseByVClass.tryAnotherLetter + '</p></div>';
         } else {
-            nothingToSeeHere = '<p class="no-individuals">' + browseByVClass.thereAreNoEntriesStartingWith + '</p> <p class="no-individuals">' + browseByVClass.selectAnotherClass + '</p>';
+            nothingToSeeHere = '<div aria-live="polite"><p class="no-individuals">' + browseByVClass.thereAreNoEntriesStartingWith + '</p> <p class="no-individuals">' + browseByVClass.selectAnotherClass + '</p></div>';
         }
 
         browseByVClass.individualsContainer.prepend(nothingToSeeHere);

From 6eff953ac59112317bc8f33e2ff2d27c25875db6 Mon Sep 17 00:00:00 2001
From: Milos Popovic <misa01523@gmail.com>
Date: Mon, 6 Apr 2026 16:38:23 +0200
Subject: [PATCH 04/13] Fixed no-individuals aria-live pt2

---
 webapp/src/main/webapp/js/menupage/browseByVClass.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/webapp/src/main/webapp/js/menupage/browseByVClass.js b/webapp/src/main/webapp/js/menupage/browseByVClass.js
index 54a59d8c2b..8c9a21961c 100644
--- a/webapp/src/main/webapp/js/menupage/browseByVClass.js
+++ b/webapp/src/main/webapp/js/menupage/browseByVClass.js
@@ -232,7 +232,7 @@ var browseByVClass = {
     // Wipe the currently displayed individuals, no-content message, and existing pagination
     wipeSlate: function() {
         browseByVClass.individualsInVClass.empty();
-        $('p.no-individuals').remove();
+        $('div.no-individuals-container').remove();
         $('.pagination').remove();
     },
 
@@ -244,9 +244,9 @@ var browseByVClass = {
         var alpha = this.selectedAlpha(alpha);
 
         if ( alpha != "all" ) {
-            nothingToSeeHere = '<div aria-live="polite"><p class="no-individuals">' + browseByVClass.thereAreNoEntriesStartingWith + ' <em>'+ alpha.toUpperCase() +'</em>.</p> <p class="no-individuals">' + browseByVClass.tryAnotherLetter + '</p></div>';
+            nothingToSeeHere = '<div aria-live="polite" class="no-individuals-container"><p class="no-individuals">' + browseByVClass.thereAreNoEntriesStartingWith + ' <em>'+ alpha.toUpperCase() +'</em>.</p> <p class="no-individuals">' + browseByVClass.tryAnotherLetter + '</p></div>';
         } else {
-            nothingToSeeHere = '<div aria-live="polite"><p class="no-individuals">' + browseByVClass.thereAreNoEntriesStartingWith + '</p> <p class="no-individuals">' + browseByVClass.selectAnotherClass + '</p></div>';
+            nothingToSeeHere = '<div aria-live="polite" class="no-individuals-container"><p class="no-individuals">' + browseByVClass.thereAreNoEntriesStartingWith + '</p> <p class="no-individuals">' + browseByVClass.selectAnotherClass + '</p></div>';
         }
 
         browseByVClass.individualsContainer.prepend(nothingToSeeHere);

From 07fbedda72e50e41650559de1ac65994bd7ba4a0 Mon Sep 17 00:00:00 2001
From: Milos Popovic <misa01523@gmail.com>
Date: Mon, 6 Apr 2026 16:40:58 +0200
Subject: [PATCH 05/13] Removed redudant role section in section tag

---
 .../freemarker/body/manageproxies/manageProxies-list.ftl        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/src/main/webapp/templates/freemarker/body/manageproxies/manageProxies-list.ftl b/webapp/src/main/webapp/templates/freemarker/body/manageproxies/manageProxies-list.ftl
index 73128cdaae..daeba034e2 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/manageproxies/manageProxies-list.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/manageproxies/manageProxies-list.ftl
@@ -28,7 +28,7 @@
         <fieldset class="proxy">
             <legend>${i18n().select_editors}</legend>
 
-            <section name="proxyProxiesPanel" role="section">
+            <section name="proxyProxiesPanel">
                 <label for="selectProfileEditors">${i18n().select_editors}</label>
                 <input id="selectProfileEditors" type="text" name="proxySelectorAC" class="acSelector" size="35" value="${i18n().select_last_name}" role="input" /><span><img class="loading-relateEditor hidden" src="${urls.images}/indicatorWhite.gif" alt="${i18n().processing_indicator}"/></span>
                 <p class="search-status"><span name='proxySelectorSearchStatus' moreCharsText='${i18n().type_more_chars}' noMatchText='${i18n().no_match}'>&nbsp;</span></p>

From 40e82c8a85007534d00bc45218cdc3e6a26ea66d Mon Sep 17 00:00:00 2001
From: Milos Popovic <misa01523@gmail.com>
Date: Mon, 6 Apr 2026 16:41:27 +0200
Subject: [PATCH 06/13] Added sr-only class

---
 webapp/src/main/webapp/css/vitro.css | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/webapp/src/main/webapp/css/vitro.css b/webapp/src/main/webapp/css/vitro.css
index bb5b18368b..30e9484f3f 100644
--- a/webapp/src/main/webapp/css/vitro.css
+++ b/webapp/src/main/webapp/css/vitro.css
@@ -82,6 +82,18 @@
   clear: both;
 }
 
+/* SCREEN READER ONLY */
+.sr-only {
+  position: absolute;
+  width: 1px;
+  height: 1px;
+  padding: 0;
+  margin: -1px;
+  overflow: hidden;
+  clip: rect(0, 0, 0, 0);
+  border: 0;
+}
+
 /* <------ INDEX PAGE*/
 .siteMap h2 {
     padding-bottom: 0;

From 90ac0f6d1e8dcc1953d0bc5f2dc524ed78d9ea8d Mon Sep 17 00:00:00 2001
From: Milos Popovic <misa01523@gmail.com>
Date: Mon, 6 Apr 2026 16:46:41 +0200
Subject: [PATCH 07/13] Fixed no-individuals screen reader in browseByVClass

---
 webapp/src/main/webapp/js/menupage/browseByVClass.js | 12 ++++++------
 .../body/partials/menupage/menupage-browse.ftl       |  3 ++-
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/webapp/src/main/webapp/js/menupage/browseByVClass.js b/webapp/src/main/webapp/js/menupage/browseByVClass.js
index 8c9a21961c..297b4d7f5b 100644
--- a/webapp/src/main/webapp/js/menupage/browseByVClass.js
+++ b/webapp/src/main/webapp/js/menupage/browseByVClass.js
@@ -25,6 +25,7 @@ var browseByVClass = {
         this.alphaIndexLinks = $('#alpha-browse-individuals li a');
         this.individualsInVClass = $('#individuals-in-class ul');
         this.individualsContainer = $('#individuals-in-class');
+        this.individualsListInfo = $('#individuals-list-info');
     },
 
     // Event listeners. Called on page load
@@ -231,8 +232,8 @@ var browseByVClass = {
 
     // Wipe the currently displayed individuals, no-content message, and existing pagination
     wipeSlate: function() {
-        browseByVClass.individualsInVClass.empty();
-        $('div.no-individuals-container').remove();
+        browseByVClass.individualsInVClass.children(':not(#individuals-list-info)').remove();
+        $('#individuals-list-info > .no-individuals').remove();
         $('.pagination').remove();
     },
 
@@ -244,12 +245,11 @@ var browseByVClass = {
         var alpha = this.selectedAlpha(alpha);
 
         if ( alpha != "all" ) {
-            nothingToSeeHere = '<div aria-live="polite" class="no-individuals-container"><p class="no-individuals">' + browseByVClass.thereAreNoEntriesStartingWith + ' <em>'+ alpha.toUpperCase() +'</em>.</p> <p class="no-individuals">' + browseByVClass.tryAnotherLetter + '</p></div>';
+            nothingToSeeHere = '<p class="no-individuals aria-atomic="true">' + browseByVClass.thereAreNoEntriesStartingWith + ' '+ alpha.toUpperCase() +'.</p> <p class="no-individuals">' + browseByVClass.tryAnotherLetter + '</p>';
         } else {
-            nothingToSeeHere = '<div aria-live="polite" class="no-individuals-container"><p class="no-individuals">' + browseByVClass.thereAreNoEntriesStartingWith + '</p> <p class="no-individuals">' + browseByVClass.selectAnotherClass + '</p></div>';
+            nothingToSeeHere = '<p class="no-individuals" aria-atomic="true">' + browseByVClass.thereAreNoEntriesStartingWith + '</p> <p class="no-individuals">' + browseByVClass.selectAnotherClass + '</p>';
         }
-
-        browseByVClass.individualsContainer.prepend(nothingToSeeHere);
+        browseByVClass.individualsListInfo.append(nothingToSeeHere);
     }
 
 };
diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/menupage/menupage-browse.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/menupage/menupage-browse.ftl
index bf9882b199..83ed6d40d5 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/partials/menupage/menupage-browse.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/partials/menupage/menupage-browse.ftl
@@ -38,7 +38,8 @@
 
     <section id="individuals-in-class" role="region">
         <ul role="list">
-
+            <div aria-live="polite" id="individuals-list-info"></div>
+            
             <#-- Will be populated dynamically via AJAX request -->
         </ul>
     </section>

From 2b8a400292cbfc9a00c7512e5fc6f3ea2f09aa46 Mon Sep 17 00:00:00 2001
From: Milos Popovic <misa01523@gmail.com>
Date: Tue, 7 Apr 2026 09:52:57 +0200
Subject: [PATCH 08/13] Added aria attr to search list download modal

---
 webapp/src/main/webapp/js/searchDownload.js | 44 +++++++++++++++------
 1 file changed, 31 insertions(+), 13 deletions(-)

diff --git a/webapp/src/main/webapp/js/searchDownload.js b/webapp/src/main/webapp/js/searchDownload.js
index ba185c131a..59e157f0de 100644
--- a/webapp/src/main/webapp/js/searchDownload.js
+++ b/webapp/src/main/webapp/js/searchDownload.js
@@ -3,27 +3,45 @@
 $(document).ready(function(){
 
     function configSlider() {
-        $( "#slider-vertical" ).slider({
-        orientation: "vertical",
-        range: "min",
-        min: 10,
-        max: 1000,
-        value: 500,
-        slide: function( event, ui ) {
-            $( "#amount" ).val( ui.value );
-            $('#csvDownload').attr("href", urlsBase + '/search?' + queryText +'&csv=1&documentsNumber=' + ui.value);
-            $('#xmlDownload').attr("href", urlsBase + '/search?' + queryText +'&xml=1&documentsNumber=' + ui.value);
+
+        $("#slider-vertical").slider({
+            orientation: "vertical",
+            range: "min",
+            min: 10,
+            max: 1000,
+            value: 500,
+            slide: function(event, ui) {
+                $("#amount").val(ui.value);
+                $('#csvDownload').attr("href", urlsBase + '/search?' + queryText + '&csv=1&documentsNumber=' + ui.value);
+                $('#xmlDownload').attr("href", urlsBase + '/search?' + queryText + '&xml=1&documentsNumber=' + ui.value);
+                // Update aria-valuenow on slide
+                $("#slider-vertical .ui-slider-handle").attr("aria-valuenow", ui.value);
+                $("#slider-vertical .ui-slider-range").attr("role", "presentation");
+                $("#slider-vertical .ui-slider-range").attr("aria-hidden", "true");
+
+            },
+            create: function(event, ui) {
+                // Set ARIA attributes on the slider handle after creation
+                var $handle = $("#slider-vertical .ui-slider-handle");
+                $handle.attr({
+                    "role": "slider",
+                    "aria-valuemin": 10,
+                    "aria-valuemax": 1000,
+                    "aria-valuenow": 500,
+                    "aria-orientation": "vertical",
+                    "aria-label": i18nStrings.downloadResultsMaxResultsSliderString
+                });
             }
         });
-        $( "#amount" ).val( $( "#slider-vertical" ).slider( "value" ) );
+        $("#amount").val($("#slider-vertical").slider("value"));
     }
 
     setTooltip("#downloadIcon", {
         title: '<div class="clearfix"><div style="float:right; width:150px;border-left: 1px solid #A6B1B0; padding: 3px 0 0 20px">'
                     	+'<p><label for="amount" style="font-size:14px;">Maximum Records:</label>'
                     	+'<input disabled type="text" id="amount" style="margin-left:35px; border: 0; color: #f6931f; font-weight: bold; width:45px" /></p>'
-                    	+'<div id="slider-vertical" style="margin-left:52px; margin-top: -20px; height: 100px; background-color:white"></div>'
-                    	+'<br /><a class="close" href="#">close</a></div>'
+                    	+'<div id="slider-vertical" aria-label="Adjust maximum number of records" style="margin-left:52px; margin-top: -20px; height: 100px; background-color:white"></div>'
+                    	+'<br aria-hidden="true"/><a class="close" href="#">close</a></div>'
                     	+'<div style="float:left; font-size:14px; width:280px; padding: 3px 0 0 20px"><p><label>Download the results from this search</label></p> '
                     	+'<p class ="download-url"><a id=xmlDownload href="' + urlsBase + '/search?' + queryText +'&amp;xml=1&amp;documentsNumber=500">download results in XML format</a></p>'
                     	+'<p class ="download-url"><a id=csvDownload href="' + urlsBase + '/search?' + queryText +'&amp;csv=1&amp;documentsNumber=500">download results in CSV format</a></p>'

From 4dca7ab1d67b91b7b0612e87d548111c6a1522cc Mon Sep 17 00:00:00 2001
From: Milos Popovic <misa01523@gmail.com>
Date: Tue, 7 Apr 2026 09:53:37 +0200
Subject: [PATCH 09/13] WCAG Pagination in search

---
 .../i18n/en_US/interface-i18n/firsttime/vitro_UiLabel.ttl | 8 ++++++++
 .../freemarker/body/search/search-pagedResults.ftl        | 4 ++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/home/src/main/resources/rdf/i18n/en_US/interface-i18n/firsttime/vitro_UiLabel.ttl b/home/src/main/resources/rdf/i18n/en_US/interface-i18n/firsttime/vitro_UiLabel.ttl
index 5130b36336..dbb6c02b12 100644
--- a/home/src/main/resources/rdf/i18n/en_US/interface-i18n/firsttime/vitro_UiLabel.ttl
+++ b/home/src/main/resources/rdf/i18n/en_US/interface-i18n/firsttime/vitro_UiLabel.ttl
@@ -5566,6 +5566,14 @@ uil-data:page.Vitro
         uil:hasKey      "page" ;
         uil:hasPackage  "Vitro-languages" .
 
+uil-data:pagination.Vitro
+        rdf:type         owl:NamedIndividual ;
+        rdf:type         uil:UILabel ;
+        rdfs:label       "Pagination"@en-US ;
+        uil:hasApp      "Vitro" ;
+        uil:hasKey      "pagination" ;
+        uil:hasPackage  "Vitro-languages" .
+
 uil-data:type_more_characters.Vitro
         rdf:type         owl:NamedIndividual ;
         rdf:type         uil:UILabel ;
diff --git a/webapp/src/main/webapp/templates/freemarker/body/search/search-pagedResults.ftl b/webapp/src/main/webapp/templates/freemarker/body/search/search-pagedResults.ftl
index c17a5c6802..895959234d 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/search/search-pagedResults.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/search/search-pagedResults.ftl
@@ -45,14 +45,14 @@ ${headScripts.add('<script type="text/javascript" src="${urls.base}/js/wNumb.min
 
 <#-- Paging controls -->
     <#if (pagingLinks?size > 0)>
-        <div class="searchpages">
+        <div class="searchpages" aria-label="${i18n().pagination}">
             ${i18n().pages}:
             <#if prevPage??><a class="prev" href="${prevPage?html}" title="${i18n().previous}">${i18n().previous}</a></#if>
             <#list pagingLinks as link>
                 <#if link.url??>
                     <a href="${link.url?html}" title="${i18n().page_link}">${link.text?html}</a>
                 <#else>
-                    <span>${link.text?html}</span> <#-- no link if current page -->
+                    <span aria-current="page">${link.text?html}</span> <#-- no link if current page -->
                 </#if>
             </#list>
             <#if nextPage??><a class="next" href="${nextPage?html}" title="${i18n().next_capitalized}">${i18n().next_capitalized}</a></#if>

From fdafe78252db35ada422af06ab524577e57fe824 Mon Sep 17 00:00:00 2001
From: Milos Popovic <misa01523@gmail.com>
Date: Tue, 7 Apr 2026 10:35:17 +0200
Subject: [PATCH 10/13] Added aria tahs to propertyGroup and removed redudant
 role and alt tags

---
 .../js/individual/propertyGroupControls.js     |  6 ++++++
 .../individual-property-group-tabs.ftl         | 18 +++++++++---------
 .../freemarker/lib/lib-properties.ftl          |  2 +-
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/webapp/src/main/webapp/js/individual/propertyGroupControls.js b/webapp/src/main/webapp/js/individual/propertyGroupControls.js
index de0cb3aaeb..7089fcbd76 100644
--- a/webapp/src/main/webapp/js/individual/propertyGroupControls.js
+++ b/webapp/src/main/webapp/js/individual/propertyGroupControls.js
@@ -29,9 +29,11 @@ $(document).ready(function(){
                 $.each($('li.selectedGroupTab'), function() {
                     $(this).removeClass("selectedGroupTab clickable");
                     $(this).addClass("nonSelectedGroupTab clickable");
+                    $(this).attr("aria-selected", "false");
                 });
                 $propertyGroupLi.removeClass("nonSelectedGroupTab clickable");
                 $propertyGroupLi.addClass("selectedGroupTab clickable");
+                $propertyGroupLi.attr("aria-selected", "true");
             }
             if ( $propertyGroupLi.attr("groupname") == "viewAll" ) {
                 processViewAllTab();
@@ -79,9 +81,11 @@ $(document).ready(function(){
                     // select the correct tab
                     $('li[groupName="' + tabName + '"]').removeClass("nonSelectedGroupTab clickable");
                     $('li[groupName="' + tabName + '"]').addClass("selectedGroupTab clickable");
+                    $('li[groupName="' + tabName + '"]').attr("aria-selected", "true");
                     // deselect the first tab
                     $firstTab.removeClass("selectedGroupTab clickable");
                     $firstTab.addClass("nonSelectedGroupTab clickable");
+                    $firstTab.attr("aria-selected", "false");
                     $('section.property-group:visible').hide();
                     // show the selected tab section
                     $('section#' + tabName).show();
@@ -168,9 +172,11 @@ $(document).ready(function(){
                     var $firstTab = $('li.clickable').first();
                     $firstTab.removeClass("selectedGroupTab clickable");
                     $firstTab.addClass("nonSelectedGroupTab clickable");
+                    $firstTab.attr("aria-selected", "false");
                     // select the stored tab
                     $("li[groupName='" + groupName + "']").removeClass("nonSelectedGroupTab clickable");
                     $("li[groupName='" + groupName + "']").addClass("selectedGroupTab clickable");
+                    $("li[groupName='" + groupName + "']").attr("aria-selected", "true");
                     // hide the first tab section
                     $('section.property-group:visible').hide();
 
diff --git a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-property-group-tabs.ftl b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-property-group-tabs.ftl
index 8cb8721040..e70cac29d6 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-property-group-tabs.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/partials/individual/individual-property-group-tabs.ftl
@@ -7,8 +7,8 @@
 <#assign tabCount = 1 >
 <#assign sectionCount = 1 >
 <!-- ${propertyGroups.all?size} -->
-<ul class="propertyTabsList">
-    <li  class="groupTabSpacer">&nbsp;</li>
+<ul class="propertyTabsList" role="tablist" >
+    <li  class="groupTabSpacer" aria-hidden="true" >&nbsp;</li>
 <#list propertyGroups.all as groupTabs>
     <#if ( groupTabs.properties?size > 0 ) >
         <#assign groupName = groupTabs.getName(nameForOtherGroup)>
@@ -20,18 +20,18 @@
     	    <#assign groupNameHtmlId = "${i18n().properties}" >
         </#if>
         <#if tabCount = 1 >
-            <li class="selectedGroupTab clickable" groupName="${groupNameHtmlId?replace("/","-")}">${groupName}</li>
-            <li class="groupTabSpacer">&nbsp;</li>
+            <li class="selectedGroupTab clickable" id="tab-${groupNameHtmlId?replace("/","-")}" aria-controls="${groupNameHtmlId?replace("/","-")}" groupName="${groupNameHtmlId?replace("/","-")}" aria-selected="true" role="tab" tabindex="0" >${p.capitalizeGroupName(groupName)}</li>
+            <li class="groupTabSpacer" aria-hidden="true">&nbsp;</li>
             <#assign tabCount = 2>
         <#else>
-            <li class="nonSelectedGroupTab clickable" groupName="${groupNameHtmlId?replace("/","-")}">${groupName}</li>
-            <li class="groupTabSpacer">&nbsp;</li>
+            <li class="nonSelectedGroupTab clickable" id="tab-${groupNameHtmlId?replace("/","-")}" aria-controls="${groupNameHtmlId?replace("/","-")}" groupName="${groupNameHtmlId?replace("/","-")}" aria-selected="false" role="tab" tabindex="0" >${p.capitalizeGroupName(groupName)}</li>
+            <li class="groupTabSpacer" aria-hidden="true">&nbsp;</li>
         </#if>
     </#if>
 </#list>
 <#if (propertyGroups.all?size > 1) >
-    <li  class="nonSelectedGroupTab clickable" groupName="viewAll">${i18n().view_all_capitalized}</li>
-    <li  class="groupTabSpacer">&nbsp;</li>
+    <li class="nonSelectedGroupTab clickable" id="tab-viewAll" groupName="viewAll" aria-selected="false" role="tab" tabindex="0" >${i18n().view_all_capitalized}</li>
+    <li class="groupTabSpacer" aria-hidden="true">&nbsp;</li>
 </#if>
 </ul>
 <#list propertyGroups.all as group>
@@ -39,7 +39,7 @@
         <#assign groupName = group.getName(nameForOtherGroup)>
         <#assign groupNameHtmlId = p.createPropertyGroupHtmlId(groupName) >
         <#assign verbose = (verbosePropertySwitch.currentValue)!false>
-        <section id="${groupNameHtmlId?replace("/","-")}" class="property-group" role="region" style="<#if (sectionCount > 1) >display:none<#else>display:block</#if>">
+        <section id="${groupNameHtmlId?replace("/","-")}" aria-labelledby="tab-${groupNameHtmlId?replace("/","-")}" class="property-group" role="tabpanel" style="<#if (sectionCount > 1) >display:none<#else>display:block</#if>">
         <nav id="scroller" class="scroll-up hidden" role="navigation">
             <a href="#branding" title="${i18n().scroll_to_menus}" >
                 <img src="${urls.images}/individual/scroll-up.gif" alt="${i18n().scroll_to_menus}" />
diff --git a/webapp/src/main/webapp/templates/freemarker/lib/lib-properties.ftl b/webapp/src/main/webapp/templates/freemarker/lib/lib-properties.ftl
index ce8c110fb7..48244ca528 100644
--- a/webapp/src/main/webapp/templates/freemarker/lib/lib-properties.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/lib/lib-properties.ftl
@@ -278,7 +278,7 @@ name will be used as the label. -->
         <#local imageLabel><@addLinkWithLabel mainImage editable "${i18n().photo}" /></#local>
         ${imageLabel}
         <#if showPlaceholder == "always" || (showPlaceholder="with_add_link" && imageLabel?has_content)>
-            <img class="individual-photo" src="${placeholderImageUrl(individual.uri)}" title = "${i18n().no_image}" alt="${i18n().placeholder_image}" width="${imageWidth!}" />
+            <img class="individual-photo" src="${placeholderImageUrl(individual.uri)}" title = "${i18n().no_image}" alt="" width="${imageWidth!}" />
         </#if>
     </#if>
 </#macro>

From 284ada14d4284c8198a88255532f06597b0a559e Mon Sep 17 00:00:00 2001
From: Milos Popovic <misa01523@gmail.com>
Date: Tue, 7 Apr 2026 11:08:45 +0200
Subject: [PATCH 11/13] Removed all role="input" because it's shouldn't be used
 with <input> (redundant)

---
 .../body/accounts/userAccounts-add.ftl           | 10 +++++-----
 .../accounts/userAccounts-createPassword.ftl     |  8 ++++----
 .../body/accounts/userAccounts-edit.ftl          | 10 +++++-----
 .../accounts/userAccounts-firstTimeExternal.ftl  | 10 +++++-----
 .../body/accounts/userAccounts-myAccount.ftl     | 10 +++++-----
 .../accounts/userAccounts-myProxiesPanel.ftl     |  4 ++--
 .../body/accounts/userAccounts-resetPassword.ftl |  4 ++--
 .../body/individual/individual-menu.ftl          |  2 +-
 .../manageLabelsForIndividualAddForm.ftl         |  2 +-
 .../body/manageproxies/manageProxies-list.ftl    | 12 ++++++------
 .../freemarker/body/menupage/page-pageList.ftl   |  2 +-
 .../body/pagemanagement/page-pageList.ftl        |  2 +-
 .../freemarker/body/pagemanagement/pageList.ftl  |  2 +-
 .../freemarker/body/recomputeInferences.ftl      |  2 +-
 .../body/siteAdmin/siteAdmin-dataInput.ftl       |  2 +-
 .../edit/forms/autoCompleteObjectPropForm.ftl    |  2 +-
 .../edit/forms/confirmDeleteIndividualForm.ftl   |  4 ++--
 .../edit/forms/confirmDeletePropertyForm.ftl     | 14 +++++++-------
 .../freemarker/edit/forms/dateTimeEntryForm.ftl  |  2 +-
 .../forms/defaultAddMissingIndividualForm.ftl    |  4 ++--
 .../edit/forms/defaultDataPropertyForm.ftl       |  2 +-
 .../forms/defaultOfferCreateNewOptionForm.ftl    | 10 +++++-----
 .../edit/forms/defaultPropertyForm.ftl           |  2 +-
 .../edit/forms/menuManagement-remove.ftl         |  8 ++++----
 .../freemarker/edit/forms/menuManagement.ftl     | 16 ++++++++--------
 .../edit/forms/pageManagement--fixedHtml.ftl     |  2 +-
 .../forms/pageManagement--searchIndividuals.ftl  |  2 +-
 .../edit/forms/pageManagement--sparqlQuery.ftl   |  4 ++--
 .../freemarker/edit/forms/pageManagement.ftl     | 16 ++++++++--------
 .../freemarker/edit/forms/rdfTypeForm.ftl        |  2 +-
 .../freemarker/edit/forms/rdfsLabelForm.ftl      |  8 ++++----
 31 files changed, 90 insertions(+), 90 deletions(-)

diff --git a/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-add.ftl b/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-add.ftl
index 4b9e4b0095..0a2e18404e 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-add.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-add.ftl
@@ -38,13 +38,13 @@
 <section id="add-account" role="region">
     <form method="POST" action="${formUrls.add}" class="customForm" role="add new account">
         <label for="email-address">${strings.email_address}<span class="requiredHint"> *</span></label>
-        <input type="text" name="emailAddress" value="${emailAddress}" id="email-address" role="input" />
+        <input type="text" name="emailAddress" value="${emailAddress}" id="email-address" />
 
         <label for="first-name">${strings.first_name}<span class="requiredHint"> *</span></label>
-        <input type="text" name="firstName" value="${firstName}" id="first-name" role="input" />
+        <input type="text" name="firstName" value="${firstName}" id="first-name" />
 
         <label for="last-name">${strings.last_name}<span class="requiredHint"> *</span></label>
-        <input type="text" name="lastName" value="${lastName}" id="last-name" role="input" />
+        <input type="text" name="lastName" value="${lastName}" id="last-name" />
 
         <#include "userAccounts-associateProfilePanel.ftl">
 
@@ -61,11 +61,11 @@
         <#else>
             <section id="passwordContainer" role="region">
                 <label for="initial-password">${strings.initial_password}<span class="requiredHint"> *</span></label>
-                <input type="password" name="initialPassword" value="${initialPassword}" id="initial-password" role="input" />
+                <input type="password" name="initialPassword" value="${initialPassword}" id="initial-password" />
                 <p class="note">${strings.minimum_password_length(minimumLength, maximumLength)}</p>
 
                 <label for="confirm-password">${strings.confirm_initial_password}<span class="requiredHint"> *</span></label>
-                <input type="password" name="confirmPassword" value="${confirmPassword}" id="confirm-password" role="input" />
+                <input type="password" name="confirmPassword" value="${confirmPassword}" id="confirm-password" />
             </section>
         </#if>
 
diff --git a/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-createPassword.ftl b/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-createPassword.ftl
index f7abaf701a..0e2e876030 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-createPassword.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-createPassword.ftl
@@ -25,16 +25,16 @@
     <p>${strings.enter_new_password(userAccount.emailAddress)}</p>
 
     <form method="POST" action="${formUrls.createPassword}" class="customForm" role="create password">
-        <input type="hidden" name="user" value="${userAccount.emailAddress}" role="input" />
-        <input type="hidden" name="key"  value="${userAccount.emailKey}" role="input" />
+        <input type="hidden" name="user" value="${userAccount.emailAddress}" />
+        <input type="hidden" name="key"  value="${userAccount.emailKey}" />
 
         <label for="new-password">${strings.new_password}<span class="requiredHint"> *</span></label>
-        <input type="password" name="newPassword" value="${newPassword}" id="new-password" role="input" />
+        <input type="password" name="newPassword" value="${newPassword}" id="new-password" />
 
         <p class="note">${strings.minimum_password_length(minimumLength, maximumLength)}</p>
 
         <label for="confirm-password">${strings.confirm_password}<span class="requiredHint"> *</span></label>
-        <input type="password" name="confirmPassword" value="${confirmPassword}" id="confirm-password" role="input" />
+        <input type="password" name="confirmPassword" value="${confirmPassword}" id="confirm-password" />
 
         <p><input type="submit" name="submit" value="${strings.save_changes}" class="submit"/></p>
 
diff --git a/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-edit.ftl b/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-edit.ftl
index 9a9008f4dc..d77e346ad4 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-edit.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-edit.ftl
@@ -38,13 +38,13 @@
 <section id="edit-account" role="region">
     <form method="POST" action="${formUrls.edit}" id="userAccountForm" class="customForm" role="edit account">
         <label for="email-address">${strings.email_address}<span class="requiredHint"> *</span></label>
-        <input type="text" name="emailAddress" value="${emailAddress}" id="email-address" role="input" />
+        <input type="text" name="emailAddress" value="${emailAddress}" id="email-address" />
 
         <label for="first-name">${strings.first_name}<span class="requiredHint"> *</span></label>
-        <input type="text" name="firstName" value="${firstName}" id="first-name" role="input" />
+        <input type="text" name="firstName" value="${firstName}" id="first-name" />
 
         <label for="last-name">${strings.last_name}<span class="requiredHint"> *</span></label>
-        <input type="text" name="lastName" value="${lastName}" id="last-name" role="input" />
+        <input type="text" name="lastName" value="${lastName}" id="last-name" />
 
 		<#if externalAuthPermitted??>
             <#include "userAccounts-associateProfilePanel.ftl">
@@ -71,12 +71,12 @@
         <#else>
             <section id="passwordContainer" <#if externalAuthOnly?? >class="hidden"</#if> role="region">
                 <label for="new-password">${strings.new_password}</label>
-                <input type="password" name="newPassword" value="${newPassword}" id="new-password" role="input" />
+                <input type="password" name="newPassword" value="${newPassword}" id="new-password" />
                 <p class="note">${strings.minimum_password_length(minimumLength, maximumLength)}<br />
                 ${strings.leave_password_unchanged}</p>
 
                 <label for="confirm-password">${strings.confirm_password}</label>
-                <input type="password" name="confirmPassword" value="${confirmPassword}" id="confirm-password" role="input" />
+                <input type="password" name="confirmPassword" value="${confirmPassword}" id="confirm-password" />
             </section>
         </#if>
 
diff --git a/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-firstTimeExternal.ftl b/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-firstTimeExternal.ftl
index 3b3c2c3b1a..f54544d4b9 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-firstTimeExternal.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-firstTimeExternal.ftl
@@ -29,17 +29,17 @@
     <p>${strings.please_provide_contact_information}</p>
 
     <form method="POST" action="${formUrls.firstTimeExternal}" class="customForm" role="my account">
-        <input type="hidden" name="externalAuthId" value="${externalAuthId}" role="input" />
-        <input type="hidden" name="afterLoginUrl" value="${afterLoginUrl}" role="input" />
+        <input type="hidden" name="externalAuthId" value="${externalAuthId}" />
+        <input type="hidden" name="afterLoginUrl" value="${afterLoginUrl}" />
 
         <label for="first-name">${strings.first_name}<span class="requiredHint"> *</span></label>
-        <input type="text" name="firstName" value="${firstName}" id="first-name" role="input" />
+        <input type="text" name="firstName" value="${firstName}" id="first-name" />
 
         <label for="last-name">${strings.last_name}<span class="requiredHint"> *</span></label>
-        <input type="text" name="lastName" value="${lastName}" id="last-name" role="input" />
+        <input type="text" name="lastName" value="${lastName}" id="last-name" />
 
         <label for="email-address">${strings.email_address}<span class="requiredHint"> *</span></label>
-        <input type="text" name="emailAddress" value="${emailAddress}" id="email-address" role="input" />
+        <input type="text" name="emailAddress" value="${emailAddress}" id="email-address" />
 
         <#if emailIsEnabled??>
             <p class="note">${strings.first_time_login_note}</p>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-myAccount.ftl b/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-myAccount.ftl
index 504087a4da..6a2102ec49 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-myAccount.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-myAccount.ftl
@@ -54,24 +54,24 @@
         </#if>
 
         <label for="email-address">${strings.email_address}<span class="requiredHint"> *</span></label>
-        <input type="text" name="emailAddress" value="${emailAddress}" id="email-address" role="input" />
+        <input type="text" name="emailAddress" value="${emailAddress}" id="email-address" />
 
         <p class="note">${strings.email_change_will_be_confirmed}</p>
 
         <label for="first-name">${strings.first_name}<span class="requiredHint"> *</span></label>
-        <input type="text" name="firstName" value="${firstName}" id="first-name" role="input" />
+        <input type="text" name="firstName" value="${firstName}" id="first-name" />
 
         <label for="last-name">${strings.last_name}<span class="requiredHint"> *</span></label>
-        <input type="text" name="lastName" value="${lastName}" id="last-name" role="input" />
+        <input type="text" name="lastName" value="${lastName}" id="last-name" />
 
         <#if !externalAuth??>
             <label for="new-password">${strings.new_password}</label>
-            <input type="password" name="newPassword" value="${newPassword}" id="new-password" role="input" />
+            <input type="password" name="newPassword" value="${newPassword}" id="new-password" />
 
             <p class="note">${strings.minimum_password_length(minimumLength, maximumLength)}<br />${strings.leave_password_unchanged}</p>
 
             <label for="confirm-password">${strings.confirm_password}</label>
-            <input type="password" name="confirmPassword" value="${confirmPassword}" id="confirm-password" role="input" />
+            <input type="password" name="confirmPassword" value="${confirmPassword}" id="confirm-password" />
         </#if>
 
         <p>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-myProxiesPanel.ftl b/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-myProxiesPanel.ftl
index 1785edbfa6..b8dd37f68f 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-myProxiesPanel.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-myProxiesPanel.ftl
@@ -9,7 +9,7 @@
 
     <label for="addProfileEditor">${strings.add_profile_editor}</label>
     <input id="addProfileEditor" type="text" name="proxySelectorAC" class="acSelector" size="35"
-            value="${strings.select_existing_last_name}" role="input" />
+            value="${strings.select_existing_last_name}" />
     <span><img class="loading-profileMyAccoount hidden" src="${urls.images}/indicatorWhite.gif" /></span>
 
     <p class="search-status">
@@ -43,7 +43,7 @@
                     <br />
                     <a class='remove-proxy' href="." templatePart="remove" title="${strings.remove_selection_title}">${strings.remove_selection}</a>
 
-                    <input type="hidden" name="proxyUri" value="%uri%" role="input" />
+                    <input type="hidden" name="proxyUri" value="%uri%" />
                 </p>
             </li>
         </div>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-resetPassword.ftl b/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-resetPassword.ftl
index 81318dda28..6f79f38d26 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-resetPassword.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/accounts/userAccounts-resetPassword.ftl
@@ -29,12 +29,12 @@
         <input type="hidden" name="key"  value="${userAccount.emailKey}" />
 
         <label for="new-password">${strings.new_password}<span class="requiredHint"> *</span></label>
-        <input type="password" name="newPassword" value="${newPassword}" id="new-password" role="input" />
+        <input type="password" name="newPassword" value="${newPassword}" id="new-password" />
 
         <p class="note">${strings.minimum_password_length(minimumLength, maximumLength)}</p>
 
         <label for="confirm-password">${strings.confirm_password}<span class="requiredHint"> *</span></label>
-        <input type="password" name="confirmPassword" value="${confirmPassword}" id="confirm-password" role="input" />
+        <input type="password" name="confirmPassword" value="${confirmPassword}" id="confirm-password" />
 
         <p><input type="submit" name="submit" value="${strings.save_changes}" class="submit"/></p>
 
diff --git a/webapp/src/main/webapp/templates/freemarker/body/individual/individual-menu.ftl b/webapp/src/main/webapp/templates/freemarker/body/individual/individual-menu.ftl
index 4e3f4d19f4..d3d6744bcf 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/individual/individual-menu.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/individual/individual-menu.ftl
@@ -26,7 +26,7 @@
 	    <form id="pageListForm" action="${urls.base}/editRequestDispatch" method="get">
 	        <input type="hidden" name="typeOfNew" value="http://vitro.mannlib.cornell.edu/ontologies/display/1.1#Page">
 	        <input type="hidden" name="switchToDisplayModel" value="1">
-	        <input type="hidden" name="editForm" value="edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.ManagePageGenerator" role="input">
+	        <input type="hidden" name="editForm" value="edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.ManagePageGenerator">
 	   		<input type="hidden" name="addMenuItem" value="true" />
 	   		<input id="submit" value="Add new menu page" role="button" type="submit" >
 	   		<input type="hidden" name="returnURL" value="${returnURL?url}" />
diff --git a/webapp/src/main/webapp/templates/freemarker/body/individual/manageLabelsForIndividualAddForm.ftl b/webapp/src/main/webapp/templates/freemarker/body/individual/manageLabelsForIndividualAddForm.ftl
index 57b23a5522..3dee21cba6 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/individual/manageLabelsForIndividualAddForm.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/individual/manageLabelsForIndividualAddForm.ftl
@@ -9,7 +9,7 @@
 
 <input type="hidden" name="editKey" id="editKey" value="${editKey}"/>
 
-<input type="submit" class="submit" id="submit" value="${i18n().save_button}" role="button" role="input" />
+<input type="submit" class="submit" id="submit" value="${i18n().save_button}" role="button" />
 ${i18n().or}
 <a href="${urls.referringPage}" class="cancel" title="${i18n().cancel_title}" >${i18n().cancel_link}</a>
 
diff --git a/webapp/src/main/webapp/templates/freemarker/body/manageproxies/manageProxies-list.ftl b/webapp/src/main/webapp/templates/freemarker/body/manageproxies/manageProxies-list.ftl
index daeba034e2..2146c6fb20 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/manageproxies/manageProxies-list.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/manageproxies/manageProxies-list.ftl
@@ -30,7 +30,7 @@
 
             <section name="proxyProxiesPanel">
                 <label for="selectProfileEditors">${i18n().select_editors}</label>
-                <input id="selectProfileEditors" type="text" name="proxySelectorAC" class="acSelector" size="35" value="${i18n().select_last_name}" role="input" /><span><img class="loading-relateEditor hidden" src="${urls.images}/indicatorWhite.gif" alt="${i18n().processing_indicator}"/></span>
+                <input id="selectProfileEditors" type="text" name="proxySelectorAC" class="acSelector" size="35" value="${i18n().select_last_name}" /><span><img class="loading-relateEditor hidden" src="${urls.images}/indicatorWhite.gif" alt="${i18n().processing_indicator}"/></span>
                 <p class="search-status"><span name='proxySelectorSearchStatus' moreCharsText='${i18n().type_more_chars}' noMatchText='${i18n().no_match}'>&nbsp;</span></p>
 
                 <#-- Magic div that holds all of the proxy data and the template that shows how to display it. -->
@@ -62,7 +62,7 @@
 
           <section name="proxyProfilesPanel" role="region">
               <label for="selectProfiles">${i18n().select_profiles}</label>
-              <input id="selectProfiles" type="text" name="proxySelectorAC" class="acSelector" size="35" value="${i18n().select_last_name}" role="input" /><span><img class="loading-relateProfile hidden" src="${urls.images}/indicatorWhite.gif"  alt="${i18n().processing_indicator}"/></span>
+              <input id="selectProfiles" type="text" name="proxySelectorAC" class="acSelector" size="35" value="${i18n().select_last_name}" /><span><img class="loading-relateProfile hidden" src="${urls.images}/indicatorWhite.gif"  alt="${i18n().processing_indicator}"/></span>
 
               <p class="search-status"><span name='proxySelectorSearchStatus' moreCharsText='${i18n().type_more_chars}' noMatchText='${i18n().no_match}'>&nbsp;</span></p>
 
@@ -82,7 +82,7 @@
                                 <br /><a class='remove-proxy' href="." templatePart="remove" title="${i18n().remove_selection}">${i18n().remove_selection}</a>
                             </p>
 
-                            <input type="hidden" name="profileUri" templatePart="uriField" value="%uri%" role="input" />
+                            <input type="hidden" name="profileUri" templatePart="uriField" value="%uri%" />
                         </li>
                     </div>
                 </ul>
@@ -98,7 +98,7 @@
 
 <section id="search-proxy" role="region">
     <form action="${formUrls.list}" method="POST">
-        <input type="text" name="searchTerm" role="input" />
+        <input type="text" name="searchTerm" />
         <input class="submit" type="submit" name="searchByProxy" value="${i18n().search_button}" role="button" />
             <#if page.previous??>
                | <a href="${formUrls.list}?pageIndex=${page.previous}&searchTerm=${searchTerm}" title="${i18n().previous}">${i18n().previous}</a>
@@ -140,7 +140,7 @@
 
             <section name="proxyProfilesPanel" role="region">
                 <label for="addProfile">${i18n().add_profile}</label>
-                <input id="addProfile" type="text" name="proxySelectorAC" class="acSelector" size="35" value="${i18n().select_last_name}" role="input" /><span><img class="loading-addProfile hidden"  alt="${i18n().processing_indicator}" src="${urls.images}/indicatorWhite.gif" /></span>
+                <input id="addProfile" type="text" name="proxySelectorAC" class="acSelector" size="35" value="${i18n().select_last_name}" /><span><img class="loading-addProfile hidden"  alt="${i18n().processing_indicator}" src="${urls.images}/indicatorWhite.gif" /></span>
 
                 <p class="search-status"><span name='proxySelectorSearchStatus' moreCharsText='${i18n().type_more_chars}' noMatchText='${i18n().no_match}'>&nbsp;</span></p>
                 <p name="excludeUri" style="display: none">${r.proxyInfos[0].profileUri}<p>
@@ -172,7 +172,7 @@
                             </p>
                         </li>
 
-                        <input type="hidden" name="profileUri" templatePart="uriField" value="%uri%" role="input" />
+                        <input type="hidden" name="profileUri" templatePart="uriField" value="%uri%" />
                     </div>
                 </ul>
             </section>
diff --git a/webapp/src/main/webapp/templates/freemarker/body/menupage/page-pageList.ftl b/webapp/src/main/webapp/templates/freemarker/body/menupage/page-pageList.ftl
index eb7f752e3d..641aca4c96 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/menupage/page-pageList.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/menupage/page-pageList.ftl
@@ -27,7 +27,7 @@
   <form id="addIndividualClass" action="${urls.base}/editRequestDispatch" method="get">
       <input type="hidden" name="typeOfNew" value="http://vitro.mannlib.cornell.edu/ontologies/display/1.1#Page">
       <input type="hidden" name="switchToDisplayModel" value="1">
-      <input type="hidden" name="editForm" value="${generators.NewIndividualFormGenerator}" role="input">
+      <input type="hidden" name="editForm" value="${generators.NewIndividualFormGenerator}">
       <input type="submit" id="submit" value="${i18n().add_page}" role="button">
   </form>
 
diff --git a/webapp/src/main/webapp/templates/freemarker/body/pagemanagement/page-pageList.ftl b/webapp/src/main/webapp/templates/freemarker/body/pagemanagement/page-pageList.ftl
index fc8d93fa93..221d147e63 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/pagemanagement/page-pageList.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/pagemanagement/page-pageList.ftl
@@ -27,7 +27,7 @@
   <form id="addIndividualClass" action="${urls.base}/editRequestDispatch" method="get">
       <input type="hidden" name="typeOfNew" value="http://vitro.mannlib.cornell.edu/ontologies/display/1.1#Page">
       <input type="hidden" name="switchToDisplayModel" value="1">
-      <input type="hidden" name="editForm" value="${generators.NewIndividualFormGenerator}" role="input">
+      <input type="hidden" name="editForm" value="${generators.NewIndividualFormGenerator}">
       <input type="submit" id="submit" value="${i18n().Add_page}" role="button">
   </form>
 
diff --git a/webapp/src/main/webapp/templates/freemarker/body/pagemanagement/pageList.ftl b/webapp/src/main/webapp/templates/freemarker/body/pagemanagement/pageList.ftl
index dcb07c189e..e6999e26f0 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/pagemanagement/pageList.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/pagemanagement/pageList.ftl
@@ -66,7 +66,7 @@
   <form id="pageListForm" action="${urls.base}/editRequestDispatch" method="get">
       <input type="hidden" name="typeOfNew" value="http://vitro.mannlib.cornell.edu/ontologies/display/1.1#Page">
       <input type="hidden" name="switchToDisplayModel" value="1">
-      <input type="hidden" name="editForm" value="edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.ManagePageGenerator" role="input">
+      <input type="hidden" name="editForm" value="edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.ManagePageGenerator">
  	<input id="submit" value="${i18n().add_page}" role="button" type="submit" >
   </form>
   <br />
diff --git a/webapp/src/main/webapp/templates/freemarker/body/recomputeInferences.ftl b/webapp/src/main/webapp/templates/freemarker/body/recomputeInferences.ftl
index 9ea5de7299..8991cc3def 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/recomputeInferences.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/recomputeInferences.ftl
@@ -2,7 +2,7 @@
 
 <#if formAction?has_content>
     <form method="post" action="${formAction}">
-        <input class="submit" type="submit" value="${i18n().recompute_inferences}" name="submit" role="input" />
+        <input class="submit" type="submit" value="${i18n().recompute_inferences}" name="submit" />
     </form>
 </#if>
 
diff --git a/webapp/src/main/webapp/templates/freemarker/body/siteAdmin/siteAdmin-dataInput.ftl b/webapp/src/main/webapp/templates/freemarker/body/siteAdmin/siteAdmin-dataInput.ftl
index 771ee19633..a419fe498c 100644
--- a/webapp/src/main/webapp/templates/freemarker/body/siteAdmin/siteAdmin-dataInput.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/body/siteAdmin/siteAdmin-dataInput.ftl
@@ -13,7 +13,7 @@
             <select id="VClassURI" name="typeOfNew" class="form-item long-options" role="select">
                 <@form.optionGroups groups=dataInput.groupedClassOptions />
             </select>
-            <input type="hidden" name="editForm" value="${generators.NewIndividualFormGenerator}" role="input" />
+            <input type="hidden" name="editForm" value="${generators.NewIndividualFormGenerator}" />
             <input type="submit" id="submit" value="${i18n().add_individual_of_class}" role="button" />
         </form>
 
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/autoCompleteObjectPropForm.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/autoCompleteObjectPropForm.ftl
index 3a7ef1d477..095491fb8a 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/autoCompleteObjectPropForm.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/autoCompleteObjectPropForm.ftl
@@ -51,7 +51,7 @@
 <#if editConfiguration.propertySelectFromExisting = true>
     <#if rangeOptionsExist  = true >
         <form class="customForm" action = "${submitUrl}">
-            <input type="hidden" name="editKey" id="editKey" value="${editKey}" role="input" />
+            <input type="hidden" name="editKey" id="editKey" value="${editKey}" />
             <#if editConfiguration.propertyPublicDescription?has_content>
                 <p>${editConfiguration.propertyPublicDescription}</p>
              </#if>
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/confirmDeleteIndividualForm.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/confirmDeleteIndividualForm.ftl
index c22660d8e4..7ad417b15e 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/confirmDeleteIndividualForm.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/confirmDeleteIndividualForm.ftl
@@ -14,8 +14,8 @@
 <form action="${editConfiguration.deleteIndividualProcessingUrl}" method="get">
     <h2>${i18n().confirm_individual_deletion} </h2>
 
-    <input type="hidden" name="individualUri"    value="${editConfiguration.objectUri}" role="input" />
-    <input type="hidden" name="redirectUrl"    value="${redirectUrl}" role="input" />
+    <input type="hidden" name="individualUri" value="${editConfiguration.objectUri}" />
+    <input type="hidden" name="redirectUrl" value="${redirectUrl}" />
     <p>
       <#if individualType??>
        ${individualType}
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/confirmDeletePropertyForm.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/confirmDeletePropertyForm.ftl
index 3fdf2a972c..0fa576b8b8 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/confirmDeletePropertyForm.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/confirmDeletePropertyForm.ftl
@@ -28,16 +28,16 @@
         </#if>
     </p>
 
-    <input type="hidden" name="subjectUri"   value="${editConfiguration.subjectUri}" role="input" />
-    <input type="hidden" name="predicateUri" value="${editConfiguration.predicateUri}" role="input" />
-    <input type="hidden" name="domainUri" value="${editConfiguration.domainUri!}" role="input" />
-    <input type="hidden" name="rangeUri" value="${editConfiguration.rangeUri!}" role="input" />
+    <input type="hidden" name="subjectUri" value="${editConfiguration.subjectUri}" />
+    <input type="hidden" name="predicateUri" value="${editConfiguration.predicateUri}" />
+    <input type="hidden" name="domainUri" value="${editConfiguration.domainUri!}" />
+    <input type="hidden" name="rangeUri" value="${editConfiguration.rangeUri!}" />
     <input type="hidden" name="deleteObjectUri" value="${editConfiguration.customDeleteObjectUri!}" />
     <#if editConfiguration.dataProperty = true>
-        <input type="hidden" name="datapropKey" value="${editConfiguration.datapropKey}" role="input" />
-        <input type="hidden" name="vitroNsProp" value="${editConfiguration.vitroNsProperty}" role="input" />
+        <input type="hidden" name="datapropKey" value="${editConfiguration.datapropKey}" />
+        <input type="hidden" name="vitroNsProp" value="${editConfiguration.vitroNsProperty}" />
     <#else>
-        <input type="hidden" name="objectUri"    value="${editConfiguration.objectUri}" role="input" />
+        <input type="hidden" name="objectUri" value="${editConfiguration.objectUri}" />
     </#if>
 
    <br />
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/dateTimeEntryForm.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/dateTimeEntryForm.ftl
index b80f63688f..9125890b02 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/dateTimeEntryForm.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/dateTimeEntryForm.ftl
@@ -1,7 +1,7 @@
 <#-- $This file is distributed under the terms of the license in LICENSE$ -->
 
 <fieldset class="dateTime">
-  <input type="hidden" id="literal" name="literal" value="${literalValues}" role="input"/>
+  <input type="hidden" id="literal" name="literal" value="${literalValues}"/>
   <#if datatype?contains("#date") || datatype?contains("Year") >
     <label for="dateTimeField-year">${i18n()[('label.dateTimeWithPrecision.year_capitalized')]}</label>
     <input class="text-field" name="dateTimeField-year" id="dateTimeField-year" type="text" value="" size="4" maxlength="4" />
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/defaultAddMissingIndividualForm.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/defaultAddMissingIndividualForm.ftl
index 9d7f9f3311..bfb8909251 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/defaultAddMissingIndividualForm.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/defaultAddMissingIndividualForm.ftl
@@ -14,8 +14,8 @@ ${i18n().new_entry_for(editConfiguration.propertyPublicDomainTitle, editConfigur
 <h2>${formTitle}</h2>
 
 <form class="editForm" action="${submitUrl}">
-    <input type="hidden" name="editKey" id="editKey" value="${editKey}" role="input" />
-    <input type="text" name="name" id="name" label="name (required)" size="30" role="input" />
+    <input type="hidden" name="editKey" id="editKey" value="${editKey}" />
+    <input type="text" name="name" id="name" label="name (required)" size="30" />
 
     <p class="submit">
         <input type="submit" id="submit" value="${submitLabel}" role="submit" />
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/defaultDataPropertyForm.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/defaultDataPropertyForm.ftl
index 678696d943..3e490f994e 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/defaultDataPropertyForm.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/defaultDataPropertyForm.ftl
@@ -26,7 +26,7 @@
 <#assign datatype = editConfiguration.dataPredicateProperty.rangeDatatypeURI!"none" />
 
 <form class="editForm" action = "${submitUrl}" method="post">
-    <input type="hidden" name="editKey" id="editKey" value="${editKey}" role="input" />
+    <input type="hidden" name="editKey" id="editKey" value="${editKey}" />
     <#if editConfiguration.dataPredicatePublicDescription?has_content>
        <label for="${editConfiguration.dataLiteral}"><p class="propEntryHelpText">${editConfiguration.dataPredicatePublicDescription}</p></label>
     </#if>
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/defaultOfferCreateNewOptionForm.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/defaultOfferCreateNewOptionForm.ftl
index a86c8e5ba1..3a3def4c8c 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/defaultOfferCreateNewOptionForm.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/defaultOfferCreateNewOptionForm.ftl
@@ -13,13 +13,13 @@
  </#if>
 
 <#assign typesList = editConfiguration.offerTypesCreateNew />
-<form class="editForm" action="${editConfiguration.mainEditUrl}" role="input" />
-    <input type="hidden" value="${editConfiguration.subjectUri}" name="subjectUri" role="input" />
-    <input type="hidden" value="${editConfiguration.predicateUri}" name="predicateUri" role="input" />
-    <input type="hidden" value="${objectUri}" name="objectUri" role="input" />
+<form class="editForm" action="${editConfiguration.mainEditUrl}" />
+    <input type="hidden" value="${editConfiguration.subjectUri}" name="subjectUri" />
+    <input type="hidden" value="${editConfiguration.predicateUri}" name="predicateUri" />
+    <input type="hidden" value="${objectUri}" name="objectUri" />
    <input type="hidden" name="domainUri" value="${editConfiguration.domainUri!}"/>
     <input type="hidden" name="rangeUri" value="${editConfiguration.rangeUri!}"/>
-    <input type="hidden" value="create" name="cmd" role="input" />
+    <input type="hidden" value="create" name="cmd" />
 
     <select id="typeOfNew" name="typeOfNew" role="selection">
     <#assign typeKeys = typesList?keys />
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/defaultPropertyForm.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/defaultPropertyForm.ftl
index 4bcebae84b..cad10b2eb8 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/defaultPropertyForm.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/defaultPropertyForm.ftl
@@ -17,7 +17,7 @@
     <#if rangeOptionsExist  = true >
         <#assign rangeOptionKeys = rangeOptions?keys />
         <form class="editForm" action = "${submitUrl}">
-            <input type="hidden" name="editKey" id="editKey" value="${editKey}" role="input" />
+            <input type="hidden" name="editKey" id="editKey" value="${editKey}" />
             <#if editConfiguration.propertyPublicDescription?has_content>
                 <p>${editConfiguration.propertyPublicDescription}</p>
              </#if>
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/menuManagement-remove.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/menuManagement-remove.ftl
index c58f615d41..c87cb58659 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/menuManagement-remove.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/menuManagement-remove.ftl
@@ -6,13 +6,13 @@
 
 <section id="remove-menu-item" role="region">
     <form method="POST" action="${formUrls}" class="customForm" role="remove menu item">
-        <input type="hidden" name="menuItem" id="menuItem" value="${menuItem}" role="input" />
-        <input type="hidden" name="cmd" id="cmd" value="Remove" role="input" />
-        <input type="hidden" name="switchToDisplayModel" id="switchToDisplayModel" value="true" role="input" />
+        <input type="hidden" name="menuItem" id="menuItem" value="${menuItem}" />
+        <input type="hidden" name="cmd" id="cmd" value="Remove" />
+        <input type="hidden" name="switchToDisplayModel" id="switchToDisplayModel" value="true" />
 
         <p>${i18n().confirm_menu_item_delete} <em>${menuName}</em> ${i18n().menu_item}?</p>
 
-        <input type="submit" name="removeMenuItem" value="${i18n().remove_menu_item}" class="submit" role="input" /> ${i18n().or} <a class="cancel" href="${cancelUrl}" title="${i18n().cancel_title}">${i18n().cancel_link}</a>
+        <input type="submit" name="removeMenuItem" value="${i18n().remove_menu_item}" class="submit" /> ${i18n().or} <a class="cancel" href="${cancelUrl}" title="${i18n().cancel_title}">${i18n().cancel_link}</a>
     </form>
 </section>
 
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/menuManagement.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/menuManagement.ftl
index 98d6f403d4..188a6bc6be 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/menuManagement.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/menuManagement.ftl
@@ -19,15 +19,15 @@
 
 <section id="${menuAction?lower_case}-menu-item" role="region">
     <form method="POST" action="${formUrls}" class="customForm" role="${menuAction} menu item">
-        <input type="hidden" name="cmd" id="cmd" value="${menuAction}" role="input" />
-        <input type="hidden" name="menuItem" id="menuItem" value="${menuItem}" role="input" />
-        <input type="hidden" name="switchToDisplayModel" id="switchToDisplayModel" value="true" role="input" />
+        <input type="hidden" name="cmd" id="cmd" value="${menuAction}" />
+        <input type="hidden" name="menuItem" id="menuItem" value="${menuItem}" />
+        <input type="hidden" name="switchToDisplayModel" id="switchToDisplayModel" value="true" />
 
         <label for="menu-name">${i18n().name}<span class="requiredHint"> *</span></label>
-        <input type="text" name="menuName" value="${menuName}" role="input" />
+        <input type="text" name="menuName" value="${menuName}" />
 
         <label for="pretty-url">${i18n().pretty_url}<span class="requiredHint"> *</span></label>
-        <input type="text" name="prettyUrl" value="${prettyUrl}" role="input" />
+        <input type="text" name="prettyUrl" value="${prettyUrl}" />
         <p class="note">${i18n().start_with_leading_slash}</p>
 
         <p>${i18n().template_capitalized}<span class="requiredHint"> *</span></p>
@@ -35,11 +35,11 @@
         <input type="radio" class="default-template" name="selectedTemplate" value="default" <#if selectedTemplateType = "default">checked</#if> role="radio" />
         <label class="inline" for="default"> ${i18n().default}</label>
         <br />
-        <input type="radio" name="selectedTemplate" class="custom-template" value="custom" <#if selectedTemplateType = "custom">checked</#if> role="input" />
+        <input type="radio" name="selectedTemplate" class="custom-template" value="custom" <#if selectedTemplateType = "custom">checked</#if> />
         <label class="inline" for="custom"> ${i18n().custom_template_mixed_caps}</label>
 
         <section id="custom-template" <#if selectedTemplateType != 'custom'>class="hidden" </#if>role="region">
-            <input type="text" name="customTemplate" value="${customTemplate!}" size="40" role="input" /><span class="requiredHint"> *</span>
+            <input type="text" name="customTemplate" value="${customTemplate!}" size="40" /><span class="requiredHint"> *</span>
         </section>
 
         <section id="existingContentType" name="existingContentType" ${existingClassGroupStyle} role="region">
@@ -92,7 +92,7 @@
             </ul>
         </section>
 
-        <input type="submit" name="submit-${menuAction}" value="${i18n().save_changes}" class="submit" role="input" /> ${i18n().or} <a class="cancel" href="${cancelUrl}" title="${i18n().cancel_title}">${i18n().cancel_link}</a>
+        <input type="submit" name="submit-${menuAction}" value="${i18n().save_changes}" class="submit" /> ${i18n().or} <a class="cancel" href="${cancelUrl}" title="${i18n().cancel_title}">${i18n().cancel_link}</a>
 
         <p class="requiredHint">* ${i18n().required_fields}</p>
     </form>
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/pageManagement--fixedHtml.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/pageManagement--fixedHtml.ftl
index 727c76a354..1a7c2d9396 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/pageManagement--fixedHtml.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/pageManagement--fixedHtml.ftl
@@ -3,7 +3,7 @@
 
 <section id="fixedHtml" class="contentSectionContainer">
     <label id="fixedHTMLVariableLabel" for="fixedHTMLVariable">${i18n().variable_name_all_caps}<span class="requiredHint"> *</span></label>
-    <input type="text" name="saveToVar" size="20" value="" id="fixedHTMLSaveToVar" role="input" />
+    <input type="text" name="saveToVar" size="20" value="" id="fixedHTMLSaveToVar" />
     <label id="fixedHTMLValueLabel" for="fixedHTMLValue">${i18n().enter_fixed_html_here}<span id="fixedHTMLValueSpan"></span><span class="requiredHint"> *</span></label>
     <textarea id="fixedHTMLValue" name="htmlValue" cols="70" rows="15" style="margin-bottom:7px"></textarea><br />
     <input  type="button" id="doneWithContent" name="doneWithContent" value="${i18n().save_this_content}" class="doneWithContent" />
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/pageManagement--searchIndividuals.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/pageManagement--searchIndividuals.ftl
index 1a9a55dceb..c9c01d82b3 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/pageManagement--searchIndividuals.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/pageManagement--searchIndividuals.ftl
@@ -5,7 +5,7 @@
 <#assign classes = pageData.classes />
 <section id="searchIndividuals" class="contentSectionContainer">
     <label id="variableLabel" for="variable">${i18n().variable_name_all_caps}<span class="requiredHint"> *</span></label>
-    <input type="text" name="saveToVar" size="20" value="" id="saveToVar" role="input" />
+    <input type="text" name="saveToVar" size="20" value="" id="saveToVar" />
     <label id="vclassUriLabel" for="vclassUri">${i18n().select_vclass_uri}<span class="requiredHint"> *</span></label>
     <br/>
     <select name="vclassUri" id="vclassUri">
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/pageManagement--sparqlQuery.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/pageManagement--sparqlQuery.ftl
index e047967643..f8cd794d08 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/pageManagement--sparqlQuery.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/pageManagement--sparqlQuery.ftl
@@ -2,10 +2,10 @@
 <#--This contains the template for the Sparql Query content type that is to be cloned and used in page management-->
 <section id="sparqlQuery" class="contentSectionContainer">
     <label id="variableLabel" for="variable">${i18n().variable_name_all_caps}<span class="requiredHint"> *</span></label>
-    <input type="text" name="saveToVar" size="20" value="" id="saveToVar" role="input" />
+    <input type="text" name="saveToVar" size="20" value="" id="saveToVar" />
     <#--Hiding query model for now-->
     <#-- <label id="queryModelLabel" for="queryModel">${i18n().query_model}</label>  -->
-    <input type="text" name="queryModel" size="20" value="" id="queryModel" role="input" style="display:none"/>
+    <input type="text" name="queryModel" size="20" value="" id="queryModel" style="display:none"/>
     <label id="queryLabel" for="queryLabel"><span id="querySpan">${i18n().enter_sparql_query_here}</span><span class="requiredHint"> *</span></label>
     <textarea id="query" name="query" cols="70" rows="15" style="margin-bottom:7px"></textarea><br />
     <input  type="button" id="doneWithContent" class="doneWithContent" name="doneWithContent" value="${i18n().save_this_content}" />
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/pageManagement.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/pageManagement.ftl
index 288e90a77f..52d5cc191d 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/pageManagement.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/pageManagement.ftl
@@ -68,7 +68,7 @@
 <section id="pageDetailsContainer">
     <#--form method="POST" action="${formUrls}" role="${menuAction} menu item"-->
 	<form id="managePage" method="POST" action="${submitUrl}" role="add page">
-	        <input type="hidden" name="switchToDisplayModel" id="switchToDisplayModel" value="1" role="input" />
+	        <input type="hidden" name="switchToDisplayModel" id="switchToDisplayModel" value="1" />
 	        <input type="hidden" id="editKey" name="editKey" value="${editKey}" />
     <h2>${pageHeading}</h2>
     <!--Drop down for the types of content possible-->
@@ -99,21 +99,21 @@
     <div id="leftSide">
         <section id="pageDetails" role="region" >
             <label for="page-name">${i18n().title_capitalized}<span class="requiredHint"> *</span></label>
-            <input id="pageName" type="text" name="pageName" value="${pageName!''}" role="input" />
+            <input id="pageName" type="text" name="pageName" value="${pageName!''}" />
             <label for="pretty-url">${i18n().pretty_url}<span class="requiredHint"> *</span></label>
-            <input type="text" name="prettyUrl" value="${prettyUrl!''}" role="input" />
+            <input type="text" name="prettyUrl" value="${prettyUrl!''}" />
             <p class="note">${i18n().begin_with_slash_no_example} <br />${i18n().slash_example}</p>
             <p id="templatePTag">${i18n().template_capitalized}<span class="requiredHint"> *</span></p>
             <input type="radio" class="default-template" name="selectedTemplate" value="default" <#if selectedTemplateType = "default">checked="checked"</#if> role="radio" />
             <label class="inline" for="default"> ${i18n().default}</label>
             <br />
-            <input type="radio" name="selectedTemplate" class="custom-template" value="custom" <#if selectedTemplateType = "custom">checked="checked"</#if> role="input" />
+            <input type="radio" name="selectedTemplate" class="custom-template" value="custom" <#if selectedTemplateType = "custom">checked="checked"</#if> />
             <label class="inline" for="custom"> ${i18n().custom_template_requiring_content}</label>
             <br /><div id="selfContainedDiv">
-            <input type="radio" name="selectedTemplate" class="selfContained-template" value="selfContained" <#if selectedTemplateType = "selfContained">checked="checked"</#if> role="input" />
+            <input type="radio" name="selectedTemplate" class="selfContained-template" value="selfContained" <#if selectedTemplateType = "selfContained">checked="checked"</#if> />
             <label class="inline" for="selfContained"> ${i18n().custom_template_containing_content}</label></div>
             <section id="custom-template" <#if selectedTemplateType ="default">class="hidden" </#if>role="region">
-                <input type="text" name="customTemplate" value="${customTemplate!''}" size="33" role="input" /><span class="requiredHint"> *</span>
+                <input type="text" name="customTemplate" value="${customTemplate!''}" size="33" /><span class="requiredHint"> *</span>
                 <input type="hidden" name="selfContainedTemplate" value="${selfContainedTemplate!''}"/>
             </section>
             <p id="menuCheckboxPTag"><input id="menuCheckbox" type="checkbox" name="menuCheckbox"
@@ -130,7 +130,7 @@
                 <label for="default">${i18n().menu_item_name}</label>
 
                 <input type="hidden" id="menuItem" name="menuItem" value="${menuItem!''}" />
-                <input type="text" id="menuLinkText" name="menuLinkText" value="${menuLinkText!''}" size="28" role="input" />
+                <input type="text" id="menuLinkText" name="menuLinkText" value="${menuLinkText!''}" size="28" />
                 <input type="hidden" id="menuPosition" name="menuPosition" value="${menuPosition!''}" />
 
 
@@ -153,7 +153,7 @@
         </section>
     </div>
     <section >
-        <span id="saveButton" ><input  id="pageSave" type="submit" name="submit-Add" value="${saveBtnText}" class="submit" role="input" /> or </span>
+        <span id="saveButton" ><input  id="pageSave" type="submit" name="submit-Add" value="${saveBtnText}" class="submit" /> or </span>
         <a class="cancel" href="${cancelUrl!}"  id="cancelPage" title="${i18n().cancel_title}">${i18n().cancel_link}</a>
         <br />
         <p class="requiredHint">* ${i18n().required_fields}</p>
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/rdfTypeForm.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/rdfTypeForm.ftl
index aa49ee2378..dd01116e49 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/rdfTypeForm.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/rdfTypeForm.ftl
@@ -13,7 +13,7 @@
     <#if rangeOptionsExist  = true >
         <#assign rangeOptionKeys = rangeOptions?keys />
         <form class="editForm" action = "${submitUrl}">
-            <input type="hidden" name="editKey" id="editKey" value="${editKey}" role="input" />
+            <input type="hidden" name="editKey" id="editKey" value="${editKey}" />
             <select id="object" name="object" role="select">
                 <#list rangeOptionKeys as key>
                  <option value="${key}" <#if editConfiguration.objectUri?has_content && editConfiguration.objectUri = key>selected</#if> role="option">${rangeOptions[key]}</option>
diff --git a/webapp/src/main/webapp/templates/freemarker/edit/forms/rdfsLabelForm.ftl b/webapp/src/main/webapp/templates/freemarker/edit/forms/rdfsLabelForm.ftl
index 92f15d56fd..229e33be89 100644
--- a/webapp/src/main/webapp/templates/freemarker/edit/forms/rdfsLabelForm.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/edit/forms/rdfsLabelForm.ftl
@@ -11,12 +11,12 @@
 <#assign literalValues = "${editConfiguration.dataLiteralValuesAsString}" />
 
 <form class="editForm" action = "${submitUrl}" method="post">
-    <input type="text" name="${editConfiguration.varNameForObject}" id="label" size="70" value="${literalValues?html}" role="input"/>
-    <input type="hidden" name="editKey" id="editKey" value="${editKey}" role="input"/>
-    <input type="hidden" name="vitroNsProp" value="true" role="input"/>
+    <input type="text" name="${editConfiguration.varNameForObject}" id="label" size="70" value="${literalValues?html}"/>
+    <input type="hidden" name="editKey" id="editKey" value="${editKey}"/>
+    <input type="hidden" name="vitroNsProp" value="true"/>
 
     <p class="submit">
-        <input type="submit" id="submit" value="${submitLabel}" role="input"/>
+        <input type="submit" id="submit" value="${submitLabel}"/>
         or <a href="${cancelUrl}" class="cancel" title="${i18n().cancel_title}">${i18n().cancel_link}</a>
     </p>
 

From 6833a468646e7c8e67ed19c8009f63cea26f3272 Mon Sep 17 00:00:00 2001
From: Milos Popovic <misa01523@gmail.com>
Date: Tue, 7 Apr 2026 11:24:29 +0200
Subject: [PATCH 12/13] Language Menu aria attrs

---
 webapp/src/main/webapp/js/languageMenuUtils.js      | 10 ++++++++--
 webapp/src/main/webapp/js/userMenu/userMenuUtils.js | 10 ++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/webapp/src/main/webapp/js/languageMenuUtils.js b/webapp/src/main/webapp/js/languageMenuUtils.js
index c4d9448211..9a4073fabc 100644
--- a/webapp/src/main/webapp/js/languageMenuUtils.js
+++ b/webapp/src/main/webapp/js/languageMenuUtils.js
@@ -8,13 +8,19 @@ $(function() {
     $("ul.language-dropdown li#language-menu").on("mouseenter", function(){
 		$("a#lang-link").html(theText);
         $(this).addClass("hover");
-        $('ul:first',this).css('visibility', 'visible');
+        $('ul:first',this)
+			.css('visibility', 'visible')
+			.attr('aria-hidden', 'false');
+		$(this).attr('aria-expanded', 'true');
         $("ul.language-dropdown ul.sub_menu li").css('width', ($("ul.language-dropdown").width() - 4) + 'px');
 
     }).on("mouseleave", function(){
     	$("a#lang-link").html(imgHTML);
         $(this).removeClass("hover");
-        $('ul:first',this).css('visibility', 'hidden');
+        $('ul:first',this)
+			.css('visibility', 'hidden')
+			.attr('aria-hidden', 'true');
+		$(this).attr('aria-expanded', 'false');
     });
 
     $("ul.language-dropdown li ul li:has(ul)").find("a:first").append(" &raquo; ");
diff --git a/webapp/src/main/webapp/js/userMenu/userMenuUtils.js b/webapp/src/main/webapp/js/userMenu/userMenuUtils.js
index 00f5502f67..b512571f54 100644
--- a/webapp/src/main/webapp/js/userMenu/userMenuUtils.js
+++ b/webapp/src/main/webapp/js/userMenu/userMenuUtils.js
@@ -4,7 +4,10 @@ $(function(){
 
     $("ul.dropdown li").on("mouseenter", function(){
         $(this).addClass("hover");
-        $('ul:first',this).css('visibility', 'visible');
+        $('ul:first',this)
+			.css('visibility', 'visible')
+			.attr('aria-hidden', 'false');
+		$(this).attr('aria-expanded', 'true');
         if ( $('ul.dropdown').width() > 88 ) {
             $('ul:first li',this).css('width', ($("ul.dropdown").width() - 22) + 'px');
         }
@@ -13,7 +16,10 @@ $(function(){
     }).on("mouseleave", function(){
 
         $(this).removeClass("hover");
-        $('ul:first',this).css('visibility', 'hidden');
+        $('ul:first',this)
+			.css('visibility', 'hidden')
+			.attr('aria-hidden', 'true');
+		$(this).attr('aria-expanded', 'false');
 
     });
 

From 179c54adbf3a8525da16536ea9b37897378da0f2 Mon Sep 17 00:00:00 2001
From: Milos Popovic <misa01523@gmail.com>
Date: Tue, 7 Apr 2026 16:03:52 +0200
Subject: [PATCH 13/13] Added capitalization function

---
 .../main/webapp/templates/freemarker/lib/lib-properties.ftl   | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/webapp/src/main/webapp/templates/freemarker/lib/lib-properties.ftl b/webapp/src/main/webapp/templates/freemarker/lib/lib-properties.ftl
index 48244ca528..18d4c09ba8 100644
--- a/webapp/src/main/webapp/templates/freemarker/lib/lib-properties.ftl
+++ b/webapp/src/main/webapp/templates/freemarker/lib/lib-properties.ftl
@@ -348,3 +348,7 @@ name will be used as the label. -->
     <#local groupName = groupName?replace("&", "-and-")>
     <#return groupName>
 </#function>
+
+<#function capitalizeGroupName propertyGroupName>
+    <#return propertyGroupName?cap_first>
+</#function>