Align action button order with settings
Use the Settings modal action order across plugin settings and related edit/create modals so primary actions appear before Cancel while preserving existing handlers and state logic.
Alessandro committed
May 7, 2026 at 03:39 UTC
63ba82168436b48247bdcd082966a72c9986feb2
7 files changed
+19
-19
webui/components/modals/file-browser/rename-modal.html
+1
-1
@@ -30,8 +30,8 @@
30
31
<template x-if="$store.fileBrowser">
32
<div class="modal-footer" data-modal-footer>
33
- <button class="btn btn-cancel" @click="$store.fileBrowser.closeRenameModal()" :disabled="$store.fileBrowser.isRenaming">Cancel</button>
33
<button class="btn btn-ok" @click="$store.fileBrowser.confirmRename()" :disabled="$store.fileBrowser.isRenaming || !$store.fileBrowser.renameName.trim()" x-text="$store.fileBrowser.renameMode === 'create-folder' ? 'Create Folder' : 'Rename'"></button>
34
+ <button class="btn btn-cancel" @click="$store.fileBrowser.closeRenameModal()" :disabled="$store.fileBrowser.isRenaming">Cancel</button>
35
</div>
36
</template>
37
webui/components/modals/file-editor/file-edit-modal.html
+1
-1
@@ -48,13 +48,13 @@
48
49
<template x-if="$store.fileEditor">
50
<div class="modal-footer" data-modal-footer>
51
- <button class="btn btn-cancel" @click="$store.fileEditor.closeFileEditor()" :disabled="$store.fileEditor.isSaving">Cancel</button>
51
<button
52
class="btn btn-ok"
53
@click="$store.fileEditor.saveFileEdits()"
54
:disabled="$store.fileEditor.isSaving || $store.fileEditor.isEditLoading || $store.fileEditor.editError"
55
x-text="$store.fileEditor.isSaving ? 'Saving…' : 'Save'"
56
></button>
57
+ <button class="btn btn-cancel" @click="$store.fileEditor.closeFileEditor()" :disabled="$store.fileEditor.isSaving">Cancel</button>
58
</div>
59
</template>
60
webui/components/modals/scheduler/scheduler-modal.html
+2
-2
@@ -28,10 +28,10 @@
28
@click="$confirmClick($event, () => $store.schedulerStore.deleteTask($store.schedulerStore.editingTask.uuid))">Delete</button>
29
</div>
30
<div class="buttons-right">
31
- <button type="button" class="button cancel"
32
- @click="$store.schedulerStore.cancelEdit()">Cancel</button>
31
<button type="button" class="button confirm"
32
@click="$store.schedulerStore.saveTask()">Save</button>
33
+ <button type="button" class="button cancel"
34
+ @click="$store.schedulerStore.cancelEdit()">Cancel</button>
35
</div>
36
</div>
37
</div>
webui/components/modals/scheduler/scheduler-task-editor.html
+4
-4
@@ -16,10 +16,10 @@
16
<div class="buttons-container scheduler-editor-actions scheduler-editor-actions-top">
17
<div class="buttons-left"></div>
18
<div class="buttons-right">
19
- <button type="button" class="button cancel"
20
- @click="$store.schedulerStore.cancelEdit()">Cancel</button>
19
<button type="button" class="button confirm"
20
@click="$store.schedulerStore.saveTask()">Save</button>
21
+ <button type="button" class="button cancel"
22
+ @click="$store.schedulerStore.cancelEdit()">Cancel</button>
23
</div>
24
</div>
25
@@ -226,10 +226,10 @@
226
@click="$confirmClick($event, () => $store.schedulerStore.deleteTask($store.schedulerStore.editingTask.uuid))">Delete</button>
227
</div>
228
<div class="buttons-right">
229
- <button type="button" class="button cancel"
230
- @click="$store.schedulerStore.cancelEdit()">Cancel</button>
229
<button type="button" class="button confirm"
230
@click="$store.schedulerStore.saveTask()">Save</button>
231
+ <button type="button" class="button cancel"
232
+ @click="$store.schedulerStore.cancelEdit()">Cancel</button>
233
</div>
234
</div>
235
webui/components/plugins/plugin-settings.html
+4
-4
@@ -140,10 +140,6 @@
140
:disabled="context?.isSaving || context?.isLoading">
141
Default
142
</button>
143
- <button class="btn btn-cancel"
144
- @click="window.closeModal?.()">
145
- Cancel
146
- </button>
143
<button class="btn btn-field"
144
x-show="context.wizardFooter?.showNext?.()"
145
@click="context.wizardFooter?.onNext?.()"
@@ -156,6 +152,10 @@
152
:disabled="context?.isSaving || context?.isLoading">
153
Save
154
</button>
155
+ <button class="btn btn-cancel"
156
+ @click="window.closeModal?.()">
157
+ Cancel
158
+ </button>
159
</div>
160
</div>
161
</div>
webui/components/projects/project-create.html
+3
-3
@@ -37,9 +37,6 @@
37
</template>
38
39
<div class="buttons-right">
40
- <button type="button" class="button cancel"
41
- @click="$store.projects.cancelCreate()"
42
- :disabled="$store.projects.selectedProject._cloning">Cancel</button>
40
<button type="button" class="button confirm"
41
@click="$store.projects.confirmCreate()"
42
:disabled="$store.projects.selectedProject._cloning">
@@ -53,6 +50,9 @@
50
<span x-text="$store.projects.selectedProject.git_url ? 'Clone and continue' : 'Create and continue'"></span>
51
</template>
52
</button>
53
+ <button type="button" class="button cancel"
54
+ @click="$store.projects.cancelCreate()"
55
+ :disabled="$store.projects.selectedProject._cloning">Cancel</button>
56
</div>
57
</div>
58
webui/components/projects/project-edit.html
+4
-4
@@ -19,10 +19,10 @@
19
@click="$confirmClick($event, () => $store.projects.deleteProjectAndCloseModal())">Delete</button>
20
</div>
21
<div class="buttons-right">
22
- <button type="button" class="button cancel"
23
- @click="$store.projects.cancelEdit()">Cancel</button>
22
<button type="button" class="button confirm"
23
@click="$store.projects.confirmEdit()">Save</button>
24
+ <button type="button" class="button cancel"
25
+ @click="$store.projects.cancelEdit()">Cancel</button>
26
</div>
27
</div>
28
@@ -85,10 +85,10 @@
85
@click="$confirmClick($event, () => $store.projects.deleteProjectAndCloseModal())">Delete</button>
86
</div>
87
<div class="buttons-right">
88
- <button type="button" class="button cancel"
89
- @click="$store.projects.cancelEdit()">Cancel</button>
88
<button type="button" class="button confirm"
89
@click="$store.projects.confirmEdit()">Save</button>
90
+ <button type="button" class="button cancel"
91
+ @click="$store.projects.cancelEdit()">Cancel</button>
92
</div>
93
</div>
94