diff --git a/app/assets/javascripts/supplier/foundation1/application.js.erb b/app/assets/javascripts/supplier/foundation1/application.js.erb index 604ca330..41a6838b 100644 --- a/app/assets/javascripts/supplier/foundation1/application.js.erb +++ b/app/assets/javascripts/supplier/foundation1/application.js.erb @@ -17,7 +17,6 @@ //= require_self var Qstorage = localStorage; - $.extend($translations.en, <%= I18n.t('supplier', locale: :en).to_json %>); $.extend($translations.nl, <%= I18n.t('supplier', locale: :nl).to_json %>); diff --git a/app/assets/stylesheets/supplier/foundation1/_menu_side.css.sass b/app/assets/stylesheets/supplier/foundation1/_menu_side.css.sass index 8a74d8c1..4bb52a9e 100644 --- a/app/assets/stylesheets/supplier/foundation1/_menu_side.css.sass +++ b/app/assets/stylesheets/supplier/foundation1/_menu_side.css.sass @@ -7,10 +7,16 @@ aside.side-menu width: 222px height: 100% z-index: 50 + h3 + color: white + margin-bottom: 3px > ul list-style: none a color: white + .title + border-bottom: 1px solid #aaa + margin-bottom: 4px .supplier-close-shop +alert($bg: $alert-color, $radius: true) padding: 3px diff --git a/app/views/suppliers/application/_top_menu.html.slim b/app/views/suppliers/application/_top_menu.html.slim index 097c52de..e82ac33e 100644 --- a/app/views/suppliers/application/_top_menu.html.slim +++ b/app/views/suppliers/application/_top_menu.html.slim @@ -24,15 +24,14 @@ header.top-menu span.supplier-orders-in-process-count-icon aside.side-menu ul - li - label Menu + li.title: h3 Menu - if current_supplier.open? li = form_tag supplier_mark_as_closed_path do a.supplier-close-shop href="javascript:void(0)" onclick="$(this).parents('form').submit()" span data-t="supplier.close_for_orders" - li= link_to 'Settings', supplier_settings_path, class: 'supplier-settings-link' - li= link_to 'Logout', destroy_supplier_session_path, method: :delete, class: 'supplier-sign-out-link' + li= link_to content_tag(:span, '', data: {t: 'supplier.settings'}), supplier_settings_path, class: 'supplier-settings-link' + li= link_to content_tag(:span, '', data: {t: 'supplier.sign_out'}), destroy_supplier_session_path, method: :delete, class: 'supplier-sign-out-link' /.navbar.navbar-fixed-top.navbar-inverse .navbar-inner .container diff --git a/config/locales/supplier.en.yml b/config/locales/supplier.en.yml index 6b787551..8e1676a7 100644 --- a/config/locales/supplier.en.yml +++ b/config/locales/supplier.en.yml @@ -17,6 +17,8 @@ en: close_for_orders: Close the shop open_for_orders: 'Open up the place!' you_are_currently_closed_alert: 'You are currently closed and not able to take orders' + settings: Settings + sign_out: Sign out table_number: Table tables: qr_codes: diff --git a/config/locales/supplier.nl.yml b/config/locales/supplier.nl.yml index d138eea5..14574dcc 100644 --- a/config/locales/supplier.nl.yml +++ b/config/locales/supplier.nl.yml @@ -17,6 +17,8 @@ nl: close_for_orders: De zaak afsluiten voor bestellingen open_for_orders: 'Open de zaak!' you_are_currently_closed_alert: 'Je bent momenteel gesloten en kan geen orders ontvangen' + settings: Instellingen + sign_out: Afmelden table_number: Tafel tables: qr_codes: diff --git a/wip.md b/wip.md index 71c5b65e..01aa7e3d 100644 --- a/wip.md +++ b/wip.md @@ -13,7 +13,6 @@ Supplier - Dashboard - Empty state - Add qr print functionality offering to send the stickers -- Supplier sidebar open/close message seems untranslated User ---- @@ -29,7 +28,7 @@ General Bugs ---- -- Dragging supplier table from one section to the other fails +- nothing!!! Post release ============