From d66c61c2d117cab161e6a11a73dfea58c35f32f0 Mon Sep 17 00:00:00 2001
From: Jim Myers <myersjd@umich.edu>
Date: Mon, 6 Dec 2021 14:43:57 -0500
Subject: [PATCH 01/39] contact Form: specify label for sum input field

---
 src/main/webapp/contactFormFragment.xhtml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/webapp/contactFormFragment.xhtml b/src/main/webapp/contactFormFragment.xhtml
index 284d84eb885..264fde98545 100644
--- a/src/main/webapp/contactFormFragment.xhtml
+++ b/src/main/webapp/contactFormFragment.xhtml
@@ -60,7 +60,9 @@
                         <p>
                             <h:outputText styleClass="highlightBold" value="#{bundle['contact.question']}"/> <span class="glyphicon glyphicon-asterisk text-danger" title="#{bundle.requiredField}"/>
                         </p>
-                        <h:outputFormat value="#{sendFeedbackDialog.op1} + #{sendFeedbackDialog.op2} = "/>
+                        <label for="emailForm:messageSum">
+                            <h:outputFormat value="#{sendFeedbackDialog.op1} + #{sendFeedbackDialog.op2} = "/>
+                        </label>
                         <p:inputText id="messageSum" label="Sum" size="4" value="#{sendFeedbackDialog.userSum}" converterMessage="#{bundle['contact.sum.converterMessage']}"
                                      required="#{param['DO_VALIDATION']}" requiredMessage="#{bundle['contact.sum.required']}"
                                      validatorMessage="#{bundle['contact.sum.invalid']}" validator="#{sendFeedbackDialog.validateUserSum}"

From 92061c2d94553b2328570e943af1f9480c34593a Mon Sep 17 00:00:00 2001
From: Jim Myers <myersjd@umich.edu>
Date: Fri, 29 Oct 2021 13:33:41 -0400
Subject: [PATCH 02/39] remove role="menu"

per https://web.archive.org/web/20190116170516/https://www.marcozehe.de/2018/09/22/wai-aria-menus-and-why-you-should-generally-avoid-using-them/
- it doesn't seem like we're using this role as intended in most cases,
so I'm doing a blanket removal to see if there are adverse UI impacts or
new accessibility issues being reported. With this role, menus like the
Edit menu in the files table report an issue (from AXE) with the menu
not containing child elements with the right role (i.e. menuitem), and a
seemingly spurious 'li elements must be contained in a ul or ol' error.

Conflicts:
	src/main/webapp/file.xhtml
---
 src/main/webapp/dashboard-users.xhtml   | 2 +-
 src/main/webapp/dataset-citation.xhtml  | 2 +-
 src/main/webapp/dataverse.xhtml         | 4 ++--
 src/main/webapp/dataverse_header.xhtml  | 2 +-
 src/main/webapp/dataverseuser.xhtml     | 2 +-
 src/main/webapp/editFilesFragment.xhtml | 4 ++--
 src/main/webapp/file.xhtml              | 2 +-
 src/main/webapp/filesFragment.xhtml     | 4 ++--
 8 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/main/webapp/dashboard-users.xhtml b/src/main/webapp/dashboard-users.xhtml
index fde6ab7e1eb..11e26335234 100644
--- a/src/main/webapp/dashboard-users.xhtml
+++ b/src/main/webapp/dashboard-users.xhtml
@@ -48,7 +48,7 @@
                                 <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
                                     <span class="glyphicon glyphicon-sort"></span> #{bundle['dataverse.results.btn.sort']} <span class="caret"></span>
                                 </button>
-                                <ul class="dropdown-menu pull-right text-left" role="menu">
+                                <ul class="dropdown-menu pull-right text-left">
                                     <ui:repeat value="#{DashboardUsersPage.getSortingMap().entrySet()}" var="sortFieldEntry">
                                         <li>
                                             <p:commandLink action="#{DashboardUsersPage.runUserSearchWithSort(sortFieldEntry.key)}" process="@this @widgetVar(inputSearchTerm)" update="@form" partialSubmit="true">
diff --git a/src/main/webapp/dataset-citation.xhtml b/src/main/webapp/dataset-citation.xhtml
index 16396110217..9baced25be0 100644
--- a/src/main/webapp/dataset-citation.xhtml
+++ b/src/main/webapp/dataset-citation.xhtml
@@ -31,7 +31,7 @@
                     <button type="button" class="btn btn-link dropdown-toggle padding-none downloadCitation" data-toggle="dropdown">
                         #{bundle['dataset.cite.downloadBtn']} <span class="caret"></span>
                     </button>
-                    <ul class="dropdown-menu" role="menu">
+                    <ul class="dropdown-menu">
                         <li>
                             <a jsf:id="endNoteLink" jsf:action="#{DatasetPage.fileDownloadService.downloadDatasetCitationXML(DatasetPage.dataset)}" >
                                 #{bundle['dataset.cite.downloadBtn.xml']}
diff --git a/src/main/webapp/dataverse.xhtml b/src/main/webapp/dataverse.xhtml
index bca2697f90f..8697a2fa6ad 100644
--- a/src/main/webapp/dataverse.xhtml
+++ b/src/main/webapp/dataverse.xhtml
@@ -492,7 +492,7 @@
                                                 <button type="button" class="btn btn-default btn-access dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
                                                     <span class="glyphicon glyphicon-link"/> #{bundle['link']} <span class="caret"></span>
                                                 </button>
-                                                <ul class="dropdown-menu pull-right text-left" role="menu">
+                                                <ul class="dropdown-menu pull-right text-left">
                                                     <li class="#{DataversePage.dataverse.owner != null ? '' : 'disabled'}">
                                                         <p:commandLink action="#{DataversePage.setupLinkingPopup('link')}"
                                                                        oncomplete="PF('linkDataverseForm').show()"
@@ -517,7 +517,7 @@
                                                 <button type="button" class="btn btn-default btn-access dropdown-toggle" data-toggle="dropdown">
                                                     <span class="glyphicon glyphicon-pencil"/> #{bundle['dataverse.edit']} <span class="caret"></span>
                                                 </button>
-                                                <ul class="dropdown-menu pull-right text-left" role="menu">
+                                                <ul class="dropdown-menu pull-right text-left">
                                                     <li>
                                                         <div id="dataverse-info-dropdown">
                                                             <div class="dataverse-info-logo-icon">
diff --git a/src/main/webapp/dataverse_header.xhtml b/src/main/webapp/dataverse_header.xhtml
index 980a0c4af45..3b18bcbc3b1 100644
--- a/src/main/webapp/dataverse_header.xhtml
+++ b/src/main/webapp/dataverse_header.xhtml
@@ -299,7 +299,7 @@
                     </a>
                 </ui:fragment>
             </div>
-            <div class="dropdown-menu" role="menu" aria-labelledby="breadcrumbLnk#{status.index}" rendered="#{dataverseHeaderFragment.hasVisibleChildren(dv)}">
+            <div class="dropdown-menu" aria-labelledby="breadcrumbLnk#{status.index}" rendered="#{dataverseHeaderFragment.hasVisibleChildren(dv)}">
                 <p:tree value="#{dataverseHeaderFragment.getDataverseTree(dv)}" var="node"  cache="true" id="tree">
                     <p:treeNode>
                         <h:outputText value="#{node.name}" styleClass="breadcrumbActive" rendered="#{dataverse.id == node.id and dataset == null}"/>
diff --git a/src/main/webapp/dataverseuser.xhtml b/src/main/webapp/dataverseuser.xhtml
index a5a38579c44..b043c4ccb6f 100644
--- a/src/main/webapp/dataverseuser.xhtml
+++ b/src/main/webapp/dataverseuser.xhtml
@@ -385,7 +385,7 @@
                                         </ui:fragment>
                                         <span class="caret"></span>
                                     </button>
-                                    <ul class="dropdown-menu pull-right text-left" role="menu">
+                                    <ul class="dropdown-menu pull-right text-left">
                                         <ui:fragment rendered="#{DataverseUserPage.passwordEditable or DataverseUserPage.accountDetailsEditable}">
                                             <li>
                                                 <p:commandLink id="editAccount" rendered="#{DataverseUserPage.accountDetailsEditable}"
diff --git a/src/main/webapp/editFilesFragment.xhtml b/src/main/webapp/editFilesFragment.xhtml
index e5e12201fc8..44fd5180f9a 100644
--- a/src/main/webapp/editFilesFragment.xhtml
+++ b/src/main/webapp/editFilesFragment.xhtml
@@ -413,7 +413,7 @@
                                         <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
                                             <span class="glyphicon glyphicon-pencil"/> #{bundle['file.editFilesSelected']} <span class="caret"></span>
                                         </button>
-                                        <ul class="dropdown-menu multi-level pull-right text-left" role="menu">
+                                        <ul class="dropdown-menu multi-level pull-right text-left">
                                             <li class="#{DatasetPage.lockedFromEdits ? 'disabled' : ''}">
                                                 <p:commandLink  onclick="if (!testFilesSelected2()) return false;" 
                                                                 oncomplete="PF('editDeleteFileConfirmation').show();">                                                  
@@ -461,7 +461,7 @@
                                             disabled="#{DatasetPage.lockedFromEdits ? 'disabled' : ''}">
                                         <span class="glyphicon glyphicon-option-vertical"/><span class="sr-only">#{bundle['file.optionsBtn']}</span><span class="caret"></span>
                                     </button>
-                                    <ul class="dropdown-menu multi-level pull-right text-left" role="menu">
+                                    <ul class="dropdown-menu multi-level pull-right text-left">
                                         <!-- Edit Options -->
                                         <li class="dropdown-header">#{bundle['file.optionsBtn.header.edit']} <span class="glyphicon glyphicon-pencil"/></li>
                                         <ui:fragment rendered="#{systemConfig.provCollectionEnabled}">
diff --git a/src/main/webapp/file.xhtml b/src/main/webapp/file.xhtml
index 001ff38dc8b..68c02e5a30e 100644
--- a/src/main/webapp/file.xhtml
+++ b/src/main/webapp/file.xhtml
@@ -358,7 +358,7 @@
                                         <button type="button" id="selectTool" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
                                             <span class="glyphicon glyphicon-eye-open"/> #{bundle['file.previewTab.button.label']} <span class="caret"></span>
                                         </button>
-                                        <ul class="dropdown-menu" role="menu">
+                                        <ul class="dropdown-menu">
                                             <ui:repeat value="#{FilePage.toolsWithPreviews}" var="tool">
                                                 <li>
                                                     <h:commandLink action="#{FilePage.setSelectedTool(tool)}">
diff --git a/src/main/webapp/filesFragment.xhtml b/src/main/webapp/filesFragment.xhtml
index 9615a565066..10355745076 100644
--- a/src/main/webapp/filesFragment.xhtml
+++ b/src/main/webapp/filesFragment.xhtml
@@ -384,7 +384,7 @@
                             disabled="#{DatasetPage.lockedFromEdits ? 'disabled' : ''}">
                         <span class="glyphicon glyphicon-pencil"/> #{bundle['file.editFiles']} <span class="caret"></span>
                     </button>
-                    <ul class="dropdown-menu multi-level pull-right text-left" role="menu">
+                    <ul class="dropdown-menu multi-level pull-right text-left">
                         <ui:include src="file-edit-button-fragment.xhtml">
                             <ui:param name="datasetVersion" value="#{DatasetPage.workingVersion}"/>
                             <ui:param name="fileMetadataForAction" value="#{DatasetPage.fileMetadataForAction}"/>
@@ -423,7 +423,7 @@
                     <button type="button" class="btn btn-default btn-download dropdown-toggle" data-toggle="dropdown">  
                         <span class="glyphicon glyphicon-download-alt"/> #{bundle.download} <span class="caret"></span>
                     </button>
-                    <ul jsf:id="downloadDropdownOptions" class="dropdown-menu multi-level pull-right text-left" role="menu">
+                    <ul jsf:id="downloadDropdownOptions" class="dropdown-menu multi-level pull-right text-left">
                         <li >
                             <p:commandLink
                                            disabled="#{false and DatasetPage.lockedFromDownload}"

From 9cd4ca4f6f8334f66567ef502b96acdeb6f8da21 Mon Sep 17 00:00:00 2001
From: Jim Myers <myersjd@umich.edu>
Date: Mon, 6 Dec 2021 16:39:26 -0500
Subject: [PATCH 03/39] dataset page - level1 heading

---
 src/main/webapp/dataset.xhtml               | 2 +-
 src/main/webapp/resources/css/structure.css | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/webapp/dataset.xhtml b/src/main/webapp/dataset.xhtml
index ccd663f4faa..abc7cdd08ef 100644
--- a/src/main/webapp/dataset.xhtml
+++ b/src/main/webapp/dataset.xhtml
@@ -116,7 +116,7 @@
                             <div class="col-xs-12">
                                 <div id="datasetVersionBlock" class="row">
                                     <div id="title-block" class="col-xs-12 margin-bottom-half" jsf:rendered="#{!empty DatasetPage.datasetVersionUI.title.value}">
-                                        <span id="title">#{DatasetPage.datasetVersionUI.title.value}</span>
+                                        <h1 id="title">#{DatasetPage.datasetVersionUI.title.value}</h1>
                                         <div id="title-label-block" class="margin-top-half">
                                             <!-- DATASET Publication Status -->
                                             <h:outputText value="#{bundle['dataset.versionUI.draft']}" styleClass="label label-primary" rendered="#{DatasetPage.workingVersion.draft}"/>
diff --git a/src/main/webapp/resources/css/structure.css b/src/main/webapp/resources/css/structure.css
index 084c2f9cb2e..4c66235cab8 100644
--- a/src/main/webapp/resources/css/structure.css
+++ b/src/main/webapp/resources/css/structure.css
@@ -586,7 +586,7 @@ div[id$='roleDisplay'] span.label, div[id$='roleDetails'] span.label {display:in
 #datasetVersionBlock span.label {vertical-align:text-top; line-height:normal; margin-left: .5em;}
 #title-label-block span:first-of-type {margin-left:0 !important;}
 
-#title {font-size:36px !important;line-height:1.1;font-weight:bold;}
+#title {font-size:36px !important;line-height:1.1;font-weight:bold;margin-top:0px;margin-bottom:0px;}
 #author, #contact {display:block; margin-bottom:.5em;}
 
 /* RESPONSIVE ORDER HACK BOOTSTRAP 3 https://stackoverflow.com/a/24834574 */

From 734bd63bc5127a2f87bb0b992a83430e3cf0f23b Mon Sep 17 00:00:00 2001
From: Jim Myers <myersjd@umich.edu>
Date: Tue, 7 Dec 2021 10:42:03 -0500
Subject: [PATCH 04/39] dataset and other pages: landmarks

---
 src/main/webapp/dataverse_footer.xhtml      | 58 +++++++++++----------
 src/main/webapp/dataverse_header.xhtml      |  8 +--
 src/main/webapp/dataverse_template.xhtml    |  2 +-
 src/main/webapp/resources/css/structure.css | 16 +++---
 4 files changed, 43 insertions(+), 41 deletions(-)

diff --git a/src/main/webapp/dataverse_footer.xhtml b/src/main/webapp/dataverse_footer.xhtml
index 5bb20519987..9da923880b8 100644
--- a/src/main/webapp/dataverse_footer.xhtml
+++ b/src/main/webapp/dataverse_footer.xhtml
@@ -18,37 +18,39 @@
             </div>
         </div>
     </div>
-    <div id="footer" class="#{widgetView ? 'widget-view' : ''}">
-        <div class="container">
-            <div class="row">
-                <div class="col-sm-8 small" jsf:rendered="#{!widgetView}">
-                    <p>
-                        <h:outputText value="#{settingsWrapper.footerCopyrightAndYear}#{settingsWrapper.get(':FooterCopyright')}" escape="false"/> <ui:fragment rendered="#{!empty settingsWrapper.get(':ApplicationPrivacyPolicyUrl')}">&#160;|&#160; <h:outputLink value="#{settingsWrapper.get(':ApplicationPrivacyPolicyUrl')}" target="_blank" rel="noopener">#{bundle['footer.privacyPolicy']}</h:outputLink></ui:fragment>
-                    </p>
-                </div>
-                <div class="col-xs-7 small" jsf:rendered="#{widgetView}">
-                    <span class="widgetBrandMsg">
-                        <h:outputFormat value="#{bundle['footer.widget.datastored']}" escape="false">
-                            <o:param>
-                                <a href="/" target="_blank" rel="noopener" title="#{settingsWrapper.rootDataverse.displayName}">#{settingsWrapper.rootDataverse.displayName}</a>
-                            </o:param>
-                        </h:outputFormat>
-                        <ui:fragment rendered="#{!dataverseSession.user.authenticated}">
-                            <h:outputLink styleClass="margin-sides highlightBold" value="/loginpage.xhtml?#{loginRedirectPage}" target="_blank" rel="noopener" title="#{bundle['footer.widget.login']} #{settingsWrapper.rootDataverse.displayName}">
-                                #{bundle.login}
-                            </h:outputLink>
-                        </ui:fragment>
-                    </span>
-                </div>
-                <div class="#{widgetView ? 'col-xs-5' : 'col-sm-4'} text-right">
-                    <div class="poweredbylogo">
-                        <span>#{bundle['footer.poweredby']}</span>
-                        <a href="http://dataverse.org/" title="#{bundle['footer.dataverseProject']}" target="_blank" rel="noopener"><img src="/resources/images/dataverse_project_logo.svg" width="118" height="40" onerror="this.src='/resources/images/dataverseproject_logo.png'" alt="#{of:format1(bundle['alt.logo'], bundle['footer.dataverseProject'])}"/></a>
-                        <h:outputText class="version" value="v. #{settingsWrapper.appVersionWithBuildNumber}" rendered="#{!widgetView}"/>
+    <footer>
+        <div id="dvfooter" class="#{widgetView ? 'widget-view' : ''}">
+            <div class="container">
+                <div class="row">
+                    <div class="col-sm-8 small" jsf:rendered="#{!widgetView}">
+                        <p>
+                            <h:outputText value="#{settingsWrapper.footerCopyrightAndYear}#{settingsWrapper.get(':FooterCopyright')}" escape="false"/> <ui:fragment rendered="#{!empty settingsWrapper.get(':ApplicationPrivacyPolicyUrl')}">&#160;|&#160; <h:outputLink value="#{settingsWrapper.get(':ApplicationPrivacyPolicyUrl')}" target="_blank" rel="noopener">#{bundle['footer.privacyPolicy']}</h:outputLink></ui:fragment>
+                        </p>
+                    </div>
+                    <div class="col-xs-7 small" jsf:rendered="#{widgetView}">
+                        <span class="widgetBrandMsg">
+                            <h:outputFormat value="#{bundle['footer.widget.datastored']}" escape="false">
+                                <o:param>
+                                    <a href="/" target="_blank" rel="noopener" title="#{settingsWrapper.rootDataverse.displayName}">#{settingsWrapper.rootDataverse.displayName}</a>
+                                </o:param>
+                            </h:outputFormat>
+                            <ui:fragment rendered="#{!dataverseSession.user.authenticated}">
+                                <h:outputLink styleClass="margin-sides highlightBold" value="/loginpage.xhtml?#{loginRedirectPage}" target="_blank" rel="noopener" title="#{bundle['footer.widget.login']} #{settingsWrapper.rootDataverse.displayName}">
+                                    #{bundle.login}
+                                </h:outputLink>
+                            </ui:fragment>
+                        </span>
+                    </div>
+                    <div class="#{widgetView ? 'col-xs-5' : 'col-sm-4'} text-right">
+                        <div class="poweredbylogo">
+                            <span>#{bundle['footer.poweredby']}</span>
+                            <a href="http://dataverse.org/" title="#{bundle['footer.dataverseProject']}" target="_blank" rel="noopener"><img src="/resources/images/dataverse_project_logo.svg" width="118" height="40" onerror="this.src='/resources/images/dataverseproject_logo.png'" alt="#{of:format1(bundle['alt.logo'], bundle['footer.dataverseProject'])}"/></a>
+                            <h:outputText class="version" value="v. #{settingsWrapper.appVersionWithBuildNumber}" rendered="#{!widgetView}"/>
+                        </div>
                     </div>
                 </div>
             </div>
         </div>
-    </div>
     <o:resourceInclude path="/CustomizationFilesServlet?customFileType=footer" rendered="#{!widgetView}"/>
+    </footer>
 </ui:composition>
\ No newline at end of file
diff --git a/src/main/webapp/dataverse_header.xhtml b/src/main/webapp/dataverse_header.xhtml
index 3b18bcbc3b1..95f30430506 100644
--- a/src/main/webapp/dataverse_header.xhtml
+++ b/src/main/webapp/dataverse_header.xhtml
@@ -15,9 +15,9 @@
     <ui:param name="showAddDatasetLink" value="#{permissionsWrapper.authUsersCanCreateDatasetsInDataverse(settingsWrapper.rootDataverse)}"/>
     <ui:param name="showAddDataGroup" value="#{showAddDataverseLink or showAddDatasetLink}"/>
 
-    <div id="dataverse-header-block">
+    <nav id="dataverse-header-block">
         <!-- Navbar Panel -->
-        <nav id="navbarFixed" class="navbar navbar-default navbar-fixed-top" jsf:rendered="#{!widgetWrapper.widgetView}">
+        <div id="navbarFixed" class="navbar navbar-default navbar-fixed-top" jsf:rendered="#{!widgetWrapper.widgetView}">
             <div class="container">
                 <div class="navbar-header">
                     <button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#topNavBar" aria-pressed="false">
@@ -184,7 +184,7 @@
                     </ul>
                 </div>
             </div>
-        </nav>
+        </div>
         <!-- Noscript Error -->
         <noscript>
             <div id="noscript-alert" class="bg-danger">
@@ -319,5 +319,5 @@
                 <iqbs:messages id="messages" collapsible="true" />
             </div>
         </p:fragment>
-    </div>
+    </nav>
 </ui:composition>
\ No newline at end of file
diff --git a/src/main/webapp/dataverse_template.xhtml b/src/main/webapp/dataverse_template.xhtml
index 8cb60eaa6cc..8c4b323d93f 100644
--- a/src/main/webapp/dataverse_template.xhtml
+++ b/src/main/webapp/dataverse_template.xhtml
@@ -62,7 +62,7 @@
             <ui:param name="showMessagePanel" value="#{showMessagePanel != null ? showMessagePanel : true}"/>
             <ui:param name="loginRedirectPage" value="#{loginRedirectPage != null ? '?redirectPage='.concat(loginRedirectPage) : navigationWrapper.redirectPage}"/>
         </ui:include>
-        <div class="container" id="content">
+        <div class="container" id="content" role="main">
             <ui:insert name="body">#{bundle.defaultBody}</ui:insert>
         </div>
         <!-- FOOTER BLOCK -->
diff --git a/src/main/webapp/resources/css/structure.css b/src/main/webapp/resources/css/structure.css
index 4c66235cab8..0536ffdfdbf 100644
--- a/src/main/webapp/resources/css/structure.css
+++ b/src/main/webapp/resources/css/structure.css
@@ -49,12 +49,12 @@ body .ui-widget {font-size: inherit;}
 #status-alert {margin-top:0; margin-bottom:0;}
 #status-alert div.alert {border:0; box-shadow:none;}
 
-#footer {position:absolute; bottom:0; width:100%; height:60px; padding-bottom:100px; color:#808080;}
-#footer.widget-view {position:fixed; left:0; bottom:0; margin:0; padding:4px 0 0 0; min-height:44px; height:auto; background:#fff;}
-#footer .poweredbylogo {text-align:right;}
-#footer .poweredbylogo span {font-size:.85em;margin-right:.3em;}
-#footer .version {vertical-align:bottom;white-space:nowrap;}
-#footer.widget-view .widgetBrandMsg {line-height:42px;}
+#dvfooter {position:absolute; bottom:0; width:100%; height:60px; padding-bottom:100px; color:#808080;}
+#dvfooter.widget-view {position:fixed; left:0; bottom:0; margin:0; padding:4px 0 0 0; min-height:44px; height:auto; background:#fff;}
+#dvfooter .poweredbylogo {text-align:right;}
+#dvfooter .poweredbylogo span {font-size:.85em;margin-right:.3em;}
+#dvfooter .version {vertical-align:bottom;white-space:nowrap;}
+#dvfooter.widget-view .widgetBrandMsg {line-height:42px;}
 
 .form-group table.noBorders tr.ui-widget-content, .form-group table.noBorders td {border:0; padding-left:0;}
 
@@ -445,8 +445,8 @@ div.panelSearchForm .input-group {margin-right:1em;}
     margin-left: 10px;
   }
   
-  #footer .poweredbylogo {text-align:center;}
-  #footer.widget-view .poweredbylogo {text-align:right;}
+  #dvfooter .poweredbylogo {text-align:center;}
+  #dvfooter.widget-view .poweredbylogo {text-align:right;}
 }
 
 .searchTypeButton {display:block; border:1px solid #DDD; padding:4px 0; margin-bottom: .5em;}

From aee596ba77316942b7bf6d94144f6cdcea16b618 Mon Sep 17 00:00:00 2001
From: Jim Myers <myersjd@umich.edu>
Date: Tue, 7 Dec 2021 13:27:50 -0500
Subject: [PATCH 05/39] edit metadata: labels for multiple primitive field
 inputs

---
 src/main/java/propertyFiles/Bundle.properties     | 1 +
 src/main/webapp/datasetFieldForEditFragment.xhtml | 8 ++++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/propertyFiles/Bundle.properties b/src/main/java/propertyFiles/Bundle.properties
index a06d2d2d67b..664e97c1977 100644
--- a/src/main/java/propertyFiles/Bundle.properties
+++ b/src/main/java/propertyFiles/Bundle.properties
@@ -2129,6 +2129,7 @@ dataset.access.description=Restricting limits access to published files. You can
 #datasetFieldForEditFragment.xhtml
 dataset.AddReplication=Add "Replication Data for" to Title
 dataset.replicationDataFor=Replication Data for:
+dataset.additionalEntry=Additional Entry
 
 
 #mydata_fragment.xhtml
diff --git a/src/main/webapp/datasetFieldForEditFragment.xhtml b/src/main/webapp/datasetFieldForEditFragment.xhtml
index 26fb70342d9..b7f61f2cafa 100644
--- a/src/main/webapp/datasetFieldForEditFragment.xhtml
+++ b/src/main/webapp/datasetFieldForEditFragment.xhtml
@@ -11,7 +11,7 @@
         <!-- input text start UPDATE: UI:REMOVE applied due to duplicate ID errors, left code as reference incase test scripts complain -->
         <span id="pre-input-#{dsf.datasetFieldType.name}" class="pre-input-tag"/></ui:remove>
     <ui:fragment rendered="#{cvoc==null}">
-        <p:inputText value="#{dsfv.valueForEdit}" id="inputText" pt:aria-required="#{dsf.required}"
+        <p:inputText value="#{dsfv.valueForEdit}" id="inputText" pt:aria-required="#{dsf.required}"  pt:aria-label="#{dsfvIndex!=0 ? bundle['dataset.additionalEntry']:''}"
                  styleClass="form-control #{dsfv.datasetField.datasetFieldType.name == 'title' and DatasetPage.editMode == 'CREATE'  ? 'datasetfield-title' : ''}"
                  rendered="#{!dsfv.datasetField.datasetFieldType.controlledVocabulary
                              and (dsfv.datasetField.datasetFieldType.fieldType == 'TEXT'
@@ -24,7 +24,7 @@
         <p:watermark for="inputText" value="#{dsfv.datasetField.datasetFieldType.localeWatermark}"></p:watermark>
     </ui:fragment>
     <ui:fragment rendered="#{cvoc!=null and cvoc.getString('term-uri-field').equals(dsfv.datasetField.datasetFieldType.name)}">
-        <p:inputText value="#{dsfv.valueForEdit}" id="cvocInputText" pt:aria-required="#{dsf.required}"
+        <p:inputText value="#{dsfv.valueForEdit}" id="cvocInputText" pt:aria-required="#{dsf.required}" pt:aria-label="#{dsfvIndex!=0 ? bundle['dataset.additionalEntry']:''}"
                  styleClass="form-control #{dsfv.datasetField.datasetFieldType.name == 'title' and DatasetPage.editMode == 'CREATE'  ? 'datasetfield-title' : ''}"
                  rendered="#{!dsfv.datasetField.datasetFieldType.controlledVocabulary
                              and (dsfv.datasetField.datasetFieldType.fieldType == 'TEXT'
@@ -44,7 +44,7 @@
         </p:inputText>
     </ui:fragment>
     <ui:fragment rendered="#{cvoc!=null and !cvoc.getString('term-uri-field').equals(dsfv.datasetField.datasetFieldType.name)}">
-        <p:inputText value="#{dsfv.valueForEdit}" id="cvocInputText2" pt:aria-required="#{dsf.required}"
+        <p:inputText value="#{dsfv.valueForEdit}" id="cvocInputText2" pt:aria-required="#{dsf.required}" pt:aria-label="#{dsfvIndex!=0 ? bundle['dataset.additionalEntry']:''}"
                  styleClass="form-control #{dsfv.datasetField.datasetFieldType.name == 'title' and DatasetPage.editMode == 'CREATE'  ? 'datasetfield-title' : ''}"
                  rendered="#{!dsfv.datasetField.datasetFieldType.controlledVocabulary
                              and (dsfv.datasetField.datasetFieldType.fieldType == 'TEXT'
@@ -57,7 +57,7 @@
         </p:inputText>
     </ui:fragment>
     
-    <p:inputTextarea value="#{dsfv.valueForEdit}" id="description" pt:aria-required="#{dsf.required}"
+    <p:inputTextarea value="#{dsfv.valueForEdit}" id="description" pt:aria-required="#{dsf.required}" pt:aria-label="#{dsfvIndex!=0 ? bundle['dataset.additionalEntry']:''}"
                      rows="5" cols="60" styleClass="form-control"
                      rendered="#{dsfv.datasetField.datasetFieldType.fieldType == 'TEXTBOX'}"/>
     <p:watermark for="description" value="#{dsfv.datasetField.datasetFieldType.localeWatermark}"></p:watermark>

From 3b11799baf237a233c8d42e4383967eafa99468a Mon Sep 17 00:00:00 2001
From: Jim Myers <myersjd@umich.edu>
Date: Tue, 7 Dec 2021 13:35:53 -0500
Subject: [PATCH 06/39] terms page - correct labels for fields

---
 src/main/webapp/dataset-license-terms.xhtml | 116 ++++++++++----------
 1 file changed, 58 insertions(+), 58 deletions(-)

diff --git a/src/main/webapp/dataset-license-terms.xhtml b/src/main/webapp/dataset-license-terms.xhtml
index c5bdc8638cf..6803b0a45a5 100644
--- a/src/main/webapp/dataset-license-terms.xhtml
+++ b/src/main/webapp/dataset-license-terms.xhtml
@@ -27,7 +27,7 @@
                    <o:importFunctions type="org.apache.commons.text.StringEscapeUtils" />
                    <div class="panel-body">
                        <div class="form-group">
-                           <label for="metadata_Terms" class="col-sm-3 control-label">
+                           <label for="datasetForm:tabView:metadata_Terms" class="col-sm-3 control-label">
                                #{bundle['file.dataFilesTab.terms.list.termsOfUse.waiver']}
                                <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                      data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.waiver.title']}"></span>
@@ -55,7 +55,7 @@
                            </div>
                        </div>
                        <div class="form-group" jsf:rendered="#{termsOfUseAndAccess.license != 'CC0'}">
-                           <label for="metadata_TermsUse" class="col-sm-3 control-label">
+                           <label for="datasetForm:tabView:metadata_TermsUse" class="col-sm-3 control-label">
                                #{bundle['file.dataFilesTab.terms.list.termsOfUse.termsOfUse']}
                                <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                      data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.termsOfUse.title']}"></span>
@@ -72,79 +72,79 @@
                        <!-- Additional Information -->
                         <ui:fragment rendered="#{empty editMode}">
                             <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.confidentialityDeclaration}">
-                                <label for="confidentialityDeclaration" class="col-sm-3 control-label">
+                                <label for="datasetForm:tabView:confidentialityDeclarationText" class="col-sm-3 control-label">
                                     #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.declaration']}
                                     <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.declaration.title']}"></span>
                                 </label>
                                 <div class="col-sm-9">
-                                    <h:outputText value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.confidentialityDeclaration)}" escape="false"/>
+                                    <h:outputText id="confidentialityDeclarationText" value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.confidentialityDeclaration)}" escape="false"/>
                                 </div>
                             </div>
                             <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.specialPermissions}">
-                                <label for="specialPermissions" class="col-sm-3 control-label">
+                                <label for="datasetForm:tabView:specialPermissionsText" class="col-sm-3 control-label">
                                     #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.permissions']}
                                     <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.permissions.title']}"></span>
                                 </label>
                                 <div class="col-sm-9">
-                                    <h:outputText value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.specialPermissions)}" escape="false"/>
+                                    <h:outputText id="specialPermissionsText" value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.specialPermissions)}" escape="false"/>
                                 </div>
                             </div>
                             <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.restrictions}">
-                                <label for="restrictions" class="col-sm-3 control-label">
+                                <label for="datasetForm:tabView:restrictionsText" class="col-sm-3 control-label">
                                     #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.restrictions']}
                                     <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.restrictions.title']}"></span>
                                 </label>
                                 <div class="col-sm-9">
-                                    <h:outputText value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.restrictions)}" escape="false"/>
+                                    <h:outputText id="restrictionsText" value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.restrictions)}" escape="false"/>
                                 </div>
                             </div>
                             <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.citationRequirements}">
-                                <label for="citationRequirements" class="col-sm-3 control-label">
+                                <label for="datasetForm:tabView:citationRequirementsText" class="col-sm-3 control-label">
                                     #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.citationRequirements']}
                                     <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.citationRequirements.title']}"></span>
                                 </label>
                                 <div class="col-sm-9">
-                                    <h:outputText value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.citationRequirements)}" escape="false"/>
+                                    <h:outputText id="citationRequirementsText" value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.citationRequirements)}" escape="false"/>
                                 </div>
                             </div>
                             <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.depositorRequirements}">
-                                <label for="depositorRequirements" class="col-sm-3 control-label">
+                                <label for="datasetForm:tabView:depositorRequirementsText" class="col-sm-3 control-label">
                                     #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.depositorRequirements']}
                                     <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.depositorRequirements.title']}"></span>
                                 </label>
                                 <div class="col-sm-9">
-                                    <h:outputText value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.depositorRequirements)}" escape="false"/>
+                                    <h:outputText id="depositorRequirementsText" value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.depositorRequirements)}" escape="false"/>
                                 </div>
                             </div>
                             <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.conditions}">
-                                <label for="conditions" class="col-sm-3 control-label">
+                                <label for="datasetForm:tabView:conditionsText" class="col-sm-3 control-label">
                                     #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.conditions']}
                                     <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.conditions.title']}"></span>
                                 </label>
                                 <div class="col-sm-9">
-                                    <h:outputText value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.conditions)}" escape="false"/>
+                                    <h:outputText id="conditionsText" value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.conditions)}" escape="false"/>
                                 </div>
                             </div>
                             <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.disclaimer}">
-                                <label for="disclaimer" class="col-sm-3 control-label">
+                                <label for="datasetForm:tabView:disclaimerText" class="col-sm-3 control-label">
                                     #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.disclaimer']}
                                     <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.disclaimer.title']}"></span>
                                 </label>
                                 <div class="col-sm-9">
-                                    <h:outputText value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.disclaimer)}" escape="false"/>
+                                    <h:outputText id="disclaimerText" value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.disclaimer)}" escape="false"/>
                                 </div>
                             </div>
                         </ui:fragment>
                         <ui:fragment rendered="#{!empty editMode}">
                             <div class="form-group">
-                                <label for="confidentialityDeclaration" class="col-sm-3 control-label">
+                                <label for="datasetForm:tabView:confidentialityDeclaration" class="col-sm-3 control-label">
                                     #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.declaration']}
                                     <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.declaration.title']}"></span>
@@ -154,7 +154,7 @@
                                 </div>
                             </div>
                             <div class="form-group">
-                                <label for="specialPermissions" class="col-sm-3 control-label">
+                                <label for="datasetForm:tabView:specialPermissions" class="col-sm-3 control-label">
                                     #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.permissions']}
                                     <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.permissions.title']}"></span>
@@ -164,7 +164,7 @@
                                 </div>
                             </div>
                             <div class="form-group">
-                                <label for="restrictions" class="col-sm-3 control-label">
+                                <label for="datasetForm:tabView:restrictions" class="col-sm-3 control-label">
                                     #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.restrictions']}
                                     <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.restrictions.title']}"></span>
@@ -174,7 +174,7 @@
                                 </div>
                             </div>
                             <div class="form-group">
-                                <label for="citationRequirements" class="col-sm-3 control-label">
+                                <label for="datasetForm:tabView:citationRequirements" class="col-sm-3 control-label">
                                     #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.citationRequirements']}
                                     <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.citationRequirements.title']}"></span>
@@ -184,7 +184,7 @@
                                 </div>
                             </div>
                             <div class="form-group">
-                                <label for="depositorRequirements" class="col-sm-3 control-label">
+                                <label for="datasetForm:tabView:depositorRequirements" class="col-sm-3 control-label">
                                     #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.depositorRequirements']}
                                     <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.depositorRequirements.title']}"></span>
@@ -194,7 +194,7 @@
                                 </div>
                             </div>
                             <div class="form-group">
-                                <label for="conditions" class="col-sm-3 control-label">
+                                <label for="datasetForm:tabView:conditions" class="col-sm-3 control-label">
                                     #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.conditions']}
                                     <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.conditions.title']}"></span>
@@ -204,7 +204,7 @@
                                 </div>
                             </div>
                             <div class="form-group">
-                                <label for="disclaimer" class="col-sm-3 control-label">
+                                <label for="datasetForm:tabView:disclaimer" class="col-sm-3 control-label">
                                     #{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.disclaimer']}
                                     <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfUse.addInfo.disclaimer.title']}"></span>
@@ -233,7 +233,7 @@
                <div class="panel-body">
                    <ui:fragment rendered="#{empty editMode}">
                        <div class="form-group" jsf:rendered="#{!settingsWrapper.publicInstall}">
-                           <label for="metadata_RestrictedFiles" class="col-sm-3 control-label">
+                           <label for="datasetForm:tabView:metadata_RestrictedFiles" class="col-sm-3 control-label">
                                #{bundle['file.dataFilesTab.terms.list.termsOfAccess.restrictedFiles']}
                                <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                      data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.restrictedFiles.title']}"></span>
@@ -241,7 +241,7 @@
                            <ui:fragment rendered="#{datasetPage == true}">
                                <div class="col-sm-9">
                                    <p>
-                                       <h:outputFormat value="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.restrictedFiles.txt']}">
+                                       <h:outputFormat id="metadata_RestrictedFiles" value="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.restrictedFiles.txt']}">
                                            <f:param value="#{DatasetPage.restrictedFileCount}"/>
                                        </h:outputFormat>
                                    </p>
@@ -249,22 +249,22 @@
                            </ui:fragment>
                        </div>
                        <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.termsOfAccess}">
-                           <label for="metadata_TermsAccess" class="col-sm-3 control-label">
+                           <label for="datasetForm:tabView:metadata_TermsAccessText" class="col-sm-3 control-label">
                                #{bundle['file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess']}
                                <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                      data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess.title']}"></span>
                            </label>
                            <div class="col-sm-9">
-                               <p><h:outputText value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.termsOfAccess)}" escape="false"/></p>
+                               <p><h:outputText id="metadata_TermsAccessText" value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.termsOfAccess)}" escape="false"/></p>
                            </div>
                        </div>
                        <div class="form-group" jsf:rendered="#{!settingsWrapper.publicInstall and ( datasetPage == true and DatasetPage.restrictedFileCount > 0)}">
-                           <label for="metadata_RequestAccess" class="col-sm-3 control-label">
+                           <label for="datasetForm:tabView:metadata_RequestAccessSelected" class="col-sm-3 control-label">
                                #{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess']}
                                <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                      data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess.title']}"></span>
                            </label>
-                           <div class="col-sm-9">
+                           <div id="metadata_RequestAccessSelected" class="col-sm-9">
                                <p jsf:rendered="#{!DatasetPage.workingVersion.draft}">
                                    <h:outputText value="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess.request']}" rendered="#{DatasetPage.dataset.fileAccessRequest}"/>
                                    <h:outputText value="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess.notRequest']}" rendered="#{!DatasetPage.dataset.fileAccessRequest}"/>
@@ -278,17 +278,17 @@
                    </ui:fragment>
                    <ui:fragment rendered="#{!empty editMode}">
                        <div class="form-group">
-                           <label for="metadata_TermsAccess" class="col-sm-3 control-label">
+                           <label for="datasetForm:tabView:metadata_TermsAccess" class="col-sm-3 control-label">
                                #{bundle['file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess']}
                                <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                      data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess.title']}"></span>
                            </label>
                            <div class="col-sm-9">
-                               <p:inputTextarea value="#{termsOfUseAndAccess.termsOfAccess}" rows="5" styleClass="form-control" />
+                               <p:inputTextarea id="metadata_TermsAccess" value="#{termsOfUseAndAccess.termsOfAccess}" rows="5" styleClass="form-control" />
                        </div>
                        </div>
                        <div class="form-group" jsf:rendered="#{!settingsWrapper.publicInstall}">
-                           <label for="metadata_RequestAccess" class="col-sm-3 control-label">
+                           <label for="datasetForm:tabView:requestAccess" class="col-sm-3 control-label">
                                #{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess']}
                                <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                      data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.requestAccess.title']}"></span>
@@ -302,125 +302,125 @@
                    <!-- Additional Information -->
                     <ui:fragment rendered="#{empty editMode}">
                         <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.dataAccessPlace}">
-                            <label for="metadata_TermsUse" class="col-sm-3 control-label">
+                            <label for="datasetForm:tabView:dataAccessPlaceText" class="col-sm-3 control-label">
                                 #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.dataAccessPlace']}
                                 <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                       data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.dataAccessPlace.title']}"></span>
                             </label>
                             <div class="col-sm-9">
-                                <h:outputText value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.dataAccessPlace)}" escape="false"/>
+                                <h:outputText id="dataAccessPlaceText" value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.dataAccessPlace)}" escape="false"/>
                             </div>
                         </div>
                         <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.originalArchive}">
-                            <label for="metadata_TermsUse" class="col-sm-3 control-label">
+                            <label for="datasetForm:tabView:originalArchiveText" class="col-sm-3 control-label">
                                 #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.originalArchive']}
                                 <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                       data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.originalArchive.title']}"></span>
                             </label>
                             <div class="col-sm-9">
-                                <h:outputText value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.originalArchive)}" escape="false"/>
+                                <h:outputText id="originalArchiveText" value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.originalArchive)}" escape="false"/>
                             </div>
                         </div>
                         <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.availabilityStatus}">
-                            <label for="metadata_TermsUse" class="col-sm-3 control-label">
+                            <label for="datasetForm:tabView:availabilityStatusText" class="col-sm-3 control-label">
                                 #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.availabilityStatus']}
                                 <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                       data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.availabilityStatus.title']}"></span>
                             </label>
                             <div class="col-sm-9">
-                                <h:outputText value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.availabilityStatus)}" escape="false"/>
+                                <h:outputText id="availabilityStatusText" value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.availabilityStatus)}" escape="false"/>
                             </div>
                         </div>
                         <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.contactForAccess}">
-                            <label for="metadata_TermsUse" class="col-sm-3 control-label">
+                            <label for="datasetForm:tabView:contactForAccessText" class="col-sm-3 control-label">
                                 #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.contactForAccess']}
                                 <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                       data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.contactForAccess.title']}"></span>
                             </label>
                             <div class="col-sm-9">
-                                <h:outputText value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.contactForAccess)}" escape="false"/>
+                                <h:outputText id="contactForAccessText" value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.contactForAccess)}" escape="false"/>
                             </div>
                         </div>
                         <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.sizeOfCollection}">
-                            <label for="metadata_TermsUse" class="col-sm-3 control-label">
+                            <label for="datasetForm:tabView:collectionSizeText" class="col-sm-3 control-label">
                                 #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.sizeOfCollection']}
                                 <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                       data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.sizeOfCollection.tip']}"></span>
                             </label>
                             <div class="col-sm-9">
-                                <h:outputText value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.sizeOfCollection)}" escape="false"/>
+                                <h:outputText id="collectionSizeText" value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.sizeOfCollection)}" escape="false"/>
                             </div>
                         </div>
                         <div class="form-group" jsf:rendered="#{!empty termsOfUseAndAccess.studyCompletion}">
-                            <label for="metadata_TermsUse" class="col-sm-3 control-label">
+                            <label for="datasetForm:tabView:studyCompletionText" class="col-sm-3 control-label">
                                 #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.studyCompletion']}
                                 <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                       data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.studyCompletion.title']}"></span>
                             </label>
                             <div class="col-sm-9">
-                                <h:outputText value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.studyCompletion)}" escape="false"/>
+                                <h:outputText id="studyCompletionText" value="#{MarkupChecker:sanitizeBasicHTML(termsOfUseAndAccess.studyCompletion)}" escape="false"/>
                             </div>
                         </div>
                     </ui:fragment>
                     <ui:fragment rendered="#{!empty editMode}">
                         <div class="form-group">
-                            <label for="metadata_TermsUse" class="col-sm-3 control-label">
+                            <label for="datasetForm:tabView:dataAccessPlace" class="col-sm-3 control-label">
                                 #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.dataAccessPlace']}
                                 <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                       data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.dataAccessPlace.title']}"></span>
                             </label>
                             <div class="col-sm-9">
-                                <p:inputTextarea value="#{termsOfUseAndAccess.dataAccessPlace}" rows="5" cols="60" styleClass="form-control" />
+                                <p:inputTextarea id="dataAccessPlace" value="#{termsOfUseAndAccess.dataAccessPlace}" rows="5" cols="60" styleClass="form-control" />
                             </div>
                         </div>
                         <div class="form-group">
-                            <label for="metadata_TermsUse" class="col-sm-3 control-label">
+                            <label for="datasetForm:tabView:originalArchive" class="col-sm-3 control-label">
                                 #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.originalArchive']}
                                 <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                       data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.originalArchive.title']}"></span>
                             </label>
                             <div class="col-sm-9">
-                                <p:inputTextarea value="#{termsOfUseAndAccess.originalArchive}" rows="5" cols="60" styleClass="form-control" />
+                                <p:inputTextarea id="originalArchive" value="#{termsOfUseAndAccess.originalArchive}" rows="5" cols="60" styleClass="form-control" />
                             </div>
                         </div>
                         <div class="form-group">
-                            <label for="metadata_TermsUse" class="col-sm-3 control-label">
+                            <label for="datasetForm:tabView:availabilityStatus" class="col-sm-3 control-label">
                                 #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.availabilityStatus']}
                                 <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                       data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.availabilityStatus.title']}"></span>
                             </label>
                             <div class="col-sm-9">
-                                <p:inputTextarea value="#{termsOfUseAndAccess.availabilityStatus}" rows="5" cols="60" styleClass="form-control" />
+                                <p:inputTextarea id="availabilityStatus" value="#{termsOfUseAndAccess.availabilityStatus}" rows="5" cols="60" styleClass="form-control" />
                             </div>
                         </div>
                         <div class="form-group">
-                            <label for="metadata_TermsUse" class="col-sm-3 control-label">
+                            <label for="datasetForm:tabView:contactForAccess" class="col-sm-3 control-label">
                                 #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.contactForAccess']}
                                 <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                       data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.contactForAccess.title']}"></span>
                             </label>
                             <div class="col-sm-9">
-                                <p:inputTextarea value="#{termsOfUseAndAccess.contactForAccess}" rows="5" cols="60" styleClass="form-control" />
+                                <p:inputTextarea id="contactForAccess" value="#{termsOfUseAndAccess.contactForAccess}" rows="5" cols="60" styleClass="form-control" />
                             </div>
                         </div>
                         <div class="form-group">
-                            <label for="metadata_TermsUse" class="col-sm-3 control-label">
+                            <label for="datasetForm:tabView:sizeOfCollection" class="col-sm-3 control-label">
                                 #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.sizeOfCollection']}
                                 <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                       data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.sizeOfCollection.tip']}"></span>
                             </label>
                             <div class="col-sm-9">
-                                <p:inputTextarea value="#{termsOfUseAndAccess.sizeOfCollection}" rows="5" cols="60" styleClass="form-control" />
+                                <p:inputTextarea id="sizeOfCollection" value="#{termsOfUseAndAccess.sizeOfCollection}" rows="5" cols="60" styleClass="form-control" />
                             </div>
                         </div>
                         <div class="form-group">
-                            <label for="metadata_TermsUse" class="col-sm-3 control-label">
+                            <label for="datasetForm:tabView:studyCompletion" class="col-sm-3 control-label">
                                 #{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.studyCompletion']}
                                 <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                       data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.addInfo.studyCompletion.title']}"></span>
                             </label>
                             <div class="col-sm-9">
-                                <p:inputTextarea value="#{termsOfUseAndAccess.studyCompletion}" rows="5" cols="60" styleClass="form-control" />
+                                <p:inputTextarea id="studyCompletion" value="#{termsOfUseAndAccess.studyCompletion}" rows="5" cols="60" styleClass="form-control" />
                             </div>
                         </div>
                     </ui:fragment>
@@ -436,12 +436,12 @@
            <div id="panelCollapseGuestbook" class="collapse in">
                <div class="panel-body">
                    <div class="form-group">
-                       <label for="metadata_Guestbook" class="col-sm-3 control-label">
+                       <label for="datasetForm:tabView:metadata_Guestbook" class="col-sm-3 control-label">
                            #{bundle['file.dataFilesTab.terms.list.guestbook']}
                            <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                  data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.guestbook.title']}"></span>
                        </label>
-                       <div class="col-sm-9">
+                       <div id="metadata_Guestbook" class="col-sm-9">
                            <ui:fragment rendered="#{empty editMode}">
                                <ui:fragment rendered="#{ datasetPage and empty DatasetPage.dataset.guestbook 
                                                         and ((!dataverseSession.user.authenticated or !permissionsWrapper.canIssueUpdateDatasetCommand(DatasetPage.dataset))

From 97f6395224694cda6b9b5980fc2c31f64f0fc464 Mon Sep 17 00:00:00 2001
From: Jim Myers <myersjd@umich.edu>
Date: Tue, 7 Dec 2021 13:41:25 -0500
Subject: [PATCH 07/39] versions tab - duplicate link ids

id="versionLink" appears once per row in the versionTable - not sure why
that is only an accessibility issue (i.e. not a problem for jsp
generation). The id wasn't used anywhere that I can see.
---
 src/main/webapp/dataset-versions.xhtml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/webapp/dataset-versions.xhtml b/src/main/webapp/dataset-versions.xhtml
index dcfb873c891..45f52723f02 100644
--- a/src/main/webapp/dataset-versions.xhtml
+++ b/src/main/webapp/dataset-versions.xhtml
@@ -59,11 +59,11 @@
             <ui:fragment rendered="#{versionTab.released 
                                      or ((versionTab.deaccessioned or versionTab.draft) and permissionServiceBean.on(DatasetPage.dataset).has('ViewUnpublishedDataset'))}">
                 <ui:fragment rendered="#{!(versionTab.released or versionTab.deaccessioned)}">
-                    <a id="versionLink" href="/dataset.xhtml?persistentId=#{versionTab.dataset.globalIdString}&#38;version=#{versionTab.versionState}" class="ui-commandlink ui-widget">
+                    <a href="/dataset.xhtml?persistentId=#{versionTab.dataset.globalIdString}&#38;version=#{versionTab.versionState}" class="ui-commandlink ui-widget">
                         <h:outputText rendered="#{!(versionTab.released or versionTab.deaccessioned)}" value="#{versionTab.versionState}" /></a>
                 </ui:fragment>
                 <ui:fragment rendered="#{(versionTab.released or versionTab.deaccessioned)}">
-                    <a id="versionLink" href="/dataset.xhtml?persistentId=#{versionTab.dataset.globalIdString}&#38;version=#{versionTab.versionNumber}.#{versionTab.minorVersionNumber}" class="ui-commandlink ui-widget">
+                    <a href="/dataset.xhtml?persistentId=#{versionTab.dataset.globalIdString}&#38;version=#{versionTab.versionNumber}.#{versionTab.minorVersionNumber}" class="ui-commandlink ui-widget">
                         <h:outputText rendered="#{versionTab.released or versionTab.deaccessioned}" value="#{versionTab.versionNumber}.#{versionTab.minorVersionNumber}" /></a>
                 </ui:fragment>
             </ui:fragment>

From 762b7a7a4a8cdb845dfab569eceb3d63555c9763 Mon Sep 17 00:00:00 2001
From: Jim Myers <myersjd@umich.edu>
Date: Tue, 7 Dec 2021 15:54:37 -0500
Subject: [PATCH 08/39] dataverse page - level 1 header

---
 src/main/webapp/dataverse_header.xhtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/webapp/dataverse_header.xhtml b/src/main/webapp/dataverse_header.xhtml
index 95f30430506..7b0bd7643e9 100644
--- a/src/main/webapp/dataverse_header.xhtml
+++ b/src/main/webapp/dataverse_header.xhtml
@@ -226,7 +226,7 @@
                     <h:outputText styleClass="dataverseHeaderDataverseName" value="#{bundle.newDataverse}"/>
                 </div>
                 <div class="dataverseHeaderCell dataverseHeaderName" jsf:rendered="#{editModeDataverse != 'CREATE'}">
-                    <a href="/dataverse/#{dataverse.alias}" class="dataverseHeaderDataverseName" style="color:##{!empty dataverse.dataverseTheme.linkColor ? dataverse.dataverseTheme.linkColor : '428bca'};">#{dataverse.name}</a>
+                    <a href="/dataverse/#{dataverse.alias}" class="dataverseHeaderDataverseName" style="color:##{!empty dataverse.dataverseTheme.linkColor ? dataverse.dataverseTheme.linkColor : '428bca'};"><h1>#{dataverse.name}</h1></a>
                     <h:outputText style="color:##{!empty dataverse.dataverseTheme.textColor ? dataverse.dataverseTheme.textColor : '888888'};" value=" (#{dataverse.affiliation})" rendered="#{!empty dataverse.affiliation}"/>
                     <h:outputText value="#{bundle.unpublished}" styleClass="label label-warning label-unpublished" rendered="#{!dataverse.released}"/>
                 </div>

From cdcca137db794373024d62affaaea588e754ed3d Mon Sep 17 00:00:00 2001
From: Jim Myers <myersjd@umich.edu>
Date: Tue, 7 Dec 2021 15:59:15 -0500
Subject: [PATCH 09/39] dataverse page - increase default color contrast

---
 src/main/webapp/dataverse_header.xhtml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/webapp/dataverse_header.xhtml b/src/main/webapp/dataverse_header.xhtml
index 7b0bd7643e9..4561782609f 100644
--- a/src/main/webapp/dataverse_header.xhtml
+++ b/src/main/webapp/dataverse_header.xhtml
@@ -227,11 +227,11 @@
                 </div>
                 <div class="dataverseHeaderCell dataverseHeaderName" jsf:rendered="#{editModeDataverse != 'CREATE'}">
                     <a href="/dataverse/#{dataverse.alias}" class="dataverseHeaderDataverseName" style="color:##{!empty dataverse.dataverseTheme.linkColor ? dataverse.dataverseTheme.linkColor : '428bca'};"><h1>#{dataverse.name}</h1></a>
-                    <h:outputText style="color:##{!empty dataverse.dataverseTheme.textColor ? dataverse.dataverseTheme.textColor : '888888'};" value=" (#{dataverse.affiliation})" rendered="#{!empty dataverse.affiliation}"/>
+                    <h:outputText style="color:##{!empty dataverse.dataverseTheme.textColor ? dataverse.dataverseTheme.textColor : '666666'};" value=" (#{dataverse.affiliation})" rendered="#{!empty dataverse.affiliation}"/>
                     <h:outputText value="#{bundle.unpublished}" styleClass="label label-warning label-unpublished" rendered="#{!dataverse.released}"/>
                 </div>
                 <div class="dataverseHeaderCell dataverseHeaderTagline" jsf:rendered="#{!empty dataverse.dataverseTheme.tagline and empty dataverse.dataverseTheme.linkUrl}">
-                    <h:outputText escape="false" style="color:##{!empty dataverse.dataverseTheme.textColor ? dataverse.dataverseTheme.textColor : '888888'};" value="#{StringEscapeUtils:escapeHtml4(dataverse.dataverseTheme.tagline)}" />
+                    <h:outputText escape="false" style="color:##{!empty dataverse.dataverseTheme.textColor ? dataverse.dataverseTheme.textColor : '666666'};" value="#{StringEscapeUtils:escapeHtml4(dataverse.dataverseTheme.tagline)}" />
                 </div>
                 <div class="dataverseHeaderCell dataverseHeaderLink" jsf:rendered="#{!empty dataverse.dataverseTheme.tagline and !empty dataverse.dataverseTheme.linkUrl}">
                     <h:outputLink value="#{dataverse.dataverseTheme.linkUrl}" style="color:##{!empty dataverse.dataverseTheme.linkColor ? dataverse.dataverseTheme.linkColor : '428bca'};" target="_blank" rel="noopener">

From 85c063786a924451bac402ce909dabddf4eafa30 Mon Sep 17 00:00:00 2001
From: Jim Myers <myersjd@umich.edu>
Date: Tue, 7 Dec 2021 16:35:27 -0500
Subject: [PATCH 10/39] dataverse page, gen info, metadata fields: color
 contrast for disabled

When editing the metadata allowed in a dataset, if you select 'Use
browse/search facets from <root dataverse>, all of the disabled entries
have insufficient contrast. One option to fix this would be increasing
the contrast, however, setting aria-disabled=true also works - disabled
entries don't have to have high contrast.
---
 src/main/webapp/dataverse.xhtml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/webapp/dataverse.xhtml b/src/main/webapp/dataverse.xhtml
index 8697a2fa6ad..e7bfb49cd96 100644
--- a/src/main/webapp/dataverse.xhtml
+++ b/src/main/webapp/dataverse.xhtml
@@ -415,6 +415,7 @@
                                             </f:facet>
                                             <f:facet name="targetCaption">#{bundle['dataverse.selected']}</f:facet>
                                             <p:ajax event="transfer" listener="#{DataversePage.onFacetTransfer}" update="editFacets" />
+                                            <f:passThroughAttribute name="aria-disabled" value="#{!DataversePage.dataverse.facetRoot and DataversePage.dataverse.owner != null}"/>
                                         </p:pickList>
                                     </div>
                                 </div>

From f887c9d39825974718c25b5a1a68dc3ca83c8d8a Mon Sep 17 00:00:00 2001
From: Jim Myers <myersjd@umich.edu>
Date: Tue, 7 Dec 2021 16:53:09 -0500
Subject: [PATCH 11/39] dataset files fragment - add unique row labels for
 selecting

works via PrimeFaces to assign a label to the row selection to avoid a
ARIA toggle fields must have an accessible name
---
 src/main/java/propertyFiles/Bundle.properties | 1 +
 src/main/webapp/filesFragment.xhtml           | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/propertyFiles/Bundle.properties b/src/main/java/propertyFiles/Bundle.properties
index 664e97c1977..7d244da01fb 100644
--- a/src/main/java/propertyFiles/Bundle.properties
+++ b/src/main/java/propertyFiles/Bundle.properties
@@ -1570,6 +1570,7 @@ file.zip.download.exceeds.limit.info=The files selected are too large to downloa
 file.zip.download.exceeds.limit.detail=You can select individual files that are below the {2} download limit from the files table, or use the <a href="{0}/{1}/api/dataaccess.html" title="Data Access API" target="_blank">Data Access API</a> for programmatic access to the files.
 file.zip.download.exceeds.limit.header=Download Options
 file.numFilesSelected={0} {0, choice, 0#files are|1#file is|2#files are} currently selected.
+file.select.action=Select
 file.select.tooltip=Select Files
 file.selectAllFiles=Select all {0} files in this dataset.
 file.dynamicCounter.filesPerPage=Files Per Page
diff --git a/src/main/webapp/filesFragment.xhtml b/src/main/webapp/filesFragment.xhtml
index 10355745076..eca89dd0574 100644
--- a/src/main/webapp/filesFragment.xhtml
+++ b/src/main/webapp/filesFragment.xhtml
@@ -54,7 +54,8 @@
                  rowIndexVar="rowNum" rowKey="#{fileMetadata.dataFile.storageIdentifier}"
                  rowSelectMode="checkbox" selection="#{DatasetPage.selectedFiles}" var="fileMetadata" widgetVar="filesTable"
                  rendered="#{DatasetPage.fileDisplayTable and (DatasetPage.workingVersion != null)}"
-                 emptyMessage="#{DatasetPage.workingVersion.fileMetadatas.size() == 0 ? bundle['file.notFound.tip'] : bundle['file.notFound.search']}">
+                 emptyMessage="#{DatasetPage.workingVersion.fileMetadatas.size() == 0 ? bundle['file.notFound.tip'] : bundle['file.notFound.search']}"
+                 ariaRowLabel="#{bundle['file.select.action']} #{fileMetadata.label}">
         <p:ajax event="page" listener="#{DatasetPage.fileListingPaginatorListener}" update="filesTable" process="@this"  oncomplete="refreshPaginator(),rebindCommand()"  immediate="true"/>
         <p:ajax event="toggleSelect" listener="#{DatasetPage.toggleAllSelected()}" update="@form:validateFilesOutcome, filesTable"  process="@this" oncomplete="rebindCommand()"  /> 
         <p:ajax event="rowUnselectCheckbox" listener="#{DatasetPage.setSelectAllFiles(false)}" update="@form:validateFilesOutcome, filesTable" process="@this" oncomplete="rebindCommand()"  />

From 5149657f1da205934f0c451d70f71212bb9c7a7e Mon Sep 17 00:00:00 2001
From: Jim Myers <myersjd@umich.edu>
Date: Tue, 7 Dec 2021 17:36:47 -0500
Subject: [PATCH 12/39] dataset files table -unique screen reader content for
 previews

---
 src/main/webapp/filesFragment.xhtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/webapp/filesFragment.xhtml b/src/main/webapp/filesFragment.xhtml
index eca89dd0574..7b326a72004 100644
--- a/src/main/webapp/filesFragment.xhtml
+++ b/src/main/webapp/filesFragment.xhtml
@@ -485,7 +485,7 @@
                     <ui:fragment rendered="#{DatasetPage.isShowPreviewButton(fileMetadata.dataFile.id) and fileDownloadHelper.isPreviewAllowed(fileMetadata)}">
                         <a class="btn-preview btn btn-link bootstrap-button-tooltip" title="#{bundle.preview}"
                             href="#{widgetWrapper.wrapURL('/file.xhtml?'.concat(!empty fileMetadata.dataFile.globalIdString ? 'persistentId=' : 'fileId=').concat(!empty fileMetadata.dataFile.globalIdString ? fileMetadata.dataFile.globalIdString : fileMetadata.dataFile.id).concat('&amp;version=').concat(fileMetadata.datasetVersion.friendlyVersionNumber))}">
-                            <span class="glyphicon glyphicon-eye-open"/><span class="sr-only">#{bundle.preview}</span>
+                            <span class="glyphicon glyphicon-eye-open"/><span class="sr-only">#{bundle.preview} "#{empty(fileMetadata.directoryLabel) ? "":fileMetadata.directoryLabel.concat("/")}#{fileMetadata.label}"</span>
                         </a>
                     </ui:fragment>
                     <a type="button" style="padding:6px 8px;" class="btn-access-file btn btn-link bootstrap-button-tooltip dropdown-toggle" 

From 9a5252f7ca0b1e0647987b9aa4e3653e5faedead Mon Sep 17 00:00:00 2001
From: Jim Myers <myersjd@umich.edu>
Date: Tue, 7 Dec 2021 17:45:22 -0500
Subject: [PATCH 13/39] dataset files table - unique titles for preview links

Links with the same name should have similar purpose

This change uses the i18n names of individual previewers for the preview
button, which reduces the ambiguity, but doesn't give the preview in
each row a unique title. (I.e. two images still have 'View Image' as the
title, but 'Read Text' for a text preview would now be different.)

We could add the filename to the title to make this fully unique, either
with/without using the previewer names.

Note: Deque says this is an issue unless the links are 'intentionally
ambiguous' - not sure if that includes assuming the row context is
enough.
---
 src/main/webapp/filesFragment.xhtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/webapp/filesFragment.xhtml b/src/main/webapp/filesFragment.xhtml
index 7b326a72004..a67ca54c9e1 100644
--- a/src/main/webapp/filesFragment.xhtml
+++ b/src/main/webapp/filesFragment.xhtml
@@ -483,7 +483,7 @@
                     <!-- TO-DO FIX RSYNC LOGIC !fileMetadata.dataFile.filePackage or
                                                     fileMetadata.dataFile.filePackage and systemConfig.HTTPDownload -->
                     <ui:fragment rendered="#{DatasetPage.isShowPreviewButton(fileMetadata.dataFile.id) and fileDownloadHelper.isPreviewAllowed(fileMetadata)}">
-                        <a class="btn-preview btn btn-link bootstrap-button-tooltip" title="#{bundle.preview}"
+                        <a class="btn-preview btn btn-link bootstrap-button-tooltip" title="#{DatasetPage.getPreviewToolsForDataFile(fileMetadata.dataFile.id).get(0).getDisplayNameLang()}"
                             href="#{widgetWrapper.wrapURL('/file.xhtml?'.concat(!empty fileMetadata.dataFile.globalIdString ? 'persistentId=' : 'fileId=').concat(!empty fileMetadata.dataFile.globalIdString ? fileMetadata.dataFile.globalIdString : fileMetadata.dataFile.id).concat('&amp;version=').concat(fileMetadata.datasetVersion.friendlyVersionNumber))}">
                             <span class="glyphicon glyphicon-eye-open"/><span class="sr-only">#{bundle.preview} "#{empty(fileMetadata.directoryLabel) ? "":fileMetadata.directoryLabel.concat("/")}#{fileMetadata.label}"</span>
                         </a>

From 107d77f3ec6e8c61a8beb50fc5c3254b3ebc3388 Mon Sep 17 00:00:00 2001
From: Jim Myers <myersjd@umich.edu>
Date: Fri, 10 Dec 2021 10:52:30 -0500
Subject: [PATCH 14/39] dataset metadata edit tab - fix labels

the existing code had labeling, but the ids labels used to refence
inputs were incorrect.

This commit also adds a label for CVV fields - (not multival in compound
fields which may or may not exist in the wild).
---
 src/main/webapp/metadataFragment.xhtml | 129 +++++++++++++------------
 1 file changed, 65 insertions(+), 64 deletions(-)

diff --git a/src/main/webapp/metadataFragment.xhtml b/src/main/webapp/metadataFragment.xhtml
index 9c52a1fe09c..898ff6243eb 100755
--- a/src/main/webapp/metadataFragment.xhtml
+++ b/src/main/webapp/metadataFragment.xhtml
@@ -171,82 +171,77 @@
                     <div id="panelCollapse#{block.index}" class="collapse #{block.first or editMode == 'CREATE' or !cvocConf.isEmpty() ? 'in' : ''}">
                         <div class="panel-body">
                             <ui:repeat value="#{metadataBlockVal.value}" var="dsf">
-                                <div class="form-group" role="group" aria-labelledby="metadata_#{dsf.datasetFieldType.name}"
+                                <div class="form-group" role="group"
                                      jsf:rendered="#{((editMode == 'METADATA'
                                                          or dsf.datasetFieldType.displayOnCreate or !dsf.isEmpty() or dsf.required) and dsf.include)
                                                          or (!datasetPage and dsf.include)}">
                                     <!-- Primitive fields -->
                                     <p:fragment id="editPrimitiveValueFragment" rendered="#{dsf.datasetFieldType.primitive}">
                                         <p:autoUpdate/>
-                                        <h:outputLabel for="#{dsf.datasetFieldType.fieldType == 'TEXTBOX' ? 'description' : 'inputText'}" styleClass="col-sm-3 control-label">
+                                        <h:outputLabel for="fieldvaluelist:0:#{dsf.datasetFieldType.fieldType == 'TEXTBOX' ? 'description' : 'inputText'}" styleClass="col-sm-3 control-label">
                                             #{dsf.datasetFieldType.localeTitle}
                                             <span class="glyphicon glyphicon-asterisk text-danger" jsf:rendered="#{dsf.required}"/>
                                             <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                                   data-toggle="tooltip" data-placement="auto right" data-original-title="#{dsf.datasetFieldType.localeDescription}"></span>
                                         </h:outputLabel>
                                         <div class="form-group">
-                                            <ui:remove><!-- There is an issue with the dynamic +/- and the primefaces autoupdate where they are not working
-                                                well together for the primitive fields, but are for the compound fields. So as a workaround for the primitive,
-                                                we wrap them in a ui:repeat that iterates on a single list. Note: dummyVar is never used--></ui:remove>
-                                            <ui:repeat value="#{Collections:singletonList('')}" var="dummyVar">
-                                                <div class="form-col-container col-sm-12">
-                                                    <ui:repeat value="#{dsf.datasetFieldValues}" var="dsfv" varStatus="valCount">
-                                                        <div class="form-group dataset-field-values">
-                                                            <div class="form-col-container col-sm-9 edit-field">
-                                                                <ui:include src="datasetFieldForEditFragment.xhtml">
-                                                                    <ui:param name="dsfv" value="#{dsfv}"/>
-                                                                    <ui:param name="dsfvIndex" value="#{valCount.index}"/>
-                                                                    <ui:param name="cvoc" value="#{cvocConf.containsKey(dsf.datasetFieldType.id)? cvocConf.get(dsf.datasetFieldType.id): null}"/>
-                                                                </ui:include>
-                                                            </div>
-                                                            <!-- Add / Remove buttons -->
-                                                            <div class="col-xs-3 field-add-delete" jsf:rendered="#{dsf.datasetFieldType.allowMultiples and !dsf.datasetFieldType.controlledVocabulary}">
-                                                                <p:commandLink title="#{bundle.add}"
-                                                                               styleClass="btn btn-default btn-sm bootstrap-button-tooltip #{dsf.datasetFieldType.compound ? 'compound-field-btn' : ''}"
-                                                                               actionListener="#{dsf.addDatasetFieldValue(valCount.index + 1)}"
-                                                                               update=":#{p:resolveClientIds('@id(editPrimitiveValueFragment)', view)}"
-                                                                               oncomplete="javascript:bind_bsui_components();">
-                                                                    <span class="glyphicon glyphicon-plus no-text"/>
-                                                                </p:commandLink>
-                                                                <p:commandLink title="#{bundle.delete}"
-                                                                               styleClass="btn btn-default btn-sm bootstrap-button-tooltip #{dsf.datasetFieldType.compound ? 'compound-field-btn' : ''}"
-                                                                               rendered="#{dsf.datasetFieldValues.size() > 1}"
-                                                                               actionListener="#{dsf.removeDatasetFieldValue(valCount.index)}"
-                                                                               update=":#{p:resolveClientIds('@id(editPrimitiveValueFragment)', view)}"
-                                                                               oncomplete="javascript:bind_bsui_components();">
-                                                                    <span class="glyphicon glyphicon-minus no-text"/>
-                                                                </p:commandLink>
-                                                            </div>
+                                            <div class="form-col-container col-sm-12">
+                                                <p:repeat value="#{dsf.datasetFieldValues}" var="dsfv" varStatus="valCount" id="fieldvaluelist">
+                                                    <div class="form-group dataset-field-values">
+                                                        <div class="form-col-container col-sm-9 edit-field">
+                                                            <ui:include src="datasetFieldForEditFragment.xhtml">
+                                                                <ui:param name="dsfv" value="#{dsfv}"/>
+                                                                <ui:param name="dsfvIndex" value="#{valCount.index}"/>
+                                                                <ui:param name="cvoc" value="#{cvocConf.containsKey(dsf.datasetFieldType.id)? cvocConf.get(dsf.datasetFieldType.id): null}"/>
+                                                            </ui:include>
                                                         </div>
-                                                    </ui:repeat>
-                                                    <ui:fragment rendered="#{dsf.datasetFieldType.controlledVocabulary}">
-                                                        <div class="form-group dataset-field-values">
-                                                            <div class="form-col-container col-sm-9 edit-field">
-                                                                <p:selectOneMenu value="#{dsf.singleControlledVocabularyValue}" converter="controlledVocabularyValueConverter" style="width: auto !important; max-width:100%; min-width:200px;" styleClass="form-control primitive"
-                                                                                 id="unique1" required="#{dsf.required}" rendered="#{!dsf.datasetFieldType.allowMultiples}">
-                                                                    <f:selectItem itemLabel="#{bundle.select}" itemValue="" noSelectionOption="true"/>
-                                                                    <f:selectItems value="#{dsf.datasetFieldType.controlledVocabularyValues}" var="cvv" itemLabel="#{cvv.getLocaleStrValue(mdLangCode)}" itemValue="#{cvv}"/>
-                                                                </p:selectOneMenu>
-                                                                <!--
-                                                                <p:outputPanel id="selectedValsList" style="padding-top:.5em;">
-                                                                    <ui:repeat value="#{dsf.controlledVocabularyValues}" var="cvv" rendered="#{!empty dsf.controlledVocabularyValues}">
-                                                                        <h:outputText value="#{cvv.localeStrValue}"  style="margin-right:.5em;display:inline-block;"/>
-                                                                    </ui:repeat>
-                                                                </p:outputPanel>
-                                                                -->
-                                                                <p:selectCheckboxMenu value="#{dsf.controlledVocabularyValues}" converter="controlledVocabularyValueConverter" styleClass="form-control"
-                                                                                      filter="true" filterMatchMode="startsWith" label="#{bundle.select}"  multiple="true"
-                                                                                      id="unique2" rendered="#{dsf.datasetFieldType.allowMultiples}">
-                                                                    <f:selectItems value="#{dsf.datasetFieldType.controlledVocabularyValues}" var="cvv" itemLabel="#{cvv.getLocaleStrValue(mdLangCode)}" itemValue="#{cvv}"/>
-                                                                </p:selectCheckboxMenu>
-                                                                <div class="ui-message ui-message-error ui-widget ui-corner-all" aria-live="polite" jsf:rendered="#{!empty dsf.validationMessage}">
-                                                                    <span class="ui-message-error-detail">#{dsf.validationMessage}</span>
-                                                                </div>
+                                                        <!-- Add / Remove buttons -->
+                                                        <div class="col-xs-3 field-add-delete" jsf:rendered="#{dsf.datasetFieldType.allowMultiples and !dsf.datasetFieldType.controlledVocabulary}">
+                                                            <p:commandLink title="#{bundle.add}"
+                                                                           styleClass="btn btn-default btn-sm bootstrap-button-tooltip #{dsf.datasetFieldType.compound ? 'compound-field-btn' : ''}"
+                                                                           actionListener="#{dsf.addDatasetFieldValue(valCount.index + 1)}"
+                                                                           update=":#{p:resolveClientIds('@id(editPrimitiveValueFragment)', view)}"
+                                                                           oncomplete="javascript:bind_bsui_components();">
+                                                                <span class="glyphicon glyphicon-plus no-text"/>
+                                                            </p:commandLink>
+                                                            <p:commandLink title="#{bundle.delete}"
+                                                                           styleClass="btn btn-default btn-sm bootstrap-button-tooltip #{dsf.datasetFieldType.compound ? 'compound-field-btn' : ''}"
+                                                                           rendered="#{dsf.datasetFieldValues.size() > 1}"
+                                                                           actionListener="#{dsf.removeDatasetFieldValue(valCount.index)}"
+                                                                           update=":#{p:resolveClientIds('@id(editPrimitiveValueFragment)', view)}"
+                                                                           oncomplete="javascript:bind_bsui_components();">
+                                                                <span class="glyphicon glyphicon-minus no-text"/>
+                                                            </p:commandLink>
+                                                        </div>
+                                                    </div>
+                                                </p:repeat>
+                                                <ui:fragment rendered="#{dsf.datasetFieldType.controlledVocabulary}">
+                                                    <div class="form-group dataset-field-values">
+                                                        <div class="form-col-container col-sm-9 edit-field">
+                                                            <p:selectOneMenu value="#{dsf.singleControlledVocabularyValue}" converter="controlledVocabularyValueConverter" style="width: auto !important; max-width:100%; min-width:200px;" styleClass="form-control primitive"
+                                                                             id="unique1" required="#{dsf.required}" rendered="#{!dsf.datasetFieldType.allowMultiples}">
+                                                                <f:selectItem itemLabel="#{bundle.select}" itemValue="" noSelectionOption="true"/>
+                                                                <f:selectItems value="#{dsf.datasetFieldType.controlledVocabularyValues}" var="cvv" itemLabel="#{cvv.getLocaleStrValue(mdLangCode)}" itemValue="#{cvv}"/>
+                                                            </p:selectOneMenu>
+                                                            <!--
+                                                            <p:outputPanel id="selectedValsList" style="padding-top:.5em;">
+                                                                <ui:repeat value="#{dsf.controlledVocabularyValues}" var="cvv" rendered="#{!empty dsf.controlledVocabularyValues}">
+                                                                   <h:outputText value="#{cvv.localeStrValue}"  style="margin-right:.5em;display:inline-block;"/>
+                                                                </ui:repeat>
+                                                            </p:outputPanel>
+                                                            -->
+                                                            <p:selectCheckboxMenu value="#{dsf.controlledVocabularyValues}" converter="controlledVocabularyValueConverter" styleClass="form-control"
+                                                                                  filter="true" filterMatchMode="startsWith" label="#{bundle.select}"  multiple="true" showHeader="#{(dsf.controlledVocabularyValues.size() lt 10) ? 'false':'true'}" 
+                                                                                  id="unique2" rendered="#{dsf.datasetFieldType.allowMultiples}">
+                                                                <f:selectItems value="#{dsf.datasetFieldType.controlledVocabularyValues}" var="cvv" itemLabel="#{cvv.getLocaleStrValue(mdLangCode)}" itemValue="#{cvv}"/>
+                                                            </p:selectCheckboxMenu>
+                                                            <div class="ui-message ui-message-error ui-widget ui-corner-all" aria-live="polite" jsf:rendered="#{!empty dsf.validationMessage}">
+                                                                <span class="ui-message-error-detail">#{dsf.validationMessage}</span>
                                                             </div>
                                                         </div>
-                                                    </ui:fragment>
-                                                </div>
-                                            </ui:repeat>
+                                                    </div>
+                                                </ui:fragment>
+                                            </div>
                                         </div>
                                     </p:fragment>
                                     <!-- Compound fields -->
@@ -274,7 +269,7 @@
                                                                     <h:outputText value="#{bundle.htmlAllowedMsg}" escape="false"/>
                                                                 </p>
                                                             </ui:fragment>
-                                                            <label jsf:for="#{subdsf.datasetFieldType.fieldType == 'TEXTBOX' ? 'description' : 'inputText'}" class="control-label">
+                                                            <label jsf:for="#{subdsf.datasetFieldType.controlledVocabulary ? 'cvv_focus' : subdsf.datasetFieldType.fieldType == 'TEXTBOX' ? 'description' : 'inputText'}" class="control-label">
                                                                 #{subdsf.datasetFieldType.localeTitle}
                                                                 <span class="glyphicon glyphicon-asterisk text-danger" jsf:rendered="#{subdsf.required and dsf.required}"/>
                                                                 <span class="glyphicon glyphicon-question-sign tooltip-icon"
@@ -290,7 +285,7 @@
                                                             </ui:fragment>
                                                             <!-- MOVED SELECT ONE TO dataFieldForEdit -->
                                                             <div jsf:rendered="#{subdsf.datasetFieldType.controlledVocabulary}">
-                                                                <p:selectOneMenu value="#{subdsf.singleControlledVocabularyValue}" converter="controlledVocabularyValueConverter" style="width: auto !important; max-width:100%; min-width:200px;"
+                                                                <p:selectOneMenu id="cvv" value="#{subdsf.singleControlledVocabularyValue}" converter="controlledVocabularyValueConverter" style="width: auto !important; max-width:100%; min-width:200px;"
                                                                                  rendered="#{!subdsf.datasetFieldType.allowMultiples}">
                                                                     <f:selectItem itemLabel="#{bundle.select}" itemValue="" noSelectionOption="true"/>
                                                                     <f:selectItems value="#{subdsf.datasetFieldType.controlledVocabularyValues}" var="cvv" itemLabel="#{cvv.localeStrValue}" itemValue="#{cvv}" />
@@ -301,7 +296,13 @@
                                                                         <h:outputText value="#{cvv.localeStrValue}"  style="margin-right:.5em;display:inline-block;"/>
                                                                     </ui:repeat>
                                                                 </p:outputPanel>
--->
+                                                                -->
+                                                                <ui:remove>
+                                                                <!-- Todo: If there are instances of multi-val cvv in a compound field, some addition will probably be needed for accessibility -
+                                                                     to associate this field with the label above (as was done in this commit for the single value cvv in a compound field case).
+                                                                     I did that by inspecting the html source produced, so skipping this unless/until I find an example. 
+                                                                -->
+                                                                </ui:remove> 
                                                                     <p:selectCheckboxMenu value="#{subdsf.controlledVocabularyValues}" converter="controlledVocabularyValueConverter"
                                                                                           rendered="#{subdsf.datasetFieldType.allowMultiples}" label="#{bundle.select}" multiple="true"  >
                                                                         <f:selectItems value="#{subdsf.datasetFieldType.controlledVocabularyValues}" var="cvv" itemLabel="#{cvv.localeStrValue}" itemValue="#{cvv}" />

From 79336b805ab5ba21c47d5a37203705bf245cdfe5 Mon Sep 17 00:00:00 2001
From: Jim Myers <myersjd@umich.edu>
Date: Fri, 10 Dec 2021 11:37:57 -0500
Subject: [PATCH 15/39] search frag - input, facet, preview icon linklabel,
 remove menu role

---
 src/main/java/propertyFiles/Bundle.properties |  3 +++
 src/main/webapp/search-include-fragment.xhtml | 20 ++++++++++---------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/main/java/propertyFiles/Bundle.properties b/src/main/java/propertyFiles/Bundle.properties
index 7d244da01fb..59ddb411ba9 100644
--- a/src/main/java/propertyFiles/Bundle.properties
+++ b/src/main/java/propertyFiles/Bundle.properties
@@ -996,6 +996,9 @@ dataverse.widgets.advanced.url.watermark=http://www.example.com/page-name
 dataverse.widgets.advanced.invalid.message=Please enter a valid URL
 dataverse.widgets.advanced.success.message=Successfully updated your Personal Website URL
 dataverse.widgets.advanced.failure.message=The dataverse Personal Website URL has not been updated.
+facet.collection.label=Show Collections
+facet.dataset.label=Show Data Projects
+facet.datafile.label=Show Files
 
 # permissions-manage.xhtml
 dataverse.permissions.title=Permissions
diff --git a/src/main/webapp/search-include-fragment.xhtml b/src/main/webapp/search-include-fragment.xhtml
index e5f35d69d5c..2d03349acf1 100644
--- a/src/main/webapp/search-include-fragment.xhtml
+++ b/src/main/webapp/search-include-fragment.xhtml
@@ -21,9 +21,10 @@
         <div class="#{widgetWrapper.widgetView ? 'col-xs-12' : 'col-sm-9'}">
             <h:form styleClass="form-inline">
                 <div class="form-group">
-                    <label class="sr-only" for="searchBasic">#{bundle.search}</label>
                     <div class="input-group">
-                        <p:inputText id="searchBasic" title="#{bundle.search}" styleClass="form-control search-input" size="35" value="#{SearchIncludeFragment.query}" onkeypress="if (event.keyCode == 13) { submitsearch(); return false; }"/>
+                        <p:inputText id="searchBasic" title="#{bundle.search}" styleClass="form-control search-input" size="35" value="#{SearchIncludeFragment.query}" onkeypress="if (event.keyCode == 13) { submitsearch(); return false; }">
+                            <f:passThroughAttribute name="aria-label" value="#{bundle.search}"/>
+                        </p:inputText>
                         <p:watermark for="searchBasic" value="#{dataverseRedirectPage == 'dataverseuser.xhtml' ? bundle['account.search.input.watermark'] : bundle['dataverse.search.input.watermark']}"/>
 
                         <span class="input-group-btn">
@@ -60,7 +61,7 @@
                         <button type="button" class="btn btn-default btn-access dropdown-toggle" data-toggle="dropdown">
                             <span class="glyphicon glyphicon-plus"/> #{bundle['dataverse.results.btn.addData']} <span class="caret"></span>
                         </button>
-                        <ul class="dropdown-menu pull-right text-left" role="menu">
+                        <ul class="dropdown-menu pull-right text-left">
                             <ui:fragment rendered="#{permissionsWrapper.canIssueCreateDataverseCommand(SearchIncludeFragment.dataverse) }">
                                 <li><a href="/dataverse.xhtml?ownerId=#{SearchIncludeFragment.dataverse.id}">#{bundle['dataverse.results.btn.addData.newDataverse']}</a></li>
                             </ui:fragment>
@@ -104,7 +105,7 @@
                         <f:param name="sort" value="#{SearchIncludeFragment.sortField}"/>
                         <f:param name="order" value="#{SearchIncludeFragment.sortOrder}"/>
                         <f:param name="page" value="1"/>
-                        <p:selectBooleanCheckbox value="#{SearchIncludeFragment.selectedTypesList.contains('dataverses') ? true : false}" disabled="#{SearchIncludeFragment.getNewSelectedTypes('dataverses') == null ? true : false}"/>
+                        <p:selectBooleanCheckbox value="#{SearchIncludeFragment.selectedTypesList.contains('dataverses') ? true : false}" disabled="#{SearchIncludeFragment.getNewSelectedTypes('dataverses') == null ? true : false}" ariaLabel="#{bundle['facet.collection.label']}"/>
                     </h:outputLink>
                     <!--DATAVERSES ONLY-->
                     <h:outputLink value="#{widgetWrapper.wrapURL(page)}" disabled="#{false}" styleClass="facetTypeLink chkbox-label-margin #{SearchIncludeFragment.selectedTypesList.contains('dataverses') ? 'facetSelected': ''}">
@@ -135,7 +136,7 @@
                         <f:param name="sort" value="#{SearchIncludeFragment.sortField}"/>
                         <f:param name="order" value="#{SearchIncludeFragment.sortOrder}"/>
                         <f:param name="page" value="1"/>
-                        <p:selectBooleanCheckbox value="#{SearchIncludeFragment.selectedTypesList.contains('datasets') ? true : false}" disabled="#{SearchIncludeFragment.getNewSelectedTypes('datasets') == null ? true : false}"/>
+                        <p:selectBooleanCheckbox value="#{SearchIncludeFragment.selectedTypesList.contains('datasets') ? true : false}" disabled="#{SearchIncludeFragment.getNewSelectedTypes('datasets') == null ? true : false}" ariaLabel="#{bundle['facet.dataset.label']}"/>
                     </h:outputLink>
                     <!--DATASETS ONLY-->
                     <h:outputLink value="#{widgetWrapper.wrapURL(page)}" disabled="#{false}" styleClass="facetTypeLink chkbox-label-margin #{SearchIncludeFragment.selectedTypesList.contains('datasets') ? 'facetSelected': ''}">
@@ -166,7 +167,7 @@
                         <f:param name="sort" value="#{SearchIncludeFragment.sortField}"/>
                         <f:param name="order" value="#{SearchIncludeFragment.sortOrder}"/>
                         <f:param name="page" value="1"/>
-                        <p:selectBooleanCheckbox value="#{SearchIncludeFragment.selectedTypesList.contains('files') ? true : false}" disabled="#{SearchIncludeFragment.getNewSelectedTypes('files') == null ? true : false}"/>
+                        <p:selectBooleanCheckbox value="#{SearchIncludeFragment.selectedTypesList.contains('files') ? true : false}" disabled="#{SearchIncludeFragment.getNewSelectedTypes('files') == null ? true : false}" ariaLabel="#{bundle['facet.datafile.label']}"/>
                     </h:outputLink>
                     <!--FILES ONLY-->
                     <h:outputLink value="#{widgetWrapper.wrapURL(page)}" disabled="#{false}" styleClass="facetTypeLink chkbox-label-margin #{SearchIncludeFragment.selectedTypesList.contains('files') ? 'facetSelected': ''}">
@@ -389,7 +390,7 @@
                         <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
                             <span class="glyphicon glyphicon-sort"/> #{bundle['dataverse.results.btn.sort']} <span class="caret"/>
                         </button>
-                        <ul class="dropdown-menu pull-right text-left" role="menu">
+                        <ul class="dropdown-menu pull-right text-left">
                             <li>
                                 <h:outputLink value="#{widgetWrapper.wrapURL(page)}">
                                     <h:outputText value="#{bundle['dataverse.results.btn.sort.option.nameAZ']}" styleClass="#{SearchIncludeFragment.sortedByNameAsc ? 'highlightBold' : ''}"/>
@@ -493,6 +494,7 @@
                             <h:outputLink value="#{!SearchIncludeFragment.rootDv and !result.isInTree ? dvUrl : widgetWrapper.wrapURL(dvUrl)}" target="#{!SearchIncludeFragment.rootDv and !result.isInTree and widgetWrapper.widgetView ? '_blank' : ''}">
                                 <img src="#{result.imageUrl}" jsf:rendered="#{!empty result.imageUrl}" alt="#{of:format1(bundle['alt.logo'], result.name)}"/>
                                 <span class="icon-dataverse text-brand" jsf:rendered="#{empty result.imageUrl}"/>
+                                <f:passThroughAttribute name="aria-label" value="#{of:format1(bundle['alt.logo'], result.name)}"/>
                             </h:outputLink>
                         </div>
 
@@ -550,7 +552,7 @@
                             <h:outputText value="#{result.userRole}" styleClass="label label-primary" rendered="#{!empty result.userRole}"/>
                         </div>
                         <div class="card-preview-icon-block text-center">
-                            <a href="#{!SearchIncludeFragment.rootDv and !result.isInTree ? result.datasetUrl : widgetWrapper.wrapURL(result.datasetUrl)}" target="#{(!SearchIncludeFragment.rootDv and !result.isInTree and widgetWrapper.widgetView) or result.harvested ? '_blank' : ''}">                               
+                            <a href="#{!SearchIncludeFragment.rootDv and !result.isInTree ? result.datasetUrl : widgetWrapper.wrapURL(result.datasetUrl)}" target="#{(!SearchIncludeFragment.rootDv and !result.isInTree and widgetWrapper.widgetView) or result.harvested ? '_blank' : ''}" aria-label="#{result.title}">
                                 <img src="#{result.imageUrl}" jsf:rendered="#{!empty result.imageUrl and !result.deaccessionedState}" alt="#{result.title}"/>
                                 <span class="icon-dataset" jsf:rendered="#{empty result.imageUrl or result.deaccessionedState}"/>
                             </a>
@@ -617,7 +619,7 @@
                         </div>
 
                         <div class="card-preview-icon-block text-center">
-                            <a href="#{!SearchIncludeFragment.rootDv and !result.isInTree ? (result.harvested ? result.fileDatasetUrl : result.fileUrl) : widgetWrapper.wrapURL(result.harvested ? result.fileDatasetUrl : result.fileUrl)}" target="#{(!SearchIncludeFragment.rootDv and !result.isInTree and widgetWrapper.widgetView) or result.harvested ? '_blank' : ''}">
+                            <a href="#{!SearchIncludeFragment.rootDv and !result.isInTree ? (result.harvested ? result.fileDatasetUrl : result.fileUrl) : widgetWrapper.wrapURL(result.harvested ? result.fileDatasetUrl : result.fileUrl)}" target="#{(!SearchIncludeFragment.rootDv and !result.isInTree and widgetWrapper.widgetView) or result.harvested ? '_blank' : ''}" aria-label="#{result.name}">
                                 <img src="#{result.imageUrl}" jsf:rendered="#{!empty result.imageUrl}" alt="#{result.name}"/>
                                 <span class="icon-#{dataFileServiceBean.getFileThumbnailClass(result.entity)} text-muted h1"
                                       jsf:rendered="#{empty result.imageUrl}"/>

From 4bb97772977f81a25cc7fa67e52494e7afb46eaa Mon Sep 17 00:00:00 2001
From: Jim Myers <myersjd@umich.edu>
Date: Fri, 10 Dec 2021 11:57:44 -0500
Subject: [PATCH 16/39] search include pager - labels for pagination controls

---
 src/main/java/propertyFiles/Bundle.properties | 4 ++++
 src/main/webapp/search-include-pager.xhtml    | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/src/main/java/propertyFiles/Bundle.properties b/src/main/java/propertyFiles/Bundle.properties
index 59ddb411ba9..a789e2cd0d0 100644
--- a/src/main/java/propertyFiles/Bundle.properties
+++ b/src/main/java/propertyFiles/Bundle.properties
@@ -922,6 +922,10 @@ dataverse.results.empty.link.technicalDetails=More technical details
 dataverse.search.facet.error=There was an error with your search parameters. Please <a href="/dataverse/{0}">clear your search</a> and try again.
 dataverse.results.count.toofresults={0} to {1} of {2} {2, choice, 0#Results|1#Result|2#Results}
 dataverse.results.paginator.current=(Current)
+dataverse.results.paginator.first=First Page
+dataverse.results.paginator.previous=Previous Page
+dataverse.results.paginator.next=Next Page
+dataverse.results.paginator.last=Last Page
 dataverse.results.btn.sort=Sort
 dataverse.results.btn.sort.option.nameAZ=Name (A-Z)
 dataverse.results.btn.sort.option.nameZA=Name (Z-A)
diff --git a/src/main/webapp/search-include-pager.xhtml b/src/main/webapp/search-include-pager.xhtml
index 5b89b1629cd..ad8fb316dda 100644
--- a/src/main/webapp/search-include-pager.xhtml
+++ b/src/main/webapp/search-include-pager.xhtml
@@ -25,6 +25,7 @@
                             <f:param name="sort" value="#{SearchIncludeFragment.sortField}"/>
                             <f:param name="order" value="#{SearchIncludeFragment.sortOrder}"/>
                             <f:param name="page" value="1"/>
+                            <f:passThroughAttribute name="title" value="#{bundle['dataverse.results.paginator.first']}"/>
                         </h:outputLink>
                     </li>
                     <li class="#{SearchIncludeFragment.page == '1' ? 'disabled' : ''}">
@@ -38,6 +39,7 @@
                             <f:param name="sort" value="#{SearchIncludeFragment.sortField}"/>
                             <f:param name="order" value="#{SearchIncludeFragment.sortOrder}"/>
                             <f:param name="page" value="#{Math:max(1,SearchIncludeFragment.page-1).intValue()}"/>
+                            <f:passThroughAttribute name="title" value="#{bundle['dataverse.results.paginator.previous']}"/>
                         </h:outputLink>
                     </li>
                     <c:forEach begin="#{Math:max(1,SearchIncludeFragment.page-Math:max(2,SearchIncludeFragment.page-SearchIncludeFragment.totalPages+4))}"
@@ -73,6 +75,7 @@
                             <f:param name="sort" value="#{SearchIncludeFragment.sortField}"/>
                             <f:param name="order" value="#{SearchIncludeFragment.sortOrder}"/>
                             <f:param name="page" value="#{Math:min(SearchIncludeFragment.page+1,SearchIncludeFragment.totalPages).intValue()}"/>
+                            <f:passThroughAttribute name="title" value="#{bundle['dataverse.results.paginator.next']}"/>
                         </h:outputLink>
                     </li>
                     <li class="#{SearchIncludeFragment.page == SearchIncludeFragment.totalPages ? 'disabled' : ''}">
@@ -86,6 +89,7 @@
                             <f:param name="order" value="#{SearchIncludeFragment.sortOrder}"/>
                             <f:param name="page" value="#{SearchIncludeFragment.totalPages}"/>
                             <f:param name="types" value="#{SearchIncludeFragment.selectedTypesString}"/>
+                            <f:passThroughAttribute name="title" value="#{bundle['dataverse.results.paginator.last']}"/>
                         </h:outputLink>
                     </li>
                 </ul>

From f33246543c8e6ee11071a42366b63bb03551b817 Mon Sep 17 00:00:00 2001
From: Jim Myers <myersjd@umich.edu>
Date: Fri, 10 Dec 2021 12:38:26 -0500
Subject: [PATCH 17/39] titles for sharre entries

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

diff --git a/src/main/webapp/resources/js/dv_rebind_bootstrap_ui.js b/src/main/webapp/resources/js/dv_rebind_bootstrap_ui.js
index fd7b1b268a8..dd877a8420f 100644
--- a/src/main/webapp/resources/js/dv_rebind_bootstrap_ui.js
+++ b/src/main/webapp/resources/js/dv_rebind_bootstrap_ui.js
@@ -139,9 +139,9 @@ function sharrre(){
         },
         template: '<div id="sharrre-block" class="clearfix">\n\
                     <input type="hidden" id="sharrre-total" name="sharrre-total" value="{total}"/> \n\
-                    <a href="#" class="sharrre-facebook"><span class="socicon socicon-facebook"/></a> \n\
-                    <a href="#" class="sharrre-twitter"><span class="socicon socicon-twitter"/></a> \n\
-                    <a href="#" class="sharrre-linkedin"><span class="socicon socicon-linkedin"/></a>\n\
+                    <a href="#" class="sharrre-facebook" title="FaceBook"><span class="socicon socicon-facebook"/></a> \n\
+                    <a href="#" class="sharrre-twitter" title="Twitter"><span class="socicon socicon-twitter"/></a> \n\
+                    <a href="#" class="sharrre-linkedin" title="LinkedIn"><span class="socicon socicon-linkedin"/></a>\n\
                     </div>',
         enableHover: false,
         enableTracking: true,

From b5751364f7f022bc1f3e3a3088cec8740ba2299c Mon Sep 17 00:00:00 2001
From: Jim Myers <myersjd@umich.edu>
Date: Mon, 13 Dec 2021 15:06:02 -0500
Subject: [PATCH 18/39] main page icon - remove tabindex=1

tabindex>0 generated a warning. In this case, the tabindex is on a
<span> within an <a> which already causes a tab stop. So I've removed
the tabindex altogether, which I think just removes a redundant stop on
this element.
---
 src/main/webapp/dataverse_header.xhtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/webapp/dataverse_header.xhtml b/src/main/webapp/dataverse_header.xhtml
index 4561782609f..6e0e6acf896 100644
--- a/src/main/webapp/dataverse_header.xhtml
+++ b/src/main/webapp/dataverse_header.xhtml
@@ -28,7 +28,7 @@
                     </button>
                     <a href="/">
                         <ui:fragment rendered="#{empty settingsWrapper.get(':LogoCustomizationFile')}">
-                            <span class="navbar-brand" tabindex="1"><span id="icon-dataverse" class="icon-dataverse"></span> #{bundle.dataverse}</span>
+                            <span class="navbar-brand"><span id="icon-dataverse" class="icon-dataverse"></span> #{bundle.dataverse}</span>
                         </ui:fragment>
                         <h:graphicImage rendered="#{!empty settingsWrapper.get(':LogoCustomizationFile')}"
                             url="#{settingsWrapper.get(':LogoCustomizationFile')}" styleClass="navbar-brand custom-logo" alt="#{of:format1(bundle['alt.homepage'], settingsWrapper.rootDataverse.name)}"/>

From 46dfdecc1a946286e83e4d72acd92f99ba6decbb Mon Sep 17 00:00:00 2001
From: Jim Myers <myersjd@umich.edu>
Date: Mon, 13 Dec 2021 15:08:50 -0500
Subject: [PATCH 19/39] main page - menu support form not in li

Since the support form in in the menu's <ul>, it needs to be wrapped in
a <li> to avoid a warning
---
 src/main/webapp/dataverse_header.xhtml | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/main/webapp/dataverse_header.xhtml b/src/main/webapp/dataverse_header.xhtml
index 6e0e6acf896..400e067b694 100644
--- a/src/main/webapp/dataverse_header.xhtml
+++ b/src/main/webapp/dataverse_header.xhtml
@@ -83,15 +83,17 @@
                             </h:outputLink>
                         </li>
                         <ui:fragment rendered="#{empty settingsWrapper.get(':NavbarSupportUrl')}">
-                            <o:form useRequestURI="true" class="navbar-form navbar-left navbar-form-link">
-                                <p:commandLink oncomplete="PF('contactForm').show()" update=":contactDialog" actionListener="#{sendFeedbackDialog.initUserInput}" id="headerSupportLink">
-                                    <f:setPropertyActionListener target="#{sendFeedbackDialog.messageSubject}" value=""/>
-                                    <f:setPropertyActionListener target="#{sendFeedbackDialog.recipient}" value="#{null}"/>
-                                    <f:setPropertyActionListener target="#{sendFeedbackDialog.userMessage}" value=""/>
-                                    <f:setPropertyActionListener target="#{sendFeedbackDialog.userEmail}" value=""/>
-                                    <h:outputText value="#{bundle['header.support']}"/>
-                                </p:commandLink>
-                            </o:form>
+                            <li>
+                                <o:form useRequestURI="true" class="navbar-form navbar-left navbar-form-link">
+                                    <p:commandLink oncomplete="PF('contactForm').show()" update=":contactDialog" actionListener="#{sendFeedbackDialog.initUserInput}" id="headerSupportLink">
+                                        <f:setPropertyActionListener target="#{sendFeedbackDialog.messageSubject}" value=""/>
+                                        <f:setPropertyActionListener target="#{sendFeedbackDialog.recipient}" value="#{null}"/>
+                                        <f:setPropertyActionListener target="#{sendFeedbackDialog.userMessage}" value=""/>
+                                        <f:setPropertyActionListener target="#{sendFeedbackDialog.userEmail}" value=""/>
+                                        <h:outputText value="#{bundle['header.support']}"/>
+                                    </p:commandLink>
+                                </o:form>
+                            </li>
                         </ui:fragment>
                         <li class="dropdown" jsf:rendered="#{settingsWrapper.localesConfigured}">
                             <a href="#" class="dropdown-toggle" data-toggle="dropdown" title="#{bundle.language}">#{dataverseSession.localeTitle} <b class="caret"></b></a>

From 0849bea667462da7a327df3ade2639d7000be993 Mon Sep 17 00:00:00 2001
From: Jim Myers <myersjd@umich.edu>
Date: Mon, 13 Dec 2021 16:09:41 -0500
Subject: [PATCH 20/39] main header -user menu remove role=menu

same as for other role=menu
---
 src/main/webapp/dataverse_header.xhtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/webapp/dataverse_header.xhtml b/src/main/webapp/dataverse_header.xhtml
index 400e067b694..ccf7872f6cd 100644
--- a/src/main/webapp/dataverse_header.xhtml
+++ b/src/main/webapp/dataverse_header.xhtml
@@ -122,7 +122,7 @@
                         </ui:fragment>
                         <ui:fragment rendered="#{dataverseSession.user.authenticated}">
                             <li class="dropdown accountName">
-                                <a href="#" id="lnk_header_account_dropdown" class="dropdown-toggle" data-toggle="dropdown" role="menu" aria-haspopup="true" aria-expanded="false">
+                                <a href="#" id="lnk_header_account_dropdown" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                                     <ui:fragment rendered="#{dataverseSession.user.superuser}">
                                         <span class="glyphicon glyphicon-user text-danger"></span>
                                     </ui:fragment>

From a099e487c2609ba6f9493bdaff851b857aefb9c6 Mon Sep 17 00:00:00 2001
From: Jim Myers <myersjd@umich.edu>
Date: Mon, 13 Dec 2021 16:25:33 -0500
Subject: [PATCH 21/39] header - label for user dropdown link

used an aria-labelledby to associate the a element with the text in the
a child element (#userDisplayIfoTitle).
---
 src/main/webapp/dataverse_header.xhtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/webapp/dataverse_header.xhtml b/src/main/webapp/dataverse_header.xhtml
index ccf7872f6cd..10d7bdf8650 100644
--- a/src/main/webapp/dataverse_header.xhtml
+++ b/src/main/webapp/dataverse_header.xhtml
@@ -122,7 +122,7 @@
                         </ui:fragment>
                         <ui:fragment rendered="#{dataverseSession.user.authenticated}">
                             <li class="dropdown accountName">
-                                <a href="#" id="lnk_header_account_dropdown" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                <a href="#" id="lnk_header_account_dropdown" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-labelledby="userInfoDisplayTitle" aria-expanded="false">
                                     <ui:fragment rendered="#{dataverseSession.user.superuser}">
                                         <span class="glyphicon glyphicon-user text-danger"></span>
                                     </ui:fragment>

From e7ff8bdd44ab9aec4414709159d09908c246b652 Mon Sep 17 00:00:00 2001
From: Jim Myers <myersjd@umich.edu>
Date: Mon, 13 Dec 2021 16:54:04 -0500
Subject: [PATCH 22/39] color updates

Colors are a complex issue - this commit has a few changes that remove
Axe warnings related to links, muted text, and some earning/danger
labels. Several of these, e.g. labels come from bootstrap and so will
change with bootstrap version. In many cases, Axe can't determine
whether there is an issue due to gradient backgrounds and/or overlapping
elements.
---
 src/main/webapp/resources/css/structure.css | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/main/webapp/resources/css/structure.css b/src/main/webapp/resources/css/structure.css
index 0536ffdfdbf..6c25fe049b8 100644
--- a/src/main/webapp/resources/css/structure.css
+++ b/src/main/webapp/resources/css/structure.css
@@ -49,8 +49,8 @@ body .ui-widget {font-size: inherit;}
 #status-alert {margin-top:0; margin-bottom:0;}
 #status-alert div.alert {border:0; box-shadow:none;}
 
-#dvfooter {position:absolute; bottom:0; width:100%; height:60px; padding-bottom:100px; color:#808080;}
-#dvfooter.widget-view {position:fixed; left:0; bottom:0; margin:0; padding:4px 0 0 0; min-height:44px; height:auto; background:#fff;}
+#dvfooter {position:absolute; bottom:0; width:100%; height:60px; padding-bottom:100px; color:#767676;}
+#dvfooter.widget-view {position:fixed; left:0; bottom:0; margin:0; padding:4px 0 0 0; min-height:44p; height:auto; background:#fff;}
 #dvfooter .poweredbylogo {text-align:right;}
 #dvfooter .poweredbylogo span {font-size:.85em;margin-right:.3em;}
 #dvfooter .version {vertical-align:bottom;white-space:nowrap;}
@@ -1070,4 +1070,17 @@ padding-right:0px;
 
 .embargolabel {
     font-weight: 700;
-}
\ No newline at end of file
+}
+
+/*Accessibility*/
+.text-muted {
+    color: #707070;
+}
+a {
+    color:#31741F;
+}
+.pagination>.disabled>a {
+    color:#767676;
+}
+span.label-warning { background-color: #A4660E }
+span.label-danger { background-color: #D3413C }

From 9c64f5ec9b9ee986af44aee697c47c4f697d0d5f Mon Sep 17 00:00:00 2001
From: qqmyers <qqmyers@hotmail.com>
Date: Wed, 22 Dec 2021 12:12:34 -0500
Subject: [PATCH 23/39] dropdown search menu - li and label issues

---
 src/main/webapp/dataverse_header.xhtml | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/main/webapp/dataverse_header.xhtml b/src/main/webapp/dataverse_header.xhtml
index 10d7bdf8650..13c157da8b0 100644
--- a/src/main/webapp/dataverse_header.xhtml
+++ b/src/main/webapp/dataverse_header.xhtml
@@ -54,17 +54,19 @@
                         <li class="dropdown">
                             <a href="#" class="dropdown-toggle" data-toggle="dropdown">#{bundle.search} <b class="caret"></b></a>
                             <ul class="dropdown-menu navbar-search">
-                                <form class="form-inline" role="search">
-                                    <label id="searchNavLabel" class="sr-only" for="navbarsearch">#{bundle.search}</label>
-                                    <div class="input-group">
-                                        <input id="navbarsearch" type="text" class="form-control" size="28" value="" placeholder="#{bundle['header.search.title']}" aria-labelledby="searchNavLabel"/>
-                                        <span class="input-group-btn">
-                                            <button type="submit" title="#{bundle.find}" class="btn btn-default bootstrap-button-tooltip" onclick="window.location='/dataverse/#{settingsWrapper.rootDataverse.alias}&#63;q=' + document.getElementById('navbarsearch').value;return false;">
-                                                <span class="glyphicon glyphicon-search no-text"/>
-                                            </button>
-                                        </span>
-                                    </div>
-                                </form>
+                                <li>
+                                    <form class="form-inline" role="search">
+                                        <label id="searchNavLabel" class="sr-only" for="navbarsearch">#{bundle.search}</label>
+                                        <div class="input-group">
+                                            <input id="navbarsearch" type="text" class="form-control" size="28" value="" placeholder="#{bundle['header.search.title']}" />
+                                            <span class="input-group-btn">
+                                                <button type="submit" title="#{bundle.find}" class="btn btn-default bootstrap-button-tooltip" aria-labelledby="searchNavLabel" onclick="window.location='/dataverse/#{settingsWrapper.rootDataverse.alias}&#63;q=' + document.getElementById('navbarsearch').value;return false;">
+                                                    <span class="glyphicon glyphicon-search no-text"/>
+                                                </button>
+                                            </span>
+                                        </div>
+                                    </form>
+                                </li>
                             </ul>
                         </li>
                         <li jsf:rendered="#{!empty settingsWrapper.get(':NavbarAboutUrl')}">

From fc4850647f57854120ba53adf30f8eae54318d9a Mon Sep 17 00:00:00 2001
From: qqmyers <qqmyers@hotmail.com>
Date: Wed, 22 Dec 2021 12:16:44 -0500
Subject: [PATCH 24/39] dataset page default label contrast

---
 src/main/webapp/resources/css/structure.css | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/webapp/resources/css/structure.css b/src/main/webapp/resources/css/structure.css
index 6c25fe049b8..9f0844106b6 100644
--- a/src/main/webapp/resources/css/structure.css
+++ b/src/main/webapp/resources/css/structure.css
@@ -1084,3 +1084,4 @@ a {
 }
 span.label-warning { background-color: #A4660E }
 span.label-danger { background-color: #D3413C }
+span.label-default { background-color: #757575 }
\ No newline at end of file

From 1464a55ac0b69b99bd3a3492086c5c885a52eb6c Mon Sep 17 00:00:00 2001
From: qqmyers <qqmyers@hotmail.com>
Date: Wed, 22 Dec 2021 12:19:19 -0500
Subject: [PATCH 25/39] dataset page access kebab - color contrast

---
 src/main/webapp/resources/css/structure.css | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/webapp/resources/css/structure.css b/src/main/webapp/resources/css/structure.css
index 9f0844106b6..2dfe3f96a88 100644
--- a/src/main/webapp/resources/css/structure.css
+++ b/src/main/webapp/resources/css/structure.css
@@ -1084,4 +1084,5 @@ a {
 }
 span.label-warning { background-color: #A4660E }
 span.label-danger { background-color: #D3413C }
-span.label-default { background-color: #757575 }
\ No newline at end of file
+span.label-default { background-color: #757575 }
+.dropdown-header { color:#757575 }
\ No newline at end of file

From f60f34b7bc09141ec2f650a1f72ba4cd7eef1587 Mon Sep 17 00:00:00 2001
From: qqmyers <qqmyers@hotmail.com>
Date: Wed, 22 Dec 2021 12:29:29 -0500
Subject: [PATCH 26/39] typo

---
 src/main/webapp/resources/css/structure.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/webapp/resources/css/structure.css b/src/main/webapp/resources/css/structure.css
index 2dfe3f96a88..6896cd35702 100644
--- a/src/main/webapp/resources/css/structure.css
+++ b/src/main/webapp/resources/css/structure.css
@@ -1077,7 +1077,7 @@ padding-right:0px;
     color: #707070;
 }
 a {
-    color:#31741F;
+    color:#3174AF;
 }
 .pagination>.disabled>a {
     color:#767676;

From 9f6a7fcb81ff13c29800c1a8984e87f8e663c3ca Mon Sep 17 00:00:00 2001
From: qqmyers <qqmyers@hotmail.com>
Date: Wed, 22 Dec 2021 12:58:46 -0500
Subject: [PATCH 27/39] login page = labels and h1 element

added css to keep font-size 30px for h1 Login element (which it was when
it was an h2 element)
---
 src/main/webapp/loginpage.xhtml             | 4 ++--
 src/main/webapp/resources/css/structure.css | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/webapp/loginpage.xhtml b/src/main/webapp/loginpage.xhtml
index 320455d6ebc..1d3bf936e7f 100644
--- a/src/main/webapp/loginpage.xhtml
+++ b/src/main/webapp/loginpage.xhtml
@@ -63,12 +63,12 @@
                                     </ui:remove>
                                     <ui:repeat id="credentialsContainer" value="#{LoginPage.filledCredentials}" var="fc">
                                         <div class="form-group text-left">
-                                            <label class="col-sm-4 control-label" for="credValue">
+                                            <label class="col-sm-4 control-label" for="loginForm:credentialsContainer:0:credValue">
                                                 #{bundle[fc.credential.key]}
                                             </label>
                                             <div class="col-sm-8">
                                                 <h:inputText rendered="#{not fc.credential.secret}" value="#{fc.value}" id="credValue" styleClass="form-control"/>
-                                                <p:message rendered="#{not fc.credential.secret}" for="credValue" display="text"/>
+                                                <p:message rendered="#{not fc.credential.secret}" for="loginForm:credentialsContainer:1:sCredValue" display="text"/>
 						<h:inputSecret rendered="#{fc.credential.secret}" value="#{fc.value}" id="sCredValue" styleClass="form-control" autocomplete="off"/><!-- browsers will in general not respect autocomplete="foo", but scanners will still flag it as a potential problem -->
                                                 <p:message rendered="#{fc.credential.secret}" for="sCredValue" display="text"/>
                                             </div>
diff --git a/src/main/webapp/resources/css/structure.css b/src/main/webapp/resources/css/structure.css
index 6896cd35702..72cfc4f9552 100644
--- a/src/main/webapp/resources/css/structure.css
+++ b/src/main/webapp/resources/css/structure.css
@@ -1085,4 +1085,6 @@ a {
 span.label-warning { background-color: #A4660E }
 span.label-danger { background-color: #D3413C }
 span.label-default { background-color: #757575 }
-.dropdown-header { color:#757575 }
\ No newline at end of file
+.dropdown-header { color:#757575 }
+
+.login-container h1 { font-size:30px; }
\ No newline at end of file

From ec929d37b334839adea5e71d5d73576e530786d4 Mon Sep 17 00:00:00 2001
From: qqmyers <qqmyers@hotmail.com>
Date: Wed, 22 Dec 2021 13:24:32 -0500
Subject: [PATCH 28/39] user/password pages - missing h1

---
 src/main/webapp/dataverseuser.xhtml | 1 +
 src/main/webapp/passwordreset.xhtml | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/webapp/dataverseuser.xhtml b/src/main/webapp/dataverseuser.xhtml
index b043c4ccb6f..f9ad3a71b9d 100644
--- a/src/main/webapp/dataverseuser.xhtml
+++ b/src/main/webapp/dataverseuser.xhtml
@@ -44,6 +44,7 @@
                     <f:viewAction action="#{DataverseUserPage.init}" />
                     <f:viewAction action="#{dataverseHeaderFragment.initBreadcrumbs(dataverseServiceBean.findRootDataverse(), (DataverseUserPage.editMode == 'CREATE' ? bundle['user.createBtn'] : bundle.account))}"/>
                 </f:metadata>
+                <h1>#{pageTitle}</h1>
                 <h:form id="dataverseUserForm">
 
                     <p:focus context="dataverseUserForm"/>
diff --git a/src/main/webapp/passwordreset.xhtml b/src/main/webapp/passwordreset.xhtml
index 422ed48397b..4ffbdf21e08 100644
--- a/src/main/webapp/passwordreset.xhtml
+++ b/src/main/webapp/passwordreset.xhtml
@@ -30,7 +30,7 @@
                         </tt>
                     </div>
                 </ui:fragment>
-                
+                <h1>#{pageTitle}</h1>
                 <ui:fragment rendered="#{empty PasswordResetPage.token}">
                     <div jsf:rendered="#{empty PasswordResetPage.emailAddress}">
                         <div class="alert alert-info">

From 77012fa3bf942e47f2695a7ef306078409da2ee3 Mon Sep 17 00:00:00 2001
From: qqmyers <qqmyers@hotmail.com>
Date: Wed, 22 Dec 2021 14:15:23 -0500
Subject: [PATCH 29/39] header - label

mismatched id/aria-labelledby values
---
 src/main/webapp/dataverse_header.xhtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/webapp/dataverse_header.xhtml b/src/main/webapp/dataverse_header.xhtml
index 13c157da8b0..8ae117dd869 100644
--- a/src/main/webapp/dataverse_header.xhtml
+++ b/src/main/webapp/dataverse_header.xhtml
@@ -124,7 +124,7 @@
                         </ui:fragment>
                         <ui:fragment rendered="#{dataverseSession.user.authenticated}">
                             <li class="dropdown accountName">
-                                <a href="#" id="lnk_header_account_dropdown" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-labelledby="userInfoDisplayTitle" aria-expanded="false">
+                                <a href="#" id="lnk_header_account_dropdown" class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-labelledby="userDisplayInfoTitle" aria-expanded="false">
                                     <ui:fragment rendered="#{dataverseSession.user.superuser}">
                                         <span class="glyphicon glyphicon-user text-danger"></span>
                                     </ui:fragment>

From 3ab0f75e42a776aacbb720888fd41856cdb75047 Mon Sep 17 00:00:00 2001
From: qqmyers <qqmyers@hotmail.com>
Date: Wed, 22 Dec 2021 14:33:51 -0500
Subject: [PATCH 30/39] embargo dialog - add input label

---
 src/main/webapp/file-edit-popup-fragment.xhtml | 4 ++--
 src/main/webapp/resources/css/structure.css    | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/webapp/file-edit-popup-fragment.xhtml b/src/main/webapp/file-edit-popup-fragment.xhtml
index 180bfbfd1a1..699b4c4bcd1 100644
--- a/src/main/webapp/file-edit-popup-fragment.xhtml
+++ b/src/main/webapp/file-edit-popup-fragment.xhtml
@@ -83,11 +83,11 @@
                     </div>
                     <div class="col-lg-9">
                         <div>
-                            <p class="help-block">
+                            <label class="help-block" for="datasetForm:fileEmbargoDate_input">
                                 #{bundle['file.editEmbargoDialog.newDate']} <span
                                     class="glyphicon glyphicon-asterisk text-danger"
                                     jsf:rendered="#{!bean.removeEmbargo}" />
-                            </p>
+                            </label>
                             <p:datePicker id="fileEmbargoDate"
                                 value="#{bean.selectionEmbargo.dateAvailable}"
                                 locale="#{dataverseSession.localeCode}"
diff --git a/src/main/webapp/resources/css/structure.css b/src/main/webapp/resources/css/structure.css
index 72cfc4f9552..a3b5526985f 100644
--- a/src/main/webapp/resources/css/structure.css
+++ b/src/main/webapp/resources/css/structure.css
@@ -1087,4 +1087,5 @@ span.label-danger { background-color: #D3413C }
 span.label-default { background-color: #757575 }
 .dropdown-header { color:#757575 }
 
-.login-container h1 { font-size:30px; }
\ No newline at end of file
+.login-container h1 { font-size:30px; }
+#embargoInputs label { font-weight: normal; }
\ No newline at end of file

From 3df52e9e5e85b93ea00e6213b29e7c24a6c294a0 Mon Sep 17 00:00:00 2001
From: qqmyers <qqmyers@hotmail.com>
Date: Wed, 22 Dec 2021 14:36:40 -0500
Subject: [PATCH 31/39] restrict access dialog - fix label reference

---
 src/main/webapp/file-edit-popup-fragment.xhtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/webapp/file-edit-popup-fragment.xhtml b/src/main/webapp/file-edit-popup-fragment.xhtml
index 699b4c4bcd1..bab17a245a8 100644
--- a/src/main/webapp/file-edit-popup-fragment.xhtml
+++ b/src/main/webapp/file-edit-popup-fragment.xhtml
@@ -33,7 +33,7 @@
         </p>
         <div class="form-horizontal">
             <div class="form-group">
-                <label for="termsAccessInput" class="col-sm-3 control-label">
+                <label for="datasetForm:termsAccessInput" class="col-sm-3 control-label">
                     #{bundle['file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess']}
                     <span class="glyphicon glyphicon-question-sign tooltip-icon"
                           data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.dataFilesTab.terms.list.termsOfAccess.termsOfsAccess.title']}"></span>

From 9f97755011234f915c4533064294fbff5544a078 Mon Sep 17 00:00:00 2001
From: qqmyers <qqmyers@hotmail.com>
Date: Wed, 22 Dec 2021 16:43:21 -0500
Subject: [PATCH 32/39] edit files table - unique ids

---
 src/main/webapp/file-info-fragment.xhtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/webapp/file-info-fragment.xhtml b/src/main/webapp/file-info-fragment.xhtml
index 4c1cb7578c8..1a31d02b518 100644
--- a/src/main/webapp/file-info-fragment.xhtml
+++ b/src/main/webapp/file-info-fragment.xhtml
@@ -25,7 +25,7 @@
     -->            
     </ui:remove>
     
-    <p:outputPanel id="fileInfoInclude-filesTable" styleClass="media">
+    <p:outputPanel id="fileInfoInclude-filesTable-#{fileMetadata.label}" styleClass="media">
         <div class="media-left col-file-thumb" style="padding-top:4px;">
             <div class="media-object thumbnail-block text-center">
                 <span class="icon-#{dataFileServiceBean.getFileThumbnailClass(fileMetadata.dataFile)} file-thumbnail-icon text-muted" jsf:rendered="#{!fileDownloadHelper.canDownloadFile(fileMetadata) or !dataFileServiceBean.isThumbnailAvailable(fileMetadata.dataFile)}"/>

From 8ca6257460c326c697546e31f647dd8e3e285d21 Mon Sep 17 00:00:00 2001
From: qqmyers <qqmyers@hotmail.com>
Date: Wed, 22 Dec 2021 16:47:13 -0500
Subject: [PATCH 33/39] remove unnecessary/wrong passthrough

this applies the File Count label to the individual row tds rather than
to the header which shows a file count.
---
 src/main/webapp/filesFragment.xhtml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/webapp/filesFragment.xhtml b/src/main/webapp/filesFragment.xhtml
index a67ca54c9e1..30e4ce91886 100644
--- a/src/main/webapp/filesFragment.xhtml
+++ b/src/main/webapp/filesFragment.xhtml
@@ -350,7 +350,6 @@
 
         <p:column class="col-file-metadata">
             <f:facet name="header">
-                <f:passThroughAttribute name="aria-label" value="#{bundle['file.count.label']}"/>
                 <div jsf:id="filesHeaderCount">
                     <!-- Files Count -->
                     <h:outputFormat value="#{DatasetPage.fileMetadatasSearch.size() == 1 ? bundle['file.count.one'] : bundle['file.count']}" styleClass="highlightBold" rendered="#{DatasetPage.fileMetadatasSearch.size() gt 0}">

From e8e25288b063cda63e034ef8408e60b79c04d5c0 Mon Sep 17 00:00:00 2001
From: qqmyers <qqmyers@hotmail.com>
Date: Wed, 22 Dec 2021 16:49:03 -0500
Subject: [PATCH 34/39] edit files table - add row labels, fix labels, fix
 empty header sr label

the row labels avoid the select check boxes having a warning about no
text
the labels/message boxes for the file name and directory label inputs
were broken
the facet for the empty header stops a warning about no screen reader
accessible text for that metadata column header
---
 src/main/java/propertyFiles/Bundle.properties |  1 +
 src/main/webapp/editFilesFragment.xhtml       | 18 +++++++++++-------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/main/java/propertyFiles/Bundle.properties b/src/main/java/propertyFiles/Bundle.properties
index a789e2cd0d0..7a77365e516 100644
--- a/src/main/java/propertyFiles/Bundle.properties
+++ b/src/main/java/propertyFiles/Bundle.properties
@@ -2027,6 +2027,7 @@ ingest.csv.nullStream=Stream can't be null.
 # editdatafile.xhtml
 
 # editFilesFragment.xhtml
+file.tableheader.info=File Info
 file.edit.error.file_exceeds_limit=This file exceeds the size limit.
 # File metadata error
 file.metadata.datafiletag.not_tabular=You cannot add Tabular Data Tags to a non-tabular file.
diff --git a/src/main/webapp/editFilesFragment.xhtml b/src/main/webapp/editFilesFragment.xhtml
index 44fd5180f9a..539df31e2ab 100644
--- a/src/main/webapp/editFilesFragment.xhtml
+++ b/src/main/webapp/editFilesFragment.xhtml
@@ -313,7 +313,8 @@
                                      selection="#{EditDatafilesPage.selectedFiles}" 
                                      var="fileMetadata" 
                                      widgetVar="filesTable"
-                                     emptyMessage="#{datasetPage || EditDatafilesPage.showFileUploadFragment() ? bundle['file.noUploadedFiles.tip'] : bundle['file.noSelectedFiles.tip']}">
+                                     emptyMessage="#{datasetPage || EditDatafilesPage.showFileUploadFragment() ? bundle['file.noUploadedFiles.tip'] : bundle['file.noSelectedFiles.tip']}"
+                                     ariaRowLabel="#{bundle['file.select.action']} #{fileMetadata.label}">
                             <f:facet name="header">
                                 <div jsf:id="filesHeaderBlock" class="row">
                                     <div id="filesHeaderCount" class="col-xs-6 text-left">
@@ -324,9 +325,12 @@
                                     </div>
                                 </div>
                             </f:facet>
-                            <p:column selectionMode="multiple" class="col-select-width text-center" style="width:40px !important;"/>
+                            <p:column selectionMode="multiple" class="col-select-width text-center" style="width:40px !important;" ariaHeaderText="#{bundle['file.select.tooltip']}/>
                             <p:column class="col-file-metadata">
-                                <div id="fileInfoInclude-filesTable" class="col-sm-12 row">
+                                <f:facet name="header">
+                                    <h:outputText styleClass="sr-only" value="#{bundle['file.tableheader.info']}"/>
+                                </f:facet>
+                                <div id="fileInfoInclude-filesTable-#{fileMetadata.label}" class="col-sm-12 row">
                                     <div class="pull-left col-file-thumb">
                                         <div class="thumbnail-block text-center">
                                             <!-- Thumbnail Preview -->
@@ -354,20 +358,20 @@
                                         </div>
                                     </div>
                                     <div class="col-md-10 file-metadata-block">
-                                        <label class="control-label" for="fileName" style="margin-right:1em;margin-bottom:.5em;">
+                                        <label class="control-label" for="datasetForm:filesTable:#{rowNum}:fileName" style="margin-right:1em;margin-bottom:.5em;">
                                             #{bundle['file.fileName']}
                                         </label>
                                         <p:inputText id="fileName" value="#{fileMetadata.label}" style="width:60%; margin-bottom:.5em;" disabled="#{fileMetadata.dataFile.filePackage}"/>
-                                        <p:message for="fileName"/>
+                                        <p:message for="datasetForm:filesTable:#{rowNum}:fileName"/>
 
-                                        <label class="control-label" for="fileDirectoryLabel" style="margin-right:1em;margin-bottom:.5em;">
+                                        <label class="control-label" for="datasetForm:filesTable:#{rowNum}:fileDirectoryName" style="margin-right:1em;margin-bottom:.5em;">
                                             #{bundle['file.metadataTab.fileMetadata.hierarchy.label']}    
                                             <span class="glyphicon glyphicon-question-sign tooltip-icon"
                                                   data-toggle="tooltip" data-placement="auto right" data-original-title="#{bundle['file.metadataTab.fileMetadata.hierarchy.tip']}"></span>
                                         </label>
                                         <p:inputText id="fileDirectoryName" value="#{fileMetadata.directoryLabel}"                                            
                                                      style="width:60%; margin-bottom:.5em;" disabled="#{fileMetadata.dataFile.filePackage}" widgetVar="fileDirectoryName"/>                        
-                                        <p:message for="fileDirectoryName"/>
+                                        <p:message for="datasetForm:filesTable:#{rowNum}:fileDirectoryName"/>
 
                                         <div class="text-muted small">
                                             <!-- TYPE + SIZE + DATE + CHECKSUM -->

From 7adc4c905fcd94230536de476c9ed4ea461bbbdd Mon Sep 17 00:00:00 2001
From: qqmyers <qqmyers@hotmail.com>
Date: Wed, 22 Dec 2021 17:35:44 -0500
Subject: [PATCH 35/39] login page - lost updates

fixes to label for= values
h2 -> h1 for lvel-one heading
---
 src/main/webapp/loginpage.xhtml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/webapp/loginpage.xhtml b/src/main/webapp/loginpage.xhtml
index 1d3bf936e7f..e1b77e9583b 100644
--- a/src/main/webapp/loginpage.xhtml
+++ b/src/main/webapp/loginpage.xhtml
@@ -40,7 +40,7 @@
 
                     <div class="col-md-12">
                         <div class="col-md-6 col-md-offset-3">
-                            <h2><span class="glyphicon glyphicon-log-in" /> #{bundle.login}</h2>
+                            <h1><span class="glyphicon glyphicon-log-in" /> #{bundle.login}</h1>
 
                             <div id="builtinProvider" jsf:rendered="#{LoginPage.authProvider.id == 'builtin'}">
                                 <h:form id="loginForm" styleClass="form-horizontal">
@@ -61,9 +61,9 @@
                                             </div>
                                         </ui:fragment>
                                     </ui:remove>
-                                    <ui:repeat id="credentialsContainer" value="#{LoginPage.filledCredentials}" var="fc">
+                                    <ui:repeat id="credentialsContainer" value="#{LoginPage.filledCredentials}" var="fc" varStatus="fcCount">
                                         <div class="form-group text-left">
-                                            <label class="col-sm-4 control-label" for="loginForm:credentialsContainer:0:credValue">
+                                            <label class="col-sm-4 control-label" for="loginForm:credentialsContainer:#{fcCount.index}:#{fc.credential.secret ? 'sC':'c'}redValue">
                                                 #{bundle[fc.credential.key]}
                                             </label>
                                             <div class="col-sm-8">

From f06b10f32172977eac296f46c8d223aa12c2f851 Mon Sep 17 00:00:00 2001
From: qqmyers <qqmyers@hotmail.com>
Date: Wed, 22 Dec 2021 17:40:23 -0500
Subject: [PATCH 36/39] typo

---
 src/main/webapp/editFilesFragment.xhtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/webapp/editFilesFragment.xhtml b/src/main/webapp/editFilesFragment.xhtml
index 539df31e2ab..08bb16ff0ca 100644
--- a/src/main/webapp/editFilesFragment.xhtml
+++ b/src/main/webapp/editFilesFragment.xhtml
@@ -325,7 +325,7 @@
                                     </div>
                                 </div>
                             </f:facet>
-                            <p:column selectionMode="multiple" class="col-select-width text-center" style="width:40px !important;" ariaHeaderText="#{bundle['file.select.tooltip']}/>
+                            <p:column selectionMode="multiple" class="col-select-width text-center" style="width:40px !important;" ariaHeaderText="#{bundle['file.select.tooltip']}"/>
                             <p:column class="col-file-metadata">
                                 <f:facet name="header">
                                     <h:outputText styleClass="sr-only" value="#{bundle['file.tableheader.info']}"/>

From 6f50c6295a24f504a196e15c99068aa9729bad9b Mon Sep 17 00:00:00 2001
From: Jim Myers <myersjd@umich.edu>
Date: Fri, 14 Jan 2022 10:53:52 -0500
Subject: [PATCH 37/39] reduce size of h1 elements

---
 src/main/webapp/resources/css/structure.css | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/webapp/resources/css/structure.css b/src/main/webapp/resources/css/structure.css
index a3b5526985f..3097bcfb607 100644
--- a/src/main/webapp/resources/css/structure.css
+++ b/src/main/webapp/resources/css/structure.css
@@ -223,7 +223,12 @@ body.widget-view #dataverse-header-block {padding-top:0px;}
 #dataverseHeader .dataverseHeaderName span.label.label-unpublished {vertical-align:text-top; line-height: normal; margin-left:1em;}
 #dataverseHeader .dataverseHeaderTagline {padding-left:2em; font-size:1.3em;}
 #dataverseHeader .dataverseHeaderLink {padding-left:2em;}
-
+#dataverseHeader .dataverseHeaderName .dataverseHeaderDataverseName h1 {
+    font-weight: inherit;
+    margin-top: 5px;
+    font-size: 35px;
+    margin-bottom: 10px;
+}
 /* -------- FOOTER -------- */
 #dataverseFooter {margin-top:15px;}
 #dataverseFooter .dataverseFooterLogo img {max-width:940px; max-height:120px;}

From 9405df3c6e435301621cffcd9a6dd130052a1e63 Mon Sep 17 00:00:00 2001
From: Jim Myers <myersjd@umich.edu>
Date: Fri, 14 Jan 2022 11:18:57 -0500
Subject: [PATCH 38/39] community version has smaller header text

---
 src/main/webapp/resources/css/structure.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/webapp/resources/css/structure.css b/src/main/webapp/resources/css/structure.css
index 3097bcfb607..60b64819e93 100644
--- a/src/main/webapp/resources/css/structure.css
+++ b/src/main/webapp/resources/css/structure.css
@@ -226,7 +226,7 @@ body.widget-view #dataverse-header-block {padding-top:0px;}
 #dataverseHeader .dataverseHeaderName .dataverseHeaderDataverseName h1 {
     font-weight: inherit;
     margin-top: 5px;
-    font-size: 35px;
+    font-size: 1.3em;
     margin-bottom: 10px;
 }
 /* -------- FOOTER -------- */

From 30f48e88776a0e11c9f7403a5c18945e09edf87c Mon Sep 17 00:00:00 2001
From: Jim Myers <myersjd@umich.edu>
Date: Fri, 14 Jan 2022 11:46:10 -0500
Subject: [PATCH 39/39] use pixel size instead of em

---
 src/main/webapp/resources/css/structure.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/webapp/resources/css/structure.css b/src/main/webapp/resources/css/structure.css
index 60b64819e93..2d23b1e42ac 100644
--- a/src/main/webapp/resources/css/structure.css
+++ b/src/main/webapp/resources/css/structure.css
@@ -226,7 +226,7 @@ body.widget-view #dataverse-header-block {padding-top:0px;}
 #dataverseHeader .dataverseHeaderName .dataverseHeaderDataverseName h1 {
     font-weight: inherit;
     margin-top: 5px;
-    font-size: 1.3em;
+    font-size: 18px;
     margin-bottom: 10px;
 }
 /* -------- FOOTER -------- */