raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-13 04:00:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into cleanup

Browse Source 
Conflicts:
	app/assets/javascripts/darkswarm/services/hubs.js.coffee
	app/views/home/_hubs.html.haml
	app/views/producers/_filters.html.haml
	app/views/producers/index.html.haml
This commit is contained in:
Rafael Schouten
2014-09-25 19:42:20 +10:00
parent bab9123ca8 be17d80cc4
commit 55f4415c0d
24 changed files with 148 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/assets/javascripts/darkswarm/directives/registration_limit_modal.js.coffee Normal file
View File

@@ -0,0 +1,13 @@
Darkswarm.directive "ofnRegistrationLimitModal", (Navigation, $modal, Loading) ->
restrict: 'A'
link: (scope, elem, attr)->
scope.modalInstance = $modal.open
templateUrl: 'registration/limit_reached.html'
windowClass: "login-modal large"
backdrop: 'static'
scope.modalInstance.result.then scope.close, scope.close
scope.close = ->
Loading.message = "Taking you back to the home page"
Navigation.go "/"

2
app/assets/javascripts/darkswarm/filters/show_profiles.js.coffee
View File

@@ -4,4 +4,4 @@ Darkswarm.filter 'showProfiles', ()->
show_profiles ?= true
enterprises.filter (enterprise)=>
show_profiles or not enterprise.is_profile
show_profiles or enterprise.has_shopfront