Skip to content
This repository has been archived by the owner on Jan 9, 2023. It is now read-only.

Adjustments to the primary action and delete buttons #568

Merged
merged 2 commits into from
Jul 13, 2016
Merged

Adjustments to the primary action and delete buttons #568

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
97ce1ad
Moved the primary action button to the right
Jul 13, 2016
3565dd4
Fixed the appearance of the delete button in the user listing
Jul 13, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions app/templates/components/edit-panel.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,13 @@
{{yield}}
</div>
<div class="panel-footer">
{{#unless editPanelProps.hideCancelButton}}
{{#if editPanelProps.cancelButtonText}}
<button class="btn btn-default warning" {{action 'cancel'}}>{{editPanelProps.cancelButtonText}}</button>
{{else}}
<button class="btn btn-default warning" {{action 'cancel'}}>{{t 'buttons.cancel'}}</button>
{{/if}}
{{/unless}}
{{#if editPanelProps.showUpdateButton}}
{{#if editPanelProps.disabledAction}}
<button class="btn btn-primary on-white disabled-btn" {{action 'disabledAction'}}>{{editPanelProps.updateButtonText}}</button>
Expand All @@ -12,13 +19,6 @@
</button>
{{/if}}
{{/if}}
{{#unless editPanelProps.hideCancelButton}}
{{#if editPanelProps.cancelButtonText}}
<button class="btn btn-default warning" {{action 'cancel'}}>{{editPanelProps.cancelButtonText}}</button>
{{else}}
<button class="btn btn-default warning" {{action 'cancel'}}>{{t 'buttons.cancel'}}</button>
{{/if}}
{{/unless}}
{{#each editPanelProps.additionalButtons as |button|}}
<button class="{{button.class}}" {{action 'fireButtonAction' button.buttonAction}}>
{{#if button.buttonIcon}}
Expand Down
6 changes: 3 additions & 3 deletions app/templates/components/modal-dialog.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
{{yield}}
</div>
<div class="modal-footer">
{{#unless hideUpdateButton}}
<button class="btn btn-primary on-white {{updateButtonClass}}" {{action "updateAction" }} disabled={{isUpdateDisabled}}>{{ updateButtonText }}</button>
{{/unless}}
{{#unless hideCancelButton}}
<button class="btn btn-default warning" {{action "cancelAction"}}>{{cancelBtnText}}</button>
{{/unless}}
{{#unless hideUpdateButton}}
<button class="btn btn-primary on-white {{updateButtonClass}}" {{action "updateAction" }} disabled={{isUpdateDisabled}}>{{ updateButtonText }}</button>
{{/unless}}
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion app/users/index/template.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<button class="btn btn-default" {{action 'editItem' user bubbles=false }}>{{t 'labels.edit'}}</button>
{{/if}}
{{#if canDelete}}
<button class="btn btn-default" {{action 'deleteItem' user bubbles=false }}>{{t 'labels.delete'}}</button>
<button class="btn btn-default warning" {{action 'deleteItem' user bubbles=false }}><span class="octicon octicon-x"></span>{{t 'labels.delete'}}</button>
{{/if}}
</td>
{{/if}}
Expand Down