Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Moved action button to the bottom of the form #1384

Merged
merged 2 commits into from
Mar 12, 2018
Merged

Moved action button to the bottom of the form #1384

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
44e9557
Moved action button to the bottom of the form
romanblanco Feb 13, 2018
27a6d0a
Added missing 'Cancel' button
romanblanco Mar 9, 2018
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
35 changes: 19 additions & 16 deletions client/app/states/catalogs/details/details.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,22 +28,6 @@ <h2>{{ ::vm.serviceTemplate.name }}</h2>
<h4 ng-bind-html="::vm.serviceTemplate.long_description || vm.serviceTemplate.description"></h4>
</div>
</div>
<div class="col-lg-4 col-md-4 col-sm-4 col-xs-4 ss-details-header__actions">
<button type="button"
class="btn btn-primary"
ng-disabled="vm.addToCartDisabled()"
confirmation
confirmation-if="vm.alreadyInCart()"
confirmation-title="{{'Duplicate Shopping Cart Item'|translate}}"
confirmation-message="{{'There already is an identical item in the cart. Do you want to add it anyway?'|translate}}"
confirmation-ok-text="{{'Add to Shopping Cart'|translate}}"
confirmation-on-ok="vm.addToCart()"
confirmation-ok-style="primary"
confirmation-show-cancel="true">
<span class="spinner spinner-xs spinner-inline" ng-show="vm.addingToCart"></span>
{{"Add to Shopping Cart"|translate}}
</button>
</div>
</div>
</div>
</section>
Expand All @@ -58,6 +42,25 @@ <h4 ng-bind-html="::vm.serviceTemplate.long_description || vm.serviceTemplate.de
<div class="row">
<div ng-repeat="dialog in ::vm.parsedDialogs">
<dialog-user class="dialog-box" dialog="dialog" refresh-field="vm.refreshField(field)" on-update="vm.setDialogData(data)"></dialog-user>
<button type="button"
class="btn btn-primary"
ng-disabled="vm.addToCartDisabled()"
confirmation
confirmation-if="vm.alreadyInCart()"
confirmation-title="{{'Duplicate Shopping Cart Item'|translate}}"
confirmation-message="{{'There already is an identical item in the cart. Do you want to add it anyway?'|translate}}"
confirmation-ok-text="{{'Add to Shopping Cart'|translate}}"
confirmation-on-ok="vm.addToCart()"
confirmation-ok-style="primary"
confirmation-show-cancel="true">
<span class="spinner spinner-xs spinner-inline" ng-show="vm.addingToCart"></span>
{{"Add to Shopping Cart"|translate}}
</button>
<button type="button"
class="btn btn-default"
ui-sref="catalogs">
{{"Cancel"}}
</button>
</div>
</div>
</div>
Expand Down