end of day commit

app/views/layouts/demo-both.html.slim

@@ -0,0 +1,24 @@
+doctype html
+html lang="en"
+  head
+    meta charset="utf-8"
+    meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1"
+    meta name="viewport" content="width=device-width, initial-scale=1.0"
+    title= content_for?(:title) ? yield(:title) : application_title
+    = csrf_meta_tags
+
+    /! Le HTML5 shim, for IE6-8 support of HTML elements
+    /[if lt IE 9]
+      = javascript_include_tag "http://html5shim.googlecode.com/svn/trunk/html5.js"
+    = stylesheet_link_tag "application", :media => "all"
+    link href="/images/apple-touch-icon-144x144.png" rel="apple-touch-icon-precomposed" sizes="144x144"
+    link href="/images/apple-touch-icon-114x114.png" rel="apple-touch-icon-precomposed" sizes="114x114"
+    link href="/images/apple-touch-icon-72x72.png" rel="apple-touch-icon-precomposed" sizes="72x72"
+    link href="/images/apple-touch-icon.png" rel="apple-touch-icon-precomposed"
+    link href="/favicon.ico" rel="shortcut icon"
+  body class=action_name
+    .container
+      .content
+        .row
+          .span12
+            = yield

app/views/supplier/edit.html.slim

@@ -35,4 +35,4 @@
   .form-actions
     = f.submit nil, class: 'btn btn-primary'
     '
-    = link_to t("helpers.links.cancel"), suppliers_path, class: 'btn'
+    = link_to t("helpers.links.cancel"), supplier_root_path, class: 'btn'

app/views/supplier/home.html.slim

@@ -7,6 +7,8 @@
   javascript:
     $(function(){
       $('#section_selector').change(function(){
+        Qsupplier.load_active_orders();
+        Qsupplier.load_active_lists();
         var el = $(this);
         var linker = $(this).siblings('a');
         if(el.val()){

app/views/suppliers/tables/_form.html.slim

@@ -11,4 +11,4 @@
   .form-actions
     = f.submit nil, class: 'btn btn-primary'
     '
-    = link_to t("helpers.links.cancel"), tables_path, class: 'btn'
+    = link_to t("helpers.links.cancel"), suppliers_tables_path, class: 'btn'

app/views/user/join_occupied_table.html.slim

@@ -1,10 +1,10 @@
 .page-header
-  h4= t('user.join_occupied_table.title')
+  h4 data-t="join_request.requestor.title" = t('user.join_occupied_table.title')
 .form-actions
-  = link_to t('user.join_occupied_table.back'), user_root_path, class: :btn
+  = link_to t('user.join_occupied_table.back'), user_root_path, class: :btn, data: {t: 'join_request.requestor.go_back'}
   '
-  button.btn.btn-primary onclick="Quser.show_table_products()" = t('user.join_occupied_table.show_the_products')
+  button.btn.btn-primary onclick="Quser.show_table_products()" data-t='join_request.requestor.show_the_products'= t('user.join_occupied_table.show_the_products')
   '
-  button.btn.btn-warning{onClick="Quser.join_occupied_table()"} = t('user.join_occupied_table.join_this_table')
+  button.btn.btn-warning onClick="Quser.join_occupied_table()" data-t='join_request.requestor.join_this_table'= t('user.join_occupied_table.join_this_table')
 #join-occupied-table-progress-container
 - onload_javascript 'Quser.watch_events()'