From 23230b8a7c5eb66357d5bcafb4184def13c5954b Mon Sep 17 00:00:00 2001
From: toasted-nutbread <toasted-nutbread@users.noreply.github.com>
Date: Mon, 19 Oct 2020 20:05:45 -0400
Subject: Backup controller refactor (#946)

* Update IDs

* Change how default fieldTemplates is assigned

* Ensure no missing fields

* Fix error display during import
---
 ext/bg/settings.html | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'ext/bg/settings.html')

diff --git a/ext/bg/settings.html b/ext/bg/settings.html
index 804574cb..df90281c 100644
--- a/ext/bg/settings.html
+++ b/ext/bg/settings.html
@@ -1111,14 +1111,14 @@
                 </p>
 
                 <div>
-                    <button class="btn btn-default" id="settings-export">Export Settings</button>
-                    <button class="btn btn-default" id="settings-import">Import Settings</button>
-                    <button class="btn btn-danger" id="settings-reset">Reset Default Settings</button>
+                    <button class="btn btn-default" id="settings-export-button">Export Settings</button>
+                    <button class="btn btn-default" id="settings-import-button">Import Settings</button>
+                    <button class="btn btn-danger" id="settings-reset-button">Reset Default Settings</button>
                 </div>
 
                 <div hidden><input type="file" id="settings-import-file" accept=".json,application/json"></div>
 
-                <div class="modal fade" tabindex="-1" role="dialog" id="settings-import-error-modal">
+                <div class="modal fade" tabindex="-1" role="dialog" id="settings-import-error">
                     <div class="modal-dialog modal-dialog-centered">
                         <div class="modal-content">
                             <div class="modal-header">
@@ -1129,7 +1129,7 @@
                                 <p>
                                     An error occurred while trying to import the settings file:
                                 </p>
-                                <p class="text-danger" id="settings-import-error-modal-message"></p>
+                                <p class="text-danger" id="settings-import-error-message"></p>
                                 <p>
                                     Additional info can be found in the developer console.
                                 </p>
@@ -1141,7 +1141,7 @@
                     </div>
                 </div>
 
-                <div class="modal fade" tabindex="-1" role="dialog" id="settings-import-warning-modal">
+                <div class="modal fade" tabindex="-1" role="dialog" id="settings-import-warning">
                     <div class="modal-dialog modal-dialog-centered">
                         <div class="modal-content">
                             <div class="modal-header">
@@ -1153,18 +1153,18 @@
                                     Settings file contains settings which may pose a security risk.
                                     Only import settings from sources you trust.
                                 </p>
-                                <ul class="text-danger" id="settings-import-warning-modal-message"></ul>
+                                <ul class="text-danger" id="settings-import-warning-message"></ul>
                             </div>
                             <div class="modal-footer">
                                 <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-                                <button type="button" class="btn btn-danger settings-import-warning-modal-import-button">Import</button>
-                                <button type="button" class="btn btn-primary settings-import-warning-modal-import-button" data-import-sanitize="true">Sanitize and Import</button>
+                                <button type="button" class="btn btn-danger settings-import-warning-import-button">Import</button>
+                                <button type="button" class="btn btn-primary settings-import-warning-import-button" data-import-sanitize="true">Sanitize and Import</button>
                             </div>
                         </div>
                     </div>
                 </div>
 
-                <div class="modal fade" tabindex="-1" role="dialog" id="settings-reset-modal">
+                <div class="modal fade" tabindex="-1" role="dialog" id="settings-reset">
                     <div class="modal-dialog modal-dialog-centered">
                         <div class="modal-content">
                             <div class="modal-header">
@@ -1188,7 +1188,7 @@
                             </div>
                             <div class="modal-footer">
                                 <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-                                <button type="button" class="btn btn-danger" id="settings-reset-modal-confirm">Reset All Settings</button>
+                                <button type="button" class="btn btn-danger" id="settings-reset-confirm-button">Reset All Settings</button>
                             </div>
                         </div>
                     </div>
-- 
cgit v1.2.3