Attachment 133222 Details for Bug 28786 – Bug 28786: (follow-up) Improve style of 2FA code input

[patch] Bug 28786: (follow-up) Improve style of 2FA code input

Bug-28786-follow-up-Improve-style-of-2FA-code-inpu.patch (text/plain), 3.40 KB, created by Owen Leonard on 2022-04-12 16:41:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Owen Leonard

Created: 2022-04-12 16:41:50 UTC

Size: 3.40 KB

patch

obsolete

>From 3775f9a5442ff810b603b8b36c5f933c9c9e5d65 Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Tue, 12 Apr 2022 16:32:20 +0000
>Subject: [PATCH] Bug 28786: (follow-up) Improve style of 2FA code input
>
>This patch cleans up login.css a little bit so that the same style rules
>which apply to the login screen apply to the 2FA input form as well.
>
>The patch also changes the "Log out" link on the 2FA form to a "Cancel"
>link alongside the "Verify" button.
>
>To test, apply the patch and start the process of logging in to the
>staff client using an account with 2FA enabled.
>
>On both the login form and 2FA code views, confirm that everything is
>styled consistently.
>---
> koha-tmpl/intranet-tmpl/prog/css/login.css    | 39 ++++++++-----------
> .../intranet-tmpl/prog/en/modules/auth.tt     | 14 ++++---
> 2 files changed, 25 insertions(+), 28 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/css/login.css b/koha-tmpl/intranet-tmpl/prog/css/login.css
>index 722e9f420c..1a8c06a3a3 100644
>--- a/koha-tmpl/intranet-tmpl/prog/css/login.css
>+++ b/koha-tmpl/intranet-tmpl/prog/css/login.css
>@@ -92,14 +92,6 @@ label {
>     overflow: hidden;
> }
> 
>-#login input {
>-	padding: 3px;
>-}
>-
>-#login select {
>-    width: 98%;
>-}
>-
> #login ul {
> 	list-style: none;
> 	margin: 0;
>@@ -112,15 +104,6 @@ label {
> 	text-align: center;
> }
> 
>-#login #userid, #password {
>-	font-size: 1.7em;
>-	width: 97%;
>-}
>-
>-#login #branch, #login #desk_id {
>-	width : 99%;
>-}
>-
> #login #submit-button, #login .button {
> 	font-size: 1.4em;
> 	padding : .3em .6em;
>@@ -173,10 +156,20 @@ label {
> }
> 
> textarea, input, select {
>-	background: #f4f4f4;
>-	border: 1px solid #b2b2b2;
>-	color: #000;
>-	font:  13px Verdana, Arial, Helvetica, sans-serif;
>-	margin: 1px;
>-	padding: 3px;
>+    background: #f4f4f4;
>+    border: 1px solid #b2b2b2;
>+    color: #000;
>+    font:  13px Verdana, Arial, Helvetica, sans-serif;
>+    margin: 1px;
>+    padding: 3px;
>+}
>+
>+select {
>+    width: 97%;
>+}
>+
>+input[type='text'],
>+input[type='password'] {
>+    font-size: 1.7em;
>+    width: 97%;
> }
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt
>index 944942498b..310e2b568e 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt
>@@ -143,13 +143,17 @@
>             <input type="hidden" name="[% INPUT.name | html %]" value="[% INPUT.value | html %]" />
>         [% END %]
>         [% IF invalid_otp_token %]
>-            <div class="dialog error">Invalid two-factor code</div>
>+            <div id="login_error">Invalid two-factor code</div>
>         [% END %]
> 
>-        <p><label for="otp_token">Two-factor authentication code:</label>
>-        <input type="text" name="otp_token" id="otp_token" class="input focus" value="" size="20" tabindex="1" />
>-        <p class="submit"><input id="submit-button" type="submit" value="Verify code" /></p>
>-        <a class="logout" id="logout" href="/cgi-bin/koha/mainpage.pl?logout.x=1">Log out</a>
>+        <p>
>+            <label for="otp_token">Two-factor authentication code:</label>
>+            <input type="text" name="otp_token" id="otp_token" class="input focus" value="" size="20" tabindex="1" />
>+        </p>
>+        <p>
>+            <input id="submit-button" type="submit" value="Verify code" />
>+            <a class="cancel" id="logout" href="/cgi-bin/koha/mainpage.pl?logout.x=1">Cancel</a>
>+        </p>
> 
>     </form>
> [% END %]
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 28786: 123375 | 123376 | 123377 | 123378 | 123379 | 123380 | 123381 | 123397 | 123398 | 123399 | 123400 | 123401 | 123402 | 123403 | 124569 | 124770 | 124771 | 124844 | 124845 | 124846 | 124847 | 128841 | 128842 | 129383 | 129384 | 129474 | 129521 | 129557 | 129558 | 129559 | 129560 | 129561 | 129562 | 129563 | 129564 | 129565 | 129566 | 129567 | 129568 | 129569 | 129654 | 129655 | 129656 | 129657 | 129658 | 129659 | 129660 | 129661 | 129662 | 129665 | 131940 | 131941 | 131942 | 131943 | 131944 | 131945 | 131946 | 131947 | 131948 | 131949 | 131950 | 131951 | 131952 | 131953 | 131954 | 131955 | 131956 | 131957 | 131958 | 132142 | 132143 | 132144 | 132145 | 132146 | 132147 | 132148 | 132149 | 132150 | 132153 | 132154 | 132155 | 132156 | 132157 | 133222 | 133516 | 133522 | 133531 | 133533 | 133541 | 133548 | 133643 | 133686