diff --git a/coco-3.11/login/login.ftl b/coco-3.11/login/login.ftl index 21f3f95..2c39f8d 100644 --- a/coco-3.11/login/login.ftl +++ b/coco-3.11/login/login.ftl @@ -16,7 +16,7 @@ /> <#if messagesPerField.existsError('username','password')> - + ${kcSanitize(messagesPerField.getFirstError('username','password'))?no_esc} diff --git a/coco-3.11/login/messages/messages_en.properties b/coco-3.11/login/messages/messages_en.properties index 49015dd..0bc89ce 100644 --- a/coco-3.11/login/messages/messages_en.properties +++ b/coco-3.11/login/messages/messages_en.properties @@ -1,3 +1,4 @@ usernameOrEmail=Logon Name: password=Password: loginAccountTitle=Type a logon name and password to log on to the Cooperative Computer Network. +invalidUserMessage=The password-list file could not be unlocked. The logon password you typed is incorrect. diff --git a/coco-3.11/login/resources/css/login.css b/coco-3.11/login/resources/css/login.css index 8906575..0da7365 100644 --- a/coco-3.11/login/resources/css/login.css +++ b/coco-3.11/login/resources/css/login.css @@ -6,6 +6,18 @@ src: url("../fonts/perfect_dos_vga_437_win-webfont.woff"); } +#input-error{ + position: fixed; + padding-top: 10px; + width: auto; + height: 12%; + bottom: 5%; + margin-left: 10%; + background-color: white; + z-index: 2; + text-align: left; +} + .login-pf { background: none; } @@ -22,6 +34,7 @@ textarea.pf-c-form-control { height: auto; } + .pf-c-form-control { width: 50%; margin-left: auto; @@ -385,7 +398,7 @@ ul#kc-totp-supported-apps { @media (max-width: 767px) { .login-pf body { - background: white; + background: #a3a1a4; } #kc-header { @@ -523,11 +536,9 @@ ul#kc-totp-supported-apps { @media (max-width: 767px) { .login-pf-page .card-pf { max-width: none; - margin-left: 0; - margin-right: 0; + margin-left: 10px; + margin-right: 10px; padding-top: 0; - border-top: 0; - box-shadow: 0 0; } .kc-social-grid { @@ -621,4 +632,5 @@ ul#kc-totp-supported-apps { align-items: baseline; margin-bottom: 16px; } + /* End Recovery codes */ diff --git a/coco-3.11/login/resources/img/logo.png b/coco-3.11/login/resources/img/logo.png new file mode 100644 index 0000000..b2a76f1 Binary files /dev/null and b/coco-3.11/login/resources/img/logo.png differ diff --git a/coco-3.11/login/template.ftl b/coco-3.11/login/template.ftl new file mode 100644 index 0000000..6ee6c4b --- /dev/null +++ b/coco-3.11/login/template.ftl @@ -0,0 +1,154 @@ +<#macro registrationLayout bodyClass="" displayInfo=false displayMessage=true displayRequiredFields=false> + + + + + + + + + <#if properties.meta?has_content> + <#list properties.meta?split(' ') as meta> + + + + ${msg("loginTitle",(realm.displayName!''))} + + <#if properties.stylesCommon?has_content> + <#list properties.stylesCommon?split(' ') as style> + + + + <#if properties.styles?has_content> + <#list properties.styles?split(' ') as style> + + + + <#if properties.scripts?has_content> + <#list properties.scripts?split(' ') as script> + + + + <#if scripts??> + <#list scripts as script> + + + + + + +
+
+
${kcSanitize(msg("loginTitleHtml",(realm.displayNameHtml!'')))?no_esc}
+
+
+
+ <#if realm.internationalizationEnabled && locale.supported?size gt 1> +
+
+
+ ${locale.current} +
    + <#list locale.supported as l> +
  • + ${l.label} +
    • + +
+
+
+
+ + <#if !(auth?has_content && auth.showUsername() && !auth.showResetCredentials())> + <#if displayRequiredFields> +
+
+ * ${msg("requiredFields")} +
+
+

<#nested "header">

+
+
+ <#else> + <#nested "header"> + + <#else> + <#if displayRequiredFields> +
+
+ * ${msg("requiredFields")} +
+
+ <#nested "show-username"> +
+ + + + +
+
+
+ <#else> + <#nested "show-username"> +
+ + + + +
+ + +
+
+
+ + <#-- App-initiated actions should not see warning messages about the need to complete the action --> + <#-- during login. --> + <#if displayMessage && message?has_content && (message.type != 'warning' || !isAppInitiatedAction??)> +
+
+ <#if message.type = 'success'> + <#if message.type = 'warning'> + <#if message.type = 'error'> + <#if message.type = 'info'> +
+ ${kcSanitize(message.summary)?no_esc} +
+ + + <#nested "form"> + + <#if auth?has_content && auth.showTryAnotherWayLink()> +
+
+ + ${msg("doTryAnotherWay")} +
+
+ + + <#nested "socialProviders"> + + <#if displayInfo> +
+
+ <#nested "info"> +
+
+ +
+
+ +
+
+ + +