rancher
/
ui
mirror of https://github.com/rancher/ui.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4764 from neillsom/neill/4189/ux-inconsistency-cancel-create-button 

UX inconsistency with order of Cancel/OK buttons in forms and dialog boxes
This commit is contained in:
Neill Somerville 2021-10-28 17:29:55 -07:00 committed by GitHub
parent d4d8be647b 5be26636f1
commit 4a724043f9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/shared/addon/components/confirm-delete/template.hbs
View File

@ -101,12 +101,12 @@
</div>
{{/if}}
<div class="footer-actions">
<button class="btn bg-error" type="button" {{action "confirm"}}>
{{t "confirmDelete.confirmAction"}}
</button>
<button class="btn bg-transparent" type="button" {{action "cancel"}}>
{{t "confirmDelete.cancelAction"}}
</button>
<button class="btn bg-error" type="button" {{action "confirm"}}>
{{t "confirmDelete.confirmAction"}}
</button>
</div>
{{#if showProtip}}
<div class="protip mt-10">

14
lib/shared/addon/components/save-cancel/template.hbs
View File

@ -1,3 +1,9 @@
{{#unless cancelDisabled}}
<button class="btn-large btn {{cancelColor}}" type="button" {{action "cancel"}}>
{{t cancelLabel}}
</button>
{{/unless}}
{{yield}}
{{#if saving}}
<button class="btn-large btn btn-disabled {{savingColor}}" type="button" {{action "doNothing"}}>
<i class="icon icon-spinner icon-spin"></i>
@ -7,10 +13,4 @@
<button type="submit" {{action "save"}} disabled={{saveDisabled}} class="btn-large btn {{if saved savedColor saveColor}}">
{{t btnLabel}}
</button>
{{/if}}
{{yield}}
{{#unless cancelDisabled}}
<button class="btn-large btn {{cancelColor}}" type="button" {{action "cancel"}}>
{{t cancelLabel}}
</button>
{{/unless}}
{{/if}}