Design and style upgrades

app/assets/javascripts/supplier/app/templates/active_list.emblem

@@ -1,14 +1,21 @@
 td.list-status
   if view.content.needs_help
-    span.list-needs-help-indicator ?
+    span.icon.needs-help
   if view.content.needs_payment
-    span.list-needs-payment-indicator €
+    |  
+    span.icon.needs-payment
 td.numeric.table_number {{view.content.table_number}}
 td.section_title {{view.content.section.title}}
 td.currency.total_list_amount {{currency view.content.price}}
 td.actions
   if view.content.needs_help
-    button.btn.btn-info.mark_list_as_helped{ action markListAsHelped view.content.id} {{t 'list.is_helped_button'}}
-  button.btn.btn-warning.close_list{ action closeList view.content.id} {{t 'list.close_list' }}
-  a.btn href="/supplier/lists/{{unbound view.content.id}}"
+    button.mark_list_as_helped{ action markListAsHelped view.content.id}
+      span.fa-stack
+        i.fa.fa-bell.fa-stack-1x
+        i.fa.fa-ban.fa-stack-2x.revoke
+      span.button-text=t 'list.is_helped_button'
+  button.close_list{ action closeList view.content.id}
+    span.fa.fa-times.fa-2x
+    span.button-text=t 'list.close_list'
+  a.btn.hide href="/supplier/lists/{{unbound view.content.id}}"
     span.icon-list  

app/assets/javascripts/supplier/app/templates/active_order.emblem

@@ -1,3 +1,5 @@
+td.status-icons
+  span.active-order.fa.fa-check.fa-lg
 td {{view.content.display}}
 td.numeric.table_number
   view Qsupplier.App.ActiveOrderTableNumberView contextBinding=view.content
@@ -5,5 +7,17 @@ td.section_title {{view.content.section.title}}
 td.currency {{currency view.content.total }}
 td.actions
   if view.content.placed
-    button.btn.btn-success{ action markOrderActive view.content.id} {{t 'order.being_processed'}}
-  button.btn.btn-inverse{ action markOrderDelivered view.content.id} {{t 'order.being_served' }}
+    button{ action markOrderActive view.content.id}
+      span.fa.fa-check.fa-2x
+      span.button-text=t 'order.being_processed'
+    button.hide.mark-order-active{ action markOrderActive view.content.id}
+      span.button-icon
+      span.button-text=t 'order.being_processed'
+  button{ action markOrderDelivered view.content.id}
+    span.fa-shifted-stack
+      i.fa.fa-check.fa-2x
+      i.fa.fa-check.fa-2x
+    span.button-text= t 'order.being_served'
+  button.hide.mark-order-delivered{ action markOrderDelivered view.content.id}
+    span.button-icon
+    span.button-text= t 'order.being_served'

app/assets/javascripts/supplier/app/templates/index.emblem

@@ -21,6 +21,7 @@
   table.active-orders-table.table
     thead
       tr
+        th.status-icons
         th {{t 'models.order'}}
         th.numeric {{t 'table_number'}}
         th {{t 'models.section'}}

app/assets/javascripts/user/app/controllers/application_controller.js.coffee

@@ -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)->

app/assets/javascripts/user/app/templates/application.emblem

@@ -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'

app/assets/javascripts/user/app/templates/menu_item_list_needs_help.emblem

@@ -1 +1 @@
-span.needs-help.fa.fa-hand-o-up.fa-lg
+span.icon.needs-help

app/assets/javascripts/user/app/templates/menu_item_list_needs_payment.emblem

@@ -1 +1 @@
-span.needs-payment.fa.fa-money.fa-lg
+span.icon.needs-payment

app/assets/javascripts/user/app/views/menu_item_view.js.coffee

@@ -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')