From f6bfc71c4b49f371b1d9421fff516edba88ceb03 Mon Sep 17 00:00:00 2001 From: Will Marshall Date: Thu, 24 Apr 2014 16:28:12 +1000 Subject: [PATCH] Various small functional tweaks --- app/assets/javascripts/darkswarm/all.js.coffee | 1 - .../{modal.js.coffee => modal.js.coffee.erb} | 3 ++- .../javascripts/darkswarm/services/hubs.js.coffee | 2 +- .../darkswarm/services/navigation.js.coffee | 2 +- app/assets/stylesheets/darkswarm/mixins.sass | 11 ++++++----- app/views/darkswarm/_hubs.html.haml | 9 +++++---- app/views/modals/_food_hub.html.haml | 3 +++ app/views/shared/_signed_out.html.haml | 10 +++++----- config/initializers/angular_assets.rb | 1 + 9 files changed, 24 insertions(+), 18 deletions(-) rename app/assets/javascripts/darkswarm/directives/{modal.js.coffee => modal.js.coffee.erb} (78%) create mode 100644 app/views/modals/_food_hub.html.haml create mode 100644 config/initializers/angular_assets.rb diff --git a/app/assets/javascripts/darkswarm/all.js.coffee b/app/assets/javascripts/darkswarm/all.js.coffee index 86eaa3b2c7..1292f2f9bd 100644 --- a/app/assets/javascripts/darkswarm/all.js.coffee +++ b/app/assets/javascripts/darkswarm/all.js.coffee @@ -27,4 +27,3 @@ $ -> Foundation.set_namespace = -> null $(document).foundation() - $(document).foundation({reveal: {animation: 'fade'}}) diff --git a/app/assets/javascripts/darkswarm/directives/modal.js.coffee b/app/assets/javascripts/darkswarm/directives/modal.js.coffee.erb similarity index 78% rename from app/assets/javascripts/darkswarm/directives/modal.js.coffee rename to app/assets/javascripts/darkswarm/directives/modal.js.coffee.erb index aa89df309d..8c34ec18a8 100644 --- a/app/assets/javascripts/darkswarm/directives/modal.js.coffee +++ b/app/assets/javascripts/darkswarm/directives/modal.js.coffee.erb @@ -6,8 +6,9 @@ Darkswarm.directive "ofnModal", ($modal)-> link: (scope, elem, attrs, ctrl, transclude)-> scope.title = attrs.title + scope.cancel = -> scope.modalInstance.dismiss("cancel") elem.on "click", -> - scope.modalInstance = $modal.open(template: transclude()) + scope.modalInstance = $modal.open(controller: ctrl, template: transclude()) diff --git a/app/assets/javascripts/darkswarm/services/hubs.js.coffee b/app/assets/javascripts/darkswarm/services/hubs.js.coffee index d5f201ad0e..9574654fe2 100644 --- a/app/assets/javascripts/darkswarm/services/hubs.js.coffee +++ b/app/assets/javascripts/darkswarm/services/hubs.js.coffee @@ -1,4 +1,4 @@ Darkswarm.factory 'Hubs', ($location, hubs, $filter) -> new class Hubs constructor: -> - @hubs = $filter('orderBy')(hubs, 'active', true) + @hubs = $filter('orderBy')(hubs, ['-active', '+orders_close_at']) diff --git a/app/assets/javascripts/darkswarm/services/navigation.js.coffee b/app/assets/javascripts/darkswarm/services/navigation.js.coffee index 05a73caf04..53d3c1a38f 100644 --- a/app/assets/javascripts/darkswarm/services/navigation.js.coffee +++ b/app/assets/javascripts/darkswarm/services/navigation.js.coffee @@ -1,7 +1,7 @@ Darkswarm.factory 'Navigation', ($location) -> new class Navigation paths: [] - path: $location.path() + path: null navigate: (path = false)-> @path = path || @path || @paths[0] diff --git a/app/assets/stylesheets/darkswarm/mixins.sass b/app/assets/stylesheets/darkswarm/mixins.sass index 156e07bf80..43445757b7 100644 --- a/app/assets/stylesheets/darkswarm/mixins.sass +++ b/app/assets/stylesheets/darkswarm/mixins.sass @@ -25,8 +25,9 @@ background-size: 100% auto @mixin csstrans - -webkit-transition: all 200ms ease-in-out - -moz-transition: all 200ms ease-in-out - -ms-transition: all 200ms ease-in-out - -o-transition: all 200ms ease-in-out - transition: all 200ms ease-in-out \ No newline at end of file + -webkit-transition: all 100ms ease-in-out + -moz-transition: all 100ms ease-in-out + -ms-transition: all 100ms ease-in-out + -o-transition: all 100ms ease-in-out + transition: all 100ms ease-in-out + -webkit-transform-style: preserve-3d diff --git a/app/views/darkswarm/_hubs.html.haml b/app/views/darkswarm/_hubs.html.haml index ad7c6bc293..1d336178c5 100644 --- a/app/views/darkswarm/_hubs.html.haml +++ b/app/views/darkswarm/_hubs.html.haml @@ -7,17 +7,17 @@ %h1 Ready to shop? %p Select a - %a food hub (modal) + -#%ofn-modal{title: "food hub"} + -#= render partial: "modals/food_hub" from the list below: + #hub-search.row - .small-9.columns + .small-12.columns %input{type: :text, "ng-model" => "query", placeholder: "Search postcode, suburb or hub name...", "ng-debounce" => "150", "ofn-disable-enter" => true} - .small-3.columns.advanced - Advanced search .row{bindonce: true} .small-12.columns @@ -29,6 +29,7 @@ .small-12.columns = render partial: 'darkswarm/skinny' = render partial: 'darkswarm/fat' + .row{"ng-show" => "filteredHubs.length == 0"} .columns.small-12.text-center No results diff --git a/app/views/modals/_food_hub.html.haml b/app/views/modals/_food_hub.html.haml new file mode 100644 index 0000000000..4b1eaa80c3 --- /dev/null +++ b/app/views/modals/_food_hub.html.haml @@ -0,0 +1,3 @@ +Information about Food Hubs +%h4 test +%a.close-reveal-modal{"ng-click" => "cancel()"} × diff --git a/app/views/shared/_signed_out.html.haml b/app/views/shared/_signed_out.html.haml index b42c104769..1ea02cc4ea 100644 --- a/app/views/shared/_signed_out.html.haml +++ b/app/views/shared/_signed_out.html.haml @@ -1,5 +1,5 @@ -%li#login-link - %a.sidebar-button{"ng-click" => "toggle('/login')"} Login -%li.divider -%li#sign-up-link - %a.sidebar-button{"ng-click" => "toggle('/signup')"} Sign Up +-#%li#login-link + -#%a.sidebar-button{"ng-click" => "toggle('/login')"} Login +-#%li.divider +-#%li#sign-up-link + -#%a.sidebar-button{"ng-click" => "toggle('/signup')"} Sign Up diff --git a/config/initializers/angular_assets.rb b/config/initializers/angular_assets.rb new file mode 100644 index 0000000000..3109b43483 --- /dev/null +++ b/config/initializers/angular_assets.rb @@ -0,0 +1 @@ +Rails.application.assets.register_engine('.haml', Tilt::HamlTemplate)