Design and style upgrades

This commit is contained in:
2014-03-31 17:43:51 +02:00
parent bbf1a11a2e
commit 14217efad3
15 changed files with 126 additions and 119 deletions
@@ -17,7 +17,10 @@ App.ApplicationController = Ember.Controller.extend
list_needs_help: -> @set 'list.needs_help', true # incoming from other users
list_is_paid: -> @set 'list.needs_payment', false
list_needs_payment: -> @set 'list.needs_payment', true # incoming from other users
list_closed: -> @set 'list', null
list_closed: (data)->
@transitionToRoute('list', data.id).then =>
@set 'list.state', 'closed'
@set 'list', null
join_request_approved: (data)->
@setCurrentList -> @transitionToRoute('active_list')
order_being_processed: (data)->
@@ -12,7 +12,7 @@
.right
if list.id
App.MenuItemView route="active_list"
App.MenuItemView route='list_products'
App.MenuItemView route='table' route_param=list.table.id
App.MenuItemListNeedsHelpView
App.MenuItemListNeedsPaymentView
aside.left-off-canvas-menu
@@ -25,12 +25,13 @@
li
a{action scanQr bubbles=false}
span Scan QR
li
=link-to 'list_products'
span= t 'list_products.title'
li
=link-to 'active_list'
span= t 'active_list.title'
if list.id
li
=link-to 'table' list.table.id
span= t 'list_products.title'
li
=link-to 'active_list'
span= t 'active_list.title'
li
=link-to 'lists'
span= t 'models.plural.list'
@@ -1 +1 @@
span.needs-help.fa.fa-hand-o-up.fa-lg
span.icon.needs-help
@@ -1 +1 @@
span.needs-payment.fa.fa-money.fa-lg
span.icon.needs-payment
@@ -2,7 +2,10 @@ App.MenuItemView = Ember.View.extend
classNames: 'menu-list-item'
classNameBindings: ['active']
click: ->
@get('controller').transitionToRoute(@route)
if @route_param
@get('controller').transitionToRoute(@route, @route_param)
else
@get('controller').transitionToRoute(@route)
active: (->
if @get('controller.currentPath') == @route then 'active' else ''
).property('controller.currentPath')