From eb27482f8ce52394c5c772482bc721bf56be1e9c Mon Sep 17 00:00:00 2001
From: Jan Heuermann <jan@jotaen.net>
Date: Tue, 21 Nov 2023 13:48:15 +0100
Subject: [PATCH 1/2] =?UTF-8?q?Remove=20=E2=80=9CCancel=E2=80=9D=20button?=
 =?UTF-8?q?=20from=20loading=20state?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../custom-elements/change-hostname-dialog.html      | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/app/templates/custom-elements/change-hostname-dialog.html b/app/templates/custom-elements/change-hostname-dialog.html
index ed67901bb..716cbb58b 100644
--- a/app/templates/custom-elements/change-hostname-dialog.html
+++ b/app/templates/custom-elements/change-hostname-dialog.html
@@ -39,7 +39,6 @@ <h3>Retrieving Current Hostname</h3>
     <div>
       <progress-spinner></progress-spinner>
     </div>
-    <button id="cancel-initialization" type="button">Cancel</button>
   </div>
 
   <div id="prompt">
@@ -133,7 +132,10 @@ <h3>Changing Hostname</h3>
           PROMPT: "prompt",
           CHANGING: "changing",
         };
-        statesWithoutDialogClose = new Set([this.states.CHANGING]);
+        statesWithoutDialogClose = new Set([
+          this.states.CHANGING,
+          this.states.INITIALIZING,
+        ]);
 
         connectedCallback() {
           this.attachShadow({ mode: "open" }).appendChild(
@@ -144,9 +146,6 @@ <h3>Changing Hostname</h3>
             hostnameInput: this.shadowRoot.getElementById("hostname-input"),
             changeAndRestart:
               this.shadowRoot.getElementById("change-and-restart"),
-            cancelInitialization: this.shadowRoot.getElementById(
-              "cancel-initialization"
-            ),
             cancelHostnameChange: this.shadowRoot.getElementById(
               "cancel-hostname-change"
             ),
@@ -164,9 +163,6 @@ <h3>Changing Hostname</h3>
               this.elements.changeAndRestart.click();
             }
           });
-          this.elements.cancelInitialization.addEventListener("click", () => {
-            this.dispatchEvent(new DialogClosedEvent());
-          });
           this.elements.cancelHostnameChange.addEventListener("click", () => {
             this.dispatchEvent(new DialogClosedEvent());
           });

From a1aa0249bc64c8dd1ee4c75e7ea0daa982bb2d22 Mon Sep 17 00:00:00 2001
From: Jan Heuermann <jan@jotaen.net>
Date: Tue, 21 Nov 2023 19:09:02 +0100
Subject: [PATCH 2/2] =?UTF-8?q?Consolidate=20button=20wording=20in=20dialo?=
 =?UTF-8?q?gs=20(=E2=80=9CClose=E2=80=9D/=E2=80=9CBack=E2=80=9D)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../change-hostname-dialog.html               |   2 +-
 .../custom-elements/feature-pro-dialog.html   |   2 +-
 .../custom-elements/paste-dialog.html         |   2 +-
 .../custom-elements/shutdown-dialog.html      |   2 +-
 .../custom-elements/update-dialog.html        |   4 +-
 .../update-prompt-automatic.html              |   2 +-
 .../video-settings-dialog.html                |   2 +-
 app/templates/styleguide.html                 | 103 ++++++++++++++----
 8 files changed, 90 insertions(+), 29 deletions(-)

diff --git a/app/templates/custom-elements/change-hostname-dialog.html b/app/templates/custom-elements/change-hostname-dialog.html
index 716cbb58b..04258bf47 100644
--- a/app/templates/custom-elements/change-hostname-dialog.html
+++ b/app/templates/custom-elements/change-hostname-dialog.html
@@ -65,7 +65,7 @@ <h3>Change Hostname</h3>
     <button id="change-and-restart" class="btn-success" type="button">
       Change and Restart
     </button>
-    <button id="cancel-hostname-change" type="button">Cancel</button>
+    <button id="cancel-hostname-change" type="button">Close</button>
   </div>
 
   <div id="changing">
diff --git a/app/templates/custom-elements/feature-pro-dialog.html b/app/templates/custom-elements/feature-pro-dialog.html
index 551ea1112..a8bf3cf52 100644
--- a/app/templates/custom-elements/feature-pro-dialog.html
+++ b/app/templates/custom-elements/feature-pro-dialog.html
@@ -14,7 +14,7 @@ <h3>This Feature is Available in TinyPilot Pro</h3>
     >
       Learn More
     </a>
-    <button id="cancel-upgrade-to-pro" type="button">Cancel</button>
+    <button id="cancel-upgrade-to-pro" type="button">Close</button>
   </div>
 </template>
 
diff --git a/app/templates/custom-elements/paste-dialog.html b/app/templates/custom-elements/paste-dialog.html
index 5ec22488d..c9cc67923 100644
--- a/app/templates/custom-elements/paste-dialog.html
+++ b/app/templates/custom-elements/paste-dialog.html
@@ -28,7 +28,7 @@ <h3>Paste Text</h3>
     spellcheck="false"
   ></textarea>
   <button id="confirm-btn" class="btn-success">Paste</button>
-  <button id="cancel-btn">Cancel</button>
+  <button id="cancel-btn">Close</button>
 </template>
 
 <script type="module">
diff --git a/app/templates/custom-elements/shutdown-dialog.html b/app/templates/custom-elements/shutdown-dialog.html
index 51f3217bb..76c73ebac 100644
--- a/app/templates/custom-elements/shutdown-dialog.html
+++ b/app/templates/custom-elements/shutdown-dialog.html
@@ -39,7 +39,7 @@ <h3>Shut Down TinyPilot Device?</h3>
     <button id="confirm-restart" class="btn-danger" type="button">
       Restart
     </button>
-    <button id="cancel-shutdown" type="button">Cancel</button>
+    <button id="cancel-shutdown" type="button">Close</button>
   </div>
 
   <div id="restarting">
diff --git a/app/templates/custom-elements/update-dialog.html b/app/templates/custom-elements/update-dialog.html
index 4dfda6022..d1c83c747 100644
--- a/app/templates/custom-elements/update-dialog.html
+++ b/app/templates/custom-elements/update-dialog.html
@@ -83,7 +83,7 @@ <h3>Update TinyPilot</h3>
   <div id="latest">
     <h3>No Updates Available</h3>
     <p>You are running the latest version of TinyPilot.</p>
-    <button id="ok-latest" type="button">OK</button>
+    <button id="ok-latest" type="button">Close</button>
   </div>
 
   <div id="update-container">
@@ -102,7 +102,7 @@ <h3>Restarting to Complete Update</h3>
 
     <div id="update-finished">
       <h3>Update Complete</h3>
-      <button id="ok-finished" type="button">OK</button>
+      <button id="ok-finished" type="button">Close</button>
     </div>
 
     <details>
diff --git a/app/templates/custom-elements/update-prompt-automatic.html b/app/templates/custom-elements/update-prompt-automatic.html
index edc209bd8..1f2d30b47 100644
--- a/app/templates/custom-elements/update-prompt-automatic.html
+++ b/app/templates/custom-elements/update-prompt-automatic.html
@@ -6,7 +6,7 @@
 
   <p>An update is available. Would you like to install the latest version?</p>
   <button id="confirm-update" class="btn-success" type="button">Update</button>
-  <button id="cancel-update" type="button">Cancel</button>
+  <button id="cancel-update" type="button">Close</button>
 </template>
 
 <script type="module">
diff --git a/app/templates/custom-elements/video-settings-dialog.html b/app/templates/custom-elements/video-settings-dialog.html
index 4a49f6fbc..ea4550fc8 100644
--- a/app/templates/custom-elements/video-settings-dialog.html
+++ b/app/templates/custom-elements/video-settings-dialog.html
@@ -188,7 +188,7 @@ <h4>Advanced Settings</h4>
       </inline-message>
     </div>
     <button class="save-btn btn-success" type="button">Apply</button>
-    <button class="close-btn" type="button">Cancel</button>
+    <button class="close-btn" type="button">Close</button>
   </div>
   <div id="saving">
     <h3>Applying Video Settings</h3>
diff --git a/app/templates/styleguide.html b/app/templates/styleguide.html
index 3b45867d7..b83200639 100644
--- a/app/templates/styleguide.html
+++ b/app/templates/styleguide.html
@@ -371,16 +371,21 @@ <h3>Design</h3>
       </button>
       <overlay-panel id="overlay-with-primary-action">
         <h3>Overlay with Primary Action</h3>
-        <div>
+        <p>
           This overlay style is used for linear and straightforward flows that
-          have a single purpose or end state, like a prompt or confirmation. It
-          contains a call-to-action button and a cancel button (in that order)
-          at the bottom. When clicked, they also terminate the dialog.
-        </div>
+          have a single purpose or end state, like a prompt or confirmation.
+        </p>
+        <p>
+          In the bottom row, the overlay should contain a call-to-action button,
+          and a button for aborting the flow.<br />
+          The button for aborting the flow should be labelled “Close”, and it
+          should be the rightmost one. We deliberately don’t say “Cancel”, to be
+          transparent that clicking the button will terminate the overlay.
+        </p>
         <button class="close-overlay-with-primary-action btn-success">
           Confirm
         </button>
-        <button class="close-overlay-with-primary-action">Cancel</button>
+        <button class="close-overlay-with-primary-action">Close</button>
       </overlay-panel>
       <script type="module">
         import { DialogClosedEvent } from "/js/events.js";
@@ -400,28 +405,76 @@ <h3>Overlay with Primary Action</h3>
       </script>
       <!-- Overlay with feature: -->
       <button id="show-overlay-with-feature-btn" class="btn-action">
-        Overlay with Feature
+        Overlay with Feature Panel
       </button>
       <overlay-panel id="overlay-with-feature">
-        <h3>Overlay with Feature</h3>
-        <div>
-          <button class="btn-action" onclick="alert('Done.')">Action 1</button>
-          <button class="btn-action" onclick="alert('Done.')">Action 2</button>
-          <button class="btn-action" onclick="alert('Done.')">Action 3</button>
+        <div id="overlay-with-feature-initial-state">
+          <h3>Overlay with Feature Panel</h3>
+          <div>
+            <button class="btn-action" onclick="alert('I’m an alert!')">
+              Show an Alert
+            </button>
+            <button
+              class="btn-action"
+              id="overlay-with-feature-secondary-state-btn"
+            >
+              Go to Secondary State
+            </button>
+          </div>
+          <p>
+            This overlay style is used for more comprehensive, non-linear
+            features.
+          </p>
+          <p>
+            In the bottom row, the overlay should contain a single button, which
+            is labelled “Close” and terminates the dialog.
+          </p>
+          <p>
+            The overlay may contain “secondary” actions that advance the overlay
+            into a different state. The corresponding buttons shouldn’t be
+            primary ones, and they shouldn’t appear in the bottom row.
+          </p>
+          <button id="close-overlay-with-feature-btn">Close</button>
         </div>
-        <div>
-          When the user can carry out “secondary” actions within the overlay
-          that don’t terminate the dialog itself, the blue action buttons should
-          be used for that. They also shouldn’t appear at the bottom.
+        <div id="overlay-with-feature-secondary-state">
+          <h3>Secondary State</h3>
+          <p>
+            The secondary state should have buttons in the bottom row, which
+            follow the same rules as in the “Overlay with Primary Action”,
+            except that …:
+          </p>
+          <ul style="text-align: left">
+            <li>
+              The buttons take the user back to the initial overlay state
+              instead of terminating the overlay.
+            </li>
+            <li>
+              The rightmost button is labelled “Back” instead of “Close”. We
+              deliberately don’t say “Cancel”, as that would make it unclear
+              whether the button terminates the overlay.
+            </li>
+          </ul>
+          <button class="btn-success overlay-with-feature-initialize-btn">
+            Confirm
+          </button>
+          <button class="overlay-with-feature-initialize-btn">Back</button>
         </div>
-        <button id="close-overlay-with-feature-btn">Close</button>
       </overlay-panel>
       <script type="module">
         import { DialogClosedEvent } from "/js/events.js";
 
+        function setDialogState(newState /* = "initial" or "secondary" */) {
+          document.getElementById(
+            "overlay-with-feature-initial-state"
+          ).style.display = newState === "initial" ? "block" : "none";
+          document.getElementById(
+            "overlay-with-feature-secondary-state"
+          ).style.display = newState === "initial" ? "none" : "block";
+        }
         document
           .getElementById("show-overlay-with-feature-btn")
           .addEventListener("click", () => {
+            setDialogState("initial");
             document.getElementById("overlay-with-feature").show();
           });
         document
@@ -429,6 +482,18 @@ <h3>Overlay with Feature</h3>
           .addEventListener("click", (evt) => {
             evt.target.dispatchEvent(new DialogClosedEvent());
           });
+        document
+          .getElementById("overlay-with-feature-secondary-state-btn")
+          .addEventListener("click", () => {
+            setDialogState("secondary");
+          });
+        document
+          .querySelectorAll(".overlay-with-feature-initialize-btn")
+          .forEach((el) =>
+            el.addEventListener("click", () => {
+              setDialogState("initial");
+            })
+          );
       </script>
       <!-- Error overlay: -->
       <overlay-panel id="error-overlay" variant="danger">
@@ -480,10 +545,6 @@ <h3>Primary Actions</h3>
         dialog. These primary actions should either advance the dialog into a
         different state, or they should terminate the dialog altogether.
       </p>
-      <p>
-        If there is a primary button for closing or canceling the dialog, it
-        should always be the rightmost one.
-      </p>
 
       <h2 class="section">Progress Indicator</h2>
       <p>