Merge branch 'laura_and_will' of github.com:openfoodfoundation/openfoodnetwork into laura_and_will

Conflicts:
	app/views/producers/_filters.html.haml
This commit is contained in:
summerscope
2014-07-09 16:18:41 +10:00
8 changed files with 72 additions and 17 deletions

View File

@@ -1,7 +1,3 @@
%ul.small-block-grid-4
%li{"ng-class" => "{active: shippingTypes['delivery']}"}
%a{"ng-click" => "shippingTypes['delivery'] = !shippingTypes['delivery']"}
Delivery
%li{"ng-class" => "{active: shippingTypes['pickup']}"}
%a{"ng-click" => "shippingTypes['pickup'] = !shippingTypes['pickup']"}
Pickup
%active-selector{"ng-repeat" => "(name, selector) in selectors"}
{{ name | capitalize }}