Mixed commit, user facebook issues

This commit is contained in:
2014-08-11 17:54:43 +02:00
parent 28192f8e39
commit 031e2bedea
19 changed files with 95 additions and 77 deletions
@@ -10,18 +10,21 @@ if list.closed_at
.display-row
.display-label=t 'attributes.list.state'
.display-field=state 'list' list.state
if list.sorted_orders
.list-orders-container
each order in list.sorted_orders
App.ListOrderView contentBinding="order"
if showTotal
.list-orders-total.total
= t 'total'
span.currency= currency list.total
if list.orders.isLoaded
if list.sorted_orders
.list-orders-container
each order in list.sorted_orders
App.ListOrderView contentBinding="order"
if showTotal
.list-orders-total.total
= t 'total'
span.currency= currency list.total
else
p
span=t 'active_list.no_orders_explanation'
br
if list.table
link-to 'table' list.table class="button"
span=t 'list_products.title'
else
p
span=t 'active_list.no_orders_explanation'
br
if list.table
link-to 'table' list.table class="button"
span=t 'list_products.title'
span.loading.large
@@ -1,10 +1,13 @@
.row
h2=t 'active_list.title'
if list
partial "list_content"
if list.orders.isLoaded
if list
partial "list_content"
else
p
span=t 'active_list.not_active.message'
br
link-to 'index' class="button"
span= t 'active_list.not_active.home_button_text'
else
p
span=t 'active_list.not_active.message'
br
link-to 'index' class="button"
span= t 'active_list.not_active.home_button_text'
span.loading.large
@@ -17,7 +17,7 @@ header.top-menu
.table-number
|
= t 'models.table'
|
| 
= list.table.number
.supplier-info-row
.counter.supplier-orders-placed-count
@@ -1,6 +1,6 @@
.home-panel
.home-header = image_tag 'logo.png'
.home-header= image_tag 'logo.png' width=100 height=115 alt="Logo"
.home-center
a{action scanQr} href="#"= image_tag 'scan-logo.png'
a{ action "scanQr" } href="#"= image_tag 'scan-logo.png' width=148 height=177 alt="Scan"
.home-footer
.home-footer-content