Merge pull request #56 from cslzchen/feature/a11y-fix-2a-2aa

cslzchen · web-flow · commit 115082f9c497 · 2022-01-20T13:13:43.000-05:00
[ENG-3492] 2A &amp; 2AA Follow-up Fixes
diff --git a/src/main/resources/templates/casInstitutionLoginView.html b/src/main/resources/templates/casInstitutionLoginView.html
@@ -19,7 +19,7 @@
                             <tbody>
                             <tr>
                                 <td>
-                                    <img class="service-ui-logo" src="/images/osf-logo.png">
+                                    <img class="service-ui-logo" src="/images/osf-logo.png" alt="OSF logo">
                                 </td>
                                 <td>
                                     <span class="service-ui-name hidden-narrow">OSF </span>
diff --git a/src/main/resources/templates/casUnsupportedInstitutionLoginView.html b/src/main/resources/templates/casUnsupportedInstitutionLoginView.html
@@ -19,7 +19,7 @@
                         <tbody>
                         <tr>
                             <td>
-                                <img class="service-ui-logo" src="/images/osf-logo.png">
+                                <img class="service-ui-logo" src="/images/osf-logo.png" alt="OSF logo">
                             </td>
                             <td>
                                 <span class="service-ui-name hidden-narrow">OSF </span>
diff --git a/src/main/resources/templates/fragments/header.html b/src/main/resources/templates/fragments/header.html
@@ -17,7 +17,7 @@
 
                 <section class="mdc-top-app-bar__section mdc-top-app-bar__section--align-center">
                     <span class="cas-brand mx-auto" >
-                        <img class="cas-logo" src="/images/osf-logo-white.png" alt="OSF logo image in the top navigation bar">
+                        <img class="cas-logo" src="/images/osf-logo-white.png" alt="OSF logo">
                     </span>
                     <div class="cas-brand-text">
                         <a class="navbar-link" th:href="@{/login(casRedirectSource=tomcat)}">
diff --git a/src/main/resources/templates/fragments/headerosf.html b/src/main/resources/templates/fragments/headerosf.html
@@ -17,7 +17,7 @@
 
                 <section class="mdc-top-app-bar__section mdc-top-app-bar__section--align-center">
                     <span class="cas-brand mx-auto" >
-                        <img class="cas-logo" src="/images/osf-logo-white.png" alt="OSF logo image in the top navigation bar">
+                        <img class="cas-logo" src="/images/osf-logo-white.png" alt="OSF logo">
                     </span>
                     <div class="cas-brand-text">
                         <a class="navbar-link" th:href="@{${osfUrl.home}}">
diff --git a/src/main/resources/templates/fragments/loginform.html b/src/main/resources/templates/fragments/loginform.html
@@ -28,11 +28,11 @@
 
             <section class="form-button-inline" th:if="${osfCasLoginContext.orcidLoginUrl}">
                 <a class="mdc-button mdc-button--raised button-osf-grey" id="orcidlogin" th:href="@{${osfCasLoginContext.orcidLoginUrl}}">
-                    <img class="delegation-button-logo" src="/images/orcid-logo.png" alt="ORCiD logo image for the sign-in-with-orcid button">
+                    <img class="delegation-button-logo" src="/images/orcid-logo.png" alt="ORCiD logo">
                     <span class="delegation-button-label" th:utext="#{screen.welcome.button.orcidlogin}"></span>
                 </a>
                 <a class="mdc-button mdc-button--raised button-osf-grey" id="instnLogin" th:href="@{/login(campaign=institution, institutionId=${institutionId ?: ''}, service=${service?.originalUrl ?: ''})}">
-                    <img class="delegation-button-logo" src="/images/institution-logo.png" alt="Institution logo image for the sign-in-via-orcid button">
+                    <img class="delegation-button-logo" src="/images/institution-logo.png" alt="Institution logo">
                     <span class="delegation-button-label" th:utext="#{screen.welcome.button.institutionlogin}"></span>
                 </a>
             </section>
diff --git a/src/main/resources/templates/fragments/osfbannerui.html b/src/main/resources/templates/fragments/osfbannerui.html
@@ -13,7 +13,7 @@
 <body>
     <main role="main" class="container mt-3 mb-3">
         <div th:fragment="osfBannerUI" id="osfbannerui" class="mb-4 service-ui text-center">
-            <img id="servicelogo" class="service-ui-logo" src="/images/osf-banner.png" alt="OSF banner image in the main form"/>
+            <img id="servicelogo" class="service-ui-logo" src="/images/osf-banner.png" alt="OSF banner"/>
         </div>
     </main>
 </body>
diff --git a/src/main/resources/templates/fragments/serviceui.html b/src/main/resources/templates/fragments/serviceui.html
@@ -15,18 +15,18 @@
         <div th:fragment="serviceUI" th:if="${registeredService}" id="serviceui" class="mb-4 service-ui text-center">
             <div th:if="${#strings.equalsIgnoreCase(registeredService.class.simpleName, 'OAuthRegisteredService')}">
                 <div class="osf-banner-without-name">
-                    <img id="serviceLogo" class="service-ui-logo" th:src="@{'images/osf-banner.png'}" alt="OSF banner image in the main form"/>
+                    <img id="serviceLogo" class="service-ui-logo" th:src="@{'images/osf-banner.png'}" alt="Service banner"/>
                 </div>
             </div>
             <div th:unless="${#strings.equalsIgnoreCase(registeredService.class.simpleName, 'OAuthRegisteredService')}">
                 <div class="osf-banner-without-name" th:if="${#strings.isEmpty(registeredService.name)}">
-                    <img id="serviceLogo" class="service-ui-logo" th:src="${registeredService.logo} ? ${registeredService.logo} : @{'images/osf-banner.png'}" alt="Service banner image in the main form"/>
+                    <img id="serviceLogo" class="service-ui-logo" th:src="${registeredService.logo} ? ${registeredService.logo} : @{'images/osf-banner.png'}" alt="Service banner"/>
                 </div>
                 <table class="osf-shield-with-name osf-shield-with-name-branded" th:unless="${#strings.isEmpty(registeredService.name)}">
                     <tbody>
                     <tr>
                         <td>
-                            <img id="serviceLogoBranded" class="service-ui-logo service-ui-logo-branded" th:src="${registeredService.logo} ? ${registeredService.logo} : @{'images/osf-logo.png'}" alt="Service logo image in the main form"/>
+                            <img id="serviceLogoBranded" class="service-ui-logo service-ui-logo-branded" th:src="${registeredService.logo} ? ${registeredService.logo} : @{'images/osf-logo.png'}" alt="Service banner"/>
                         </td>
                         <td>
                             <span id="serviceNameBranded" class="service-ui-name service-ui-name-branded" th:text="${registeredService.name}"></span>
