Upgrade progress

This commit is contained in:
2015-07-28 12:52:00 +02:00
parent efae583705
commit 11578b9aef
17 changed files with 31 additions and 22 deletions
@@ -1,5 +1,5 @@
App.MarkListHelpedButtonView = Ember.View.extend
templateName: 'mark_list_helped_button'
App.ButtonMarkListHelpedComponent = Ember.View.extend
templateName: 'components/button/mark-list-helped'
classNames: ['mark-list-as-helped-button']
classNameBindings: ['content.needs_help:show:hide']
tagName: 'button'
@@ -1,6 +1,6 @@
App.MarkOrderActiveComponent = Ember.Component.extend
App.ButtonMarkOrderActiveComponent = Ember.Component.extend
tagName: 'button'
templateName: 'components/buttons/mark-order-active'
templateName: 'components/button/mark-order-active'
classNames: ['mark-order-active-button']
classNameBindings: ['order.placed:active:hide']
click: -> @get('order').mark_active()
@@ -1,6 +1,6 @@
App.MarkOrderCancelledComponent = Ember.Component.extend
App.ButtonMarkOrderCancelledComponent = Ember.Component.extend
tagName: 'button'
templateName: 'components/buttons/mark-order-cancelled'
templateName: 'components/button/mark-order-cancelled'
classNames: ['mark-order-cancelled-button']
classNameBindings: ['showButton:active:hide']
showButton: Ember.computed 'order.state', ->
@@ -1,6 +1,6 @@
App.MarkOrderDeliveredComponent = Ember.Component.extend
App.ButtonMarkOrderDeliveredComponent = Ember.Component.extend
tagName: 'button'
templateName: 'components/buttons/mark-order-delivered'
templateName: 'components/button/mark-order-delivered'
classNames: ['mark-order-delivered-button']
classNameBindings: ['showButton:active:hide']
showButton: Ember.computed 'order.state', ->
@@ -23,9 +23,9 @@ if list.sorted_orders
span.currency= currency order.total
span.created_at= time order.created_at
.list-order-actions
= mark-order-active order=order
= mark-order-delivered order=order
= mark-order-cancelled order=order
= button-mark-order-active order=order
= button-mark-order-delivered order=order
= button-mark-order-cancelled order=order
if showTotal
.list-orders-total.total
= t 'general.total'
@@ -16,7 +16,8 @@ td.actions
span.fa-stack.fa-2x.fa-stack-sized
i.fa.fa-bell.fa-stack-small
i.fa.fa-ban.revoke
= view "mark-list-helped-button" content=view.content
/= view "mark-list-helped-button" content=view.content
= button-mark-list-helped content=view.content
/= view "remove-list-needs-payment" content=view.content
= view "close-list-button" content=view.content
@@ -10,6 +10,6 @@ td.section_title= link-to 'section' view.content.list.table.section.id: span=vie
td.currency=currency view.content.total
td.time= time view.content.created_at format="HH:mm"
td.actions
= mark-order-active order=view.content
= mark-order-delivered order=view.content
= mark-order-cancelled order=view.content
= button-mark-order-active order=view.content
= button-mark-order-delivered order=view.content
= button-mark-order-cancelled order=view.content
@@ -9,7 +9,8 @@ if table.active_list
.title= table.number
if table.active_list
.table-action-row
= view "mark-list-helped-button" contentBinding="table.active_list"
/= view "mark-list-helped-button" contentBinding="table.active_list"
= button-mark-list-helped content=table.active_list
= view "close-list-button" contentBinding="table.active_list"
each order in table.active_list.active_orders
.table-action-row= order.display_tag