day work towards ios and qr optimization

app/views/layouts/phone.html.slim

@@ -22,7 +22,7 @@ html lang="en"
         var data_host = 'http://data.qwaiter.com';
         var event_host = '#{event_host}';
         var $locale = 'en';
-        var $asset_path = 'file:///android_asset/assets/';
+        var $asset_path = '##assets_path##';
     - else
       javascript:
         var QMobile, Qwaiter, Quser;
@@ -43,8 +43,8 @@ html lang="en"
             this.authentication_string_storage = 'auth_token='+token;
             this.authentication_object_storage = '{"auth_token": "'+token+'"}'
           },
-          root_url: function(){return 'file:///Users/bterkuile/Documents/workspace/Qwaiter/assets'},
-          root_url: function(){return ''},
+          root_url: function(){return 'file:///Users/bterkuile/Documents/workspace/Qwaiter/assets/user'},
+          root_url: function(){return '/user'},
           goHome: function(){ redirect_to('user_root')},
           connection_problem: function(){alert('There is a problem connecting to the server')},
           locale: function(){ return $locale || ($locale = 'en')},

app/views/theme1/_navigation.html.slim

@@ -1,5 +1,5 @@
 ul.nav
-  li[class=(current_page?(controller: '/dashboard', action: 'home') ? :active : nil)]= link_to t('menu.home'), root_path
+  li[class=(current_page?(controller: '/dashboard', action: 'index') ? :active : nil)]= link_to t('menu.home'), root_path
   li[class=(current_page?(controller: '/dashboard', action: 'clients') ? :active : nil)]= link_to t('menu.clients'), clients_path
   li[class=(current_page?(controller: '/dashboard', action: 'bars_restaurants') ? :active : nil)]= link_to t('menu.bars_restaurants'), bars_restaurants_path
   li[class=(current_page?(controller: '/dashboard', action: 'enquete') ? :active : nil)]= link_to t('menu.enquete'), enquete_path

app/views/user/active_list.html.slim

@@ -1,13 +1,13 @@
 = top_bar title: 'active_list.title' do
-  .pull-right
-    .table-number
-    .supplier-name
   .action-buttons
     = link_to content_tag(:span, t('helpers.links.place_order')), user_list_products_path, class: ['user-top-button'], id: 'place-order-on-list'
     span#list-needs-payment-button.user-top-button
       span
     span#list-needs-help-button.user-top-button
       span
+  .pull-right
+    .table-number
+    .supplier-name
 .well
   table#active-list-table.table
     thead

app/views/user/list_products.html.slim

@@ -1,13 +1,13 @@
 = top_bar title: 'show_products.title' do
-  .pull-right
-    .table-number
-    .supplier-name
   .action-buttons
     = link_to content_tag(:span, t('helpers.links.show_active_list'), list: List.model_name.human), user_active_list_path, class: ['user-top-button'], id: 'show-active-list'
     span#list-needs-payment-button.user-top-button
       span
     span#list-needs-help-button.user-top-button
       span
+  .pull-right
+    .table-number
+    .supplier-name
  
 .well
   table#products-table.table