Mixed commit, user facebook issues

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

@@ -12,7 +12,10 @@
   rootElement: '#ember-app-container'
   obtain_token: (message)->
     message ||= ''
-    window.location = "#{$root_url}/obtain_token?message=#{message}"
+    # frame = $('<iframe></iframe>').addClass('obtain-token-frame').attr 'src', $obtain_token_url
+    # frame.css width: $('body').outerWidth(), height: $('body').outerHeight()
+    # $('body').append frame
+    window.location = "#{$obtain_token_url}"
 
 Ember.$.ajaxPrefilter (options) ->
   if options.type.toUpperCase() == 'GET'

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

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

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

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

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

@@ -17,7 +17,7 @@ header.top-menu
           .table-number
             |
             = t 'models.table'
-            |
+            | 
             = list.table.number
         .supplier-info-row
           .counter.supplier-orders-placed-count

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

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