Big upgrade and supplier style upgrades

app/assets/javascripts/supplier/app/templates/global/_side_menu.emblem

@@ -6,6 +6,11 @@ aside.side-menu
       li: a.supplier-close-shop{action "markSupplierClosed"}= t 'supplier.close_for_orders'
     else
       li: a.supplier-open-shop{action "markSupplierOpen"}= t 'supplier.open_for_orders'
-    = link-to "settings" class="supplier-settings-link"
-      = t 'supplier.settings'
-    li class="supplier-sign-out-link": a{action "signOut"}= t 'supplier.sign_out'
+    li
+      =link-to 'settings' class="supplier-settings-link"
+        span.settings-icon
+        span= t 'supplier.settings'
+    li class="supplier-sign-out-link"
+      a{action "signOut"}
+        span.sign-out-icon
+        = t 'supplier.sign_out'

app/assets/javascripts/supplier/app/templates/modals/section_arrange_tables.emblem

@@ -1,52 +1,30 @@
-.modal-alert== alert_message
 p=t 'section.arrange_tables.modal.body_header'
-.arrange-type-buttons
-  if isDistributed
-    span.arrange-tables-current-type.distributed=t 'section.arrange_tables.modal.distributed.title'
-  else
-    button.arrange-tables-type-button.distributed{action "makeDistributed"}=t 'section.arrange_tables.modal.distributed.title'
-  if isByRow
-    span.arrange-tables-current-type.by_row=t 'section.arrange_tables.modal.by_row.title'
-  else
-    button.arrange-tables-type-button.by_row{action "makeByRow"}=t 'section.arrange_tables.modal.by_row.title'
-  if isByColumn
-    span.arrange-tables-current-type.by_column=t 'section.arrange_tables.modal.by_column.title'
-  else
-    button.arrange-tables-type-button.by_column{action "makeByColumn"}=t 'section.arrange_tables.modal.by_column.title'
-.arrange-content
-  if isDistributed
-    ==t 'section.arrange_tables.modal.distributed.explanation'
-  if isByRow
-    ==t 'section.arrange_tables.modal.by_row.before_field'
-    App.NumberField valueBinding="row_count"
-    ==t 'section.arrange_tables.modal.by_row.after_field'
-  if isByColumn
-    ==t 'section.arrange_tables.modal.by_column.before_field'
-    App.NumberField valueBinding="column_count"
-    ==t 'section.arrange_tables.modal.by_column.after_field'
+if canArrangeTables
+  .arrange-type-buttons
+    if isDistributed
+      span.arrange-tables-current-type.distributed=t 'section.arrange_tables.modal.distributed.title'
+    else
+      button.arrange-tables-type-button.distributed{action "makeDistributed"}=t 'section.arrange_tables.modal.distributed.title'
+    if isByRow
+      span.arrange-tables-current-type.by_row=t 'section.arrange_tables.modal.by_row.title'
+    else
+      button.arrange-tables-type-button.by_row{action "makeByRow"}=t 'section.arrange_tables.modal.by_row.title'
+    if isByColumn
+      span.arrange-tables-current-type.by_column=t 'section.arrange_tables.modal.by_column.title'
+    else
+      button.arrange-tables-type-button.by_column{action "makeByColumn"}=t 'section.arrange_tables.modal.by_column.title'
+  .arrange-content
+    if isDistributed
+      ==t 'section.arrange_tables.modal.distributed.explanation'
+    if isByRow
+      =t 'section.arrange_tables.modal.by_row.before_field'
+      App.NumberField valueBinding="row_count"
+      =t 'section.arrange_tables.modal.by_row.after_field'
+    if isByColumn
+      =t 'section.arrange_tables.modal.by_column.before_field'
+      App.NumberField valueBinding="column_count"
+      =t 'section.arrange_tables.modal.by_column.after_field'
 hr
 button.modal-close{action "close"}=t 'section.arrange_tables.modal.close_button'
-button.modal-confirm.right{action "arrangeTables"}=t 'section.arrange_tables.modal.arrange_button'
-
-
-  /form.form-horizontal
-    .control-group
-      label.control-label for='arrange-tables-distributed' data-t='section.arrange_tables.modal.distributed' = t('supplier.section.arrange_tables.modal.distributed')
-      .controls
-        input#arrange-tables-distributed type="radio" name="arrange-table-option" checked=true value="distributed"
-    .control-group
-      label.control-label for='arrange-tables-by_row' data-t='section.arrange_tables.modal.by_row' = t('supplier.section.arrange_tables.modal.by_row')
-      .controls
-        input#arrange-tables-by_row type="radio" name="arrange-table-option" value="by_row"
-        label for="arrange-tables-by-row-count" data-t='section.arrange_tables.modal.by_row_count' = t('supplier.section.arrange_tables.modal.by_row_count')
-        input.input-mini#arrange-tables-by-row-count type="text" value=0
-        '
-        span data-t='models.plural.table'
-    .control-group
-      label.control-label for='arrange-tables-by_column' data-t='section.arrange_tables.modal.by_column' = t('supplier.section.arrange_tables.modal.by_column')
-      .controls
-        input#arrange-tables-by_column type="radio" name="arrange-table-option" value="by_column"
-        label for="arrange-tables-by-column-count" data-t='section.arrange_tables.modal.by_column_count' = t('supplier.section.arrange_tables.modal.by_column_count')
-        input.input-mini#arrange-tables-by-column-count type="text" value=0
-        '
-        span data-t='models.plural.table'
+if canArrangeTables
+  button.modal-confirm.right{action "arrangeTables"}=t 'section.arrange_tables.modal.arrange_button'

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

@@ -4,33 +4,18 @@
     = view "section-tab-header" context=section
   a.add-section{action "addSection"}: span
 .section-manage-tables.pull-right
+  App.DropdownLink title="Action"
+    ul
+      li: a{action "addTables"}: span.section-add-tables-icon=t 'section.add_tables.button_label'
+      li: a{action "arrangeTables"}: span.section-arrange-tables-icon=t 'section.arrange_tables.modal.title'
+      li: a href="{{route 'qr_codes_suppliers_tables_path' section_id=id}}" target="_blank": span.qr-icon=t 'table.print_qr_codes'
+      li: a.section-destroy{action "destroySection"}: span.section-remove-icon=t 'helpers.links.destroy'
   if editmode
-    /.btn-group
-      /a.btn.dropdown-toggle data-toggle="dropdown" href="#section-background"
-        span Background
-        span.caret
-      ul#section-background.dropdown-menu
-        each texture in textures
-          li
-            a{ action "setTexture" texture }= texture
-    /a.tiny.button.dropdown.section-actions-menu-header href="#" data-dropdown="section-action-list" Action
-    /button.btn.dropdown-toggle data-toggle="dropdown"
-      span Action
-      span.caret
-    App.DropdownLink title="Action"
-      ul
-        li
-          a{action "addTables"}: span.section-add-tables-icon=t 'section.add_tables.button_label'
-        li
-          a{action "arrangeTables"}: span.section-arrange-tables-icon=t 'section.arrange_tables.modal.title'
-        li
-          a href="{{route 'qr_codes_suppliers_tables_path' section_id=id}}": span.table-qr-codes=t 'tables.qr_codes.link'
-        li
-          a.section-destroy{action "destroySection"}: span.section-remove-icon=t 'helpers.links.destroy'
     = input type="text" valueBinding="title" class="section-edit-title-field"
     App.NumberField valueBinding="width" class="dimension section-edit-width-field"
     span.fa.fa-lg.fa-times
     App.NumberField valueBinding="height" class="dimension section-edit-height-field"
+    a.section-rollback-button{ action "rollbackEditable" }: span
     a.section-normal-mode-button{ action "finishEditable" }: span
   else
     a.section-edit-mode-button{ action "makeEditable" }: span

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

@@ -32,8 +32,7 @@
             /td.timestamp=time list.created_at
             td.actions
               a.section-dashboard-orders{action showDashboardOrders section}: span
-              a.table-qr-codes{path qr_codes_suppliers_tables section_id=section.id}
-                span
+              a.table-qr-codes{path qr_codes_suppliers_tables section_id=section.id} target="_blank": span.qr-icon
   else
     .row: .small-12.columns
       .panel=t 'section.none_found'

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

@@ -1,4 +1,4 @@
-h2=t 'settings.title'
+.row: .small-12.columns: h2=t 'settings.title'
 .form-row
   .form-label: label=t 'attributes.supplier.name'
   .form-field: Ember.TextField valueBinding="controller.model.name" classNames="supplier-name"

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

@@ -20,7 +20,8 @@
             td.actions
               a.table-edit{ action 'editTable' table }: span
               a.table-destroy{ action 'destroyTable' table }: span
-  a.button.new-table-button{action "newTable"}= t 'table.new_button'
-  a.table-qr-codes{path qr_codes_suppliers_tables}
-    span
-    = t 'table.print_qr_codes'
+  .form-actions
+    a.form-action-new{action "newTable"}= t 'table.new_button'
+    a.table-qr-codes{path qr_codes_suppliers_tables} target="_blank"
+      span.qr-icon
+      = t 'table.print_qr_codes'