Supplier side menu enhancements

This commit is contained in:
2014-08-21 14:43:59 +02:00
parent e735c17b7a
commit 79cfd0b81d
6 changed files with 14 additions and 7 deletions
@@ -17,7 +17,6 @@
//= require_self //= require_self
var Qstorage = localStorage; var Qstorage = localStorage;
$.extend($translations.en, <%= I18n.t('supplier', locale: :en).to_json %>); $.extend($translations.en, <%= I18n.t('supplier', locale: :en).to_json %>);
$.extend($translations.nl, <%= I18n.t('supplier', locale: :nl).to_json %>); $.extend($translations.nl, <%= I18n.t('supplier', locale: :nl).to_json %>);
@@ -7,10 +7,16 @@ aside.side-menu
width: 222px width: 222px
height: 100% height: 100%
z-index: 50 z-index: 50
h3
color: white
margin-bottom: 3px
> ul > ul
list-style: none list-style: none
a a
color: white color: white
.title
border-bottom: 1px solid #aaa
margin-bottom: 4px
.supplier-close-shop .supplier-close-shop
+alert($bg: $alert-color, $radius: true) +alert($bg: $alert-color, $radius: true)
padding: 3px padding: 3px
@@ -24,15 +24,14 @@ header.top-menu
span.supplier-orders-in-process-count-icon span.supplier-orders-in-process-count-icon
aside.side-menu aside.side-menu
ul ul
li li.title: h3 Menu
label Menu
- if current_supplier.open? - if current_supplier.open?
li li
= form_tag supplier_mark_as_closed_path do = form_tag supplier_mark_as_closed_path do
a.supplier-close-shop href="javascript:void(0)" onclick="$(this).parents('form').submit()" a.supplier-close-shop href="javascript:void(0)" onclick="$(this).parents('form').submit()"
span data-t="supplier.close_for_orders" span data-t="supplier.close_for_orders"
li= link_to 'Settings', supplier_settings_path, class: 'supplier-settings-link' li= link_to content_tag(:span, '', data: {t: 'supplier.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.sign_out'}), destroy_supplier_session_path, method: :delete, class: 'supplier-sign-out-link'
/.navbar.navbar-fixed-top.navbar-inverse /.navbar.navbar-fixed-top.navbar-inverse
.navbar-inner .navbar-inner
.container .container
+2
View File
@@ -17,6 +17,8 @@ en:
close_for_orders: Close the shop close_for_orders: Close the shop
open_for_orders: 'Open up the place!' open_for_orders: 'Open up the place!'
you_are_currently_closed_alert: 'You are currently closed and not able to take orders' you_are_currently_closed_alert: 'You are currently closed and not able to take orders'
settings: Settings
sign_out: Sign out
table_number: Table table_number: Table
tables: tables:
qr_codes: qr_codes:
+2
View File
@@ -17,6 +17,8 @@ nl:
close_for_orders: De zaak afsluiten voor bestellingen close_for_orders: De zaak afsluiten voor bestellingen
open_for_orders: 'Open de zaak!' open_for_orders: 'Open de zaak!'
you_are_currently_closed_alert: 'Je bent momenteel gesloten en kan geen orders ontvangen' you_are_currently_closed_alert: 'Je bent momenteel gesloten en kan geen orders ontvangen'
settings: Instellingen
sign_out: Afmelden
table_number: Tafel table_number: Tafel
tables: tables:
qr_codes: qr_codes:
+1 -2
View File
@@ -13,7 +13,6 @@ Supplier
- Dashboard - Dashboard
- Empty state - Empty state
- Add qr print functionality offering to send the stickers - Add qr print functionality offering to send the stickers
- Supplier sidebar open/close message seems untranslated
User User
---- ----
@@ -29,7 +28,7 @@ General
Bugs Bugs
---- ----
- Dragging supplier table from one section to the other fails - nothing!!!
Post release Post release
============ ============