From cf6bf8243c5d1830a3045e14dde3f007d40ba556 Mon Sep 17 00:00:00 2001
From: Joe Knapper <jaknapper@hotmail.com>
Date: Fri, 13 Mar 2026 16:28:33 +0000
Subject: [PATCH 1/2] Close calibration with confirmation

Centre CSM button in calibration

Add the word "Data" to "No CSM available"
---
 .../modalComponents/calibrationWizard.vue     | 22 +++++++++++++++++++
 .../csmSteps/runCsmStep.vue                   |  2 ++
 .../CSMCalibrationSettings.vue                |  2 +-
 3 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/webapp/src/components/modalComponents/calibrationWizard.vue b/webapp/src/components/modalComponents/calibrationWizard.vue
index f4729936..eb7de58e 100644
--- a/webapp/src/components/modalComponents/calibrationWizard.vue
+++ b/webapp/src/components/modalComponents/calibrationWizard.vue
@@ -1,6 +1,13 @@
 <template>
   <div id="modal-example" ref="calibrationModalEl" uk-modal="bg-close: false;">
     <div class="uk-modal-dialog uk-modal-body">
+      <!-- Get the style from uk-close, but use stop.prevent to avoid it actually closing -->
+      <button
+        type="button"
+        class="uk-modal-close-default"
+        uk-close
+        @click.stop.prevent="confirmClose"
+      ></button>
       <h2 class="uk-modal-title">Microscope Calibration</h2>
 
       <component
@@ -167,6 +174,21 @@ export default {
       this.$emit("onClose");
     },
 
+    confirmClose() {
+      let confirmationMessage =
+        "Close calibration wizard?<br><br>This can be re-opened from the Settings tab at any time.";
+      // Use standard modal confirmation
+      this.modalConfirm(confirmationMessage).then(
+        () => {
+          // User clicked YES → hide modal
+          this.hide();
+        },
+        () => {
+          // User clicked NO → do nothing, modal stays open
+        },
+      );
+    },
+
     /*
      * Move to the previous task.
      */
diff --git a/webapp/src/components/modalComponents/calibrationWizardComponents/csmSteps/runCsmStep.vue b/webapp/src/components/modalComponents/calibrationWizardComponents/csmSteps/runCsmStep.vue
index 41eee4fd..048f3e98 100644
--- a/webapp/src/components/modalComponents/calibrationWizardComponents/csmSteps/runCsmStep.vue
+++ b/webapp/src/components/modalComponents/calibrationWizardComponents/csmSteps/runCsmStep.vue
@@ -45,5 +45,7 @@ export default {
 <style scoped>
 .action-button-container {
   padding: 4px;
+  display: flex;
+  justify-content: center;
 }
 </style>
diff --git a/webapp/src/components/tabContentComponents/settingsComponents/CSMSettingsComponents/CSMCalibrationSettings.vue b/webapp/src/components/tabContentComponents/settingsComponents/CSMSettingsComponents/CSMCalibrationSettings.vue
index 49ad43f3..89c0c0db 100644
--- a/webapp/src/components/tabContentComponents/settingsComponents/CSMSettingsComponents/CSMCalibrationSettings.vue
+++ b/webapp/src/components/tabContentComponents/settingsComponents/CSMSettingsComponents/CSMCalibrationSettings.vue
@@ -51,7 +51,7 @@
         </ul>
       </details>
     </div>
-    <p v-else><strong>No Calibration Available</strong></p>
+    <p v-else><strong>No Calibration Data Available</strong></p>
   </div>
 </template>
 

From fbcd7eee9392587a59f65add306065637e5b0664 Mon Sep 17 00:00:00 2001
From: Joe Knapper <jaknapper@hotmail.com>
Date: Tue, 17 Mar 2026 19:09:43 +0000
Subject: [PATCH 2/2] Also show modal when pressing Esc, handle multiple Escs

---
 .../modalComponents/calibrationWizard.vue     | 41 ++++++++++++++-----
 1 file changed, 31 insertions(+), 10 deletions(-)

diff --git a/webapp/src/components/modalComponents/calibrationWizard.vue b/webapp/src/components/modalComponents/calibrationWizard.vue
index eb7de58e..0dd1dcc2 100644
--- a/webapp/src/components/modalComponents/calibrationWizard.vue
+++ b/webapp/src/components/modalComponents/calibrationWizard.vue
@@ -1,5 +1,5 @@
 <template>
-  <div id="modal-example" ref="calibrationModalEl" uk-modal="bg-close: false;">
+  <div id="modal-example" ref="calibrationModalEl" uk-modal="bg-close: false; esc-close:false;">
     <div class="uk-modal-dialog uk-modal-body">
       <!-- Get the style from uk-close, but use stop.prevent to avoid it actually closing -->
       <button
@@ -47,6 +47,8 @@ export default {
       tasks: [],
       taskIndex: 0,
       movingBackward: false,
+      modalOpen: false,
+      confirmingClose: false,
     };
   },
 
@@ -159,12 +161,18 @@ export default {
     },
 
     show: function () {
+      this.modalOpen = true;
+      window.addEventListener("keydown", this.handleKeydown);
+
       // Show the modal element
       var el = this.$refs["calibrationModalEl"];
       this.showModalElement(el); // Calls the mixin
     },
 
     hide: function () {
+      this.modalOpen = false;
+      window.removeEventListener("keydown", this.handleKeydown);
+
       // Show the modal
       var el = this.$refs["calibrationModalEl"];
       this.hideModalElement(el); // Calls the mixin
@@ -174,19 +182,32 @@ export default {
       this.$emit("onClose");
     },
 
+    handleKeydown(event) {
+      if (event.key === "Escape" && !event.repeat && this.modalOpen && !this.confirmingClose) {
+        event.preventDefault();
+        this.confirmClose();
+      }
+    },
+
     confirmClose() {
+      if (this.confirmingClose) return;
+      this.confirmingClose = true;
       let confirmationMessage =
         "Close calibration wizard?<br><br>This can be re-opened from the Settings tab at any time.";
       // Use standard modal confirmation
-      this.modalConfirm(confirmationMessage).then(
-        () => {
-          // User clicked YES → hide modal
-          this.hide();
-        },
-        () => {
-          // User clicked NO → do nothing, modal stays open
-        },
-      );
+      this.modalConfirm(confirmationMessage)
+        .then(
+          () => {
+            // User clicked YES → hide modal
+            this.hide();
+          },
+          () => {
+            // User clicked NO → do nothing, modal stays open
+          },
+        )
+        .finally(() => {
+          this.confirmingClose = false; // reset flag when confirmation modal is gone
+        });
     },
 
     /*