diff --git a/app/assets/javascripts/user/app/templates/application.emblem b/app/assets/javascripts/user/app/templates/application.emblem index f57fe60d..887b011d 100644 --- a/app/assets/javascripts/user/app/templates/application.emblem +++ b/app/assets/javascripts/user/app/templates/application.emblem @@ -3,13 +3,17 @@ header.top-menu .top-menu-bar .menu-content section.main-buttons - link-to 'index' class="top-menu-logo" - = image_tag 'user/logo-small.png' if list.id + link-to 'index' class="top-menu-logo with-list" + = image_tag 'user/logo-small.png' App.MenuItemView route="active_list" App.MenuItemView route='table' route_param=list.table.id App.MenuItemListNeedsHelpView App.MenuItemListNeedsPaymentView + else + link-to 'index' class="top-menu-logo without-list" + = image_tag 'user/logo-small.png' + App.MenuItemScanQrView App.MenuItemProductOrdersView if list .extra-info diff --git a/app/assets/javascripts/user/app/templates/menu/scan_qr.emblem b/app/assets/javascripts/user/app/templates/menu/scan_qr.emblem new file mode 100644 index 00000000..900c564e --- /dev/null +++ b/app/assets/javascripts/user/app/templates/menu/scan_qr.emblem @@ -0,0 +1 @@ +span.icon.scan-qr diff --git a/app/assets/javascripts/user/app/views/menu_item_scan_qr_view.js.coffee b/app/assets/javascripts/user/app/views/menu_item_scan_qr_view.js.coffee new file mode 100644 index 00000000..16476cc3 --- /dev/null +++ b/app/assets/javascripts/user/app/views/menu_item_scan_qr_view.js.coffee @@ -0,0 +1,5 @@ +App.MenuItemScanQrView = Ember.View.extend Ember.ViewTargetActionSupport, + action: 'scanQr' + templateName: "menu/scan_qr" + classNames: 'menu-list-item' + click: -> @triggerAction() diff --git a/app/assets/stylesheets/user/foundation/_structure.css.sass b/app/assets/stylesheets/user/foundation/_structure.css.sass index 239a9544..7a5f5c28 100644 --- a/app/assets/stylesheets/user/foundation/_structure.css.sass +++ b/app/assets/stylesheets/user/foundation/_structure.css.sass @@ -24,6 +24,8 @@ span.icon @extend .fa-bell &.needs-payment @extend .fa-money + &.scan-qr + @extend .fa-qrcode #notice a color: white diff --git a/app/assets/stylesheets/user/foundation/components/_menu_main.css.sass b/app/assets/stylesheets/user/foundation/components/_menu_main.css.sass index 758f936b..70654ebe 100644 --- a/app/assets/stylesheets/user/foundation/components/_menu_main.css.sass +++ b/app/assets/stylesheets/user/foundation/components/_menu_main.css.sass @@ -18,8 +18,11 @@ header.top-menu padding-left: 48px padding-right: 52px .top-menu-logo - @media #{$small-only} - display: none + &.with-list + @media #{$small-only} + display: none + &.without-list + margin-left: 6px img margin-top: -6px .menu-content diff --git a/config/version b/config/version new file mode 100644 index 00000000..965065db --- /dev/null +++ b/config/version @@ -0,0 +1 @@ +0.9.3