Merge branch 'release/22.0.0'

cslzchen · cslzchen · commit eaac1fd36774 · 2022-01-25T10:23:07.000-05:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 We follow the CalVer (https://calver.org/) versioning scheme: YY.MINOR.MICRO.
 
+22.0.0 (01-25-2022)
+===================
+
+CAS accessibility fixes
+
+
 21.3.4 (01-10-2022)
 ===================
 
diff --git a/src/main/resources/static/css/cas.css b/src/main/resources/static/css/cas.css
@@ -48,8 +48,45 @@ a:hover, a:visited, a:active {
     color: var(--cas-theme-primary-light);
 }
 
+h1 {
+    font-size: 1.5em;
+    margin-block-start: 0.83em;
+    margin-block-end: 0.83em;
+}
+
+h2,
+h1.downsize-to-h2 {
+    font-size: 1.17em;
+    margin-block-start: 1em;
+    margin-block-end: 1em;
+}
+
+h3,
+h2.downsize-to-h3 {
+    font-size: 1em;
+    margin-block-start: 1.33em;
+    margin-block-end: 1.33em;
+}
+
+h4,
+h3.downsize-to-h4 {
+    font-size: 0.83em;
+    margin-block-start: 1.67em;
+    margin-block-end: 1.67em;
+}
+
+h5, h6 {
+    font-size: 0.67em;
+    margin-block-start: 2.33em;
+    margin-block-end: 2.33em;
+}
+
 h1, h2, h3, h4, h5, h6 {
+    display: block;
     margin-top: 0;
+    margin-inline-start: 0;
+    margin-inline-end: 0;
+    font-weight: bold;
 }
 
 aside, section, main {
diff --git a/src/main/resources/templates/casAccountDisabledView.html b/src/main/resources/templates/casAccountDisabledView.html
@@ -24,7 +24,7 @@
                 </section>
                 <hr class="my-4" />
                 <section class="card-message">
-                    <h2 th:utext="#{screen.accountdisabled.heading}"></h2>
+                    <h1 th:utext="#{screen.accountdisabled.heading}"></h1>
                     <p th:utext="#{screen.accountdisabled.message}"></p>
                 </section>
                 <section class="form-button">
diff --git a/src/main/resources/templates/casAccountNotConfirmedIdPView.html b/src/main/resources/templates/casAccountNotConfirmedIdPView.html
@@ -24,7 +24,7 @@
                 </section>
                 <hr class="my-4" />
                 <section class="card-message">
-                    <h2 th:utext="#{screen.accountnotconfirmedidp.heading}"></h2>
+                    <h1 th:utext="#{screen.accountnotconfirmedidp.heading}"></h1>
                     <p th:utext="#{screen.accountnotconfirmedidp.message}"></p>
                 </section>
                 <section class="form-button">
diff --git a/src/main/resources/templates/casAccountNotConfirmedOsfView.html b/src/main/resources/templates/casAccountNotConfirmedOsfView.html
@@ -24,7 +24,7 @@
                 </section>
                 <hr class="my-4" />
                 <section class="card-message">
-                    <h2 th:utext="#{screen.accountnotconfirmedosf.heading}"></h2>
+                    <h1 th:utext="#{screen.accountnotconfirmedosf.heading}"></h1>
                     <p th:utext="#{screen.accountnotconfirmedosf.message}"></p>
                 </section>
                 <section class="form-button">
diff --git a/src/main/resources/templates/casGenericSuccessView.html b/src/main/resources/templates/casGenericSuccessView.html
@@ -24,7 +24,7 @@
                 </section>
                 <hr class="my-4" />
                 <section class="card-message">
-                    <h2 th:utext="#{screen.generic.loginsuccess.heading}"></h2>
+                    <h1 th:utext="#{screen.generic.loginsuccess.heading}"></h1>
                     <div th:utext="#{screen.generic.loginsuccess.message}"></div>
                 </section>
                 <section id="authnAttr" class="pre-formatted-small word-break-all">
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>
@@ -31,14 +31,14 @@
                     </section>
 
                     <section class="card-message">
-                        <h2 th:utext="#{screen.institutionlogin.heading}"></h2>
+                        <h1 th:utext="#{screen.institutionlogin.heading}"></h1>
                         <p th:unless=${osfCasLoginContext.institutionId} th:utext="#{screen.institutionlogin.message.select}"></p>
                         <p th:if=${osfCasLoginContext.institutionId} th:utext="#{screen.institutionlogin.message.auto}"></p>
                     </section>
 
                     <section class="text-with-mdi text-bold text-large">
-                        <span th:unless=${osfCasLoginContext.institutionId} th:utext="#{screen.institutionlogin.heading.select}"></span>
-                        <span th:if=${osfCasLoginContext.institutionId} th:utext="#{screen.institutionlogin.heading.auto}"></span>
+                        <label for="institutionSelect" th:unless=${osfCasLoginContext.institutionId} th:utext="#{screen.institutionlogin.heading.select}"></label>
+                        <label for="institutionSelect" th:if=${osfCasLoginContext.institutionId} th:utext="#{screen.institutionlogin.heading.auto}"></label>
                     </section>
 
                     <section class="instn-select">
diff --git a/src/main/resources/templates/casInstitutionSsoFailedView.html b/src/main/resources/templates/casInstitutionSsoFailedView.html
@@ -24,7 +24,7 @@
                 </section>
                 <hr class="my-4" />
                 <section class="card-message">
-                    <h2 th:utext="#{screen.institutionssofailed.heading}"></h2>
+                    <h1 th:utext="#{screen.institutionssofailed.heading}"></h1>
                     <p th:utext="#{screen.institutionssofailed.message}"></p>
                 </section>
                 <section class="form-button" th:with="loginUrl=@{${@casServerLoginUrl}(casRedirectSource=cas)}">
diff --git a/src/main/resources/templates/casInvalidUserStatusView.html b/src/main/resources/templates/casInvalidUserStatusView.html
@@ -24,7 +24,7 @@
                 </section>
                 <hr class="my-4" />
                 <section class="card-message">
-                    <h2 th:utext="#{screen.invaliduserstatus.heading}"></h2>
+                    <h1 th:utext="#{screen.invaliduserstatus.heading}"></h1>
                     <p th:utext="#{screen.invaliduserstatus.message}"></p>
                 </section>
                 <section class="form-button">
diff --git a/src/main/resources/templates/casInvalidVerificationKeyView.html b/src/main/resources/templates/casInvalidVerificationKeyView.html
@@ -24,7 +24,7 @@
                 </section>
                 <hr class="my-4" />
                 <section class="card-message">
-                    <h2 th:utext="#{screen.invalidverificationkey.heading}"></h2>
+                    <h1 th:utext="#{screen.invalidverificationkey.heading}"></h1>
                     <p th:utext="#{screen.invalidverificationkey.message}"></p>
                 </section>
                 <section class="form-button">
diff --git a/src/main/resources/templates/casLogoutView.html b/src/main/resources/templates/casLogoutView.html
@@ -24,7 +24,7 @@
                 </section>
                 <hr class="my-4" />
                 <section class="card-message">
-                    <h2 th:utext="#{screen.generic.logoutsuccess.heading}"></h2>
+                    <h1 th:utext="#{screen.generic.logoutsuccess.heading}"></h1>
                     <div th:utext="#{screen.generic.logoutsuccess.message}"></div>
                 </section>
                 <section class="form-button">
diff --git a/src/main/resources/templates/casOAuth20ErrorView.html b/src/main/resources/templates/casOAuth20ErrorView.html
@@ -24,7 +24,7 @@
             </section>
             <hr class="my-4" />
             <section class="card-message">
-                <h2 th:utext="#{screen.oauth.error.heading}"></h2>
+                <h1 th:utext="#{screen.oauth.error.heading}"></h1>
                 <p th:utext="#{${errorMsg}}"></p>
                 <p class="pre-formatted-small word-break-all">
                     <pre class="wrap" th:utext="#{${errorCode + ': ' + errorParam}}"></pre>
diff --git a/src/main/resources/templates/casPac4jStopWebflow.html b/src/main/resources/templates/casPac4jStopWebflow.html
@@ -24,7 +24,7 @@
             </section>
             <hr class="my-4" />
             <section class="card-message">
-                <h2 th:utext="#{screen.pac4j.error.heading}"></h2>
+                <h1 th:utext="#{screen.pac4j.error.heading}"></h1>
                 <p th:utext="#{screen.pac4j.error.message}"></p>
             </section>
             <section id="errorInfo" class="pre-formatted-small word-break-all">
diff --git a/src/main/resources/templates/casServiceErrorView.html b/src/main/resources/templates/casServiceErrorView.html
@@ -24,7 +24,7 @@
                 </section>
                 <hr class="my-4" />
                 <section class="card-message">
-                    <h2 th:utext="#{screen.service.error.heading}"></h2>
+                    <h1 th:utext="#{screen.service.error.heading}"></h1>
                     <p th:if="${rootCauseException != null and rootCauseException.code != null}" th:utext="#{${rootCauseException.code}}"></p>
                 </section>
                 <section id="errorInfo" class="pre-formatted-small word-break-all">
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>
@@ -31,12 +31,12 @@
                 </section>
 
                 <section class="card-message">
-                    <h2 th:utext="#{screen.unsupp-instn.heading}"></h2>
+                    <h1 th:utext="#{screen.unsupp-instn.heading}"></h1>
                     <p th:utext="#{screen.unsupp-instn.message(${osfUrl.institutionsHome})}"></p>
                 </section>
 
                 <section class="card-message">
-                    <h3 th:utext="#{screen.unsupp-instn.existing.heading}"></h3>
+                    <h2 th:utext="#{screen.unsupp-instn.existing.heading}"></h2>
                     <p th:utext="#{screen.unsupp-instn.existing.message}"></p>
                 </section>
 
@@ -65,8 +65,7 @@ <h3 th:utext="#{screen.unsupp-instn.existing.heading}"></h3>
                                        size="256"
                                        type="email"
                                        name="forgot_password-email"
-                                       th:accesskey="#{screen.unsupp-instn.existing.setpw.label.email.accesskey}"
-                                       autocomplete="off" />
+                                       th:accesskey="#{screen.unsupp-instn.existing.setpw.label.email.accesskey}" />
                                 <label for="username" class="mdc-floating-label" th:utext="#{screen.unsupp-instn.existing.setpw.label.email}"></label>
                             </div>
                         </section>
diff --git a/src/main/resources/templates/error.html b/src/main/resources/templates/error.html
@@ -24,7 +24,7 @@
                 </section>
                 <hr class="my-4" />
                 <section class="card-message">
-                    <h2 th:utext="#{screen.unavailable.heading}"></h2>
+                    <h1 th:utext="#{screen.unavailable.heading}"></h1>
                     <div th:utext="#{screen.unavailable.message}"></div>
                 </section>
                 <section id="errorInfo" class="pre-formatted-small word-break-all">
diff --git a/src/main/resources/templates/error/401.html b/src/main/resources/templates/error/401.html
@@ -27,7 +27,7 @@
                 <hr class="my-4" />
 
                 <section class="card-message">
-                    <h2 th:utext="#{screen.error.page.accessdenied}"></h2>
+                    <h1 th:utext="#{screen.error.page.accessdenied}"></h1>
                     <p th:utext="#{screen.error.page.permissiondenied}"></p>
                 </section>
 
diff --git a/src/main/resources/templates/error/403.html b/src/main/resources/templates/error/403.html
@@ -27,7 +27,7 @@
                 <hr class="my-4" />
 
                 <section class="card-message">
-                    <h2 th:utext="#{screen.error.page.authdenied}"></h2>
+                    <h1 th:utext="#{screen.error.page.authdenied}"></h1>
                     <p th:utext="#{screen.error.page.permissiondenied}"></p>
                 </section>
 
diff --git a/src/main/resources/templates/error/404.html b/src/main/resources/templates/error/404.html
@@ -27,7 +27,7 @@
                 <hr class="my-4" />
 
                 <section class="card-message">
-                    <h2 th:utext="#{screen.error.page.notfound}"></h2>
+                    <h1 th:utext="#{screen.error.page.notfound}"></h1>
                     <p th:utext="#{screen.error.page.doesnotexist}"></p>
                 </section>
 
diff --git a/src/main/resources/templates/error/405.html b/src/main/resources/templates/error/405.html
@@ -27,7 +27,7 @@
                 <hr class="my-4" />
 
                 <section class="card-message">
-                    <h2 th:utext="#{screen.error.page.requestunsupported}"></h2>
+                    <h1 th:utext="#{screen.error.page.requestunsupported}"></h1>
                     <p th:utext="#{screen.error.page.permissiondenied}"></p>
                 </section>
 
diff --git a/src/main/resources/templates/error/423.html b/src/main/resources/templates/error/423.html
@@ -27,7 +27,7 @@
                 <hr class="my-4" />
 
                 <section class="card-message">
-                    <h2 th:utext="#{screen.blocked.header}"></h2>
+                    <h1 th:utext="#{screen.blocked.header}"></h1>
                     <p th:utext="#{screen.blocked.message}"></p>
                 </section>
 
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">
+                        <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)}">
@@ -29,7 +29,7 @@
 
                 <section class="mdc-top-app-bar__section mdc-top-app-bar__section--align-center">
                     <div class="form-button form-button-navbar">
-                        <a class="mdc-button mdc-button--raised button-osf-disabled">
+                        <a id="osfRegister" class="mdc-button mdc-button--raised button-osf-disabled">
                             <span class="mdc-button__label">Sign up</span>
                         </a>
                     </div>
@@ -47,8 +47,10 @@
                     signUpButton.style.cursor = "not-allowed";
                     signUpButton.style.backgroundColor = "#efefef";
                     signUpButton.style.color = "#cccccc";
+                    signUpButton.style.visibility = "hidden";
                 }
             }
+            disableSignUpButton();
         </script>
 
         <script type="text/javascript">
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">
+                        <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}}">
@@ -47,6 +47,7 @@
                     signUpButton.style.cursor = "not-allowed";
                     signUpButton.style.backgroundColor = "#efefef";
                     signUpButton.style.color = "#cccccc";
+                    signUpButton.style.visibility = "hidden";
                 }
             }
         </script>
diff --git a/src/main/resources/templates/fragments/loginform.html b/src/main/resources/templates/fragments/loginform.html
@@ -11,7 +11,7 @@
 </head>
 
 <body>
-    <main role="main" class="container mt-3 mb-3">
+    <main class="container mt-3 mb-3">
 
         <!-- Login form template begins here -->
         <div th:fragment="loginform" class="d-flex flex-column justify-content-between m-auto">
@@ -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">
+                    <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">
+                    <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>
@@ -101,8 +101,8 @@
                                     size="25"
                                     th:accesskey="#{screen.welcome.label.password.accesskey}"
                                     th:field="*{password}"
-                                    autocomplete="off" />
-                                <label for="username" class="mdc-floating-label" th:utext="#{screen.welcome.label.password}"></label>
+                                    autocomplete="current-password" />
+                                <label for="password" class="mdc-floating-label" th:utext="#{screen.welcome.label.password}"></label>
                             </div>
                             <div class="mdc-text-field-helper-line caps-warn">
                                 <p class="mdc-text-field-helper-text mdc-text-field-helper-text--persistent mdc-text-field-helper-text--validation-msg text-danger">
diff --git a/src/main/resources/templates/fragments/osfbannerui.html b/src/main/resources/templates/fragments/osfbannerui.html
@@ -11,9 +11,9 @@
 </head>
 
 <body>
-    <main role="main" class="container mt-3 mb-3">
+    <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" />
+            <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
@@ -11,22 +11,22 @@
 </head>
 
 <body>
-    <main role="main" class="container mt-3 mb-3">
+    <main class="container mt-3 mb-3">
         <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'}" />
+                    <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'}" />
+                    <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'}" />
+                            <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>
diff --git a/src/main/resources/templates/fragments/submitbutton.html b/src/main/resources/templates/fragments/submitbutton.html
diff --git a/src/main/resources/templates/fragments/tosloginform.html b/src/main/resources/templates/fragments/tosloginform.html
diff --git a/src/main/resources/templates/fragments/totploginform.html b/src/main/resources/templates/fragments/totploginform.html
diff --git a/src/main/resources/templates/layout.html b/src/main/resources/templates/layout.html
diff --git a/src/main/resources/templates/layoutosf.html b/src/main/resources/templates/layoutosf.html
diff --git a/src/main/resources/templates/protocol/oauth/confirm.html b/src/main/resources/templates/protocol/oauth/confirm.html
