From 4ee9a3a098642dfa8a979f51322ae2646be5f1d3 Mon Sep 17 00:00:00 2001
From: Firstyear <william@blackhats.net.au>
Date: Thu, 12 Dec 2024 07:53:22 +1000
Subject: [PATCH] Minor tweaks to cred reset ui (#3284)

---
 server/core/templates/credentials_reset.html  |  5 ++--
 .../templates/credentials_reset_form.html     |  5 ++--
 .../templates/credentials_update_partial.html | 26 +++++--------------
 .../templates/credentials_update_primary.html |  6 ++---
 4 files changed, 16 insertions(+), 26 deletions(-)

diff --git a/server/core/templates/credentials_reset.html b/server/core/templates/credentials_reset.html
index 5028b9706..bf593093b 100644
--- a/server/core/templates/credentials_reset.html
+++ b/server/core/templates/credentials_reset.html
@@ -5,13 +5,14 @@
 (% endblock %)
 
 (% block body %)
-<main class="form-cred-reset-body container my-auto">
+<main class="container-lg my-auto">
     <div class="text-center">
         <h3>Updating Credentials</h3>
         <p><strong>User:</strong> (( names ))</p>
         <p><strong>Kanidm domain:</strong> (( domain_info.display_name() ))</p>
     </div>
-    <hr class="my-4" />
+    <div class="ps-sm-4 ps-md-5 pt-sm-0 pt-4">
     (( credentials_update_partial|safe ))
+    </div>
 </main>
 (% endblock %)
diff --git a/server/core/templates/credentials_reset_form.html b/server/core/templates/credentials_reset_form.html
index 38a64849e..ec37c7be7 100644
--- a/server/core/templates/credentials_reset_form.html
+++ b/server/core/templates/credentials_reset_form.html
@@ -22,8 +22,9 @@
             src="/pkg/img/logo-square.svg?v=((crate::https::cache_buster::get_cache_buster_key()))"
             alt="(( domain_info.display_name() ))" class="kanidm_logo" />
         (% endif %)
-        <h2>Credential Reset</h2>
-        <h3>(( domain_info.display_name() ))</h3>
+        <h2>(( domain_info.display_name() ))</h2>
+        <div />
+        <h3>Credential Reset</h3>
     </center>
     <form class="mb-3">
         <div>
diff --git a/server/core/templates/credentials_update_partial.html b/server/core/templates/credentials_update_partial.html
index e96ac73f5..c6b80128c 100644
--- a/server/core/templates/credentials_update_partial.html
+++ b/server/core/templates/credentials_update_partial.html
@@ -81,24 +81,12 @@
             (% when CUCredState::Modifiable %)
             (% include "credentials_update_passkeys.html" %)
             <!-- Here we are modifiable so we can render the button to add passkeys  -->
-            <div class="btn-group mt-4">
-                <button type="button" class="btn btn-secondary"
-                    hx-post="/ui/reset/add_passkey"
-                    hx-vals='{"class": "Any"}'
-                    hx-target="#credentialUpdateDynamicSection">
-                    Add Passkey
-                </button>
-                <button type="button"
-                    class="btn btn-secondary dropdown-toggle dropdown-toggle-split"
-                    data-bs-toggle="dropdown" aria-expanded="false">
-                    <span class="visually-hidden">Toggle Dropdown</span>
-                </button>
-                <ul class="dropdown-menu">
-                    <li><a class="dropdown-item" hx-post="/ui/api/cancel_mfareg"
-                            hx-swap="none">Cancel MFA Registration
-                            session</a></li>
-                </ul>
-            </div>
+            <button type="button" class="btn btn-primary"
+                hx-post="/ui/reset/add_passkey"
+                hx-vals='{"class": "Any"}'
+                hx-target="#credentialUpdateDynamicSection">
+                Add Passkey
+            </button>
 
             (% when CUCredState::DeleteOnly %)
             (% if passkeys.len() > 0 %)
@@ -117,7 +105,7 @@
             <hr class="my-4" />
             <h4>UNIX Password</h4>
             <p>This password is used when authenticating to a UNIX-like system</p>
-            <button type="button" class="btn btn-secondary"
+            <button type="button" class="btn btn-primary"
                 hx-post="/ui/reset/set_unixcred"
                 hx-target="#credentialUpdateDynamicSection">
                 Set UNIX Password
diff --git a/server/core/templates/credentials_update_primary.html b/server/core/templates/credentials_update_primary.html
index 99703a96e..52e1263d1 100644
--- a/server/core/templates/credentials_update_primary.html
+++ b/server/core/templates/credentials_update_primary.html
@@ -25,7 +25,7 @@
                             <h6><b>Password</b></h6>
                         </div>
                         <div class="flex-shrink-0 ps-3">
-                            <button type="button" class="btn btn-sm btn-secondary" hx-post="/ui/reset/change_password">
+                            <button type="button" class="btn btn-sm btn-primary" hx-post="/ui/reset/change_password">
                                 Change Password
                             </button>
                         </div>
@@ -36,7 +36,7 @@
                             <p>TOTPs are 6 digit codes generated on-demand as a second authentication factor.</p>
                         </div>
                         <div class="flex-shrink-0 ps-3">
-                            <button type="button" class="btn btn-sm btn-secondary" hx-post="/ui/reset/add_totp">
+                            <button type="button" class="btn btn-sm btn-primary" hx-post="/ui/reset/add_totp">
                                 Add TOTP
                             </button>
                         </div>
@@ -121,4 +121,4 @@
             </button>
         </div>
     (% endif %)
-</div>
\ No newline at end of file
+</div>