bterkuile/mozo-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

small refactor for ember actions

Browse Source
This commit is contained in:
Benjamin ter Kuile
2014-08-13 17:07:26 +02:00
parent a675999d01
commit 446cf08afb
17 changed files with 54 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/assets/javascripts/user/app/templates/application.emblem
+1 -1
View File
@@ -59,7 +59,7 @@ aside.side-menu
main.main-section
.main-section-content
if notice
#notice.alert-box{action clearNotice} data-alert=true
#notice.alert-box{action "clearNotice"} data-alert=true
a.right href="#"
span.fa.fa-times.fa-lg
span= notice
app/assets/javascripts/user/app/templates/join_requests.emblem
+3 -3
View File
@@ -2,10 +2,10 @@
h2= t 'join_request.existing_user.title'
each join_request in join_requests
.join-request-container
img.facebook-image src="http://graph.facebook.com/#{unbound join_request.user.facebook_id}/picture?type=square"
= join_request.user.facebook_image_tag
span.user-email= join_request.user.email
.right
button.join-request-reject{action rejectRequest join_request}=t 'join_request.existing_user.reject_request'
button.join-request-approve{action approveRequest join_request}=t 'join_request.existing_user.approve_request'
button.join-request-reject{action "rejectRequest" join_request}=t 'join_request.existing_user.reject_request'
button.join-request-approve{action "approveRequest" join_request}=t 'join_request.existing_user.approve_request'
else
p=t 'join_request.existing_user.no_join_requests_message'
app/assets/javascripts/user/app/templates/modal_confirm.emblem
+1 -1
View File
@@ -3,4 +3,4 @@ modal-dialog action="close"
p=body
hr
button.confirm-cancel{action "close"}= t 'confirm.cancel'
button.confirm-ok.right{action 'confirm'}= t 'confirm.confirm'
button.confirm-ok.right{action "confirm"}= t 'confirm.confirm'
app/assets/javascripts/user/app/templates/modal_info.emblem
+1 -1
View File
@@ -2,4 +2,4 @@ modal-dialog action="close"
h3.flush--top= title
p==body
hr
button{action 'close'}= t 'modal.info.close'
button{action "close"}= t 'modal.info.close'
app/assets/javascripts/user/app/templates/table.emblem
+7 -7
View File
@@ -1,7 +1,7 @@
.row
h2
=t 'models.table'
|
|
= number
if showJoinButton
if join_request_sent
@@ -9,13 +9,13 @@
span.fa.fa-spinner.fa-spin.fa-lg
span=t 'join_request.requestor.waiting_for_approval'
else
button.join-table-button{action joinOccupiedTable}=t 'join_request.requestor.join_this_table'
button.join-table-button{action "joinOccupiedTable"}=t 'join_request.requestor.join_this_table'
if tableCanTakeOrders
.large-6.columns
each product_category in supplier.product_categories
if product_category.products
hr
h4.product_category-title{action toggleProductCategory product_category}
h4.product_category-title{action "toggleProductCategory" product_category}
if product_category.collapsed
span.icon.collapsed
else
@@ -27,12 +27,12 @@
each product in product_category.products
li class="order-product-#{unbound product.id}"
if product.description
button.show-product-description{action showProductDescription product}
button.show-product-description{action "showProductDescription" product}
span
else
span.no-product-description
a{action addProduct product}= product.name
button.add-product-to-list{action addProduct product}
a{action "addProduct" product}= product.name
button.add-product-to-list{action "addProduct" product}
span
span.product-price.currency=currency product.price
.large-6.columns= render 'product_orders'
@@ -47,7 +47,7 @@
each product in product_category.products
li class="order-product-#{unbound product.id}"
if product.description
button.show-product-description{action showProductDescription product}
button.show-product-description{action "showProductDescription" product}
span
span= product.name
span.right.currency=currency product.price