From b329d2d6d99369a17c868b989f1a3cec4bc46872 Mon Sep 17 00:00:00 2001 From: Benjamin ter Kuile Date: Tue, 24 Mar 2015 16:04:19 +0100 Subject: [PATCH] Better suppliers menu --- .../templates/components/menu-product.emblem | 24 ++++++------ .../app/templates/global/_side_menu.emblem | 29 +++++++++++++-- .../foundation1/components/_nav_side.sass | 7 +++- config/locales/models.en.yml | 4 +- config/locales/models.nl.yml | 4 +- config/locales/supplier.en.yml | 37 ++++++++++--------- config/locales/supplier.nl.yml | 3 +- 7 files changed, 70 insertions(+), 38 deletions(-) diff --git a/app/assets/javascripts/supplier/app/templates/components/menu-product.emblem b/app/assets/javascripts/supplier/app/templates/components/menu-product.emblem index 3406a0a4..72a034bf 100644 --- a/app/assets/javascripts/supplier/app/templates/components/menu-product.emblem +++ b/app/assets/javascripts/supplier/app/templates/components/menu-product.emblem @@ -1,24 +1,26 @@ if editMode .row - .small-3.columns.name + .small-6.medium-3.columns.name = input value=product.name placeholder=namePlaceholder action="save" = errors product.errors.name - .small-3.columns.price - = edit-currency value=product.price action="save" - = errors product.errors.price - .small-3.columns.code= input value=product.code placeholder=codePlaceholder - .small-3.columns.actions + .small-6.medium-3.columns.actions a.rollback-product-action{action "rollbackProduct"}: span a.destroy-product-action{action "destroyProduct" product}: span a.save-product-action{action "save"}: span + .small-6.medium-3.columns.price + = edit-currency value=product.price action="save" + = errors product.errors.price + .small-6.medium-3.columns.code= input value=product.code placeholder=codePlaceholder .row - .small-4.large-2.columns= t 'attributes.product.active' - .small-8.large-10.columns: view boolean-switch value=product.active + .small-3.columns= t 'attributes.product.active' + .small-9.columns: view boolean-switch value=product.active .row.menu-product-container - .medium-4.small-6.columns + .small-12.medium-6.columns + = descriptionPlaceholder + = textarea value=product.description placeholder=descriptionPlaceholder + .small-12.medium-6.columns = view "upload-file" name="image" accept="image/*" file=product.image - .medium-4.small-6.columns: img src=product.image_src - .medium-4.small-6.columns= textarea value=product.description placeholder=descriptionPlaceholder + img src=product.image_src else if showProduct .row diff --git a/app/assets/javascripts/supplier/app/templates/global/_side_menu.emblem b/app/assets/javascripts/supplier/app/templates/global/_side_menu.emblem index c216ec58..0c5e64a3 100644 --- a/app/assets/javascripts/supplier/app/templates/global/_side_menu.emblem +++ b/app/assets/javascripts/supplier/app/templates/global/_side_menu.emblem @@ -1,7 +1,6 @@ .side-menu ul - li.title: h3 Menu - li.supplier-name= supplier.name + li.title: h3= supplier.name can manage supplier if supplier.open li: a.supplier-close-shop{action "markSupplierClosed"}= t 'supplier.close_for_orders' @@ -11,7 +10,31 @@ =link-to 'settings' class="supplier-settings-link" span.settings-icon span= t 'supplier.settings' - li class="supplier-sign-out-link" + li + = link-to 'index' + span.fa.fa-list-alt + = t 'dashboard.title' + li + = link-to 'menu' + span.fa.fa-coffee + = t 'top_menu.menu' + li + = link-to 'sections' + span.fa.fa-th-large + = t 'models.plural.section' + li + = link-to 'tables' + span.fa.fa-square-o + = t 'models.plural.table' + li + = link-to 'employees' + span.fa.fa-users + = t 'models.plural.employee' + li + = link-to 'schedule' + span.fa.fa-calendar + = t 'top_menu.schedule' + li.supplier-sign-out-link a{action "signOut"} span.sign-out-icon = t 'supplier.sign_out' diff --git a/app/assets/stylesheets/supplier/foundation1/components/_nav_side.sass b/app/assets/stylesheets/supplier/foundation1/components/_nav_side.sass index f4edfb42..e837ce20 100644 --- a/app/assets/stylesheets/supplier/foundation1/components/_nav_side.sass +++ b/app/assets/stylesheets/supplier/foundation1/components/_nav_side.sass @@ -15,6 +15,9 @@ margin-bottom: 3px ul list-style: none + li + font-size: 1.2em + margin-bottom: 11px a color: white .title @@ -27,8 +30,10 @@ margin-right: 18px @extend .fa, .fa-info-circle .sign-out-icon - margin-right: 18px @extend .fa, .fa-caret-square-o-left + margin-right: 18px + .fa + margin-right: 18px .supplier-close-shop +alert($bg: $alert-color, $radius: true) padding: 3px diff --git a/config/locales/models.en.yml b/config/locales/models.en.yml index cab03e43..9f5f9d2a 100644 --- a/config/locales/models.en.yml +++ b/config/locales/models.en.yml @@ -5,7 +5,7 @@ en: supplier: Restaurant new_supplier: New restaurant table: Table - list: List + list: Tap product: Product order: Order product_category: Product category @@ -22,7 +22,7 @@ en: supplier: Restaurants new_supplier: New restaurants table: Tables - list: Lists + list: Taps product: Products order: Orders product_category: Product categories diff --git a/config/locales/models.nl.yml b/config/locales/models.nl.yml index 737608c4..20322a5f 100644 --- a/config/locales/models.nl.yml +++ b/config/locales/models.nl.yml @@ -5,7 +5,7 @@ nl: supplier: Restaurant new_supplier: Nieuw restaurant table: Tafel - list: Lijst + list: Bon product: Product order: Bestelling product_category: Product categorie @@ -21,7 +21,7 @@ nl: supplier: Restaurants new_supplier: Nieuwe restaurants table: Tafels - list: Lijsten + list: Bonnen product: Producten order: Bestellingen product_category: Product categorieen diff --git a/config/locales/supplier.en.yml b/config/locales/supplier.en.yml index 41cd6f14..2c19cf2f 100644 --- a/config/locales/supplier.en.yml +++ b/config/locales/supplier.en.yml @@ -18,18 +18,19 @@ en: Happy ordering! button: Sign up dashboard: + title: Dashboard active_lists: - no_lists: No active lists + no_lists: No active ${models.list|downcase} active_orders: - no_orders: No active orders + no_orders: No active ${models.plural.order|downcase} top_menu: menu: Menu schedule: Schedule active_lists: - title: Active lists + title: Active ${models.plural.list|downcase} price: Price active_orders: - title: Active orders + title: Active ${models.plural.order|downcase} price: Price supplier: close_for_orders: Close the shop @@ -42,8 +43,8 @@ en: table: print_qr_codes: Print Qr codes add_tables_first: - title: Add tables first - body: To be able to print QR-codes, you first need to add tables. Each table has its own QR-code + title: Add ${models.plural.table|downcase} first + body: To be able to print QR-codes, you first need to add ${models.plural.table|downcase}. Each table has its own QR-code destroy: modal: title: Are you sure you want to delete ${models.table} %{number} @@ -55,9 +56,9 @@ en: new_button: Add ${models.table|downcase} lists: index: - show_all: Show all ${models.plural.list} + show_all: Show all ${models.plural.list|downcase} show_active: Show active ${models.plural.list} - show_list_on_day: Lists on date + show_list_on_day: ${models.list} on date show: title: Show %{list} users: Clients @@ -65,7 +66,7 @@ en: is_helped_button: Question answered! close_list: Close! none_found: 'No ${models.plural.list|downcase}' - go_to_lists: Go to lists + go_to_lists: Go to ${models.plural.list} close: modal: title: Are you sure yout want to close the ${models.list} @@ -78,21 +79,21 @@ en: sections_header: all_sections: All section: - first_section_title: Room + first_section_title: Inside show: title: 'Show ${models.section|downcase}' manage_tables: - link: 'Manage tables' - title: "Manage tables for ${models.section|downcase}: %{title}" + link: 'Manage ${models.plural.table|downcase}' + title: "Manage ${models.plural.table|downcase} for ${models.section|downcase}: %{title}" tables_view: - link: 'Tables view' + link: '${models.plural.table} view' table_actions: title: '${models.table} actions' got_to_table: 'Go to ${models.table|downcase}' add_tables: - button_label: Add tables + button_label: Add ${models.plural.table|downcase} modal: - title: Add tables + title: Add ${models.plural.table|downcase} body_header: "" number_start: From number number_end: Till number @@ -107,11 +108,11 @@ en: close_button: Close add_button: Create arrange_tables: - button_label: Arrange tables + button_label: Arrange ${models.plural.table|downcase} by_row_no_row_count: 'Please fill in a positive number representing the number of ${models.plural.table|downcase} per row' by_column_no_column_count: 'Please fill in a positive number representing the number of ${models.plural.table|downcase} per column' modal: - title: Arrange tables + title: Arrange ${models.plural.table|downcase} body_header: "" distributed: title: Distributed @@ -126,7 +127,7 @@ en: after_field: ' ${models.plural.table}' close_button: Close arrange_button: Distribute - cannot_arrange: 'The tables could not be arranged. Does the ${models.section|downcase} have a width and a height?' + cannot_arrange: 'The ${models.plural.table|downcase} could not be arranged. Does the ${models.section|downcase} have a width and a height?' settings: title: Settings save: Save settings diff --git a/config/locales/supplier.nl.yml b/config/locales/supplier.nl.yml index 117e4d0d..796d1966 100644 --- a/config/locales/supplier.nl.yml +++ b/config/locales/supplier.nl.yml @@ -17,6 +17,7 @@ nl: Hierna kan je aan de slag met mobiel bestellen! button: Aanmelden dashboard: + title: Dashboard active_lists: no_lists: Geen actieve ${models.plural.list} active_orders: @@ -25,7 +26,7 @@ nl: menu: Menu schedule: Schema active_lists: - title: Actieve lijsten + title: Actieve ${models.plural.list|downcase} price: Prijs active_orders: title: Actieve orders