From f76c883bb9c69a81b15f1a9f2b273b2029ff0439 Mon Sep 17 00:00:00 2001 From: Benjamin ter Kuile Date: Mon, 1 Sep 2014 10:12:34 +0200 Subject: [PATCH] minor fixes and reload button --- .../controllers/application_controller.js.coffee | 6 ++++-- .../user/app/templates/application.emblem | 7 ++++--- .../user/app/templates/settings.emblem | 16 ++++++++++------ .../foundation/components/_settings.css.sass | 3 +++ app/serializers/user_extended_list_serializer.rb | 2 +- config/initializers/mozo_settings.rb | 2 +- config/locales/user.en.yml | 1 + config/locales/user.nl.yml | 1 + wip.md | 6 ++++++ 9 files changed, 31 insertions(+), 13 deletions(-) diff --git a/app/assets/javascripts/user/app/controllers/application_controller.js.coffee b/app/assets/javascripts/user/app/controllers/application_controller.js.coffee index 99a4ec5a..9eba24c3 100644 --- a/app/assets/javascripts/user/app/controllers/application_controller.js.coffee +++ b/app/assets/javascripts/user/app/controllers/application_controller.js.coffee @@ -58,6 +58,7 @@ App.ApplicationController = Ember.Controller.extend @set 'join_request_sent', false join_request_approved: -> + return if @get('list.id') @setCurrentList -> @transitionToRoute('active_list').then => @set 'notice', t('join_request.requestor.join_request_approved') @@ -87,10 +88,11 @@ App.ApplicationController = Ember.Controller.extend error_list.eraseRecord() @set 'list', list @controllerFor('active_list').set('model', list) - if list.get('join_requests').toArray().length + if list.get('join_requests.length') @transitionToRoute 'join_requests' + else if @currentRouteName is 'index' + @transitionToRoute 'active_list' callback.call(@) if callback - @transitionToRoute 'active_list' if @currentRouteName is 'index' error = @ajaxError (emberError)=> # if jqXHR.status == 404 officially, now assume close list on error #@redirect_to 'index', message: 'the_list_has_been_closed' diff --git a/app/assets/javascripts/user/app/templates/application.emblem b/app/assets/javascripts/user/app/templates/application.emblem index 42c0d87f..8ddeb267 100644 --- a/app/assets/javascripts/user/app/templates/application.emblem +++ b/app/assets/javascripts/user/app/templates/application.emblem @@ -44,12 +44,13 @@ aside.side-menu =link-to 'active_list' class="side-menu-active-list" span.active-list-icon span= t 'active_list.title' + if list.join_requests + li + =link-to 'join_requests' + span= t 'models.plural.join_request' li =link-to 'lists' class="side-menu-lists" span= t 'models.plural.list' - li - =link-to 'join_requests' - span= t 'models.plural.join_request' li =link-to 'settings' span.settings-icon diff --git a/app/assets/javascripts/user/app/templates/settings.emblem b/app/assets/javascripts/user/app/templates/settings.emblem index 7c7098dc..309e8d6c 100644 --- a/app/assets/javascripts/user/app/templates/settings.emblem +++ b/app/assets/javascripts/user/app/templates/settings.emblem @@ -1,6 +1,10 @@ -.row: h3=t 'settings.title' -.display-row - .display-label=t 'settings.language' - .display-field - each locale in locales - App.SettingsLocaleView locale=locale +.settings.page + .row: h3=t 'settings.title' + .display-row + .display-label=t 'settings.language' + .display-field + each locale in locales + App.SettingsLocaleView locale=locale + .display-row + .display-label   + .display-field: a.button href="./index.html"=t 'settings.reload_application' diff --git a/app/assets/stylesheets/user/foundation/components/_settings.css.sass b/app/assets/stylesheets/user/foundation/components/_settings.css.sass index 6d3baaa5..82f93332 100644 --- a/app/assets/stylesheets/user/foundation/components/_settings.css.sass +++ b/app/assets/stylesheets/user/foundation/components/_settings.css.sass @@ -3,3 +3,6 @@ margin-right: 8px &.current border: 1px solid $current-color +.settings.page + .display-row + margin-bottom: 15px diff --git a/app/serializers/user_extended_list_serializer.rb b/app/serializers/user_extended_list_serializer.rb index 2b6ce9da..9c07a9ef 100644 --- a/app/serializers/user_extended_list_serializer.rb +++ b/app/serializers/user_extended_list_serializer.rb @@ -19,7 +19,7 @@ class UserExtendedListSerializer < Qwaiter::Serializer has_many :orders #has_many :product_categories has_one :table, serializer: UserExtendedTableSerializer # this one add a lot of stuff - has_many :join_requests + has_many :join_requests, serializer: JoinRequestSerializer has_many :users, serializer: UserUserSerializer #has_one :supplier # added by other resource diff --git a/config/initializers/mozo_settings.rb b/config/initializers/mozo_settings.rb index b5b9ae5d..ad9b4b26 100644 --- a/config/initializers/mozo_settings.rb +++ b/config/initializers/mozo_settings.rb @@ -1,4 +1,4 @@ -Qwaiter.event_host = "http://#{Rails.env.development? or Rails.env.test? ? 'localhost' : 'events.mozo.bar'}:9296/faye" +Qwaiter.event_host = "http://#{(Rails.env.development? or Rails.env.test?) ? 'localhost' : 'events.mozo.bar'}:9296/faye" Qwaiter.broadcaster = Qwaiter::Broadcaster::Faye.new # use the connection from couchbase-structures/documents diff --git a/config/locales/user.en.yml b/config/locales/user.en.yml index 15108fdf..16c3c4c3 100644 --- a/config/locales/user.en.yml +++ b/config/locales/user.en.yml @@ -104,3 +104,4 @@ en: settings: title: Settings language: Language + reload_application: Reload application diff --git a/config/locales/user.nl.yml b/config/locales/user.nl.yml index 1ad392a2..89870fca 100644 --- a/config/locales/user.nl.yml +++ b/config/locales/user.nl.yml @@ -104,3 +104,4 @@ nl: settings: title: Settings language: Taal + reload_application: Applicatie herstarten diff --git a/wip.md b/wip.md index b99e452b..53defebd 100644 --- a/wip.md +++ b/wip.md @@ -67,3 +67,9 @@ User - Subscribe to general faye channels [':version', 'mozo'] - Post order on Facebook - Split bill by user + +Integrations +------------ + +- Payleven? Payment +- Bonnetjes machine