Change wording of trial option on change_type_form

Conflicts:
	app/views/admin/order_cycles/_row.html.haml

.gitignore

@@ -36,3 +36,5 @@ config/initializers/feature_toggle.rb
 NERD_tree*
 coverage
 libpeerconnection.log
+tags
+app/assets/javascripts/tags

Gemfile

@@ -7,7 +7,11 @@ gem 'pg'
 gem 'spree', :github => 'openfoodfoundation/spree', :branch => '1-3-stable'
 gem 'spree_i18n', :github => 'spree/spree_i18n'
 gem 'spree_auth_devise', :github => 'spree/spree_auth_devise', :branch => '1-3-stable'
-gem 'spree_paypal_express', :github => "spree-contrib/better_spree_paypal_express", :branch => "1-3-stable"
+
+# Waiting on merge of PR #117
+# https://github.com/spree-contrib/better_spree_paypal_express/pull/117
+gem 'spree_paypal_express', :github => "openfoodfoundation/better_spree_paypal_express", :branch => "1-3-stable"
+#gem 'spree_paypal_express', :github => "spree-contrib/better_spree_paypal_express", :branch => "1-3-stable"
 
 gem 'comfortable_mexican_sofa'
 
@@ -38,6 +42,7 @@ gem 'gmaps4rails'
 gem 'spinjs-rails'
 gem 'rack-ssl', :require => 'rack/ssl'
 gem 'custom_error_message', :github => 'jeremydurham/custom-err-msg'
+gem 'angularjs-file-upload-rails', '~> 1.1.0'
 
 gem 'foreigner'
 gem 'immigrant'

Gemfile.lock

@@ -12,6 +12,15 @@ GIT
   specs:
     custom_error_message (1.1.1)
 
+GIT
+  remote: git://github.com/openfoodfoundation/better_spree_paypal_express.git
+  revision: cdd61161ccd27cd8d183f9321422c7be113796b8
+  branch: 1-3-stable
+  specs:
+    spree_paypal_express (2.0.3)
+      paypal-sdk-merchant (= 1.106.1)
+      spree_core (~> 1.3.4)
+
 GIT
   remote: git://github.com/openfoodfoundation/spree.git
   revision: bbe5e779bcb883a1726ad4006d7c06b06c3f5372
@@ -54,15 +63,6 @@ GIT
     spree_sample (1.3.6.beta)
       spree_core (= 1.3.6.beta)
 
-GIT
-  remote: git://github.com/spree-contrib/better_spree_paypal_express.git
-  revision: db135b89a289aaab951c1228bcc55871de0cbba7
-  branch: 1-3-stable
-  specs:
-    spree_paypal_express (2.0.3)
-      paypal-sdk-merchant (= 1.106.1)
-      spree_core (~> 1.3.4)
-
 GIT
   remote: git://github.com/spree/deface.git
   revision: 1110a1336252109bce7f98f9182042e0bc2930ae
@@ -153,6 +153,7 @@ GEM
       railties (>= 3.1)
       sprockets
       tilt
+    angularjs-file-upload-rails (1.1.0)
     angularjs-rails (1.2.13)
     ansi (1.4.2)
     arel (3.0.3)
@@ -505,6 +506,7 @@ DEPENDENCIES
   active_model_serializers
   andand
   angular-rails-templates
+  angularjs-file-upload-rails (~> 1.1.0)
   angularjs-rails
   awesome_print
   aws-sdk

README.markdown

@@ -9,7 +9,6 @@ Supported by the Open Food Foundation, we are proudly open source and not-for-pr
 
 We're part of global movement - get involved!
 
-* We're crowd-funding RIGHT NOW - please help out at http://startsomegood.com/openfoodnetwork
 * Fill in this short survey to tell us who you are and what you want to do with OFN: https://docs.google.com/a/eaterprises.com.au/forms/d/1zxR5vSiU9CigJ9cEaC8-eJLgYid8CR8er7PPH9Mc-30/edit#
 * Find out more and join in the conversation - http://openfoodnetwork.org
 

app/assets/images/map-icon-both.svg

@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="32px" y="32px" height="32px" width="32px"
-	 viewBox="0 0 30.2 40" enable-background="new 0 0 30.2 40" xml:space="preserve">
-<g id="Layer_1_1_">
-	<g>
-		<g>
-			<g>
-				<path fill="#C1122B" d="M15.1,39.5c-0.1,0-0.2,0-0.3-0.1C14.2,38.9,0.5,27.2,0.5,15.1C0.5,7.1,7,0.5,15.1,0.5
-					s14.6,6.6,14.6,14.6c0,12.3-13.7,23.8-14.3,24.3C15.3,39.5,15.2,39.5,15.1,39.5z"/>
-				<path fill="#E5E5E5" d="M15.1,1c8,0,14.1,6.5,14.1,14.1C29.2,27.4,15.1,39,15.1,39S1,27.1,1,15.1C1,7.5,7.1,1,15.1,1 M15.1,0
-					C6.8,0,0,6.8,0,15.1c0,12.3,13.9,24.1,14.5,24.6c0.2,0.2,0.4,0.2,0.6,0.2c0.2,0,0.5-0.1,0.6-0.2c0.6-0.5,14.5-12.1,14.5-24.6
-					C30.2,6.8,23.4,0,15.1,0L15.1,0z"/>
-			</g>
-		</g>
-		<g>
-			<g>
-				<path fill="#0B8C61" d="M15.1,32.5c-0.1,0-0.2,0-0.3-0.1c-0.4-0.3-9.1-7.7-9.1-15.5c0-5.2,4.2-9.4,9.4-9.4s9.4,4.2,9.4,9.4
-					c0,7.9-8.7,15.2-9.1,15.5C15.3,32.5,15.2,32.5,15.1,32.5z"/>
-				<path fill="#E5E5E5" d="M15.1,8c5.1,0,8.9,4.1,8.9,8.9c0,7.7-8.9,15.1-8.9,15.1s-8.9-7.5-8.9-15.1C6.2,12.1,10,8,15.1,8 M15.1,7
-					c-5.5,0-9.9,4.5-9.9,9.9c0,8,8.9,15.5,9.3,15.8c0.2,0.2,0.4,0.2,0.6,0.2c0.2,0,0.5-0.1,0.6-0.2C16.1,32.5,25,25,25,16.9
-					C25,11.5,20.6,7,15.1,7L15.1,7z"/>
-			</g>
-		</g>
-	</g>
-</g>
-<g id="source_files" display="none">
-</g>
-</svg>

app/assets/images/map-icon-hub.svg

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="32px" y="32px" height="32px" width="32px"
-	 viewBox="0 0 30.2 40" enable-background="new 0 0 30.2 40" xml:space="preserve">
-<g id="Layer_1_1_">
-	<g>
-		<g>
-			<g>
-				<path fill="#C1122B" d="M15.1,39.5c-0.1,0-0.2,0-0.3-0.1C14.2,38.9,0.5,27.2,0.5,15.1C0.5,7.1,7,0.5,15.1,0.5
-					s14.6,6.6,14.6,14.6c0,12.3-13.7,23.8-14.3,24.3C15.3,39.5,15.2,39.5,15.1,39.5z"/>
-				<path fill="#E5E5E5" d="M15.1,1c8,0,14.1,6.5,14.1,14.1C29.2,27.4,15.1,39,15.1,39S1,27.1,1,15.1C1,7.5,7.1,1,15.1,1 M15.1,0
-					C6.8,0,0,6.8,0,15.1c0,12.3,13.9,24.1,14.5,24.6c0.2,0.2,0.4,0.2,0.6,0.2c0.2,0,0.5-0.1,0.6-0.2c0.6-0.5,14.5-12.1,14.5-24.6
-					C30.2,6.8,23.4,0,15.1,0L15.1,0z"/>
-			</g>
-		</g>
-		<path fill="#FFFFFF" d="M16.9,21.7c1.9-3.2,3.9-7.3,3.9-9.5c0-3.2-2.6-5.7-5.7-5.7S9.4,9,9.4,12.2c0,2.2,2.1,6.3,3.9,9.5
-			c-2.1,0.3-3.5,1.2-3.5,2.3c0,1.4,2.3,2.5,5.3,2.5s5.3-1.1,5.3-2.5C20.4,22.9,19,22.1,16.9,21.7z M12.2,12.2c0-1.6,1.3-2.9,2.9-2.9
-			c1.6,0,2.9,1.3,2.9,2.9c0,1.6-1.3,2.9-2.9,2.9C13.5,15.1,12.2,13.8,12.2,12.2z M15.1,25.7c-2.7,0-4.6-0.9-4.6-1.7
-			c0-0.6,1.2-1.4,3.2-1.6c0.1,0.2,0.2,0.3,0.3,0.4c0,0.1,0.1,0.2,0.1,0.2c0.1,0.2,0.2,0.3,0.3,0.5c0,0,0.1,0.1,0.1,0.1
-			c0.1,0.2,0.2,0.3,0.2,0.4c0,0,0,0,0,0c0.1,0.1,0.1,0.1,0.1,0.1l0.3,0.5l0.3-0.5c0,0,0,0,0.1-0.1c0,0,0-0.1,0-0.1
-			c0.1-0.1,0.1-0.2,0.2-0.3c0,0,0-0.1,0.1-0.1c0.1-0.2,0.2-0.3,0.3-0.5c0-0.1,0.1-0.1,0.1-0.2c0.1-0.1,0.2-0.3,0.3-0.5
-			c2,0.3,3.2,1,3.2,1.6C19.7,24.8,17.8,25.7,15.1,25.7z"/>
-	</g>
-</g>
-<g id="source_files" display="none">
-</g>
-</svg>

app/assets/images/map-icon-producer.svg

@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="32px" y="32px" height="32px" width="32px"
-	 viewBox="0 0 30.2 40" enable-background="new 0 0 30.2 40" xml:space="preserve">
-<g id="Layer_1_1_">
-	<g>
-		<g>
-			<g>
-				<path fill="#0B8C61" d="M15.1,39.5c-0.1,0-0.2,0-0.3-0.1C14.2,38.9,0.5,27.2,0.5,15.1C0.5,7.1,7,0.5,15.1,0.5
-					s14.6,6.6,14.6,14.6c0,12.3-13.7,23.8-14.3,24.3C15.3,39.5,15.2,39.5,15.1,39.5z"/>
-				<path fill="#E5E5E5" d="M15.1,1c8,0,14.1,6.5,14.1,14.1C29.2,27.4,15.1,39,15.1,39S1,27.1,1,15.1C1,7.5,7.1,1,15.1,1 M15.1,0
-					C6.8,0,0,6.8,0,15.1c0,12.3,13.9,24.1,14.5,24.6c0.2,0.2,0.4,0.2,0.6,0.2c0.2,0,0.5-0.1,0.6-0.2c0.6-0.5,14.5-12.1,14.5-24.6
-					C30.2,6.8,23.4,0,15.1,0L15.1,0z"/>
-			</g>
-		</g>
-		<g>
-			<path fill="#FFFFFF" d="M8.3,15.3c2.9-0.8,5.8,1.2,6.1,4.2c0,0.1,0,0.2,0.1,0.4c0.1,0,0.2,0,0.4,0c2.4-0.1,4.8-0.1,7.2-0.2
-				c-1,0.3-1.7,1.2-1.7,2.3c0,1.3,1.1,2.4,2.4,2.4c1.3,0,2.4-1.1,2.4-2.4c0-1.2-0.9-2.2-2-2.3c1.8-0.1,1.4-0.1,1.7-1.7
-				c0.1-0.8,0.2-1.6,0.3-2.3c0.1-0.7-0.1-0.9-0.8-0.9c-1.1,0-2-0.1-3.1-0.1c0,0-0.1,0-0.1-0.1c0-0.8,0-2.7,0-2.7s-0.4-0.3-0.9,0
-				c0,0.9,0,1.8,0,2.8c0,0-1.3,0-3.1-0.1c-0.1,0-0.3-0.1-0.4-0.4c-0.3-0.8-0.9-2.3-1.7-4.6c0,0-0.4-1-1.5-1c-0.9,0-5.2,0-5.2,0v5.7
-				c0,0-0.4,0.2-0.7,0.2C7.4,15.3,7.5,15.5,8.3,15.3z M23.9,22c0,0.7-0.6,1.2-1.2,1.2s-1.2-0.6-1.2-1.2c0-0.7,0.6-1.2,1.2-1.2
-				C23.4,20.8,23.9,21.3,23.9,22z M9.6,11.3l0-1.1l4.4,0l1.4,4.2l0,0c-1.9,0-4,0-5.8,0.1L9.6,11.3z"/>
-			<path fill="#FFFFFF" d="M9.4,15.8c-2.4,0-4.3,1.9-4.3,4.3s1.9,4.3,4.3,4.3c2.4,0,4.3-1.9,4.3-4.3C13.7,17.7,11.8,15.8,9.4,15.8z
-				 M9.4,22.5c-1.3,0-2.4-1.1-2.4-2.4c0-1.3,1.1-2.4,2.4-2.4c1.3,0,2.4,1.1,2.4,2.4S10.7,22.5,9.4,22.5z"/>
-		</g>
-	</g>
-</g>
-<g id="source_files" display="none">
-</g>
-</svg>

app/assets/images/map_001-producer-only.svg

@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+	<!ENTITY ns_extend "http://ns.adobe.com/Extensibility/1.0/">
+	<!ENTITY ns_ai "http://ns.adobe.com/AdobeIllustrator/10.0/">
+	<!ENTITY ns_graphs "http://ns.adobe.com/Graphs/1.0/">
+	<!ENTITY ns_vars "http://ns.adobe.com/Variables/1.0/">
+	<!ENTITY ns_imrep "http://ns.adobe.com/ImageReplacement/1.0/">
+	<!ENTITY ns_sfw "http://ns.adobe.com/SaveForWeb/1.0/">
+	<!ENTITY ns_custom "http://ns.adobe.com/GenericCustomNamespace/1.0/">
+	<!ENTITY ns_adobe_xpath "http://ns.adobe.com/XPath/1.0/">
+]>
+<svg version="1.1" id="Layer_1" xmlns:x="&ns_extend;" xmlns:i="&ns_ai;" xmlns:graph="&ns_graphs;"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="28px" height="33px"
+	 viewBox="0 0 28 33" enable-background="new 0 0 28 33" xml:space="preserve">
+<metadata>
+	<sfw  xmlns="&ns_sfw;">
+		<slices></slices>
+		<sliceSourceBounds  height="96" width="16383" y="-85.5" x="-8112" bottomLeftOrigin="true"></sliceSourceBounds>
+	</sfw>
+</metadata>
+<g>
+	<path opacity="0.25" fill="#282828" d="M14,25c-6.059,0-10.988,1.679-10.988,3.333c0,2.485,10.307,4.542,10.746,4.643
+		C13.828,32.992,13.914,33,14,33c0.084,0,0.17-0.008,0.239-0.023c0.439-0.099,10.749-2.114,10.749-4.643
+		C24.988,26.679,20.059,25,14,25z"/>
+	<g>
+		<path fill="#FFFFFF" d="M14,0C6.28,0,0,6.717,0,13.332c0,9.941,13.132,18.169,13.691,18.572C13.78,31.968,13.891,32,14,32
+			c0.107,0,0.217-0.031,0.305-0.094C14.864,31.511,28,23.45,28,13.332C28,6.717,21.72,0,14,0z"/>
+		<g>
+			<path fill="#0B8C61" d="M9.46,8.846L9.458,9.319l-0.003,2.397c1.098-0.034,2.3-0.052,3.438-0.052c0.201,0,0.401,0.001,0.6,0.002
+				l-0.935-2.824L9.46,8.846z"/>
+			<circle fill="#0B8C61" cx="8.728" cy="17.454" r="1.569"/>
+			<path fill="#0B8C61" d="M12.395,17.13c-0.015-0.107-0.027-0.199-0.037-0.282c-0.047-0.382-0.165-0.741-0.325-1.075
+				c-0.049-0.096-0.097-0.193-0.155-0.285c-0.038-0.063-0.078-0.124-0.119-0.184c-0.514-0.723-1.278-1.251-2.166-1.464
+				c-0.202-0.04-0.409-0.061-0.619-0.061c-0.295,0-0.592,0.041-0.881,0.122c-0.276,0.077-0.487,0.112-0.685,0.112
+				c-0.027,0-0.048-0.008-0.074-0.009C5.969,14.557,5,15.892,5,17.455c0,2.055,1.672,3.727,3.728,3.727
+				c2.035,0,3.689-1.642,3.719-3.671l-0.041-0.296L12.395,17.13z M8.728,19.523c-1.142,0-2.07-0.928-2.07-2.069
+				s0.928-2.07,2.07-2.07c1.141,0,2.069,0.929,2.069,2.07S9.869,19.523,8.728,19.523z"/>
+			<circle fill="#0B8C61" cx="20.826" cy="19.013" r="1.006"/>
+			<path fill="#0B8C61" d="M22.72,15.398c0.13-0.696,0.212-1.403,0.271-2.108c0.055-0.659-0.112-0.814-0.758-0.839
+				c-0.961-0.034-1.848-0.071-2.808-0.109c-0.029-0.001-0.077-0.022-0.077-0.06c0-0.724,0.037-2.484,0.037-2.484
+				S19.196,9.66,18.931,9.66c-0.116,0-0.247,0.026-0.383,0.103c0,0.821,0,1.654,0,2.527c0,0-1.172-0.031-2.844-0.065
+				c-0.074-0.002-0.281-0.128-0.378-0.392c-0.251-0.694-0.8-2.045-1.52-4.126c0,0-0.373-0.888-1.316-0.888c-0.781,0-4.679,0-4.679,0
+				v5.199c0,0-0.353,0.148-0.649,0.178c-0.078,0.472-0.067,0.711,0.115,0.784c0.46-0.15,0.942-0.252,1.451-0.252
+				c0.389,0,0.761,0.061,1.122,0.149c1.119,0.237,2.101,0.923,2.748,1.879c0.034,0.048,0.064,0.097,0.096,0.147
+				c0.094,0.151,0.179,0.306,0.255,0.47c0.083,0.167,0.154,0.338,0.217,0.515c0.004,0.012,0.008,0.024,0.011,0.037
+				c0.127,0.368,0.206,0.754,0.238,1.156c0.101,0.014,0.196,0.036,0.289,0.036c0.007,0,0.013,0,0.02,0
+				c2.176-0.056,4.355-0.06,6.529-0.169c-0.906,0.251-1.575,1.082-1.575,2.067c0,1.184,0.962,2.147,2.148,2.147
+				c1.184,0,2.147-0.963,2.147-2.147c0-1.071-0.79-1.958-1.816-2.119C22.761,16.794,22.451,16.842,22.72,15.398z M12.893,12.163
+				c-1.343,0-2.729,0.025-3.938,0.069l0.003-2.916l0.004-0.97l3.957-0.006l1.263,3.813l0.045,0.018
+				C13.793,12.166,13.345,12.163,12.893,12.163z M22.082,19.013c0,0.693-0.564,1.257-1.256,1.257c-0.692,0-1.256-0.564-1.256-1.257
+				c0-0.692,0.564-1.255,1.256-1.255C21.518,17.758,22.082,18.321,22.082,19.013z"/>
+			<path fill="#0B8C61" d="M14,0C6.28,0,0,6.717,0,13.332c0,9.941,13.132,18.169,13.691,18.572C13.78,31.968,13.891,32,14,32
+				c0.107,0,0.217-0.031,0.305-0.094C14.864,31.511,28,23.45,28,13.332C28,6.717,21.72,0,14,0z M23.973,19.013
+				c0,1.735-1.412,3.147-3.147,3.147c-1.736,0-3.148-1.412-3.148-3.147c0-0.34,0.055-0.67,0.158-0.98
+				c-0.652,0.016-1.301,0.027-1.94,0.039c-0.716,0.013-1.431,0.025-2.137,0.043l-0.037,0.001h-0.018
+				c-0.102,0-0.208-0.014-0.315-0.03c-0.312,2.306-2.272,4.096-4.661,4.096C6.121,22.181,4,20.061,4,17.455
+				c0-1.725,0.939-3.222,2.323-4.047c-0.278-0.463-0.209-1.002-0.148-1.375L6.3,11.276l0.511-0.051V6.819v-1h1h4.679
+				c1.269,0,2.003,0.943,2.238,1.5l0.012,0.03l0.011,0.03c0.497,1.435,0.905,2.503,1.203,3.283c0.083,0.217,0.156,0.408,0.217,0.572
+				c0.531,0.011,0.998,0.022,1.376,0.031V9.763V9.177l0.512-0.286c0.273-0.153,0.566-0.23,0.872-0.23
+				c0.55,0,0.938,0.254,1.044,0.332l0.419,0.307l-0.011,0.52c0,0.001-0.017,0.815-0.028,1.56c0.635,0.025,1.257,0.05,1.916,0.073
+				c0.277,0.011,0.925,0.036,1.358,0.525c0.384,0.434,0.393,0.974,0.358,1.396c-0.07,0.848-0.161,1.55-0.284,2.208
+				c-0.04,0.216-0.066,0.397-0.089,0.547c-0.062,0.425-0.158,0.742-0.292,0.981C23.731,17.644,23.973,18.308,23.973,19.013z"/>
+		</g>
+	</g>
+</g>
+</svg>

app/assets/images/map_002-producer-only-profile.svg

@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+	<!ENTITY ns_extend "http://ns.adobe.com/Extensibility/1.0/">
+	<!ENTITY ns_ai "http://ns.adobe.com/AdobeIllustrator/10.0/">
+	<!ENTITY ns_graphs "http://ns.adobe.com/Graphs/1.0/">
+	<!ENTITY ns_vars "http://ns.adobe.com/Variables/1.0/">
+	<!ENTITY ns_imrep "http://ns.adobe.com/ImageReplacement/1.0/">
+	<!ENTITY ns_sfw "http://ns.adobe.com/SaveForWeb/1.0/">
+	<!ENTITY ns_custom "http://ns.adobe.com/GenericCustomNamespace/1.0/">
+	<!ENTITY ns_adobe_xpath "http://ns.adobe.com/XPath/1.0/">
+]>
+<svg version="1.1" id="Layer_1" xmlns:x="&ns_extend;" xmlns:i="&ns_ai;" xmlns:graph="&ns_graphs;"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="28px" height="33px"
+	 viewBox="0 0 28 33" enable-background="new 0 0 28 33" xml:space="preserve">
+<metadata>
+	<sfw  xmlns="&ns_sfw;">
+		<slices></slices>
+		<sliceSourceBounds  height="96" width="16383" y="-85.5" x="-8112" bottomLeftOrigin="true"></sliceSourceBounds>
+	</sfw>
+</metadata>
+<g>
+	<path opacity="0.25" fill="#282828" d="M14,25c-6.059,0-10.988,1.679-10.988,3.333c0,2.485,10.307,4.542,10.746,4.643
+		C13.828,32.992,13.914,33,14,33c0.084,0,0.17-0.008,0.239-0.023c0.439-0.099,10.749-2.114,10.749-4.643
+		C24.988,26.679,20.059,25,14,25z"/>
+	<g>
+		<path fill="#FFFFFF" d="M14,0C6.28,0,0,6.717,0,13.332c0,9.941,13.132,18.169,13.691,18.572C13.78,31.968,13.891,32,14,32
+			c0.107,0,0.217-0.031,0.305-0.094C14.864,31.511,28,23.45,28,13.332C28,6.717,21.72,0,14,0z"/>
+		<g>
+			<path fill="#0B8C61" d="M14,0C6.28,0,0,6.717,0,13.333c0,9.941,13.132,18.169,13.691,18.571C13.78,31.968,13.891,32,14,32
+				c0.107,0,0.217-0.031,0.305-0.094C14.864,31.511,28,23.45,28,13.333C28,6.717,21.72,0,14,0z M14.002,30.908
+				C10.865,28.805,1,21.533,1,13.333C1,7.511,6.56,1,14,1c7.44,0,13,6.511,13,12.333C27,21.682,17.14,28.843,14.002,30.908z"/>
+			<path fill="#0B8C61" d="M23.703,15.582c0.123-0.658,0.214-1.36,0.284-2.208c0.035-0.422,0.026-0.962-0.358-1.396
+				c-0.433-0.489-1.081-0.514-1.358-0.525c-0.659-0.024-1.281-0.048-1.916-0.073c0.011-0.745,0.028-1.56,0.028-1.56l0.011-0.52
+				l-0.419-0.307c-0.106-0.078-0.495-0.332-1.044-0.332c-0.306,0-0.599,0.077-0.872,0.23l-0.512,0.286v0.586v1.502
+				c-0.378-0.009-0.845-0.02-1.376-0.031c-0.062-0.164-0.135-0.355-0.217-0.572c-0.298-0.78-0.706-1.847-1.203-3.283l-0.011-0.03
+				l-0.013-0.03c-0.234-0.557-0.969-1.5-2.238-1.5H7.811h-1v1v4.407L6.3,11.276l-0.125,0.757c-0.061,0.373-0.13,0.911,0.148,1.375
+				C4.939,14.233,4,15.729,4,17.455c0,2.606,2.121,4.727,4.728,4.727c2.39,0,4.349-1.79,4.661-4.096
+				c0.107,0.016,0.212,0.03,0.315,0.03h0.018l0.037-0.001c0.706-0.018,1.421-0.031,2.137-0.043c0.639-0.011,1.288-0.023,1.94-0.039
+				c-0.103,0.311-0.158,0.641-0.158,0.98c0,1.735,1.412,3.147,3.148,3.147c1.736,0,3.147-1.412,3.147-3.147
+				c0-0.706-0.242-1.369-0.651-1.903c0.135-0.239,0.23-0.556,0.292-0.981C23.636,15.978,23.662,15.798,23.703,15.582z M8.728,21.181
+				C6.672,21.181,5,19.51,5,17.455c0-1.562,0.969-2.898,2.335-3.451c0.026,0.001,0.046,0.009,0.074,0.009
+				c0.197,0,0.409-0.034,0.685-0.112c0.289-0.081,0.586-0.122,0.881-0.122c0.21,0,0.417,0.021,0.619,0.061
+				c0.888,0.213,1.652,0.741,2.166,1.464c0.041,0.06,0.082,0.121,0.119,0.184c0.057,0.091,0.105,0.188,0.155,0.285
+				c0.16,0.334,0.279,0.693,0.325,1.075c0.009,0.083,0.022,0.176,0.037,0.283l0.011,0.082l0.041,0.296
+				C12.417,19.539,10.763,21.181,8.728,21.181z M22.973,19.013c0,1.184-0.964,2.147-2.147,2.147c-1.186,0-2.148-0.963-2.148-2.147
+				c0-0.985,0.669-1.815,1.575-2.067c-2.174,0.109-4.353,0.113-6.529,0.169c-0.007,0-0.013,0-0.02,0
+				c-0.092,0-0.188-0.022-0.289-0.036c-0.032-0.402-0.111-0.788-0.238-1.156c-0.004-0.012-0.007-0.024-0.011-0.037
+				c-0.063-0.177-0.134-0.348-0.217-0.515c-0.076-0.163-0.161-0.318-0.255-0.469c-0.032-0.05-0.062-0.099-0.096-0.147
+				c-0.646-0.956-1.628-1.642-2.748-1.879c-0.362-0.089-0.734-0.149-1.122-0.149c-0.509,0-0.991,0.102-1.451,0.252
+				c-0.181-0.073-0.192-0.312-0.115-0.784c0.296-0.029,0.649-0.178,0.649-0.178V6.819c0,0,3.899,0,4.679,0
+				c0.943,0,1.316,0.888,1.316,0.888c0.72,2.081,1.269,3.432,1.52,4.126c0.097,0.264,0.303,0.39,0.378,0.392
+				c1.672,0.035,2.844,0.065,2.844,0.065c0-0.873,0-1.706,0-2.527c0.136-0.076,0.267-0.103,0.383-0.103
+				c0.265,0,0.453,0.138,0.453,0.138s-0.037,1.76-0.037,2.484c0,0.038,0.048,0.059,0.077,0.06c0.961,0.038,1.848,0.075,2.808,0.109
+				c0.646,0.025,0.813,0.18,0.758,0.839c-0.059,0.705-0.14,1.412-0.271,2.108c-0.269,1.444,0.042,1.395-1.562,1.496
+				C22.183,17.055,22.973,17.943,22.973,19.013z"/>
+			<path fill="#0B8C61" d="M19.57,19.013c0,0.693,0.564,1.257,1.256,1.257c0.692,0,1.256-0.564,1.256-1.257
+				c0-0.692-0.564-1.255-1.256-1.255C20.134,17.758,19.57,18.321,19.57,19.013z M21.832,19.013c0,0.555-0.451,1.007-1.006,1.007
+				c-0.555,0-1.006-0.452-1.006-1.007c0-0.554,0.451-1.005,1.006-1.005C21.381,18.008,21.832,18.459,21.832,19.013z"/>
+			<path fill="#0B8C61" d="M12.919,8.341L8.961,8.347l-0.004,0.97l-0.003,2.916c1.209-0.044,2.595-0.069,3.939-0.069
+				c0.452,0,0.9,0.003,1.334,0.009l-0.045-0.018L12.919,8.341z M12.893,11.663c-1.138,0-2.34,0.018-3.438,0.052l0.003-2.397
+				L9.46,8.846l3.098-0.005l0.935,2.824C13.294,11.664,13.094,11.663,12.893,11.663z"/>
+			<path fill="#0B8C61" d="M8.728,15.385c-1.142,0-2.07,0.929-2.07,2.07s0.928,2.069,2.07,2.069c1.141,0,2.069-0.928,2.069-2.069
+				S9.869,15.385,8.728,15.385z M8.728,19.023c-0.865,0-1.57-0.704-1.57-1.569c0-0.866,0.704-1.57,1.57-1.57
+				c0.865,0,1.569,0.704,1.569,1.57C10.297,18.32,9.593,19.023,8.728,19.023z"/>
+		</g>
+	</g>
+</g>
+</svg>

app/assets/images/map_003-producer-shop.svg

@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+	<!ENTITY ns_extend "http://ns.adobe.com/Extensibility/1.0/">
+	<!ENTITY ns_ai "http://ns.adobe.com/AdobeIllustrator/10.0/">
+	<!ENTITY ns_graphs "http://ns.adobe.com/Graphs/1.0/">
+	<!ENTITY ns_vars "http://ns.adobe.com/Variables/1.0/">
+	<!ENTITY ns_imrep "http://ns.adobe.com/ImageReplacement/1.0/">
+	<!ENTITY ns_sfw "http://ns.adobe.com/SaveForWeb/1.0/">
+	<!ENTITY ns_custom "http://ns.adobe.com/GenericCustomNamespace/1.0/">
+	<!ENTITY ns_adobe_xpath "http://ns.adobe.com/XPath/1.0/">
+]>
+<svg version="1.1" id="Layer_1" xmlns:x="&ns_extend;" xmlns:i="&ns_ai;" xmlns:graph="&ns_graphs;"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="28px" height="33px"
+	 viewBox="0 0 28 33" enable-background="new 0 0 28 33" xml:space="preserve">
+<metadata>
+	<sfw  xmlns="&ns_sfw;">
+		<slices></slices>
+		<sliceSourceBounds  height="96" width="16383" y="-85.5" x="-8112" bottomLeftOrigin="true"></sliceSourceBounds>
+	</sfw>
+</metadata>
+<g>
+	<path opacity="0.25" fill="#282828" d="M14,25c-6.059,0-10.988,1.679-10.988,3.333c0,2.485,10.307,4.542,10.746,4.643
+		C13.828,32.992,13.914,33,14,33c0.084,0,0.17-0.008,0.239-0.023c0.439-0.099,10.749-2.114,10.749-4.643
+		C24.988,26.679,20.059,25,14,25z"/>
+	<g>
+		<path fill="#FFFFFF" d="M14,0C6.28,0,0,6.717,0,13.332c0,9.941,13.132,18.169,13.691,18.572C13.78,31.968,13.891,32,14,32
+			c0.107,0,0.217-0.031,0.305-0.094C14.864,31.511,28,23.45,28,13.332C28,6.717,21.72,0,14,0z"/>
+		<g>
+			<path fill="#C1122B" d="M9.46,8.846L9.458,9.319l-0.003,2.397c1.098-0.034,2.3-0.052,3.438-0.052c0.201,0,0.401,0.001,0.6,0.002
+				l-0.935-2.824L9.46,8.846z"/>
+			<circle fill="#C1122B" cx="8.728" cy="17.454" r="1.569"/>
+			<path fill="#C1122B" d="M12.395,17.13c-0.015-0.107-0.027-0.199-0.037-0.282c-0.047-0.382-0.165-0.741-0.325-1.075
+				c-0.049-0.096-0.097-0.193-0.155-0.285c-0.038-0.063-0.078-0.124-0.119-0.184c-0.514-0.723-1.278-1.251-2.166-1.464
+				c-0.202-0.04-0.409-0.061-0.619-0.061c-0.295,0-0.592,0.041-0.881,0.122c-0.276,0.077-0.487,0.112-0.685,0.112
+				c-0.027,0-0.048-0.008-0.074-0.009C5.969,14.557,5,15.892,5,17.455c0,2.055,1.672,3.727,3.728,3.727
+				c2.035,0,3.689-1.642,3.719-3.671l-0.041-0.296L12.395,17.13z M8.728,19.523c-1.142,0-2.07-0.928-2.07-2.069
+				s0.928-2.07,2.07-2.07c1.141,0,2.069,0.929,2.069,2.07S9.869,19.523,8.728,19.523z"/>
+			<circle fill="#C1122B" cx="20.826" cy="19.013" r="1.006"/>
+			<path fill="#C1122B" d="M22.72,15.398c0.13-0.696,0.212-1.403,0.271-2.108c0.055-0.659-0.112-0.814-0.758-0.839
+				c-0.961-0.034-1.848-0.071-2.808-0.109c-0.029-0.001-0.077-0.022-0.077-0.06c0-0.724,0.037-2.484,0.037-2.484
+				S19.196,9.66,18.931,9.66c-0.116,0-0.247,0.026-0.383,0.103c0,0.821,0,1.654,0,2.527c0,0-1.172-0.031-2.844-0.065
+				c-0.074-0.002-0.281-0.128-0.378-0.392c-0.251-0.694-0.8-2.045-1.52-4.126c0,0-0.373-0.888-1.316-0.888c-0.781,0-4.679,0-4.679,0
+				v5.199c0,0-0.353,0.148-0.649,0.178c-0.078,0.472-0.067,0.711,0.115,0.784c0.46-0.15,0.942-0.252,1.451-0.252
+				c0.389,0,0.761,0.061,1.122,0.149c1.119,0.237,2.101,0.923,2.748,1.879c0.034,0.048,0.064,0.097,0.096,0.147
+				c0.094,0.151,0.179,0.306,0.255,0.47c0.083,0.167,0.154,0.338,0.217,0.515c0.004,0.012,0.008,0.024,0.011,0.037
+				c0.127,0.368,0.206,0.754,0.238,1.156c0.101,0.014,0.196,0.036,0.289,0.036c0.007,0,0.013,0,0.02,0
+				c2.176-0.056,4.355-0.06,6.529-0.169c-0.906,0.251-1.575,1.082-1.575,2.067c0,1.184,0.962,2.147,2.148,2.147
+				c1.184,0,2.147-0.963,2.147-2.147c0-1.071-0.79-1.958-1.816-2.119C22.761,16.794,22.451,16.842,22.72,15.398z M12.893,12.163
+				c-1.343,0-2.729,0.025-3.938,0.069l0.003-2.916l0.004-0.97l3.957-0.006l1.263,3.813l0.045,0.018
+				C13.793,12.166,13.345,12.163,12.893,12.163z M22.082,19.013c0,0.693-0.564,1.257-1.256,1.257c-0.692,0-1.256-0.564-1.256-1.257
+				c0-0.692,0.564-1.255,1.256-1.255C21.518,17.758,22.082,18.321,22.082,19.013z"/>
+			<path fill="#C1122B" d="M14,0C6.28,0,0,6.717,0,13.332c0,9.941,13.132,18.169,13.691,18.572C13.78,31.968,13.891,32,14,32
+				c0.107,0,0.217-0.031,0.305-0.094C14.864,31.511,28,23.45,28,13.332C28,6.717,21.72,0,14,0z M23.973,19.013
+				c0,1.735-1.412,3.147-3.147,3.147c-1.736,0-3.148-1.412-3.148-3.147c0-0.34,0.055-0.67,0.158-0.98
+				c-0.652,0.016-1.301,0.027-1.94,0.039c-0.716,0.013-1.431,0.025-2.137,0.043l-0.037,0.001h-0.018
+				c-0.102,0-0.208-0.014-0.315-0.03c-0.312,2.306-2.272,4.096-4.661,4.096C6.121,22.181,4,20.061,4,17.455
+				c0-1.725,0.939-3.222,2.323-4.047c-0.278-0.463-0.209-1.002-0.148-1.375L6.3,11.276l0.511-0.051V6.819v-1h1h4.679
+				c1.269,0,2.003,0.943,2.238,1.5l0.012,0.03l0.011,0.03c0.497,1.435,0.905,2.503,1.203,3.283c0.083,0.217,0.156,0.408,0.217,0.572
+				c0.531,0.011,0.998,0.022,1.376,0.031V9.763V9.177l0.512-0.286c0.273-0.153,0.566-0.23,0.872-0.23
+				c0.55,0,0.938,0.254,1.044,0.332l0.419,0.307l-0.011,0.52c0,0.001-0.017,0.815-0.028,1.56c0.635,0.025,1.257,0.05,1.916,0.073
+				c0.277,0.011,0.925,0.036,1.358,0.525c0.384,0.434,0.393,0.974,0.358,1.396c-0.07,0.848-0.161,1.55-0.284,2.208
+				c-0.04,0.216-0.066,0.397-0.089,0.547c-0.062,0.425-0.158,0.742-0.292,0.981C23.731,17.644,23.973,18.308,23.973,19.013z"/>
+		</g>
+	</g>
+</g>
+</svg>

app/assets/images/map_004-producer-shop-profile.svg

@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+	<!ENTITY ns_extend "http://ns.adobe.com/Extensibility/1.0/">
+	<!ENTITY ns_ai "http://ns.adobe.com/AdobeIllustrator/10.0/">
+	<!ENTITY ns_graphs "http://ns.adobe.com/Graphs/1.0/">
+	<!ENTITY ns_vars "http://ns.adobe.com/Variables/1.0/">
+	<!ENTITY ns_imrep "http://ns.adobe.com/ImageReplacement/1.0/">
+	<!ENTITY ns_sfw "http://ns.adobe.com/SaveForWeb/1.0/">
+	<!ENTITY ns_custom "http://ns.adobe.com/GenericCustomNamespace/1.0/">
+	<!ENTITY ns_adobe_xpath "http://ns.adobe.com/XPath/1.0/">
+]>
+<svg version="1.1" id="Layer_1" xmlns:x="&ns_extend;" xmlns:i="&ns_ai;" xmlns:graph="&ns_graphs;"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="28px" height="33px"
+	 viewBox="0 0 28 33" enable-background="new 0 0 28 33" xml:space="preserve">
+<metadata>
+	<sfw  xmlns="&ns_sfw;">
+		<slices></slices>
+		<sliceSourceBounds  height="96" width="16383" y="-85.5" x="-8112" bottomLeftOrigin="true"></sliceSourceBounds>
+	</sfw>
+</metadata>
+<g>
+	<path opacity="0.25" fill="#282828" d="M14,25c-6.059,0-10.988,1.679-10.988,3.333c0,2.485,10.307,4.542,10.746,4.643
+		C13.828,32.992,13.914,33,14,33c0.084,0,0.17-0.008,0.239-0.023c0.439-0.099,10.749-2.114,10.749-4.643
+		C24.988,26.679,20.059,25,14,25z"/>
+	<g>
+		<path fill="#FFFFFF" d="M14,0C6.28,0,0,6.717,0,13.332c0,9.941,13.132,18.169,13.691,18.572C13.78,31.968,13.891,32,14,32
+			c0.107,0,0.217-0.031,0.305-0.094C14.864,31.511,28,23.45,28,13.332C28,6.717,21.72,0,14,0z"/>
+		<g>
+			<path fill="#C1122B" d="M14,0C6.28,0,0,6.717,0,13.333c0,9.941,13.132,18.169,13.691,18.571C13.78,31.968,13.891,32,14,32
+				c0.107,0,0.217-0.031,0.305-0.094C14.864,31.511,28,23.45,28,13.333C28,6.717,21.72,0,14,0z M14.002,30.908
+				C10.865,28.805,1,21.533,1,13.333C1,7.511,6.56,1,14,1c7.44,0,13,6.511,13,12.333C27,21.682,17.14,28.843,14.002,30.908z"/>
+			<path fill="#C1122B" d="M23.703,15.582c0.123-0.658,0.214-1.36,0.284-2.208c0.035-0.422,0.026-0.962-0.358-1.396
+				c-0.433-0.489-1.081-0.514-1.358-0.525c-0.659-0.024-1.281-0.048-1.916-0.073c0.011-0.745,0.028-1.56,0.028-1.56l0.011-0.52
+				l-0.419-0.307c-0.106-0.078-0.495-0.332-1.044-0.332c-0.306,0-0.599,0.077-0.872,0.23l-0.512,0.286v0.586v1.502
+				c-0.378-0.009-0.845-0.02-1.376-0.031c-0.062-0.164-0.135-0.355-0.217-0.572c-0.298-0.78-0.706-1.847-1.203-3.283l-0.011-0.03
+				l-0.013-0.03c-0.234-0.557-0.969-1.5-2.238-1.5H7.811h-1v1v4.407L6.3,11.276l-0.125,0.757c-0.061,0.373-0.13,0.911,0.148,1.375
+				C4.939,14.233,4,15.729,4,17.455c0,2.606,2.121,4.727,4.728,4.727c2.39,0,4.349-1.79,4.661-4.096
+				c0.107,0.016,0.212,0.03,0.315,0.03h0.018l0.037-0.001c0.706-0.018,1.421-0.031,2.137-0.043c0.639-0.011,1.288-0.023,1.94-0.039
+				c-0.103,0.311-0.158,0.641-0.158,0.98c0,1.735,1.412,3.147,3.148,3.147c1.736,0,3.147-1.412,3.147-3.147
+				c0-0.706-0.242-1.369-0.651-1.903c0.135-0.239,0.23-0.556,0.292-0.981C23.636,15.978,23.662,15.798,23.703,15.582z M8.728,21.181
+				C6.672,21.181,5,19.51,5,17.455c0-1.562,0.969-2.898,2.335-3.451c0.026,0.001,0.046,0.009,0.074,0.009
+				c0.197,0,0.409-0.034,0.685-0.112c0.289-0.081,0.586-0.122,0.881-0.122c0.21,0,0.417,0.021,0.619,0.061
+				c0.888,0.213,1.652,0.741,2.166,1.464c0.041,0.06,0.082,0.121,0.119,0.184c0.057,0.091,0.105,0.188,0.155,0.285
+				c0.16,0.334,0.279,0.693,0.325,1.075c0.009,0.083,0.022,0.176,0.037,0.283l0.011,0.082l0.041,0.296
+				C12.417,19.539,10.763,21.181,8.728,21.181z M22.973,19.013c0,1.184-0.964,2.147-2.147,2.147c-1.186,0-2.148-0.963-2.148-2.147
+				c0-0.985,0.669-1.815,1.575-2.067c-2.174,0.109-4.353,0.113-6.529,0.169c-0.007,0-0.013,0-0.02,0
+				c-0.092,0-0.188-0.022-0.289-0.036c-0.032-0.402-0.111-0.788-0.238-1.156c-0.004-0.012-0.007-0.024-0.011-0.037
+				c-0.063-0.177-0.134-0.348-0.217-0.515c-0.076-0.163-0.161-0.318-0.255-0.469c-0.032-0.05-0.062-0.099-0.096-0.147
+				c-0.646-0.956-1.628-1.642-2.748-1.879c-0.362-0.089-0.734-0.149-1.122-0.149c-0.509,0-0.991,0.102-1.451,0.252
+				c-0.181-0.073-0.192-0.312-0.115-0.784c0.296-0.029,0.649-0.178,0.649-0.178V6.819c0,0,3.899,0,4.679,0
+				c0.943,0,1.316,0.888,1.316,0.888c0.72,2.081,1.269,3.432,1.52,4.126c0.097,0.264,0.303,0.39,0.378,0.392
+				c1.672,0.035,2.844,0.065,2.844,0.065c0-0.873,0-1.706,0-2.527c0.136-0.076,0.267-0.103,0.383-0.103
+				c0.265,0,0.453,0.138,0.453,0.138s-0.037,1.76-0.037,2.484c0,0.038,0.048,0.059,0.077,0.06c0.961,0.038,1.848,0.075,2.808,0.109
+				c0.646,0.025,0.813,0.18,0.758,0.839c-0.059,0.705-0.14,1.412-0.271,2.108c-0.269,1.444,0.042,1.395-1.562,1.496
+				C22.183,17.055,22.973,17.943,22.973,19.013z"/>
+			<path fill="#C1122B" d="M19.57,19.013c0,0.693,0.564,1.257,1.256,1.257c0.692,0,1.256-0.564,1.256-1.257
+				c0-0.692-0.564-1.255-1.256-1.255C20.134,17.758,19.57,18.321,19.57,19.013z M21.832,19.013c0,0.555-0.451,1.007-1.006,1.007
+				c-0.555,0-1.006-0.452-1.006-1.007c0-0.554,0.451-1.005,1.006-1.005C21.381,18.008,21.832,18.459,21.832,19.013z"/>
+			<path fill="#C1122B" d="M12.919,8.341L8.961,8.347l-0.004,0.97l-0.003,2.916c1.209-0.044,2.595-0.069,3.939-0.069
+				c0.452,0,0.9,0.003,1.334,0.009l-0.045-0.018L12.919,8.341z M12.893,11.663c-1.138,0-2.34,0.018-3.438,0.052l0.003-2.397
+				L9.46,8.846l3.098-0.005l0.935,2.824C13.294,11.664,13.094,11.663,12.893,11.663z"/>
+			<path fill="#C1122B" d="M8.728,15.385c-1.142,0-2.07,0.929-2.07,2.07s0.928,2.069,2.07,2.069c1.141,0,2.069-0.928,2.069-2.069
+				S9.869,15.385,8.728,15.385z M8.728,19.023c-0.865,0-1.57-0.704-1.57-1.569c0-0.866,0.704-1.57,1.57-1.57
+				c0.865,0,1.569,0.704,1.569,1.57C10.297,18.32,9.593,19.023,8.728,19.023z"/>
+		</g>
+	</g>
+</g>
+</svg>

app/assets/images/map_005-hub.svg

@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+	<!ENTITY ns_extend "http://ns.adobe.com/Extensibility/1.0/">
+	<!ENTITY ns_ai "http://ns.adobe.com/AdobeIllustrator/10.0/">
+	<!ENTITY ns_graphs "http://ns.adobe.com/Graphs/1.0/">
+	<!ENTITY ns_vars "http://ns.adobe.com/Variables/1.0/">
+	<!ENTITY ns_imrep "http://ns.adobe.com/ImageReplacement/1.0/">
+	<!ENTITY ns_sfw "http://ns.adobe.com/SaveForWeb/1.0/">
+	<!ENTITY ns_custom "http://ns.adobe.com/GenericCustomNamespace/1.0/">
+	<!ENTITY ns_adobe_xpath "http://ns.adobe.com/XPath/1.0/">
+]>
+<svg version="1.1" id="Layer_1" xmlns:x="&ns_extend;" xmlns:i="&ns_ai;" xmlns:graph="&ns_graphs;"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="28px" height="33px"
+	 viewBox="0 0 28 33" enable-background="new 0 0 28 33" xml:space="preserve">
+<metadata>
+	<sfw  xmlns="&ns_sfw;">
+		<slices></slices>
+		<sliceSourceBounds  height="96" width="16383" y="-85.5" x="-8112" bottomLeftOrigin="true"></sliceSourceBounds>
+	</sfw>
+</metadata>
+<g>
+	<path opacity="0.25" fill="#282828" d="M14,25c-6.059,0-10.988,1.679-10.988,3.333c0,2.485,10.307,4.542,10.746,4.643
+		C13.828,32.992,13.914,33,14,33c0.084,0,0.17-0.008,0.239-0.023c0.439-0.099,10.749-2.114,10.749-4.643
+		C24.988,26.679,20.059,25,14,25z"/>
+	<g>
+		<path fill="#FFFFFF" d="M14,0C6.28,0,0,6.717,0,13.332c0,9.941,13.132,18.169,13.691,18.572C13.78,31.968,13.891,32,14,32
+			c0.107,0,0.217-0.031,0.305-0.094C14.864,31.511,28,23.45,28,13.332C28,6.717,21.72,0,14,0z"/>
+		<g>
+			<path fill="#C1122B" d="M13.999,8.546c-1.24,0-2.249,1.009-2.249,2.248c0,1.242,1.009,2.253,2.249,2.253
+				c1.241,0,2.251-1.01,2.251-2.253C16.25,9.555,15.24,8.546,13.999,8.546z"/>
+			<path fill="#C1122B" d="M14,6.348c-2.453,0-4.448,1.995-4.448,4.448c0,0.859,0.468,3.112,3.602,8.541l0.387,0.671l0.134,0.225
+				l0.09,0.15l0.043,0.072l0.085,0.144l0.108,0.178l0.104-0.172l0.036-0.061l0.088-0.149l0.032-0.054l0.19-0.319l0.395-0.685
+				c3.134-5.44,3.602-7.687,3.602-8.542C18.448,8.343,16.452,6.348,14,6.348z M13.999,13.797c-1.654,0-2.999-1.347-2.999-3.003
+				c0-1.655,1.346-2.998,2.999-2.998c1.655,0,3.001,1.345,3.001,2.998C17,12.451,15.654,13.797,13.999,13.797z"/>
+			<path fill="#C1122B" d="M14,0C6.28,0,0,6.717,0,13.333c0,9.941,13.132,18.169,13.691,18.571C13.78,31.968,13.891,32,14,32
+				c0.107,0,0.217-0.031,0.305-0.094C14.864,31.511,28,23.45,28,13.333C28,6.717,21.72,0,14,0z M19.336,22.021
+				c-0.002,1.728-2.686,2.632-5.337,2.632c-2.652,0-5.337-0.905-5.337-2.634c0-1.158,1.352-2.099,3.465-2.462
+				c-1.721-3.01-3.577-6.721-3.577-8.76c0-3.004,2.444-5.448,5.448-5.448s5.448,2.444,5.449,5.447c0,2.036-1.858,5.75-3.578,8.762
+				C17.984,19.92,19.336,20.86,19.336,22.021z"/>
+			<path fill="#C1122B" d="M15.175,20.763c-0.029,0.048-0.059,0.1-0.088,0.148c-0.04,0.068-0.084,0.142-0.121,0.204
+				c-0.111,0.184-0.206,0.339-0.293,0.483c-0.021,0.03-0.042,0.066-0.061,0.096c-0.081,0.133-0.142,0.231-0.194,0.313
+				c-0.015,0.025-0.032,0.054-0.045,0.073c-0.052,0.082-0.08,0.125-0.08,0.125l-0.295,0.463l-0.293-0.463
+				c0,0-0.031-0.048-0.085-0.134c-0.006-0.009-0.013-0.023-0.019-0.029c-0.053-0.086-0.123-0.198-0.212-0.345
+				c-0.025-0.038-0.052-0.086-0.079-0.127c-0.083-0.136-0.17-0.278-0.274-0.448c-0.042-0.072-0.089-0.15-0.134-0.225
+				c-0.026-0.044-0.053-0.09-0.078-0.132l-0.381,0.061c-1.729,0.277-2.477,0.925-2.477,1.195c0,0.172,0.269,0.481,0.859,0.754
+				c0.8,0.37,1.926,0.574,3.172,0.574c2.608,0,4.031-0.878,4.031-1.329c0-0.269-0.748-0.917-2.476-1.195L15.175,20.763z"/>
+		</g>
+	</g>
+</g>
+</svg>

app/assets/images/map_006-hub-profile.svg

@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+	<!ENTITY ns_extend "http://ns.adobe.com/Extensibility/1.0/">
+	<!ENTITY ns_ai "http://ns.adobe.com/AdobeIllustrator/10.0/">
+	<!ENTITY ns_graphs "http://ns.adobe.com/Graphs/1.0/">
+	<!ENTITY ns_vars "http://ns.adobe.com/Variables/1.0/">
+	<!ENTITY ns_imrep "http://ns.adobe.com/ImageReplacement/1.0/">
+	<!ENTITY ns_sfw "http://ns.adobe.com/SaveForWeb/1.0/">
+	<!ENTITY ns_custom "http://ns.adobe.com/GenericCustomNamespace/1.0/">
+	<!ENTITY ns_adobe_xpath "http://ns.adobe.com/XPath/1.0/">
+]>
+<svg version="1.1" id="Layer_1" xmlns:x="&ns_extend;" xmlns:i="&ns_ai;" xmlns:graph="&ns_graphs;"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="28px" height="33px"
+	 viewBox="0 0 28 33" enable-background="new 0 0 28 33" xml:space="preserve">
+<metadata>
+	<sfw  xmlns="&ns_sfw;">
+		<slices></slices>
+		<sliceSourceBounds  height="96" width="16383" y="-85.5" x="-8112" bottomLeftOrigin="true"></sliceSourceBounds>
+	</sfw>
+</metadata>
+<g>
+	<path opacity="0.25" fill="#282828" d="M14,25c-6.059,0-10.988,1.679-10.988,3.333c0,2.485,10.307,4.542,10.746,4.643
+		C13.828,32.992,13.914,33,14,33c0.084,0,0.17-0.008,0.239-0.023c0.439-0.099,10.749-2.114,10.749-4.643
+		C24.988,26.679,20.059,25,14,25z"/>
+	<g>
+		<path fill="#FFFFFF" d="M14,0C6.28,0,0,6.717,0,13.332c0,9.941,13.132,18.169,13.691,18.572C13.78,31.968,13.891,32,14,32
+			c0.107,0,0.217-0.031,0.305-0.094C14.864,31.511,28,23.45,28,13.332C28,6.717,21.72,0,14,0z"/>
+		<g>
+			<path fill="#C1122B" d="M14,0C6.28,0,0,6.717,0,13.333c0,9.941,13.132,18.169,13.691,18.571C13.78,31.968,13.891,32,14,32
+				c0.107,0,0.217-0.031,0.305-0.094C14.864,31.511,28,23.45,28,13.333C28,6.717,21.72,0,14,0z M14.002,30.908
+				C10.865,28.805,1,21.533,1,13.333C1,7.511,6.56,1,14,1s13,6.511,13,12.333C27,21.682,17.14,28.843,14.002,30.908z"/>
+			<path fill="#C1122B" d="M14,7.796c-1.654,0-3,1.344-3,2.998c0,1.656,1.346,3.003,3,3.003c1.655,0,3-1.347,3-3.003
+				C17,9.141,15.654,7.796,14,7.796z M14,13.047c-1.24,0-2.25-1.01-2.25-2.253c0-1.24,1.009-2.248,2.25-2.248
+				c1.241,0,2.25,1.009,2.25,2.248C16.25,12.037,15.24,13.047,14,13.047z"/>
+			<path fill="#C1122B" d="M14,5.348c-3.004,0-5.448,2.444-5.448,5.448c0,2.039,1.856,5.75,3.577,8.76
+				c-2.113,0.363-3.465,1.304-3.465,2.462c0,1.729,2.685,2.634,5.337,2.634c2.65,0,5.335-0.904,5.337-2.632
+				c0-1.16-1.352-2.1-3.465-2.464c1.719-3.012,3.578-6.725,3.578-8.762C19.448,7.792,17.003,5.348,14,5.348z M18.031,22.018
+				c0,0.451-1.423,1.329-4.031,1.329c-1.246,0-2.372-0.204-3.172-0.574c-0.591-0.273-0.859-0.582-0.859-0.754
+				c0-0.269,0.748-0.917,2.477-1.195l0.381-0.061c0.025,0.042,0.053,0.088,0.078,0.132c0.045,0.075,0.092,0.153,0.134,0.225
+				c0.104,0.17,0.191,0.313,0.274,0.448c0.027,0.042,0.054,0.089,0.079,0.127c0.089,0.147,0.159,0.258,0.212,0.345
+				c0.006,0.007,0.013,0.021,0.019,0.029c0.053,0.086,0.085,0.134,0.085,0.134l0.293,0.463l0.295-0.463c0,0,0.028-0.044,0.08-0.125
+				c0.012-0.019,0.029-0.048,0.045-0.073c0.052-0.082,0.113-0.18,0.194-0.313c0.019-0.029,0.04-0.066,0.061-0.096
+				c0.086-0.143,0.181-0.298,0.293-0.483c0.037-0.063,0.081-0.136,0.121-0.204c0.029-0.048,0.06-0.1,0.088-0.148l0.38,0.061
+				C17.283,21.101,18.031,21.749,18.031,22.018z M14.847,19.337l-0.396,0.688l-0.189,0.316l-0.032,0.054l-0.089,0.151l-0.036,0.06
+				l-0.104,0.172L13.892,20.6l-0.085-0.144l-0.043-0.072l-0.09-0.15l-0.135-0.227l-0.387-0.67c-3.134-5.43-3.602-7.682-3.602-8.541
+				c0-2.453,1.995-4.448,4.448-4.448c2.453,0,4.448,1.995,4.449,4.447C18.449,11.65,17.981,13.897,14.847,19.337z"/>
+		</g>
+	</g>
+</g>
+</svg>

app/assets/images/map_007-shop.svg

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+	<!ENTITY ns_extend "http://ns.adobe.com/Extensibility/1.0/">
+	<!ENTITY ns_ai "http://ns.adobe.com/AdobeIllustrator/10.0/">
+	<!ENTITY ns_graphs "http://ns.adobe.com/Graphs/1.0/">
+	<!ENTITY ns_vars "http://ns.adobe.com/Variables/1.0/">
+	<!ENTITY ns_imrep "http://ns.adobe.com/ImageReplacement/1.0/">
+	<!ENTITY ns_sfw "http://ns.adobe.com/SaveForWeb/1.0/">
+	<!ENTITY ns_custom "http://ns.adobe.com/GenericCustomNamespace/1.0/">
+	<!ENTITY ns_adobe_xpath "http://ns.adobe.com/XPath/1.0/">
+]>
+<svg version="1.1" id="Layer_1" xmlns:x="&ns_extend;" xmlns:i="&ns_ai;" xmlns:graph="&ns_graphs;"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="28px" height="33px"
+	 viewBox="0 0 28 33" enable-background="new 0 0 28 33" xml:space="preserve">
+<metadata>
+	<sfw  xmlns="&ns_sfw;">
+		<slices></slices>
+		<sliceSourceBounds  height="96" width="16383" y="-85.5" x="-8112" bottomLeftOrigin="true"></sliceSourceBounds>
+	</sfw>
+</metadata>
+<g>
+	<path opacity="0.25" fill="#282828" d="M14,25c-6.059,0-10.988,1.679-10.988,3.333c0,2.485,10.307,4.542,10.746,4.643
+		C13.828,32.992,13.914,33,14,33c0.084,0,0.17-0.008,0.239-0.023c0.439-0.099,10.749-2.114,10.749-4.643
+		C24.988,26.679,20.059,25,14,25z"/>
+	<g>
+		<path fill="#FFFFFF" d="M14,0C6.28,0,0,6.717,0,13.332c0,9.941,13.132,18.169,13.691,18.572C13.78,31.968,13.891,32,14,32
+			c0.107,0,0.217-0.031,0.305-0.094C14.864,31.511,28,23.45,28,13.332C28,6.717,21.72,0,14,0z"/>
+		<g>
+			<path fill="#C1122B" d="M21.552,10.282h-3.274l-1.683-2.709c-0.165-0.287-0.533-0.384-0.8-0.228
+				c-0.135,0.078-0.229,0.201-0.27,0.35c-0.041,0.153-0.019,0.315,0.062,0.457l1.359,2.129h-6.311l1.379-2.161
+				c0.066-0.114,0.087-0.271,0.046-0.421c-0.04-0.15-0.136-0.275-0.271-0.353c-0.266-0.156-0.64-0.053-0.787,0.202l-1.697,2.733
+				H6.448c-0.522,0-0.948,0.426-0.948,0.948v0.827c0,0.492,0.363,0.97,0.793,1.041l0.105,0.018h15.156l0.119-0.016
+				c0.44-0.058,0.827-0.545,0.827-1.043V11.23C22.5,10.708,22.074,10.282,21.552,10.282z"/>
+			<path fill="#C1122B" d="M8.057,20.02c0.007,0.222,0.122,0.337,0.263,0.337h11.365c0.142,0,0.257-0.115,0.257-0.256l0.007-0.1
+				l0.971-5.886H7.082L8.057,20.02z M17.116,16.074c0-0.298,0.22-0.539,0.518-0.539c0.297,0,0.516,0.241,0.516,0.539v2.017
+				c0,0.298-0.219,0.539-0.516,0.539c-0.298,0-0.518-0.241-0.518-0.539V16.074z M14.694,16.074c0-0.298,0.219-0.539,0.517-0.539
+				s0.517,0.241,0.517,0.539v2.017c0,0.298-0.219,0.539-0.517,0.539s-0.517-0.241-0.517-0.539V16.074z M12.272,16.074
+				c0-0.298,0.219-0.539,0.517-0.539c0.297,0,0.517,0.241,0.517,0.539v2.017c0,0.298-0.22,0.539-0.517,0.539
+				c-0.298,0-0.517-0.241-0.517-0.539V16.074z M9.85,16.074c0-0.298,0.219-0.539,0.517-0.539c0.297,0,0.516,0.241,0.516,0.539v2.017
+				c0,0.298-0.219,0.539-0.516,0.539c-0.298,0-0.517-0.241-0.517-0.539V16.074z"/>
+			<path fill="#C1122B" d="M14,0C6.28,0,0,6.717,0,13.333c0,9.941,13.132,18.169,13.691,18.571C13.78,31.968,13.891,32,14,32
+				c0.107,0,0.217-0.031,0.305-0.094C14.864,31.511,28,23.45,28,13.333C28,6.717,21.72,0,14,0z M23.5,12.057
+				c0,0.863-0.567,1.661-1.325,1.942l-1.025,5.889c-0.015,0.976-0.889,1.831-1.94,1.831H8.744c-1.052,0-1.925-0.855-1.947-1.906
+				l-1.024-5.828C5.036,13.691,4.5,12.91,4.5,12.057V11.23c0-1.074,0.874-1.948,1.948-1.948H8.75l1.396-2.247
+				c0.4-0.698,1.417-0.978,2.145-0.555c0.755,0.435,1.015,1.403,0.58,2.159l-0.41,0.642h2.662l-0.39-0.61
+				c-0.227-0.391-0.284-0.823-0.174-1.235c0.109-0.406,0.37-0.745,0.734-0.955c0.716-0.417,1.739-0.148,2.159,0.579l1.381,2.223
+				h2.718c1.074,0,1.948,0.874,1.948,1.948V12.057z"/>
+		</g>
+	</g>
+</g>
+</svg>

app/assets/images/map_008-shop-profile.svg

@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 17.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
+	<!ENTITY ns_extend "http://ns.adobe.com/Extensibility/1.0/">
+	<!ENTITY ns_ai "http://ns.adobe.com/AdobeIllustrator/10.0/">
+	<!ENTITY ns_graphs "http://ns.adobe.com/Graphs/1.0/">
+	<!ENTITY ns_vars "http://ns.adobe.com/Variables/1.0/">
+	<!ENTITY ns_imrep "http://ns.adobe.com/ImageReplacement/1.0/">
+	<!ENTITY ns_sfw "http://ns.adobe.com/SaveForWeb/1.0/">
+	<!ENTITY ns_custom "http://ns.adobe.com/GenericCustomNamespace/1.0/">
+	<!ENTITY ns_adobe_xpath "http://ns.adobe.com/XPath/1.0/">
+]>
+<svg version="1.1" id="Layer_1" xmlns:x="&ns_extend;" xmlns:i="&ns_ai;" xmlns:graph="&ns_graphs;"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="28px" height="33px"
+	 viewBox="0 0 28 33" enable-background="new 0 0 28 33" xml:space="preserve">
+<metadata>
+	<sfw  xmlns="&ns_sfw;">
+		<slices></slices>
+		<sliceSourceBounds  height="96" width="16383" y="-85.5" x="-8112" bottomLeftOrigin="true"></sliceSourceBounds>
+	</sfw>
+</metadata>
+<g>
+	<path opacity="0.25" fill="#282828" d="M14,25c-6.059,0-10.988,1.679-10.988,3.333c0,2.485,10.307,4.542,10.746,4.643
+		C13.828,32.992,13.914,33,14,33c0.084,0,0.17-0.008,0.239-0.023c0.439-0.099,10.749-2.114,10.749-4.643
+		C24.988,26.679,20.059,25,14,25z"/>
+	<g>
+		<path fill="#FFFFFF" d="M14,0C6.28,0,0,6.717,0,13.332c0,9.941,13.132,18.169,13.691,18.572C13.78,31.968,13.891,32,14,32
+			c0.107,0,0.217-0.031,0.305-0.094C14.864,31.511,28,23.45,28,13.332C28,6.717,21.72,0,14,0z"/>
+		<path fill="#C1122B" d="M14,0C6.28,0,0,6.717,0,13.333c0,9.941,13.132,18.169,13.691,18.572C13.78,31.968,13.891,32,14,32
+			c0.107,0,0.217-0.031,0.305-0.094C14.864,31.511,28,23.45,28,13.333C28,6.717,21.72,0,14,0z M14.002,30.908
+			C10.865,28.805,1,21.533,1,13.333C1,7.511,6.56,1,14,1s13,6.511,13,12.333C27,21.682,17.14,28.843,14.002,30.908z"/>
+		<g>
+			<g>
+				<path fill="#C1122B" d="M19.457,22.366H8.494c-1.074,0-1.965-0.873-1.988-1.946l-1.079-6.143
+					C4.661,13.986,4.1,13.177,4.1,12.295v-0.866c0-1.097,0.892-1.989,1.988-1.989h2.441l1.479-2.379
+					c0.408-0.709,1.438-0.99,2.177-0.563c0.37,0.214,0.635,0.559,0.747,0.973c0.11,0.413,0.054,0.846-0.16,1.216l-0.479,0.751h2.98
+					L14.813,8.72c-0.229-0.395-0.288-0.833-0.177-1.251c0.11-0.413,0.375-0.758,0.745-0.971c0.731-0.428,1.766-0.151,2.191,0.588
+					l1.463,2.354h2.877c1.096,0,1.988,0.892,1.988,1.989v0.866c0,0.894-0.594,1.719-1.382,1.996l-1.08,6.199
+					C21.423,21.492,20.532,22.366,19.457,22.366z M6.088,10.383c-0.576,0-1.045,0.47-1.045,1.046v0.866
+					c0,0.54,0.401,1.064,0.874,1.143l0.33,0.055l1.195,6.836c0.019,0.635,0.488,1.094,1.052,1.094h10.964
+					c0.565,0,1.034-0.459,1.045-1.023l1.199-6.915l0.344-0.045c0.494-0.064,0.912-0.588,0.912-1.145v-0.866
+					c0-0.576-0.469-1.046-1.045-1.046H18.51L16.762,7.57c-0.186-0.324-0.605-0.433-0.909-0.256
+					c-0.153,0.088-0.262,0.229-0.307,0.398c-0.046,0.175-0.021,0.358,0.072,0.518l1.373,2.152h-6.42l1.393-2.183
+					c0.077-0.134,0.1-0.313,0.055-0.483c-0.046-0.17-0.156-0.313-0.308-0.401c-0.304-0.179-0.729-0.061-0.895,0.23l-1.763,2.838
+					H6.088z"/>
+			</g>
+			<g>
+				<path fill="#C1122B" d="M19.956,21.986H8.049c-0.697,0-1.264-0.566-1.264-1.263l-1.207-7.266h16.845l-1.204,7.282
+					C21.22,21.419,20.653,21.986,19.956,21.986z M6.69,14.399l1.031,6.247c0.006,0.253,0.151,0.397,0.328,0.397h11.907
+					c0.177,0,0.321-0.144,0.321-0.32l0.006-0.097l1.029-6.226H6.69z"/>
+			</g>
+			<g>
+				<g>
+					<path fill="#C1122B" d="M17.807,19.181c0.311,0,0.541-0.253,0.541-0.565v-2.113c0-0.312-0.23-0.565-0.541-0.565
+						c-0.312,0-0.542,0.253-0.542,0.565v2.113C17.264,18.929,17.495,19.181,17.807,19.181z"/>
+				</g>
+				<g>
+					<path fill="#C1122B" d="M15.268,19.181c0.312,0,0.542-0.253,0.542-0.565v-2.113c0-0.312-0.23-0.565-0.542-0.565
+						s-0.542,0.253-0.542,0.565v2.113C14.727,18.929,14.957,19.181,15.268,19.181z"/>
+				</g>
+				<g>
+					<path fill="#C1122B" d="M12.731,19.181c0.311,0,0.542-0.253,0.542-0.565v-2.113c0-0.312-0.23-0.565-0.542-0.565
+						c-0.312,0-0.542,0.253-0.542,0.565v2.113C12.19,18.929,12.419,19.181,12.731,19.181z"/>
+				</g>
+				<g>
+					<path fill="#C1122B" d="M10.194,19.181c0.311,0,0.541-0.253,0.541-0.565v-2.113c0-0.312-0.23-0.565-0.541-0.565
+						c-0.312,0-0.542,0.253-0.542,0.565v2.113C9.652,18.929,9.882,19.181,10.194,19.181z"/>
+				</g>
+			</g>
+		</g>
+	</g>
+</g>
+</svg>

app/assets/javascripts/admin/admin.js.coffee

@@ -1,3 +1,3 @@
 angular.module("ofn.admin", ["ngResource", "ngAnimate", "ofn.dropdown", "admin.products", "infinite-scroll"]).config ($httpProvider) ->
   $httpProvider.defaults.headers.common["X-CSRF-Token"] = $("meta[name=csrf-token]").attr("content")
-  $httpProvider.defaults.headers.common["Accept"] = "application/json, text/javascript, */*"
+  $httpProvider.defaults.headers.common["Accept"] = "application/json, text/javascript, */*"

app/assets/javascripts/admin/all.js

@@ -22,5 +22,9 @@
 //= require ./payment_methods/payment_methods
 //= require ./products/products
 //= require ./shipping_methods/shipping_methods
+//= require ./utils/utils
+//= require ./users/users
+//= require textAngular.min.js
+//= require textAngular-sanitize.min.js
 
 //= require_tree .

app/assets/javascripts/admin/bulk_order_management.js.coffee

@@ -1,6 +1,7 @@
 angular.module("ofn.admin").controller "AdminOrderMgmtCtrl", [
-  "$scope", "$http", "dataFetcher", "blankOption", "pendingChanges", "VariantUnitManager", "OptionValueNamer",
-  ($scope, $http, dataFetcher, blankOption, pendingChanges, VariantUnitManager, OptionValueNamer) ->
+  "$scope", "$http", "dataFetcher", "blankOption", "pendingChanges", "VariantUnitManager", "OptionValueNamer", "SpreeApiKey"
+  ($scope, $http, dataFetcher, blankOption, pendingChanges, VariantUnitManager, OptionValueNamer, SpreeApiKey) ->
+    $scope.loading = true
 
     $scope.initialiseVariables = ->
       start = daysFromToday -7
@@ -32,14 +33,14 @@ angular.module("ofn.admin").controller "AdminOrderMgmtCtrl", [
         quantity:     { name: "Quantity",     visible: true }
         max:          { name: "Max",          visible: true }
 
-    $scope.initialise = (spree_api_key) ->
+    $scope.initialise = ->
       $scope.initialiseVariables()
       authorise_api_reponse = ""
-      dataFetcher("/api/users/authorise_api?token=" + spree_api_key).then (data) ->
+      dataFetcher("/api/users/authorise_api?token=" + SpreeApiKey).then (data) ->
         authorise_api_reponse = data
         $scope.spree_api_key_ok = data.hasOwnProperty("success") and data["success"] == "Use of API Authorised"
         if $scope.spree_api_key_ok
-          $http.defaults.headers.common["X-Spree-Token"] = spree_api_key
+          $http.defaults.headers.common["X-Spree-Token"] = SpreeApiKey
           dataFetcher("/api/enterprises/accessible?template=bulk_index&q[is_primary_producer_eq]=true").then (data) ->
             $scope.suppliers = data
             $scope.suppliers.unshift blankOption()

app/assets/javascripts/admin/bulk_product_update.js.coffee

@@ -1,6 +1,8 @@
 angular.module("ofn.admin").controller "AdminProductEditCtrl", [
-  "$scope", "$timeout", "$http", "dataFetcher", "DirtyProducts", "VariantUnitManager", "producers", "Taxons",
-  ($scope, $timeout, $http, dataFetcher, DirtyProducts, VariantUnitManager, producers, Taxons) ->
+  "$scope", "$timeout", "$http", "dataFetcher", "DirtyProducts", "VariantUnitManager", "producers", "Taxons", "SpreeApiKey",
+  ($scope, $timeout, $http, dataFetcher, DirtyProducts, VariantUnitManager, producers, Taxons, SpreeApiKey) ->
+    $scope.loading = true
+
     $scope.updateStatusMessage =
       text: ""
       style: {}
@@ -41,15 +43,15 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", [
     $scope.currentFilters = []
     $scope.limit = 15
     $scope.productsWithUnsavedVariants = []
+    $scope.query = ""
 
-
-    $scope.initialise = (spree_api_key) ->
+    $scope.initialise = ->
       authorise_api_reponse = ""
-      dataFetcher("/api/users/authorise_api?token=" + spree_api_key).then (data) ->
+      dataFetcher("/api/users/authorise_api?token=" + SpreeApiKey).then (data) ->
         authorise_api_reponse = data
         $scope.spree_api_key_ok = data.hasOwnProperty("success") and data["success"] == "Use of API Authorised"
         if $scope.spree_api_key_ok
-          $http.defaults.headers.common["X-Spree-Token"] = spree_api_key
+          $http.defaults.headers.common["X-Spree-Token"] = SpreeApiKey
           $scope.fetchProducts()
         else if authorise_api_reponse.hasOwnProperty("error")
           $scope.api_error_msg = authorise_api_reponse("error")

app/assets/javascripts/admin/controllers/enterprise_relationships_controller.js.coffee

@@ -1,9 +1,10 @@
 angular.module("ofn.admin").controller "AdminEnterpriseRelationshipsCtrl", ($scope, EnterpriseRelationships, Enterprises) ->
   $scope.EnterpriseRelationships = EnterpriseRelationships
   $scope.Enterprises = Enterprises
+  $scope.permissions = {}
 
   $scope.create = ->
-    $scope.EnterpriseRelationships.create($scope.parent_id, $scope.child_id)
+    $scope.EnterpriseRelationships.create($scope.parent_id, $scope.child_id, $scope.permissions)
 
   $scope.delete = (enterprise_relationship) ->
     if confirm("Are you sure?")

app/assets/javascripts/admin/controllers/enterprise_roles_controller.js.coffee

@@ -0,0 +1,11 @@
+angular.module("ofn.admin").controller "AdminEnterpriseRolesCtrl", ($scope, EnterpriseRoles, Users, Enterprises) ->
+  $scope.EnterpriseRoles = EnterpriseRoles
+  $scope.Users = Users
+  $scope.Enterprises = Enterprises
+
+  $scope.create = ->
+    $scope.EnterpriseRoles.create($scope.user_id, $scope.enterprise_id)
+
+  $scope.delete = (enterprise_role) ->
+    if confirm("Are you sure?")
+      $scope.EnterpriseRoles.delete enterprise_role

app/assets/javascripts/admin/controllers/providers_controller.js.coffee

@@ -0,0 +1,7 @@
+angular.module("ofn.admin").controller "ProvidersCtrl", ($scope, paymentMethod) ->
+  if paymentMethod.type
+    $scope.include_html = "/admin/payment_methods/show_provider_preferences?" +
+      "provider_type=#{paymentMethod.type};" +
+      "pm_id=#{paymentMethod.id};"
+  else
+    $scope.include_html = ""

app/assets/javascripts/admin/directives/provider_prefs_for.js.coffee

@@ -0,0 +1,7 @@
+angular.module("ofn.admin").directive "providerPrefsFor", ($http) ->
+  link: (scope, element, attrs) ->
+    element.on "change blur load", ->
+      scope.$apply ->
+        scope.include_html = "/admin/payment_methods/show_provider_preferences?" +
+          "provider_type=#{element.val()};" +
+          "pm_id=#{attrs.providerPrefsFor};"

app/assets/javascripts/admin/enterprises/controllers/change_type_form_controller.js.coffee

@@ -0,0 +1,12 @@
+angular.module("admin.enterprises")
+  .controller "changeTypeFormCtrl", ($scope, enterprise) ->
+    $scope.sells = enterprise.sells
+    $scope.producer_profile_only = enterprise.producer_profile_only
+    $scope.submitted = false
+
+    $scope.valid = (form) ->
+      $scope.submitted = !form.$valid
+      form.$valid
+
+    $scope.submit = (form) ->
+      event.preventDefault() unless $scope.valid(form)

app/assets/javascripts/admin/enterprises/controllers/enterprise_controller.js.coffee

@@ -1,11 +1,20 @@
 angular.module("admin.enterprises")
-  .controller "enterpriseCtrl", ($scope, Enterprise, PaymentMethods, ShippingMethods) ->
+  .controller "enterpriseCtrl", ($scope, longDescription, NavigationCheck, Enterprise, PaymentMethods, ShippingMethods) ->
     $scope.Enterprise = Enterprise.enterprise
     $scope.PaymentMethods = PaymentMethods.paymentMethods
     $scope.ShippingMethods = ShippingMethods.shippingMethods
+    $scope.navClear = NavigationCheck.clear
+    # htmlVariable is used by textAngular wysiwyg for the long descrtiption.
+    $scope.htmlVariable = longDescription
 
-    for PaymentMethod in $scope.PaymentMethods
-      PaymentMethod.selected = if PaymentMethod.id in $scope.Enterprise.payment_method_ids then true else false
+    # Provide a callback for generating warning messages displayed before leaving the page. This is passed in
+    # from a directive "nav-check" in the page - if we pass it here it will be called in the test suite,
+    # and on all new uses of this contoller, and we might not want that .
+    $scope.enterpriseNavCallback = ->
+      "You are editing an enterprise!"
+
+    for payment_method in $scope.PaymentMethods
+      payment_method.selected = payment_method.id in $scope.Enterprise.payment_method_ids
 
     $scope.paymentMethodsColor = ->
       if $scope.PaymentMethods.length > 0
@@ -14,13 +23,13 @@ angular.module("admin.enterprises")
         "red"
 
     $scope.selectedPaymentMethodsCount = ->
-      $scope.PaymentMethods.reduce (count, PaymentMethod) ->
-        count++ if PaymentMethod.selected
+      $scope.PaymentMethods.reduce (count, payment_method) ->
+        count++ if payment_method.selected
         count
       , 0
 
-    for ShippingMethod in $scope.ShippingMethods
-      ShippingMethod.selected = if ShippingMethod.id in $scope.Enterprise.shipping_method_ids then true else false
+    for shipping_method in $scope.ShippingMethods
+      shipping_method.selected = shipping_method.id in $scope.Enterprise.shipping_method_ids
 
     $scope.shippingMethodsColor = ->
       if $scope.ShippingMethods.length > 0
@@ -29,7 +38,7 @@ angular.module("admin.enterprises")
         "red"
 
     $scope.selectedShippingMethodsCount = ->
-      $scope.ShippingMethods.reduce (count, ShippingMethod) ->
-        count++ if ShippingMethod.selected
+      $scope.ShippingMethods.reduce (count, shipping_method) ->
+        count++ if shipping_method.selected
         count
-      , 0
+      , 0

app/assets/javascripts/admin/enterprises/enterprises.js.coffee

@@ -1 +1 @@
-angular.module("admin.enterprises", ["admin.payment_methods", "admin.shipping_methods"])
+angular.module("admin.enterprises", ["admin.payment_methods", "admin.utils", "admin.shipping_methods", "admin.users", "textAngular"])

app/assets/javascripts/admin/enterprises/services/enterprise.js.coffee

@@ -1,4 +1,5 @@
 angular.module("admin.enterprises")
+  # Populate Enterprise.enterprise with enterprise json array from the page.
   .factory 'Enterprise', (enterprise) ->
     new class Enterprise
-      enterprise: enterprise
+      enterprise: enterprise

app/assets/javascripts/admin/order_cycle.js.erb.coffee

@@ -1,4 +1,4 @@
-angular.module('order_cycle', ['ngResource'])
+angular.module('admin.order_cycles', ['ngResource'])
   .controller('AdminCreateOrderCycleCtrl', ['$scope', 'OrderCycle', 'Enterprise', 'EnterpriseFee', ($scope, OrderCycle, Enterprise, EnterpriseFee) ->
     $scope.enterprises = Enterprise.index()
     $scope.supplied_products = Enterprise.supplied_products
@@ -162,234 +162,6 @@ angular.module('order_cycle', ['ngResource'])
     $httpProvider.defaults.headers.common['X-CSRF-Token'] = $('meta[name=csrf-token]').attr('content')
   ])
 
-  .factory('OrderCycle', ['$resource', '$window', ($resource, $window) ->
-    OrderCycle = $resource '/admin/order_cycles/:order_cycle_id.json', {}, {
-      'index':  { method: 'GET', isArray: true}
-  		'create': { method: 'POST'}
-  		'update': { method: 'PUT'}}
-
-    {
-      order_cycle:
-        incoming_exchanges: []
-   	    outgoing_exchanges: []
-        coordinator_fees: []
-
-      loaded: false
-
-      exchangeSelectedVariants: (exchange) ->
-        numActiveVariants = 0
-        numActiveVariants++ for id, active of exchange.variants when active
-        numActiveVariants
-
-      exchangeDirection: (exchange) ->
-        if this.order_cycle.incoming_exchanges.indexOf(exchange) == -1 then 'outgoing' else 'incoming'
-
-      toggleProducts: (exchange) ->
-      	exchange.showProducts = !exchange.showProducts
-
-      setExchangeVariants: (exchange, variants, selected) ->
-        exchange.variants[variant] = selected for variant in variants
-
-      addSupplier: (new_supplier_id) ->
-      	this.order_cycle.incoming_exchanges.push({enterprise_id: new_supplier_id, incoming: true, active: true, variants: {}, enterprise_fees: []})
-
-      addDistributor: (new_distributor_id) ->
-      	this.order_cycle.outgoing_exchanges.push({enterprise_id: new_distributor_id, incoming: false, active: true, variants: {}, enterprise_fees: []})
-
-      removeExchange: (exchange) ->
-        incoming_index = this.order_cycle.incoming_exchanges.indexOf exchange
-        this.order_cycle.incoming_exchanges.splice(incoming_index, 1) if incoming_index > -1
-        outgoing_index = this.order_cycle.outgoing_exchanges.indexOf exchange
-        this.order_cycle.outgoing_exchanges.splice(outgoing_index, 1) if outgoing_index > -1
-
-        this.removeDistributionOfVariant(variant_id) for variant_id, active of exchange.variants when active
-
-      addCoordinatorFee: ->
-        this.order_cycle.coordinator_fees.push({})
-
-      removeCoordinatorFee: (index) ->
-        this.order_cycle.coordinator_fees.splice(index, 1)
-
-      addExchangeFee: (exchange) ->
-        exchange.enterprise_fees.push({})
-
-      removeExchangeFee: (exchange, index) ->
-        exchange.enterprise_fees.splice(index, 1)
-
-      productSuppliedToOrderCycle: (product) ->
-        product_variant_ids = (variant.id for variant in product.variants)
-        variant_ids = [product.master_id].concat(product_variant_ids)
-        incomingExchangesVariants = this.incomingExchangesVariants()
-
-        # TODO: This is an O(n^2) implementation of set intersection and thus is slooow.
-        # Use a better algorithm if needed.
-        # Also, incomingExchangesVariants is called every time, when it only needs to be
-        # called once per change to incoming variants. Some sort of caching?
-        ids = (variant_id for variant_id in variant_ids when incomingExchangesVariants.indexOf(variant_id) != -1)
-        ids.length > 0
-
-      variantSuppliedToOrderCycle: (variant) ->
-        this.incomingExchangesVariants().indexOf(variant.id) != -1
-
-      incomingExchangesVariants: ->
-        variant_ids = []
-
-        for exchange in this.order_cycle.incoming_exchanges
-          variant_ids.push(parseInt(id)) for id, active of exchange.variants when active
-        variant_ids
-
-      participatingEnterpriseIds: ->
-        suppliers = (exchange.enterprise_id for exchange in this.order_cycle.incoming_exchanges)
-        distributors = (exchange.enterprise_id for exchange in this.order_cycle.outgoing_exchanges)
-        jQuery.unique(suppliers.concat(distributors)).sort()
-
-      removeDistributionOfVariant: (variant_id) ->
-        for exchange in this.order_cycle.outgoing_exchanges
-          exchange.variants[variant_id] = false
-
-      load: (order_cycle_id) ->
-        service = this
-        OrderCycle.get {order_cycle_id: order_cycle_id}, (oc) ->
-      	  angular.extend(service.order_cycle, oc)
-      	  service.order_cycle.incoming_exchanges = []
-      	  service.order_cycle.outgoing_exchanges = []
-      	  for exchange in service.order_cycle.exchanges
-      	    if exchange.incoming
-      	      angular.extend(exchange, {enterprise_id: exchange.sender_id, active: true})
-      	      delete(exchange.receiver_id)
-      	      service.order_cycle.incoming_exchanges.push(exchange)
-      
-      	    else
-      	      angular.extend(exchange, {enterprise_id: exchange.receiver_id, active: true})
-      	      delete(exchange.sender_id)
-      	      service.order_cycle.outgoing_exchanges.push(exchange)
-      
-          delete(service.order_cycle.exchanges)
-          service.loaded = true
-
-        this.order_cycle
-
-      create: ->
-      	oc = new OrderCycle({order_cycle: this.dataForSubmit()})
-      	oc.$create (data) ->
-      	  if data['success']
-      	    $window.location = '/admin/order_cycles'
-      	  else
-            console.log('Failed to create order cycle')
-
-      update: ->
-      	oc = new OrderCycle({order_cycle: this.dataForSubmit()})
-      	oc.$update {order_cycle_id: this.order_cycle.id}, (data) ->
-      	  if data['success']
-      	    $window.location = '/admin/order_cycles'
-      	  else
-            console.log('Failed to update order cycle')
-
-      dataForSubmit: ->
-        data = this.deepCopy()
-        data = this.removeInactiveExchanges(data)
-        data = this.translateCoordinatorFees(data)
-        data = this.translateExchangeFees(data)
-        data
-
-      deepCopy: ->
-        data = angular.extend({}, this.order_cycle)
-
-        # Copy exchanges
-        data.incoming_exchanges = (angular.extend {}, exchange for exchange in this.order_cycle.incoming_exchanges) if this.order_cycle.incoming_exchanges?
-        data.outgoing_exchanges = (angular.extend {}, exchange for exchange in this.order_cycle.outgoing_exchanges) if this.order_cycle.outgoing_exchanges?
-
-        # Copy exchange fees
-        all_exchanges = (data.incoming_exchanges || []) + (data.outgoing_exchanges || [])
-        for exchange in all_exchanges
-          if exchange.enterprise_fees?
-            exchange.enterprise_fees = (angular.extend {}, fee for fee in exchange.enterprise_fees)
-
-        data
-
-      removeInactiveExchanges: (order_cycle) ->
-        order_cycle.incoming_exchanges =
-          (exchange for exchange in order_cycle.incoming_exchanges when exchange.active)
-        order_cycle.outgoing_exchanges =
-          (exchange for exchange in order_cycle.outgoing_exchanges when exchange.active)
-        order_cycle
-
-      translateCoordinatorFees: (order_cycle) ->
-        order_cycle.coordinator_fee_ids = (fee.id for fee in order_cycle.coordinator_fees)
-        delete order_cycle.coordinator_fees
-        order_cycle
-
-      translateExchangeFees: (order_cycle) ->
-        for exchange in order_cycle.incoming_exchanges
-          exchange.enterprise_fee_ids = (fee.id for fee in exchange.enterprise_fees)
-          delete exchange.enterprise_fees
-        for exchange in order_cycle.outgoing_exchanges
-          exchange.enterprise_fee_ids = (fee.id for fee in exchange.enterprise_fees)
-          delete exchange.enterprise_fees
-        order_cycle
-    }])
-
-  .factory('Enterprise', ['$resource', ($resource) ->
-    Enterprise = $resource('/admin/enterprises/:enterprise_id.json', {}, {'index': {method: 'GET', isArray: true}})
-
-    {
-      Enterprise: Enterprise
-      enterprises: {}
-      supplied_products: []
-      loaded: false
-
-      index: ->
-      	service = this
-
-      	Enterprise.index (data) ->
-          for enterprise in data
-            service.enterprises[enterprise.id] = enterprise
-
-            for product in enterprise.supplied_products
-              service.supplied_products.push(product)
-
-          service.loaded = true
-
-      	this.enterprises
-
-      suppliedVariants: (enterprise_id) ->
-        vs = (this.variantsOf(product) for product in this.enterprises[enterprise_id].supplied_products)
-        [].concat vs...
-
-      variantsOf: (product) ->
-        if product.variants.length > 0
-          variant.id for variant in product.variants
-        else
-          [product.master_id]
-
-      totalVariants: (enterprise) ->
-        numVariants = 0
-
-        if enterprise
-          counts = for product in enterprise.supplied_products
-            numVariants += if product.variants.length == 0 then 1 else product.variants.length
-
-        numVariants
-    }])
-
-  .factory('EnterpriseFee', ['$resource', ($resource) ->
-    EnterpriseFee = $resource('/admin/enterprise_fees/:enterprise_fee_id.json', {}, {'index': {method: 'GET', isArray: true}})
-
-    {
-      EnterpriseFee: EnterpriseFee
-      enterprise_fees: {}
-      loaded: false
-
-      index: ->
-        service = this
-        EnterpriseFee.index (data) ->
-          service.enterprise_fees = data
-          service.loaded = true
-
-      forEnterprise: (enterprise_id) ->
-        enterprise_fee for enterprise_fee in this.enterprise_fees when enterprise_fee.enterprise_id == enterprise_id
-    }])
-
   .directive('datetimepicker', ['$parse', ($parse) ->
     (scope, element, attrs) ->
       # using $parse instead of scope[attrs.datetimepicker] for cases

app/assets/javascripts/admin/order_cycles/controllers/simple_create.js.coffee

@@ -0,0 +1,43 @@
+angular.module('admin.order_cycles').controller "AdminSimpleCreateOrderCycleCtrl", ($scope, OrderCycle, Enterprise, EnterpriseFee) ->
+  $scope.enterprises = Enterprise.index (enterprises) =>
+    $scope.init(enterprises)
+  $scope.enterprise_fees = EnterpriseFee.index()
+  $scope.order_cycle = OrderCycle.order_cycle
+
+  $scope.init = (enterprises) ->
+    enterprise = enterprises[Object.keys(enterprises)[0]]
+    OrderCycle.addSupplier enterprise.id
+    OrderCycle.addDistributor enterprise.id
+    $scope.outgoing_exchange = OrderCycle.order_cycle.outgoing_exchanges[0]
+
+    # All variants start as checked
+    OrderCycle.setExchangeVariants(OrderCycle.order_cycle.incoming_exchanges[0],
+      Enterprise.suppliedVariants(enterprise.id), true)
+
+    OrderCycle.order_cycle.coordinator_id = enterprise.id
+
+  $scope.loaded = ->
+    Enterprise.loaded && EnterpriseFee.loaded
+
+  $scope.removeDistributionOfVariant = angular.noop
+
+  $scope.setExchangeVariants = (exchange, variants, selected) ->
+    OrderCycle.setExchangeVariants(exchange, variants, selected)
+
+  $scope.suppliedVariants = (enterprise_id) ->
+    Enterprise.suppliedVariants(enterprise_id)
+
+  $scope.addCoordinatorFee = ($event) ->
+    $event.preventDefault()
+    OrderCycle.addCoordinatorFee()
+
+  $scope.removeCoordinatorFee = ($event, index) ->
+    $event.preventDefault()
+    OrderCycle.removeCoordinatorFee(index)
+
+  $scope.enterpriseFeesForEnterprise = (enterprise_id) ->
+    EnterpriseFee.forEnterprise(parseInt(enterprise_id))
+
+  $scope.submit = ->
+    OrderCycle.mirrorIncomingToOutgoingProducts()
+    OrderCycle.create()

app/assets/javascripts/admin/order_cycles/controllers/simple_edit.js.coffee

@@ -0,0 +1,37 @@
+angular.module('admin.order_cycles').controller "AdminSimpleEditOrderCycleCtrl", ($scope, $location, OrderCycle, Enterprise, EnterpriseFee) ->
+  $scope.orderCycleId = ->
+    $location.absUrl().match(/\/admin\/order_cycles\/(\d+)/)[1]
+
+  $scope.enterprises = Enterprise.index()
+  $scope.enterprise_fees = EnterpriseFee.index()
+  $scope.order_cycle = OrderCycle.load $scope.orderCycleId(), (order_cycle) =>
+    $scope.init()
+
+  $scope.loaded = ->
+    Enterprise.loaded && EnterpriseFee.loaded && OrderCycle.loaded
+
+  $scope.init = ->
+    $scope.outgoing_exchange = OrderCycle.order_cycle.outgoing_exchanges[0]
+
+  $scope.enterpriseFeesForEnterprise = (enterprise_id) ->
+    EnterpriseFee.forEnterprise(parseInt(enterprise_id))
+
+  $scope.removeDistributionOfVariant = angular.noop
+
+  $scope.setExchangeVariants = (exchange, variants, selected) ->
+    OrderCycle.setExchangeVariants(exchange, variants, selected)
+
+  $scope.suppliedVariants = (enterprise_id) ->
+    Enterprise.suppliedVariants(enterprise_id)
+
+  $scope.addCoordinatorFee = ($event) ->
+    $event.preventDefault()
+    OrderCycle.addCoordinatorFee()
+
+  $scope.removeCoordinatorFee = ($event, index) ->
+    $event.preventDefault()
+    OrderCycle.removeCoordinatorFee(index)
+
+  $scope.submit = ->
+    OrderCycle.mirrorIncomingToOutgoingProducts()
+    OrderCycle.update()

app/assets/javascripts/admin/order_cycles/services/enterprise.js.coffee

@@ -0,0 +1,43 @@
+angular.module('admin.order_cycles').factory('Enterprise', ($resource) ->
+  Enterprise = $resource('/admin/enterprises/for_order_cycle/:enterprise_id.json', {}, {'index': {method: 'GET', isArray: true}})
+
+  {
+    Enterprise: Enterprise
+    enterprises: {}
+    supplied_products: []
+    loaded: false
+
+    index: (callback=null) ->
+    	service = this
+
+    	Enterprise.index (data) ->
+        for enterprise in data
+          service.enterprises[enterprise.id] = enterprise
+
+          for product in enterprise.supplied_products
+            service.supplied_products.push(product)
+
+        service.loaded = true
+        (callback || angular.noop)(service.enterprises)
+
+    	this.enterprises
+
+    suppliedVariants: (enterprise_id) ->
+      vs = (this.variantsOf(product) for product in this.enterprises[enterprise_id].supplied_products)
+      [].concat vs...
+
+    variantsOf: (product) ->
+      if product.variants.length > 0
+        variant.id for variant in product.variants
+      else
+        [product.master_id]
+
+    totalVariants: (enterprise) ->
+      numVariants = 0
+
+      if enterprise
+        counts = for product in enterprise.supplied_products
+          numVariants += if product.variants.length == 0 then 1 else product.variants.length
+
+      numVariants
+  })

app/assets/javascripts/admin/order_cycles/services/enterprise_fee.js.coffee

@@ -0,0 +1,18 @@
+angular.module('admin.order_cycles').factory('EnterpriseFee', ($resource) ->
+  EnterpriseFee = $resource('/admin/enterprise_fees/:enterprise_fee_id.json', {}, {'index': {method: 'GET', isArray: true}})
+
+  {
+    EnterpriseFee: EnterpriseFee
+    enterprise_fees: {}
+    loaded: false
+
+    index: ->
+      service = this
+      EnterpriseFee.index (data) ->
+        service.enterprise_fees = data
+        service.loaded = true
+
+    forEnterprise: (enterprise_id) ->
+      enterprise_fee for enterprise_fee in this.enterprise_fees when enterprise_fee.enterprise_id == enterprise_id
+  })
+

app/assets/javascripts/admin/order_cycles/services/order_cycle.js.coffee

@@ -0,0 +1,179 @@
+angular.module('admin.order_cycles').factory('OrderCycle', ($resource, $window) ->
+  OrderCycle = $resource '/admin/order_cycles/:order_cycle_id.json', {}, {
+    'index':  { method: 'GET', isArray: true}
+		'create': { method: 'POST'}
+		'update': { method: 'PUT'}}
+
+  {
+    order_cycle:
+      incoming_exchanges: []
+ 	    outgoing_exchanges: []
+      coordinator_fees: []
+
+    loaded: false
+
+    exchangeSelectedVariants: (exchange) ->
+      numActiveVariants = 0
+      numActiveVariants++ for id, active of exchange.variants when active
+      numActiveVariants
+
+    exchangeDirection: (exchange) ->
+      if this.order_cycle.incoming_exchanges.indexOf(exchange) == -1 then 'outgoing' else 'incoming'
+
+    toggleProducts: (exchange) ->
+    	exchange.showProducts = !exchange.showProducts
+
+    setExchangeVariants: (exchange, variants, selected) ->
+      exchange.variants[variant] = selected for variant in variants
+
+    addSupplier: (new_supplier_id) ->
+    	this.order_cycle.incoming_exchanges.push({enterprise_id: new_supplier_id, incoming: true, active: true, variants: {}, enterprise_fees: []})
+
+    addDistributor: (new_distributor_id) ->
+    	this.order_cycle.outgoing_exchanges.push({enterprise_id: new_distributor_id, incoming: false, active: true, variants: {}, enterprise_fees: []})
+
+    removeExchange: (exchange) ->
+      if exchange.incoming
+        incoming_index = this.order_cycle.incoming_exchanges.indexOf exchange
+        this.order_cycle.incoming_exchanges.splice(incoming_index, 1)
+        this.removeDistributionOfVariant(variant_id) for variant_id, active of exchange.variants when active
+      else
+        outgoing_index = this.order_cycle.outgoing_exchanges.indexOf exchange
+        this.order_cycle.outgoing_exchanges.splice(outgoing_index, 1) if outgoing_index > -1
+
+    addCoordinatorFee: ->
+      this.order_cycle.coordinator_fees.push({})
+
+    removeCoordinatorFee: (index) ->
+      this.order_cycle.coordinator_fees.splice(index, 1)
+
+    addExchangeFee: (exchange) ->
+      exchange.enterprise_fees.push({})
+
+    removeExchangeFee: (exchange, index) ->
+      exchange.enterprise_fees.splice(index, 1)
+
+    productSuppliedToOrderCycle: (product) ->
+      product_variant_ids = (variant.id for variant in product.variants)
+      variant_ids = [product.master_id].concat(product_variant_ids)
+      incomingExchangesVariants = this.incomingExchangesVariants()
+
+      # TODO: This is an O(n^2) implementation of set intersection and thus is slooow.
+      # Use a better algorithm if needed.
+      # Also, incomingExchangesVariants is called every time, when it only needs to be
+      # called once per change to incoming variants. Some sort of caching?
+      ids = (variant_id for variant_id in variant_ids when incomingExchangesVariants.indexOf(variant_id) != -1)
+      ids.length > 0
+
+    variantSuppliedToOrderCycle: (variant) ->
+      this.incomingExchangesVariants().indexOf(variant.id) != -1
+
+    incomingExchangesVariants: ->
+      variant_ids = []
+
+      for exchange in this.order_cycle.incoming_exchanges
+        variant_ids.push(parseInt(id)) for id, active of exchange.variants when active
+      variant_ids
+
+    participatingEnterpriseIds: ->
+      suppliers = (exchange.enterprise_id for exchange in this.order_cycle.incoming_exchanges)
+      distributors = (exchange.enterprise_id for exchange in this.order_cycle.outgoing_exchanges)
+      jQuery.unique(suppliers.concat(distributors)).sort()
+
+    removeDistributionOfVariant: (variant_id) ->
+      for exchange in this.order_cycle.outgoing_exchanges
+        exchange.variants[variant_id] = false
+
+    load: (order_cycle_id, callback=null) ->
+      service = this
+      OrderCycle.get {order_cycle_id: order_cycle_id}, (oc) ->
+    	  angular.extend(service.order_cycle, oc)
+    	  service.order_cycle.incoming_exchanges = []
+    	  service.order_cycle.outgoing_exchanges = []
+    	  for exchange in service.order_cycle.exchanges
+    	    if exchange.incoming
+    	      angular.extend(exchange, {enterprise_id: exchange.sender_id, active: true})
+    	      delete(exchange.receiver_id)
+    	      service.order_cycle.incoming_exchanges.push(exchange)
+    
+    	    else
+    	      angular.extend(exchange, {enterprise_id: exchange.receiver_id, active: true})
+    	      delete(exchange.sender_id)
+    	      service.order_cycle.outgoing_exchanges.push(exchange)
+    
+        delete(service.order_cycle.exchanges)
+        service.loaded = true
+
+        (callback || angular.noop)(service.order_cycle)
+
+      this.order_cycle
+
+    create: ->
+    	oc = new OrderCycle({order_cycle: this.dataForSubmit()})
+    	oc.$create (data) ->
+    	  if data['success']
+    	    $window.location = '/admin/order_cycles'
+    	  else
+          console.log('Failed to create order cycle')
+
+    update: ->
+    	oc = new OrderCycle({order_cycle: this.dataForSubmit()})
+    	oc.$update {order_cycle_id: this.order_cycle.id}, (data) ->
+    	  if data['success']
+    	    $window.location = '/admin/order_cycles'
+    	  else
+          console.log('Failed to update order cycle')
+
+    dataForSubmit: ->
+      data = this.deepCopy()
+      data = this.removeInactiveExchanges(data)
+      data = this.translateCoordinatorFees(data)
+      data = this.translateExchangeFees(data)
+      data
+
+    deepCopy: ->
+      data = angular.extend({}, this.order_cycle)
+
+      # Copy exchanges
+      data.incoming_exchanges = (angular.extend {}, exchange for exchange in this.order_cycle.incoming_exchanges) if this.order_cycle.incoming_exchanges?
+      data.outgoing_exchanges = (angular.extend {}, exchange for exchange in this.order_cycle.outgoing_exchanges) if this.order_cycle.outgoing_exchanges?
+
+      # Copy exchange fees
+      all_exchanges = (data.incoming_exchanges || []) + (data.outgoing_exchanges || [])
+      for exchange in all_exchanges
+        if exchange.enterprise_fees?
+          exchange.enterprise_fees = (angular.extend {}, fee for fee in exchange.enterprise_fees)
+
+      data
+
+    removeInactiveExchanges: (order_cycle) ->
+      order_cycle.incoming_exchanges =
+        (exchange for exchange in order_cycle.incoming_exchanges when exchange.active)
+      order_cycle.outgoing_exchanges =
+        (exchange for exchange in order_cycle.outgoing_exchanges when exchange.active)
+      order_cycle
+
+    translateCoordinatorFees: (order_cycle) ->
+      order_cycle.coordinator_fee_ids = (fee.id for fee in order_cycle.coordinator_fees)
+      delete order_cycle.coordinator_fees
+      order_cycle
+
+    translateExchangeFees: (order_cycle) ->
+      for exchange in order_cycle.incoming_exchanges
+        exchange.enterprise_fee_ids = (fee.id for fee in exchange.enterprise_fees)
+        delete exchange.enterprise_fees
+      for exchange in order_cycle.outgoing_exchanges
+        exchange.enterprise_fee_ids = (fee.id for fee in exchange.enterprise_fees)
+        delete exchange.enterprise_fees
+      order_cycle
+
+    # In the simple UI, we don't list outgoing products. Instead, all products are considered
+    # part of both incoming and outgoing enterprises. This method mirrors the former to the
+    # latter **for order cycles with a single incoming and outgoing exchange only**.
+    mirrorIncomingToOutgoingProducts: ->
+      incoming = this.order_cycle.incoming_exchanges[0]
+      outgoing = this.order_cycle.outgoing_exchanges[0]
+
+      for id, active of incoming.variants
+        outgoing.variants[id] = active
+  })

app/assets/javascripts/admin/services/enterprise_relationships.js.coffee

@@ -1,12 +1,17 @@
 angular.module("ofn.admin").factory 'EnterpriseRelationships', ($http, enterprise_relationships) ->
   new class EnterpriseRelationships
     create_errors: ""
+    all_permissions: [
+      'add_to_order_cycle'
+      'manage_products'
+    ]
 
     constructor: ->
       @enterprise_relationships = enterprise_relationships
 
-    create: (parent_id, child_id) ->
-      $http.post('/admin/enterprise_relationships', {enterprise_relationship: {parent_id: parent_id, child_id: child_id}}).success (data, status) =>
+    create: (parent_id, child_id, permissions) ->
+      permissions = (name for name, enabled of permissions when enabled)
+      $http.post('/admin/enterprise_relationships', {enterprise_relationship: {parent_id: parent_id, child_id: child_id, permissions_list: permissions}}).success (data, status) =>
         @enterprise_relationships.unshift(data)
         @create_errors = ""
 
@@ -16,3 +21,8 @@ angular.module("ofn.admin").factory 'EnterpriseRelationships', ($http, enterpris
     delete: (er) ->
       $http.delete('/admin/enterprise_relationships/' + er.id).success (data) =>
         @enterprise_relationships.splice @enterprise_relationships.indexOf(er), 1
+
+    permission_presentation: (permission) ->
+      switch permission
+        when "add_to_order_cycle" then "to add to order cycle"
+        when "manage_products" then "to manage products"

app/assets/javascripts/admin/services/enterprise_roles.js.coffee

@@ -0,0 +1,18 @@
+angular.module("ofn.admin").factory 'EnterpriseRoles', ($http, enterpriseRoles) ->
+  new class EnterpriseRoles
+    create_errors: ""
+
+    constructor: ->
+      @enterprise_roles = enterpriseRoles
+
+    create: (user_id, enterprise_id) ->
+      $http.post('/admin/enterprise_roles', {enterprise_role: {user_id: user_id, enterprise_id: enterprise_id}}).success (data, status) =>
+        @enterprise_roles.unshift(data)
+        @create_errors = ""
+
+      .error (response, status) =>
+        @create_errors = response.errors
+
+    delete: (er) ->
+      $http.delete('/admin/enterprise_roles/' + er.id).success (data) =>
+        @enterprise_roles.splice @enterprise_roles.indexOf(er), 1

app/assets/javascripts/admin/services/users.js.coffee

@@ -0,0 +1,4 @@
+angular.module("ofn.admin").factory 'Users', (users) ->
+  new class Users
+    constructor: ->
+      @users = users

app/assets/javascripts/admin/users/directives/user_autocomplete.js.coffee

@@ -0,0 +1,18 @@
+angular.module("admin.users").directive "ofnUserAutocomplete", ($http) ->
+  link: (scope,element,attrs) ->
+    setTimeout ->
+      element.select2
+        multiple: false
+        initSelection: (element, callback) ->
+          callback { id: element.val(), email: attrs.email }
+        ajax:
+          url: Spree.routes.user_search
+          datatype: 'json'
+          data:(term, page) ->
+            { q: term }
+          results: (data, page) ->
+            { results: data }
+        formatResult: (user) ->
+          user.email
+        formatSelection: (user) ->
+          user.email

app/assets/javascripts/admin/users/users.js.coffee

@@ -0,0 +1 @@
+angular.module("admin.users", [])

app/assets/javascripts/admin/utils/directives/navigation_check.js.coffee

@@ -0,0 +1,9 @@
+angular.module("admin.utils").directive "navCheck", (NavigationCheck)->
+  restrict: 'A'
+  scope:
+    navCallback: '&'
+  link: (scope,element,attributes) ->
+    # Define navigationCallback on a controller in scope, otherwise this default will be used:
+    scope.navCallback ||= ->
+      "You will lose any unsaved work!"
+    NavigationCheck.register(scope.navCallback)

app/assets/javascripts/admin/utils/services/navigation_check.js.coffee

@@ -0,0 +1,46 @@
+angular.module("admin.utils")
+  .factory "NavigationCheck", ($window, $rootScope) ->
+    new class NavigationCheck
+      callbacks = []
+      constructor: ->
+        if $window.addEventListener
+          $window.addEventListener "beforeunload", @onBeforeUnloadHandler
+        else
+          $window.onbeforeunload = @onBeforeUnloadHandler
+
+        $rootScope.$on "$locationChangeStart", @locationChangeStartHandler
+
+
+      # Action for regular browser navigation.
+      onBeforeUnloadHandler: ($event) =>
+        message = @getMessage()
+        if message
+          ($event or $window.event).preventDefault()
+          message
+
+      # Action for angular navigation.
+      locationChangeStartHandler: ($event) =>
+        message = @getMessage()
+        if message and not $window.confirm(message)
+          $event.stopPropagation() if $event.stopPropagation
+          $event.preventDefault() if $event.preventDefault
+          $event.cancelBubble = true
+          $event.returnValue = false
+
+      # Runs callback functions to retreive most recently added non-empty message.
+      getMessage: ->
+        message = null
+        message = callback() ? message for callback in callbacks
+        message
+
+      register: (callback) =>
+        callbacks.push callback
+
+      clear: =>
+        if $window.addEventListener
+          $window.removeEventListener "beforeunload", @onBeforeUnloadHandler
+        else
+          $window.onbeforeunload = null
+
+        $rootScope.$on "$locationChangeStart", null
+

app/assets/javascripts/admin/utils/utils.js.coffee

@@ -0,0 +1 @@
+angular.module("admin.utils", [])

app/assets/javascripts/darkswarm/all.js.coffee

@@ -11,11 +11,12 @@
 #= require lodash.underscore.js
 #= require angular-scroll.min.js
 #= require angular-google-maps.min.js
-#= require angular-timer.min.js
 #= require ../shared/mm-foundation-tpls-0.2.2.min.js
 #= require ../shared/bindonce.min.js
 #= require ../shared/ng-infinite-scroll.min.js
 #= require ../shared/angular-local-storage.js
+#= require angularjs-file-upload
+
 
 #= require angular-rails-templates
 #= require_tree ../templates

app/assets/javascripts/darkswarm/controllers/authentication/signup_controller.js.coffee

@@ -1,4 +1,4 @@
-Darkswarm.controller "SignupCtrl", ($scope, $http, $location, AuthenticationService) ->
+Darkswarm.controller "SignupCtrl", ($scope, $http, $window, $location, Redirections, AuthenticationService) ->
   $scope.path = "/signup"
   $scope.errors =
     email: null
@@ -6,6 +6,9 @@ Darkswarm.controller "SignupCtrl", ($scope, $http, $location, AuthenticationServ
 
   $scope.submit = ->
     $http.post("/user/spree_user", {spree_user: $scope.spree_user}).success (data)->
-      location.href = location.origin + location.pathname  # Strips out hash fragments
+       if Redirections.after_login
+        $window.location.href = $window.location.origin + Redirections.after_login
+       else
+        $window.location.href = $window.location.origin + $window.location.pathname  # Strips out hash fragments
     .error (data) ->
       $scope.errors = data

app/assets/javascripts/darkswarm/controllers/authentication_controller.js.coffee

@@ -1,7 +1,7 @@
 Darkswarm.controller "AuthenticationCtrl", ($scope, AuthenticationService, SpreeUser)->
   $scope.open = AuthenticationService.open
   $scope.toggle = AuthenticationService.toggle
-  
+
   $scope.spree_user = SpreeUser.spree_user
   $scope.active = AuthenticationService.active
   $scope.select = AuthenticationService.select

app/assets/javascripts/darkswarm/controllers/checkout/checkout_controller.js.coffee

@@ -6,9 +6,9 @@ Darkswarm.controller "CheckoutCtrl", ($scope, storage, Checkout, CurrentUser, Cu
   prefix = "order_#{Checkout.order.id}#{CurrentUser?.id}#{CurrentHub.hub.id}"
 
   for field in $scope.fieldsToBind
-    storage.bind $scope, "Checkout.order.#{field}", 
+    storage.bind $scope, "Checkout.order.#{field}",
       storeName: "#{prefix}_#{field}"
-  storage.bind $scope, "Checkout.ship_address_same_as_billing", 
+  storage.bind $scope, "Checkout.ship_address_same_as_billing",
     storeName: "#{prefix}_sameasbilling"
     defaultValue: true
 

app/assets/javascripts/darkswarm/controllers/checkout/payment_controller.js.coffee

@@ -6,7 +6,7 @@ Darkswarm.controller "PaymentCtrl", ($scope, $timeout) ->
     {key: "January", value: "1"},
     {key: "February", value: "2"},
     {key: "March", value: "3"},
-    {key: "April", value: "4"}, 
+    {key: "April", value: "4"},
     {key: "May", value: "5"},
     {key: "June", value: "6"},
     {key: "July", value: "7"},
@@ -20,4 +20,4 @@ Darkswarm.controller "PaymentCtrl", ($scope, $timeout) ->
   $scope.years = [moment().year()..(moment().year()+15)]
   $scope.secrets.card_month = "1"
   $scope.secrets.card_year = moment().year()
-  $timeout $scope.onTimeout 
+  $timeout $scope.onTimeout

app/assets/javascripts/darkswarm/controllers/enterprise_image_controller.js.coffee

@@ -0,0 +1,13 @@
+angular.module('Darkswarm').controller "EnterpriseImageCtrl", ($scope, EnterpriseImageService) ->
+  $scope.imageStep = 'logo'
+
+  $scope.imageSteps = ['logo', 'promo']
+
+  $scope.imageUploader = EnterpriseImageService.imageUploader
+
+  $scope.imageSelect = (image_step) ->
+    EnterpriseImageService.imageSrc = null
+    $scope.imageStep = image_step
+
+  $scope.imageSrc = ->
+    EnterpriseImageService.imageSrc

app/assets/javascripts/darkswarm/controllers/enterprises_controller.js.coffee

@@ -1,11 +1,14 @@
-Darkswarm.controller "HubsCtrl", ($scope, Hubs, Search, $document, $rootScope, HashNavigation, FilterSelectorsService) ->
-  $scope.Hubs = Hubs
-  $scope.hubs = Hubs.visible
+Darkswarm.controller "EnterprisesCtrl", ($scope, Enterprises, Search, $document, $rootScope, HashNavigation, FilterSelectorsService, EnterpriseModal) ->
+  $scope.Enterprises = Enterprises
   $scope.totalActive =  FilterSelectorsService.totalActive
   $scope.clearAll =  FilterSelectorsService.clearAll
   $scope.filterText =  FilterSelectorsService.filterText
   $scope.FilterSelectorsService =  FilterSelectorsService
   $scope.query = Search.search()
+  $scope.openModal = EnterpriseModal.open
+  $scope.activeTaxons = []
+  $scope.show_profiles = false
+  $scope.filtersActive = false
 
   $scope.$watch "query", (query)->
     Search.search query

app/assets/javascripts/darkswarm/controllers/producers_controller.js.coffee

@@ -1,12 +0,0 @@
-Darkswarm.controller "ProducersCtrl", ($scope, Producers, $filter, FilterSelectorsService, Search) ->
-  $scope.Producers = Producers
-  $scope.totalActive =  FilterSelectorsService.totalActive
-  $scope.clearAll =  FilterSelectorsService.clearAll
-  $scope.filterText =  FilterSelectorsService.filterText
-  $scope.FilterSelectorsService =  FilterSelectorsService
-  $scope.filtersActive = false
-  $scope.activeTaxons = []
-  $scope.query = Search.search()
-
-  $scope.$watch "query", (query)->
-    Search.search query

app/assets/javascripts/darkswarm/controllers/registration/registration_controller.js.coffee

@@ -0,0 +1,11 @@
+Darkswarm.controller "RegistrationCtrl", ($scope, RegistrationService, EnterpriseRegistrationService, availableCountries) ->
+  $scope.currentStep = RegistrationService.currentStep
+  $scope.enterprise = EnterpriseRegistrationService.enterprise
+  $scope.select = RegistrationService.select
+
+  $scope.steps = ['details','contact','type','about','images','social']
+
+  $scope.countries = availableCountries
+
+  $scope.countryHasStates = ->
+    $scope.enterprise.country.states.length > 0

app/assets/javascripts/darkswarm/controllers/registration/registration_form_controller.js.coffee

@@ -0,0 +1,15 @@
+Darkswarm.controller "RegistrationFormCtrl", ($scope, RegistrationService, EnterpriseRegistrationService) ->
+  $scope.submitted = false
+
+  $scope.valid = (form) ->
+    $scope.submitted = !form.$valid
+    form.$valid
+
+  $scope.create = (form) ->
+    EnterpriseRegistrationService.create() if $scope.valid(form)
+
+  $scope.update = (nextStep, form) ->
+    EnterpriseRegistrationService.update(nextStep) if $scope.valid(form)
+
+  $scope.selectIfValid = (nextStep, form) ->
+    RegistrationService.select(nextStep) if $scope.valid(form)

app/assets/javascripts/darkswarm/controllers/tabs/producers_controller.js.coffee

@@ -1,3 +1,4 @@
-Darkswarm.controller "ProducersTabCtrl", ($scope, CurrentHub, Enterprises) ->
-  # Injecting Enterprises so CurrentHub.producers is dereferenced
+Darkswarm.controller "ProducersTabCtrl", ($scope, CurrentHub, Enterprises, EnterpriseModal) ->
+  # Injecting Enterprises so CurrentHub.producers is dereferenced.
+  # We should probably dereference here instead and separate out CurrentHub dereferencing from the Enterprise factory.
   $scope.CurrentHub = CurrentHub

app/assets/javascripts/darkswarm/controllers/tabs_controller.js.coffee

@@ -1,18 +1,11 @@
 Darkswarm.controller "TabsCtrl", ($scope, $rootScope, $location, OrderCycle) ->
+  # Return active if supplied path matches url hash path.
   $scope.active = (path)->
-    if !OrderCycle.selected() and $location.hash() == "" and path == "about"
-      true
-    else
-      $location.hash() == path
+    $location.hash() == path
 
-
-  $scope.tabs = ["contact", "about", "groups", "producers"]
-  for tab in $scope.tabs 
-    $scope[tab] =
-      path: tab 
-
-  $scope.select = (tab)->
-    if $scope.active(tab.path)
+  # Toggle tab selected status by setting the url hash path.
+  $scope.select = (path)->
+    if $scope.active(path)
       $location.hash ""
     else
-      $location.hash tab.path
+      $location.hash path

app/assets/javascripts/darkswarm/darkswarm.js.coffee

@@ -1,19 +1,19 @@
-window.Darkswarm = angular.module("Darkswarm", ["ngResource", 
-  'mm.foundation', 
-  'angularLocalStorage', 
-  'pasvaz.bindonce', 
-  'infinite-scroll', 
-  'angular-flash.service', 
+window.Darkswarm = angular.module("Darkswarm", ["ngResource",
+  'mm.foundation',
+  'angularLocalStorage',
+  'pasvaz.bindonce',
+  'infinite-scroll',
+  'angular-flash.service',
   'templates',
-  'timer',
   'ngSanitize',
   'ngAnimate',
   'google-maps',
   'duScroll',
+  'angularFileUpload',
   ]).config ($httpProvider, $tooltipProvider, $locationProvider, $anchorScrollProvider) ->
-  $httpProvider.defaults.headers.post['X-CSRF-Token'] = $('meta[name="csrf-token"]').attr('content') 
-  $httpProvider.defaults.headers.put['X-CSRF-Token'] = $('meta[name="csrf-token"]').attr('content') 
-  $httpProvider.defaults.headers['common']['X-Requested-With'] = 'XMLHttpRequest' 
+  $httpProvider.defaults.headers.post['X-CSRF-Token'] = $('meta[name="csrf-token"]').attr('content')
+  $httpProvider.defaults.headers.put['X-CSRF-Token'] = $('meta[name="csrf-token"]').attr('content')
+  $httpProvider.defaults.headers['common']['X-Requested-With'] = 'XMLHttpRequest'
   $httpProvider.defaults.headers.common.Accept = "application/json, text/javascript, */*"
 
   # This allows us to trigger these two events on tooltips
@@ -21,4 +21,3 @@ window.Darkswarm = angular.module("Darkswarm", ["ngResource",
 
   # We manually handle our scrolling
   $anchorScrollProvider.disableAutoScrolling()
-

app/assets/javascripts/darkswarm/directives/enterprise_modal.js.coffee

@@ -1,4 +1,4 @@
-Darkswarm.directive "producerModal", ($modal)->
+Darkswarm.directive "enterpriseModal", ($modal)->
   restrict: 'E'
   replace: true
   template: "<a ng-transclude></a>"
@@ -6,5 +6,4 @@ Darkswarm.directive "producerModal", ($modal)->
   link: (scope, elem, attrs, ctrl)->
     elem.on "click", (ev)=>
       ev.stopPropagation()
-      scope.modalInstance = $modal.open(controller: ctrl, templateUrl: 'producer_modal.html', scope: scope)
-
+      scope.modalInstance = $modal.open(controller: ctrl, templateUrl: 'enterprise_modal.html', scope: scope)

app/assets/javascripts/darkswarm/directives/hub_modal.js.coffee

@@ -1,8 +0,0 @@
-Darkswarm.directive "hubModal", ($modal)->
-  restrict: 'E'
-  replace: true
-  template: "<a>{{enterprise.name}}</a>"
-  link: (scope, elem, attrs, ctrl)->
-    elem.on "click", (ev)=>
-      ev.stopPropagation()
-      scope.modalInstance = $modal.open(controller: ctrl, templateUrl: 'hub_modal.html', scope: scope)

app/assets/javascripts/darkswarm/directives/inline_alert.js.coffee

@@ -0,0 +1,7 @@
+Darkswarm.directive "ofnInlineAlert", ->
+  restrict: 'A'
+  scope: true
+  link: (scope, elem, attrs) ->
+    scope.visible = true
+    scope.close = ->
+      scope.visible = false

app/assets/javascripts/darkswarm/directives/registration_limit_modal.js.coffee

@@ -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 register-modal xlarge"
+      backdrop: 'static'
+
+    scope.modalInstance.result.then scope.close, scope.close
+
+    scope.close = ->
+      Loading.message = "Taking you back to the home page"
+      Navigation.go "/"

app/assets/javascripts/darkswarm/filters/capitalize.js.coffee

@@ -1,4 +1,5 @@
 Darkswarm.filter "capitalize", ->
+  # Convert to basic sentence case.
   (input, scope) ->
-    input = input.toLowerCase()  if input?
+    input = input.toLowerCase() if input?
     input.substring(0, 1).toUpperCase() + input.substring(1)

app/assets/javascripts/darkswarm/filters/filter_hubs.js.coffee

@@ -1,9 +0,0 @@
-Darkswarm.filter 'hubs', (Matcher)-> 
-  (hubs, text) ->
-    hubs ||= []
-    text ?= ""
-
-    hubs.filter (hub)=>
-      Matcher.match [
-        hub.name, hub.address.zipcode, hub.address.city, hub.address.state
-      ], text

app/assets/javascripts/darkswarm/filters/filter_producers.js.coffee

@@ -1,6 +0,0 @@
-Darkswarm.filter 'filterProducers', (hubsFilter)-> 
-  (producers, text) ->
-    producers ||= []
-    text ?= ""
-    hubsFilter(producers, text)
-    

app/assets/javascripts/darkswarm/filters/localize_currency.js.coffee

@@ -0,0 +1,15 @@
+Darkswarm.filter "localizeCurrency", (currencyConfig)->
+  # Convert number to string currency using injected currency configuration.
+  (amount) ->
+    # Set country code (eg. "US").
+    currency_code = if currencyConfig.display_currency then " " + currencyConfig.currency else ""
+    # Set decimal points,  2 or 0 if hide_cents.
+    decimals = if currencyConfig.hide_cents == "true" then 0 else 2
+    # We need to use parseFloat before toFixed as the amount should come in as a string.
+    amount_fixed = parseFloat(amount).toFixed(decimals)
+
+    # Build the final price string. TODO use spree decimal point and spacer character settings.
+    if currencyConfig.symbol_position == 'before'
+      currencyConfig.symbol + amount_fixed + currency_code
+    else
+      amount_fixed + " " + currencyConfig.symbol + currency_code

app/assets/javascripts/darkswarm/filters/search_enterprises.js.coffee

@@ -0,0 +1,10 @@
+Darkswarm.filter 'searchEnterprises', (Matcher)->
+  # Search multiple fields of enterprises for matching text fragment.
+  (enterprises, text) ->
+    enterprises ||= []
+    text ?= ""
+
+    enterprises.filter (enterprise)=>
+      Matcher.match [
+        enterprise.name, enterprise.address.zipcode, enterprise.address.city, enterprise.address.state
+      ], text

app/assets/javascripts/darkswarm/filters/show_hub_profiles.js.coffee

@@ -0,0 +1,8 @@
+Darkswarm.filter 'showHubProfiles', ()->
+  # Filter hub_profile enterprises in or out.
+  (enterprises, show_profiles) ->
+    enterprises ||= []
+    show_profiles ?= false
+
+    enterprises.filter (enterprise)=>
+      show_profiles or enterprise.is_distributor

app/assets/javascripts/darkswarm/filters/taxons.js.coffee

@@ -1,13 +1,16 @@
-Darkswarm.filter 'taxons', (Matcher)-> 
-  # Filter anything that responds to object.taxons, and/or object.primary_taxon
+Darkswarm.filter 'taxons', ()->
+  # Filter anything that responds to object.taxons, object.supplied_taxon or object.primary_taxon.
   (objects, ids) ->
     objects ||= []
     ids ?= []
     if ids.length == 0
+      # No taxons selected, pass all objects through.
       objects
     else
       objects.filter (obj)->
         taxons = obj.taxons
-        taxons.concat obj.supplied_taxons if obj.supplied_taxons
+        # Combine object taxons with supplied taxons, if they exist.
+        taxons = taxons.concat obj.supplied_taxons if obj.supplied_taxons
+        # Match primary taxon if it exists, then taxon array.
         obj.primary_taxon?.id in ids || taxons.some (taxon)->
           taxon.id in ids

app/assets/javascripts/darkswarm/mixins/fieldset_mixin.js.coffee

@@ -1,7 +1,7 @@
 window.FieldsetMixin = ($scope)->
   $scope.next = (event = false)->
     event.preventDefault() if event
-    $scope.show $scope.nextPanel 
+    $scope.show $scope.nextPanel
 
   $scope.onTimeout = ->
     if $scope[$scope.name].$valid
@@ -36,7 +36,6 @@ window.FieldsetMixin = ($scope)->
           when "number"   then "must be number"
           when "email"    then "must be email address"
 
-    #server_errors = $scope.Order.errors[path.replace('order.', '')] 
-    #errors.push server_errors if server_errors? 
-    (errors.filter (error) -> error?).join ", "
-    
+    #server_errors = $scope.Order.errors[path.replace('order.', '')]
+    #errors.push server_errors if server_errors?
+    (errors.filter (error) -> error?).join ", "

app/assets/javascripts/darkswarm/services/authentication_service.js.coffee

@@ -1,15 +1,17 @@
-Darkswarm.factory "AuthenticationService", (Navigation, $modal, $location, Redirections)->
+Darkswarm.factory "AuthenticationService", (Navigation, $modal, $location, Redirections, Loading)->
 
   new class AuthenticationService
     selectedPath: "/login"
 
     constructor: ->
-      if $location.path() in ["/login", "/signup", "/forgot"] 
-        @open()
+      if $location.path() in ["/login", "/signup", "/forgot"] && location.pathname isnt '/register/auth'
+        @open $location.path()
+      else if location.pathname is '/register/auth'
+        @open '/signup', 'registration_authentication.html'
 
-    open: (path = false)=>
+    open: (path = false, template = 'authentication.html') =>
       @modalInstance = $modal.open
-        templateUrl: 'authentication.html'
+        templateUrl: template
         windowClass: "login-modal medium"
       @modalInstance.result.then @close, @close
       @selectedPath = path || @selectedPath
@@ -23,4 +25,9 @@ Darkswarm.factory "AuthenticationService", (Navigation, $modal, $location, Redir
     active: Navigation.active
 
     close: ->
-      Navigation.navigate "/"
+      if location.pathname == "/"
+        Navigation.navigate "/"
+      else
+        Loading.message = "Taking you back to the home page"
+        location.hash = ""
+        location.pathname = "/"

app/assets/javascripts/darkswarm/services/cart.js.coffee

@@ -3,7 +3,7 @@ Darkswarm.factory 'Cart', (CurrentOrder, Variants, $timeout, $http)->
   new class Cart
     dirty: false
     order: CurrentOrder.order
-    line_items: CurrentOrder.order?.line_items || [] 
+    line_items: CurrentOrder.order?.line_items || []
     constructor: ->
       for line_item in @line_items
         line_item.variant.line_item = line_item
@@ -22,13 +22,13 @@ Darkswarm.factory 'Cart', (CurrentOrder, Variants, $timeout, $http)->
         # TODO what shall we do here?
 
     data: =>
-      variants = {} 
+      variants = {}
       for li in @line_items_present()
-        variants[li.variant.id] = 
+        variants[li.variant.id] =
           quantity: li.quantity
           max_quantity: li.max_quantity
       {variants: variants}
-  
+
 
     saved: =>
       @dirty = false
@@ -48,15 +48,15 @@ Darkswarm.factory 'Cart', (CurrentOrder, Variants, $timeout, $http)->
 
     total: =>
       @line_items_present().map (li)->
-        li.variant.getPrice()
+        li.variant.totalPrice()
       .reduce (t, price)->
         t + price
       , 0
 
     register_variant: (variant)=>
       exists = @line_items.some (li)-> li.variant == variant
-      @create_line_item(variant) unless exists 
-        
+      @create_line_item(variant) unless exists
+
     create_line_item: (variant)->
       variant.line_item =
         variant: variant

app/assets/javascripts/darkswarm/services/checkout.js.coffee

@@ -13,7 +13,7 @@ Darkswarm.factory 'Checkout', (CurrentOrder, ShippingMethods, PaymentMethods, $h
         Loading.clear()
         @errors = response.errors
         RailsFlashLoader.loadFlash(response.flash)
-        
+
     # Rails wants our Spree::Address data to be provided with _attributes
     preprocess: ->
       munged_order = {}
@@ -25,13 +25,17 @@ Darkswarm.factory 'Checkout', (CurrentOrder, ShippingMethods, PaymentMethods, $h
             munged_order["ship_address_attributes"] = value
           when "payment_method_id"
             munged_order["payments_attributes"] = [{payment_method_id: value}]
-          when "shipping_method_id", "payment_method_id", "email"
+          when "shipping_method_id", "payment_method_id", "email", "special_instructions"
             munged_order[name] = value
           else
             # Ignore everything else
 
       if @ship_address_same_as_billing
         munged_order.ship_address_attributes = munged_order.bill_address_attributes
+        # If the order already has a ship and bill address (as with logged in users with
+        # past orders), and we don't remove id here, then this will set the wrong id for
+        # ship address, and Rails will error with a 404 for that address.
+        delete munged_order.ship_address_attributes.id
 
       if @paymentMethod()?.method_type == 'gateway'
         angular.extend munged_order.payments_attributes[0], {
@@ -54,7 +58,7 @@ Darkswarm.factory 'Checkout', (CurrentOrder, ShippingMethods, PaymentMethods, $h
 
     shippingPrice: ->
       @shippingMethod()?.price || 0.0
-    
+
     paymentMethod: ->
       PaymentMethods.payment_methods_by_id[@order.payment_method_id]
 

app/assets/javascripts/darkswarm/services/current_hub.js.coffee

@@ -1,3 +1,4 @@
-Darkswarm.factory 'CurrentHub', ($location, $filter, currentHub) ->
+Darkswarm.factory 'CurrentHub', (currentHub) ->
+  # Populate CurrentHub.hub from json in page. This is probably redundant now.
   new class CurrentHub
     hub: currentHub

app/assets/javascripts/darkswarm/services/current_order.js.coffee

@@ -1,3 +1,4 @@
 Darkswarm.factory 'CurrentOrder', (currentOrder) ->
+  # Populate Currentorder.order from json in page. This is probably redundant now.
   new class CurrentOrder
     order: currentOrder

app/assets/javascripts/darkswarm/services/enterprise_image_service.js.coffee

@@ -0,0 +1,12 @@
+Darkswarm.factory "EnterpriseImageService", (FileUploader, spreeApiKey) ->
+  new class EnterpriseImageService
+    imageSrc: null
+
+    imageUploader: new FileUploader
+      headers:
+        'X-Spree-Token': spreeApiKey
+      autoUpload: true
+
+    configure: (enterprise) =>
+      @imageUploader.url = "/api/enterprises/#{enterprise.id}/update_image"
+      @imageUploader.onSuccessItem = (image, response) => @imageSrc = response

app/assets/javascripts/darkswarm/services/enterprise_modal.js.coffee

@@ -0,0 +1,8 @@
+Darkswarm.factory "EnterpriseModal", ($modal, $rootScope)->
+  # Build a modal popup for an enterprise.
+  new class EnterpriseModal
+    open: (enterprise)->
+      scope = $rootScope.$new(true) # Spawn an isolate to contain the enterprise
+
+      scope.enterprise = enterprise
+      $modal.open(templateUrl: "enterprise_modal.html", scope: scope)

app/assets/javascripts/darkswarm/services/enterprise_registration_service.js.coffee

@@ -0,0 +1,58 @@
+Darkswarm.factory "EnterpriseRegistrationService", ($http, RegistrationService, EnterpriseImageService, CurrentUser, spreeApiKey, Loading, availableCountries, enterpriseAttributes) ->
+  new class EnterpriseRegistrationService
+    enterprise:
+      user_ids: [CurrentUser.id]
+      email: CurrentUser.email
+      address: {}
+      country: availableCountries[0]
+
+    constructor: ->
+      for key, value of enterpriseAttributes
+        @enterprise[key] = value
+
+    create: =>
+      Loading.message = "Creating " + @enterprise.name
+      $http(
+        method: "POST"
+        url: "/api/enterprises"
+        data:
+          enterprise: @prepare()
+        params:
+          token: spreeApiKey
+      ).success((data) =>
+        Loading.clear()
+        @enterprise.id = data
+        EnterpriseImageService.configure(@enterprise)
+        RegistrationService.select('about')
+      ).error((data) =>
+        Loading.clear()
+        alert('Failed to create your enterprise.\nPlease ensure all fields are completely filled out.')
+      )
+      # RegistrationService.select('about')
+
+    update: (step) =>
+      Loading.message = "Updating " + @enterprise.name
+      $http(
+        method: "PUT"
+        url: "/api/enterprises/#{@enterprise.id}"
+        data:
+          enterprise: @prepare()
+        params:
+          token: spreeApiKey
+      ).success((data) ->
+        Loading.clear()
+        RegistrationService.select(step)
+      ).error((data) ->
+        Loading.clear()
+        alert('Failed to update your enterprise.\nPlease ensure all fields are completely filled out.')
+      )
+      # RegistrationService.select(step)
+
+    prepare: =>
+      enterprise = {}
+      excluded = [ 'address', 'country', 'id' ]
+      for key, value of @enterprise when key not in excluded
+        enterprise[key] = value
+      enterprise.address_attributes = @enterprise.address if @enterprise.address?
+      enterprise.address_attributes.country_id = @enterprise.country.id if @enterprise.country?
+      enterprise

app/assets/javascripts/darkswarm/services/enterprises.js.coffee

@@ -1,13 +1,21 @@
-Darkswarm.factory 'Enterprises', (enterprises, CurrentHub, Taxons, Dereferencer)->
+Darkswarm.factory 'Enterprises', (enterprises, CurrentHub, Taxons, Dereferencer, visibleFilter)->
   new class Enterprises
-    enterprises_by_id: {} # id/object pairs for lookup 
+    enterprises_by_id: {}
     constructor: ->
+      # Populate Enterprises.enterprises from json in page.
       @enterprises = enterprises
+      # Map enterprises to id/object pairs for lookup.
       for enterprise in enterprises
         @enterprises_by_id[enterprise.id] = enterprise
+      # Replace enterprise and taxons ids with actual objects.
       @dereferenceEnterprises()
       @dereferenceTaxons()
-    
+      @visible_enterprises = visibleFilter @enterprises
+      @producers = @visible_enterprises.filter (enterprise)->
+        enterprise.category in ["producer_hub", "producer_shop", "producer"]
+      @hubs = @visible_enterprises.filter (enterprise)->
+        enterprise.category in ["hub", "hub_profile", "producer_hub", "producer_shop"]
+
     dereferenceEnterprises: ->
       if CurrentHub.hub?.id
         CurrentHub.hub = @enterprises_by_id[CurrentHub.hub.id]
@@ -16,6 +24,7 @@ Darkswarm.factory 'Enterprises', (enterprises, CurrentHub, Taxons, Dereferencer)
         Dereferencer.dereference enterprise.producers, @enterprises_by_id
 
     dereferenceTaxons: ->
-      for enterprise in @enterprises 
+      for enterprise in @enterprises
         Dereferencer.dereference enterprise.taxons, Taxons.taxons_by_id
         Dereferencer.dereference enterprise.supplied_taxons, Taxons.taxons_by_id
+

app/assets/javascripts/darkswarm/services/hubs.js.coffee

@@ -1,9 +0,0 @@
-Darkswarm.factory 'Hubs', ($filter, Enterprises, visibleFilter) ->
-  new class Hubs
-    constructor: ->
-      @hubs = @order Enterprises.enterprises.filter (hub)->
-        hub.is_distributor
-      @visible = visibleFilter @hubs
-
-    order: (hubs)->
-      $filter('orderBy')(hubs, ['-active', '+orders_close_at'])

app/assets/javascripts/darkswarm/services/map.js.coffee

@@ -1,7 +1,7 @@
-Darkswarm.factory "OfnMap", (Enterprises, MapModal, visibleFilter)->
+Darkswarm.factory "OfnMap", (Enterprises, EnterpriseModal, visibleFilter)->
   new class OfnMap
     constructor: ->
-      @enterprises = (@extend(enterprise) for enterprise in visibleFilter(Enterprises.enterprises)) 
+      @enterprises = (@extend(enterprise) for enterprise in visibleFilter(Enterprises.enterprises))
 
 
     # Adding methods to each enterprise
@@ -14,4 +14,4 @@ Darkswarm.factory "OfnMap", (Enterprises, MapModal, visibleFilter)->
         icon: enterprise.icon
         id: enterprise.id
         reveal: =>
-          MapModal.open enterprise
+          EnterpriseModal.open enterprise

app/assets/javascripts/darkswarm/services/map_modal.js.coffee

@@ -1,12 +0,0 @@
-Darkswarm.factory "MapModal", ($modal, $rootScope)->
-  new class MapModal
-    open: (enterprise)->
-      scope = $rootScope.$new(true) # Spawn an isolate to contain the enterprise
-
-      scope.enterprise = enterprise
-      if enterprise.is_distributor
-        scope.hub = enterprise
-        $modal.open(templateUrl: "hub_modal.html", scope: scope)
-      else
-        scope.producer = enterprise
-        $modal.open(templateUrl: "map_modal_producer.html", scope: scope)

app/assets/javascripts/darkswarm/services/matcher.js.coffee

@@ -1,6 +1,7 @@
 Darkswarm.factory "Matcher", ->
-    new class Matcher
-      match: (properties, text)->
-        properties.some (prop)->
-          prop ||= ""
-          prop.toLowerCase().indexOf(text.toLowerCase()) != -1
+  # Match text fragment in an array of strings.
+  new class Matcher
+    match: (properties, text)->
+      properties.some (prop)->
+        prop ||= ""
+        prop.toLowerCase().indexOf(text.toLowerCase()) != -1

app/assets/javascripts/darkswarm/services/producers.js.coffee

@@ -1,7 +0,0 @@
-Darkswarm.factory 'Producers', (Enterprises, visibleFilter) ->
-  new class Producers
-    constructor: ->
-      @producers = Enterprises.enterprises.filter (enterprise)->
-        enterprise.is_primary_producer
-      @visible = visibleFilter @producers
-

app/assets/javascripts/darkswarm/services/products.js.coffee

@@ -48,3 +48,4 @@ Darkswarm.factory 'Products', ($resource, Enterprises, Dereferencer, Taxons, Car
         
         product.primaryImage = product.images[0]?.small_url if product.images
         product.primaryImageOrMissing = product.primaryImage || "/assets/noimage/small.png"
+        product.largeImage = product.images[0]?.large_url if product.images

app/assets/javascripts/darkswarm/services/registration_service.js.coffee

@@ -0,0 +1,23 @@
+angular.module('Darkswarm').factory "RegistrationService", (Navigation, $modal, Loading)->
+
+  new class RegistrationService
+    constructor: ->
+      @open()
+
+    open: =>
+      @modalInstance = $modal.open
+        templateUrl: 'registration.html'
+        windowClass: "login-modal large"
+        backdrop: 'static'
+      @modalInstance.result.then @close, @close
+      @select 'introduction'
+
+    select: (step)=>
+      @current_step = step
+
+    currentStep: =>
+      @current_step
+
+    close: ->
+      Loading.message = "Taking you back to the home page"
+      Navigation.go "/"

app/assets/javascripts/darkswarm/services/taxons.js.coffee

@@ -1,8 +1,10 @@
 Darkswarm.factory "Taxons", (taxons)->
   new class Taxons
-    taxons: taxons   
+    # Populate Taxons.taxons from json in page.
+    taxons: taxons
     taxons_by_id: {}
     constructor: ->
+      # Map taxons to id/object pairs for lookup.
       for taxon in @taxons
         @taxons_by_id[taxon.id] = taxon
 

app/assets/javascripts/darkswarm/services/variants.js.coffee

@@ -5,7 +5,8 @@ Darkswarm.factory 'Variants', ->
       @variants[variant.id] ||= @extend variant
 
     extend: (variant)->
-      variant.getPrice = ->
-        variant.price * variant.line_item.quantity
-      variant.basePricePercentage = Math.round(variant.base_price / variant.price * 100)
+      # Add totalPrice method to calculate line item total. This should be on a line item!
+      variant.totalPrice = ->
+        variant.price_with_fees * variant.line_item.quantity
+      variant.basePricePercentage = Math.round(variant.price / variant.price_with_fees * 100)
       variant

app/assets/javascripts/search/all.js

@@ -1,18 +0,0 @@
-// This is a manifest file that'll be compiled into including all the files listed below.
-// Add new JavaScript/Coffee code in separate files in this directory and they'll automatically
-// be included in the compiled file accessible from http://example.com/assets/application.js
-// It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
-// the compiled file.
-//
-
-//= require jquery
-//= require jquery_ujs
-//= require jquery-ui
-//= require spin
-//= require foundation
-//= require_tree .
-//
-
-// Hacky fix for issue - http://foundation.zurb.com/forum/posts/2112-foundation-5100-syntax-error-in-js
-Foundation.set_namespace = function() {};
-$(function(){ $(document).foundation(); });

app/assets/javascripts/search/gmaps4rails/gmaps4rails.base.js.coffee

@@ -1,444 +0,0 @@
-Gmaps = {}
-
-Gmaps.triggerOldOnload = ->
-  Gmaps.oldOnload() if typeof(Gmaps.oldOnload) == 'function'
-
-Gmaps.loadMaps = ->
-  #loop through all variable names.
-  #there should only be maps inside so it trigger their load function
-  for key, value of Gmaps
-    searchLoadIncluded = key.search(/load/)
-    if searchLoadIncluded == -1
-      load_function_name = "load_" + key
-      Gmaps[load_function_name]()
-
-window.Gmaps = Gmaps
-
-class @Gmaps4Rails
-
-  constructor: ->
-    #map config
-    @map =  null               #DEPRECATED: will still contain a copy of serviceObject below as transition
-    @serviceObject = null      #contains the map we're working on
-    @visibleInfoWindow = null  #contains the current opened infowindow
-    @userLocation = null       #contains user's location if geolocalization was performed and successful
-
-    #empty slots
-    @geolocationSuccess = -> false  #triggered when geolocation succeeds. Can be customized.
-    @geolocationFailure = -> false  #triggered when geolocation fails. If customized, must be like= function(navigator_handles_geolocation){} where 'navigator_handles_geolocation' is a boolean
-    @callback           = -> false  #to let user set a custom callback function
-    @customClusterer    = -> false  #to let user set custom clusterer pictures
-    @infobox            = -> false  #to let user use custom infoboxes
-    @jsTemplate         = false     #to let user create infowindows client side
-
-    @default_map_options =
-      id: 'map'
-      draggable: true
-      detect_location: false  # should the browser attempt to use geolocation detection features of HTML5?
-      center_on_user: false   # centers map on the location detected through the browser
-      center_latitude: 0
-      center_longitude: 0
-      zoom: 7
-      maxZoom: null
-      minZoom: null
-      auto_adjust : true      # adjust the map to the markers if set to true
-      auto_zoom: true         # zoom given by auto-adjust
-      bounds: []              # adjust map to these limits. Should be [{"lat": , "lng": }]
-      raw: {}                  # raw json to pass additional options
-
-    @default_markers_conf =
-      #Marker config
-      title: ""
-      #MarkerImage config
-      picture : ""
-      width: 22
-      length: 32
-      draggable: false         # how to modify: <%= gmaps( "markers" => { "data" => @object.to_gmaps4rails, "options" => { "draggable" => true }}) %>
-      #clustering config
-      do_clustering: false     # do clustering if set to true
-      randomize: false         # Google maps can't display two markers which have the same coordinates. This randomizer enables to prevent this situation from happening.
-      max_random_distance: 100 # in meters. Each marker coordinate could be altered by this distance in a random direction
-      list_container: null     # id of the ul that will host links to all markers
-      offset: 0                # used when adding_markers to an existing map. Because new markers are concated with previous one, offset is here to prevent the existing from being re-created.
-      raw: {}                  # raw json to pass additional options
-
-    #Stored variables
-    @markers = []            # contains all markers. A marker contains the following: {"description": , "longitude": , "title":, "latitude":, "picture": "", "width": "", "length": "", "sidebar": "", "serviceObject": google_marker}
-    @boundsObject = null     # contains current bounds from markers, polylines etc...
-    @polygons = []           # contains raw data, array of arrays (first element could be a hash containing options)
-    @polylines = []          # contains raw data, array of arrays (first element could be a hash containing options)
-    @circles = []            # contains raw data, array of hash
-    @markerClusterer = null  # contains all marker clusterers
-    @markerImages = []
-
-	#Polyline Styling
-    @polylines_conf =         #default style for polylines
-      strokeColor: "#FF0000"
-      strokeOpacity: 1
-      strokeWeight: 2
-      clickable: false
-      zIndex: null
-
-  #tnitializes the map
-  initialize : ->
-    @serviceObject = @createMap()
-    @map = @serviceObject #beware, soon deprecated
-    if (@map_options.detect_location == true or @map_options.center_on_user == true)
-      @findUserLocation(this)
-    #resets sidebar if needed
-    @resetSidebarContent()
-
-  findUserLocation : (map_object) ->
-    if (navigator.geolocation)
-      #try to retrieve user's position
-      positionSuccessful = (position) ->
-        map_object.userLocation = map_object.createLatLng(position.coords.latitude, position.coords.longitude)
-        #change map's center to focus on user's geoloc if asked
-        if(map_object.map_options.center_on_user == true)
-          map_object.centerMapOnUser()
-        map_object.geolocationSuccess()
-      positionFailure = ->
-        map_object.geolocationFailure(true)
-
-      navigator.geolocation.getCurrentPosition( positionSuccessful, positionFailure)
-    else
-      #failure but the navigator doesn't handle geolocation
-      map_object.geolocationFailure(false)
-
-
-  #////////////////////////////////////////////////////
-  #//////////////////// DIRECTIONS ////////////////////
-  #////////////////////////////////////////////////////
-
-  create_direction : ->
-    directionsDisplay = new google.maps.DirectionsRenderer()
-    directionsService = new google.maps.DirectionsService()
-
-    directionsDisplay.setMap(@serviceObject)
-    #display panel only if required
-    if @direction_conf.display_panel
-      directionsDisplay.setPanel(document.getElementById(@direction_conf.panel_id))
-
-    directionsDisplay.setOptions
-      suppressMarkers:     false
-      suppressInfoWindows: false
-      suppressPolylines:   false
-
-    request =
-      origin:             @direction_conf.origin
-      destination:        @direction_conf.destination
-      waypoints:          @direction_conf.waypoints
-      optimizeWaypoints:  @direction_conf.optimizeWaypoints
-      unitSystem:         google.maps.DirectionsUnitSystem[@direction_conf.unitSystem]
-      avoidHighways:      @direction_conf.avoidHighways
-      avoidTolls:         @direction_conf.avoidTolls
-      region:             @direction_conf.region
-      travelMode:         google.maps.DirectionsTravelMode[@direction_conf.travelMode]
-      language:           "en"
-
-    directionsService.route request, (response, status) ->
-      if (status == google.maps.DirectionsStatus.OK)
-        directionsDisplay.setDirections(response)
-
-  #////////////////////////////////////////////////////
-  #///////////////////// CIRCLES //////////////////////
-  #////////////////////////////////////////////////////
-
-  #Loops through all circles
-  #Loops through all circles and draws them
-  create_circles : ->
-    for circle in @circles
-      @create_circle circle
-
-  create_circle : (circle) ->
-    #by convention, default style configuration could be integrated in the first element
-    if circle == @circles[0]
-      @circles_conf.strokeColor   = circle.strokeColor   if circle.strokeColor?
-      @circles_conf.strokeOpacity = circle.strokeOpacity if circle.strokeOpacity?
-      @circles_conf.strokeWeight  = circle.strokeWeight  if circle.strokeWeight?
-      @circles_conf.fillColor     = circle.fillColor     if circle.fillColor?
-      @circles_conf.fillOpacity   = circle.fillOpacity   if circle.fillOpacity?
-
-    if circle.lat? and circle.lng?
-      # always check if a config is given, if not, use defaults
-      # NOTE: is there a cleaner way to do this? Maybe a hash merge of some sort?
-      newCircle = new google.maps.Circle
-        center:        @createLatLng(circle.lat, circle.lng)
-        strokeColor:   circle.strokeColor   || @circles_conf.strokeColor
-        strokeOpacity: circle.strokeOpacity || @circles_conf.strokeOpacity
-        strokeWeight:  circle.strokeWeight  || @circles_conf.strokeWeight
-        fillOpacity:   circle.fillOpacity   || @circles_conf.fillOpacity
-        fillColor:     circle.fillColor     || @circles_conf.fillColor
-        clickable:     circle.clickable     || @circles_conf.clickable
-        zIndex:        circle.zIndex        || @circles_conf.zIndex
-        radius:        circle.radius
-
-      circle.serviceObject = newCircle
-      newCircle.setMap(@serviceObject)
-
-  # clear circles
-  clear_circles : ->
-    for circle in @circles
-      @clear_circle circle
-
-  clear_circle : (circle) ->
-    circle.serviceObject.setMap(null)
-
-  hide_circles : ->
-    for circle in @circles
-      @hide_circle circle
-
-  hide_circle : (circle) ->
-    circle.serviceObject.setMap(null)
-
-  show_circles : ->
-    for circle in @circles
-      @show_circle @circle
-
-  show_circle : (circle) ->
-    circle.serviceObject.setMap(@serviceObject)
-
-  #////////////////////////////////////////////////////
-  #///////////////////// POLYGONS /////////////////////
-  #////////////////////////////////////////////////////
-
-  #polygons is an array of arrays. It loops.
-  create_polygons : ->
-    for polygon in @polygons
-      @create_polygon(polygon)
-
-  #creates a single polygon, triggered by create_polygons
-  create_polygon : (polygon) ->
-    polygon_coordinates = []
-
-    #Polygon points are in an Array, that's why looping is necessary
-    for point in polygon
-      latlng = @createLatLng(point.lat, point.lng)
-      polygon_coordinates.push(latlng)
-      #first element of an Array could contain specific configuration for this particular polygon. If no config given, use default
-      if point == polygon[0]
-        strokeColor   = point.strokeColor   || @polygons_conf.strokeColor
-        strokeOpacity = point.strokeOpacity || @polygons_conf.strokeOpacity
-        strokeWeight  = point.strokeWeight  || @polygons_conf.strokeWeight
-        fillColor     = point.fillColor     || @polygons_conf.fillColor
-        fillOpacity   = point.fillOpacity   || @polygons_conf.fillOpacity
-        clickable     = point.clickable     || @polygons_conf.clickable
-        
-    #Construct the polygon
-    new_poly = new google.maps.Polygon
-      paths:          polygon_coordinates
-      strokeColor:    strokeColor
-      strokeOpacity:  strokeOpacity
-      strokeWeight:   strokeWeight
-      fillColor:      fillColor
-      fillOpacity:    fillOpacity
-      clickable:      clickable
-      map:            @serviceObject
-
-    #save polygon in list
-    polygon.serviceObject = new_poly
-
-  
-
-  #////////////////////////////////////////////////////
-  #///////////////////// MARKERS //////////////////////
-  #////////////////////////////////////////////////////
-
-  #creates, clusterizes and adjusts map
-  create_markers : ->
-    @createServiceMarkersFromMarkers()
-    @clusterize()
-
-  #create google.maps Markers from data provided by user
-  createServiceMarkersFromMarkers : ->
-    for marker, index in @markers
-      if not @markers[index].serviceObject?
-        #extract options, test if value passed or use default
-        Lat = @markers[index].lat
-        Lng = @markers[index].lng
-
-        #alter coordinates if randomize is true
-        if @markers_conf.randomize
-          LatLng = @randomize(Lat, Lng)
-          #retrieve coordinates from the array
-          Lat = LatLng[0]
-          Lng = LatLng[1]
-
-        #save object
-        @markers[index].serviceObject = @createMarker
-          "marker_picture":   if @markers[index].picture  then @markers[index].picture else @markers_conf.picture
-          "marker_width":     if @markers[index].width    then @markers[index].width   else @markers_conf.width
-          "marker_height":    if @markers[index].height   then @markers[index].height  else @markers_conf.length
-          "marker_title":     if @markers[index].title    then @markers[index].title   else null
-          "marker_anchor":    if @markers[index].marker_anchor  then @markers[index].marker_anchor  else null
-          "shadow_anchor":    if @markers[index].shadow_anchor  then @markers[index].shadow_anchor  else null
-          "shadow_picture":   if @markers[index].shadow_picture then @markers[index].shadow_picture else null
-          "shadow_width":     if @markers[index].shadow_width   then @markers[index].shadow_width   else null
-          "shadow_height":    if @markers[index].shadow_height  then @markers[index].shadow_height  else null
-          "marker_draggable": if @markers[index].draggable      then @markers[index].draggable      else @markers_conf.draggable
-          "rich_marker":      if @markers[index].rich_marker    then @markers[index].rich_marker    else null
-          "zindex":           if @markers[index].zindex         then @markers[index].zindex         else null
-          "Lat":              Lat
-          "Lng":              Lng
-          "index":            index
-
-        #add infowindowstuff if enabled
-        @createInfoWindow(@markers[index])
-        #create sidebar if enabled
-        @createSidebar(@markers[index])
-
-    @markers_conf.offset = @markers.length
-
-  #creates Image Anchor Position or return null if nothing passed
-  createImageAnchorPosition : (anchorLocation) ->
-    if (anchorLocation == null)
-      return null
-    else
-      return @createPoint(anchorLocation[0], anchorLocation[1])
-
-
-  #replace old markers with new markers on an existing map
-  replaceMarkers : (new_markers, adjustBounds = true) ->
-    @clearMarkers()
-    #reset previous markers
-    @markers = new Array
-    #reset current bounds
-    @boundsObject = @createLatLngBounds() if adjustBounds
-    #reset sidebar content if exists
-    @resetSidebarContent()
-    #add new markers
-    @markers_conf.offset = 0
-    @addMarkers(new_markers, adjustBounds)
-
-  #add new markers to on an existing map
-  addMarkers : (new_markers, adjustBounds = true) ->
-    #update the list of markers to take into account
-    @markers = @markers.concat(new_markers)
-    #put markers on the map
-    @create_markers()
-    @adjustMapToBounds() if adjustBounds
-
-  #////////////////////////////////////////////////////
-  #///////////////////// SIDEBAR //////////////////////
-  #////////////////////////////////////////////////////
-
-  #//creates sidebar
-  createSidebar : (marker_container) ->
-    if (@markers_conf.list_container)
-      ul = document.getElementById(@markers_conf.list_container)
-      li = document.createElement('li')
-      aSel = document.createElement('a')
-      aSel.href = 'javascript:void(0);'
-      html = if marker_container.sidebar? then marker_container.sidebar else "Marker"
-      aSel.innerHTML = html
-      currentMap = this
-      aSel.onclick = @sidebar_element_handler(currentMap, marker_container.serviceObject, 'click')
-      li.appendChild(aSel)
-      ul.appendChild(li)
-
-  #moves map to marker clicked + open infowindow
-  sidebar_element_handler : (currentMap, marker, eventType) ->
-    return () ->
-      currentMap.map.panTo(marker.position)
-      google.maps.event.trigger(marker, eventType)
-
-
-  resetSidebarContent : ->
-    if @markers_conf.list_container isnt null
-      ul = document.getElementById(@markers_conf.list_container)
-      ul.innerHTML = ""
-
-  #////////////////////////////////////////////////////
-  #////////////////// MISCELLANEOUS ///////////////////
-  #////////////////////////////////////////////////////
-
-  #to make the map fit the different LatLng points
-  adjustMapToBounds : ->
-    #FIRST_STEP: retrieve all bounds
-    #create the bounds object only if necessary
-    if @map_options.auto_adjust or @map_options.bounds isnt null
-      @boundsObject = @createLatLngBounds()
-
-      #if autodjust is true, must get bounds from markers polylines etc...
-      if @map_options.auto_adjust
-        #from markers
-        @extendBoundsWithMarkers()
-
-        #from polylines:
-        @updateBoundsWithPolylines()
-
-        #from polygons:
-        @updateBoundsWithPolygons()
-
-        #from circles
-        @updateBoundsWithCircles()
-
-      #in every case, I've to take into account the bounds set up by the user
-      @extendMapBounds()
-
-      #SECOND_STEP: ajust the map to the bounds
-      @adaptMapToBounds()
-
-  #////////////////////////////////////////////////////
-  #/////////////////// POLYLINES //////////////////////
-  #////////////////////////////////////////////////////
-
-  #replace old markers with new markers on an existing map
-  replacePolylines : (new_polylines) ->
-    #reset previous polylines and kill them from map
-    @destroy_polylines()
-    #set new polylines
-    @polylines = new_polylines
-    #create
-    @create_polylines()
-    #.... and adjust map boundaries
-    @adjustMapToBounds()
-
-  destroy_polylines : ->
-    for polyline in @polylines
-      #delete polylines from map
-      polyline.serviceObject.setMap(null)
-    #empty array
-    @polylines = []
-
-  #polylines is an array of arrays. It loops.
-  create_polylines : ->
-    for polyline in @polylines
-      @create_polyline polyline
-
-  #////////////////////////////////////////////////////
-  #///////////////// Basic functions //////////////////
-  #///////////////////tests coded//////////////////////
-
-  #//basic function to check existence of a variable
-  exists : (var_name) ->
-    return (var_name	!= "" and typeof var_name != "undefined")
-
-
-  #randomize
-  randomize : (Lat0, Lng0) ->
-    #distance in meters between 0 and max_random_distance (positive or negative)
-    dx = @markers_conf.max_random_distance * @random()
-    dy = @markers_conf.max_random_distance * @random()
-    Lat = parseFloat(Lat0) + (180/Math.PI)*(dy/6378137)
-    Lng = parseFloat(Lng0) + ( 90/Math.PI)*(dx/6378137)/Math.cos(Lat0)
-    return [Lat, Lng]
-
-  mergeObjectWithDefault : (object1, object2) ->
-    copy_object1 = {}
-    for key, value of object1
-      copy_object1[key] = value
-
-    for key, value of object2
-      unless copy_object1[key]?
-        copy_object1[key] = value
-    return copy_object1
-
-  mergeWithDefault : (objectName) ->
-    default_object = @["default_" + objectName]
-    object = @[objectName]
-    @[objectName] = @mergeObjectWithDefault(object, default_object)
-    return true
-
-  #gives a value between -1 and 1
-  random : -> return(Math.random() * 2 -1)

app/assets/javascripts/search/gmaps4rails/gmaps4rails.bing.js.coffee

@@ -1,174 +0,0 @@
-######################################################################################################
-##############################################  Bing Maps  ##########################################
-######################################################################################################
-
-#// http://wiki.openstreetmap.org/wiki/OpenLayers
-#// http://openlayers.org/dev/examples
-#//http://docs.openlayers.org/contents.html
-
-class @Gmaps4RailsBing extends Gmaps4Rails
-
-  constructor: ->
-    super
-    @map_options =
-      type:  "road"   # aerial, auto, birdseye, collinsBart, mercator, ordnanceSurvey, road
-    @markers_conf =
-      infobox:  "description" #description or htmlContent
-
-    @mergeWithDefault("map_options")
-    @mergeWithDefault("markers_conf")
-
-  #////////////////////////////////////////////////////
-  #/////////////// Basic Objects         //////////////
-  #////////////////////////////////////////////////////
-
-  getMapType: -> 
-    switch @map_options.type
-      when "road"           then return Microsoft.Maps.MapTypeId.road
-      when "aerial"         then return Microsoft.Maps.MapTypeId.aerial
-      when "auto"           then return Microsoft.Maps.MapTypeId.auto
-      when "birdseye"       then return Microsoft.Maps.MapTypeId.birdseye
-      when "collinsBart"    then return Microsoft.Maps.MapTypeId.collinsBart
-      when "mercator"       then return Microsoft.Maps.MapTypeId.mercator
-      when "ordnanceSurvey" then return Microsoft.Maps.MapTypeId.ordnanceSurvey
-      else return Microsoft.Maps.MapTypeId.auto
-
-  createPoint: (lat, lng) ->
-    return new Microsoft.Maps.Point(lat, lng)
-
-  createLatLng:(lat, lng) ->
-    return new Microsoft.Maps.Location(lat, lng)
-  
-  createLatLngBounds: ->
-
-  createMap: ->
-    return new Microsoft.Maps.Map(document.getElementById(@map_options.id), { 
-      credentials:  @map_options.provider_key,
-      mapTypeId:    @getMapType(),
-      center:       @createLatLng(@map_options.center_latitude, @map_options.center_longitude),
-      zoom:         @map_options.zoom
-    })
-
-  createSize: (width, height) ->
-    return new google.maps.Size(width, height)
-
-  #////////////////////////////////////////////////////
-  #////////////////////// Markers /////////////////////
-  #////////////////////////////////////////////////////
-
-  createMarker: (args) ->
-    markerLatLng = @createLatLng(args.Lat, args.Lng) 
-    marker
-    #// Marker sizes are expressed as a Size of X,Y
-    if args.marker_picture == ""  
-      marker = new Microsoft.Maps.Pushpin(@createLatLng(args.Lat, args.Lng), {
-        draggable: args.marker_draggable,
-        anchor:    @createImageAnchorPosition(args.Lat, args.Lng),
-        text:      args.marker_title
-        }
-      );
-    else 
-      marker = new Microsoft.Maps.Pushpin(@createLatLng(args.Lat, args.Lng), {
-        draggable: args.marker_draggable,
-        anchor:    @createImageAnchorPosition(args.Lat, args.Lng),
-        icon:      args.marker_picture,
-        height:    args.marker_height,
-        text:      args.marker_title,
-        width:     args.marker_width
-        }
-      );
-    @addToMap(marker)
-    return marker
-
-  #// clear markers
-  clearMarkers: ->  
-    for marker in @markers
-      @clearMarker marker
-
-  clearMarker: (marker) ->
-    @removeFromMap(marker.serviceObject)
-
-  #//show and hide markers
-  showMarkers: ->
-    for marker in @markers
-      @showMarker marker
-
-  showMarker: (marker) ->
-    marker.serviceObject.setOptions({ visible: true })
-
-  hideMarkers: ->
-    for marker in @markers
-      @hideMarker marker
-
-  hideMarker: (marker) ->
-    marker.serviceObject.setOptions({ visible: false })
-
-  extendBoundsWithMarkers: ->
-    locationsArray = []
-    for marker in @markers
-      locationsArray.push(marker.serviceObject.getLocation())
-    @boundsObject = Microsoft.Maps.LocationRect.fromLocations(locationsArray)
-
-  #////////////////////////////////////////////////////
-  #/////////////////// Clusterer //////////////////////
-  #////////////////////////////////////////////////////
-
-  createClusterer: (markers_array) ->
-
-  clearClusterer: ->
-
-  #//creates clusters
-  clusterize: ->
-    
-  #////////////////////////////////////////////////////
-  #/////////////////// INFO WINDOW ////////////////////
-  #////////////////////////////////////////////////////
-
-  #// creates infowindows
-  createInfoWindow: (marker_container) ->
-    if marker_container.description?
-      #//create the infowindow
-      if @markers_conf.infobox == "description"
-        marker_container.info_window = new Microsoft.Maps.Infobox(marker_container.serviceObject.getLocation(), { description: marker_container.description, visible: false, showCloseButton: true})
-      else
-        marker_container.info_window = new Microsoft.Maps.Infobox(marker_container.serviceObject.getLocation(), { htmlContent: marker_container.description, visible: false})
-
-      #//add the listener associated
-      currentMap = this
-      Microsoft.Maps.Events.addHandler(marker_container.serviceObject, 'click', @openInfoWindow(currentMap, marker_container.info_window))
-      @addToMap(marker_container.info_window)
-
-  openInfoWindow: (currentMap, infoWindow) ->
-    return ->
-      # Close the latest selected marker before opening the current one.
-      if currentMap.visibleInfoWindow
-        currentMap.visibleInfoWindow.setOptions({ visible: false })
-      infoWindow.setOptions({ visible:true })
-      currentMap.visibleInfoWindow = infoWindow
-
-  #////////////////////////////////////////////////////
-  #/////////////////// Other methods //////////////////
-  #////////////////////////////////////////////////////
-
-  fitBounds: ->
-    @serviceObject.setView({bounds: @boundsObject})
-
-  addToMap: (object)->
-    @serviceObject.entities.push(object)
-
-  removeFromMap: (object)->
-    @serviceObject.entities.remove(object)
-
-  centerMapOnUser: ->
-    @serviceObject.setView({ center: @userLocation})
-
-  updateBoundsWithPolylines: ()->
-
-  updateBoundsWithPolygons: ()->
-
-  updateBoundsWithCircles: ()->
-  
-  extendMapBounds :->
-
-  adaptMapToBounds: ->
-    @fitBounds()

app/assets/javascripts/search/gmaps4rails/gmaps4rails.googlemaps.js.coffee

@@ -1,339 +0,0 @@
-#######################################################################################################
-##############################################  Google maps  ##########################################
-#######################################################################################################
-
-class @Gmaps4RailsGoogle extends Gmaps4Rails
-
-  constructor: ->
-    super
-    #Map settings
-    @map_options =
-      disableDefaultUI:       false
-      disableDoubleClickZoom: false
-      type:                   "ROADMAP" # HYBRID, ROADMAP, SATELLITE, TERRAIN
-
-    #markers + info styling
-    @markers_conf =
-      clusterer_gridSize:      50
-      clusterer_maxZoom:       5
-      custom_cluster_pictures: null
-      custom_infowindow_class: null
-
-    @mergeWithDefault("map_options")
-    @mergeWithDefault("markers_conf")
-
-    @kml_options =
-      clickable: true
-      preserveViewport: false
-      suppressInfoWindows: false
-
-    #Polygon Styling
-    @polygons_conf =         # default style for polygons
-      strokeColor: "#FFAA00"
-      strokeOpacity: 0.8
-      strokeWeight: 2
-      fillColor: "#000000"
-      fillOpacity: 0.35
-      clickable: false
-
-    #Circle Styling
-    @circles_conf =           #default style for circles
-      fillColor: "#00AAFF"
-      fillOpacity: 0.35
-      strokeColor: "#FFAA00"
-      strokeOpacity: 0.8
-      strokeWeight: 2
-      clickable: false
-      zIndex: null
-
-    #Direction Settings
-    @direction_conf =
-      panel_id:           null
-      display_panel:      false
-      origin:             null
-      destination:        null
-      waypoints:          []       #[{location: "toulouse,fr", stopover: true}, {location: "Clermont-Ferrand, fr", stopover: true}]
-      optimizeWaypoints:  false
-      unitSystem:         "METRIC" #IMPERIAL
-      avoidHighways:      false
-      avoidTolls:         false
-      region:             null
-      travelMode:         "DRIVING" #WALKING, BICYCLING
-
-  #////////////////////////////////////////////////////
-  #/////////////// Basic Objects         //////////////
-  #////////////////////////////////////////////////////
-
-  createPoint : (lat, lng) ->
-    return new google.maps.Point(lat, lng)
-
-  createLatLng : (lat, lng) ->
-    return new google.maps.LatLng(lat, lng)
-
-  createLatLngBounds : ->
-    return new google.maps.LatLngBounds()
-
-  createMap : ->
-    defaultOptions =
-      maxZoom:                @map_options.maxZoom
-      minZoom:                @map_options.minZoom
-      zoom:                   @map_options.zoom
-      center:                 @createLatLng(@map_options.center_latitude, @map_options.center_longitude)
-      mapTypeId:              google.maps.MapTypeId[@map_options.type]
-      mapTypeControl:         @map_options.mapTypeControl
-      disableDefaultUI:       @map_options.disableDefaultUI
-      disableDoubleClickZoom: @map_options.disableDoubleClickZoom
-      draggable:              @map_options.draggable
-
-    mergedOptions = @mergeObjectWithDefault @map_options.raw, defaultOptions
-
-    return new google.maps.Map document.getElementById(@map_options.id), mergedOptions
-
-
-  createMarkerImage : (markerPicture, markerSize, origin, anchor, scaledSize) ->
-    return new google.maps.MarkerImage(markerPicture, markerSize, origin, anchor, scaledSize)
-
-  createSize : (width, height) ->
-    return new google.maps.Size(width, height)
-
-  #////////////////////////////////////////////////////
-  #////////////////////// Markers /////////////////////
-  #////////////////////////////////////////////////////
-
-  createMarker : (args) ->
-    markerLatLng = @createLatLng(args.Lat, args.Lng)
-    #Marker sizes are expressed as a Size of X,Y
-    if args.marker_picture == "" and args.rich_marker == null
-      defaultOptions = {position: markerLatLng, map: @serviceObject, title: args.marker_title, draggable: args.marker_draggable, zIndex: args.zindex}
-      mergedOptions  = @mergeObjectWithDefault @markers_conf.raw, defaultOptions
-      return new google.maps.Marker mergedOptions
-
-    if (args.rich_marker != null)
-      return new RichMarker({
-        position: markerLatLng
-        map:       @serviceObject
-        draggable: args.marker_draggable
-        content:   args.rich_marker
-        flat:      if args.marker_anchor == null then false else args.marker_anchor[1]
-        anchor:    if args.marker_anchor == null then 0     else args.marker_anchor[0]
-        zIndex:    args.zindex
-      })
-
-    #default behavior
-    #calculate MarkerImage anchor location
-    imageAnchorPosition  = @createImageAnchorPosition args.marker_anchor
-    shadowAnchorPosition = @createImageAnchorPosition args.shadow_anchor
-    #create or retrieve existing MarkerImages
-    markerImage = @createOrRetrieveImage(args.marker_picture, args.marker_width, args.marker_height, imageAnchorPosition)
-    shadowImage = @createOrRetrieveImage(args.shadow_picture, args.shadow_width, args.shadow_height, shadowAnchorPosition)
-    defaultOptions = {position: markerLatLng, map: @serviceObject, icon: markerImage, title: args.marker_title, draggable: args.marker_draggable, shadow: shadowImage,  zIndex: args.zindex}
-    mergedOptions  = @mergeObjectWithDefault @markers_conf.raw, defaultOptions
-    return new google.maps.Marker mergedOptions
-
-  #checks if obj is included in arr Array and returns the position or false
-  includeMarkerImage : (arr, obj) ->
-    for object, index in arr
-      return index if object.url == obj
-    return false
-
-  #checks if MarkerImage exists before creating a new one
-  #returns a MarkerImage or false if ever something wrong is passed as argument
-  createOrRetrieveImage : (currentMarkerPicture, markerWidth, markerHeight, imageAnchorPosition) ->
-    return null if (currentMarkerPicture == "" or currentMarkerPicture == null )
-
-    test_image_index = @includeMarkerImage(@markerImages, currentMarkerPicture)
-    switch test_image_index
-      when false
-        markerImage = @createMarkerImage(currentMarkerPicture, @createSize(markerWidth, markerHeight), null, imageAnchorPosition, null )
-        @markerImages.push(markerImage)
-        return markerImage
-        break
-      else
-        return @markerImages[test_image_index] if typeof test_image_index == 'number'
-        return false
-
-  #clear markers
-  clearMarkers : ->
-    for marker in @markers
-      @clearMarker marker
-
-  #show and hide markers
-  showMarkers : ->
-    for marker in @markers
-      @showMarker marker
-
-  hideMarkers : ->
-    for marker in @markers
-      @hideMarker marker
-
-  clearMarker : (marker) ->
-    marker.serviceObject.setMap(null)
-
-  showMarker : (marker) ->
-    marker.serviceObject.setVisible(true)
-
-  hideMarker : (marker) ->
-    marker.serviceObject.setVisible(false)
-
-  extendBoundsWithMarkers : ->
-    for marker in @markers
-      @boundsObject.extend(marker.serviceObject.position)
-
-  #////////////////////////////////////////////////////
-  #/////////////////// Clusterer //////////////////////
-  #////////////////////////////////////////////////////
-
-  createClusterer : (markers_array) ->
-    return new MarkerClusterer( @serviceObject, markers_array, {  maxZoom: @markers_conf.clusterer_maxZoom, gridSize: @markers_conf.clusterer_gridSize, styles: @customClusterer() })
-
-  clearClusterer : ->
-    @markerClusterer.clearMarkers()
-
-  #creates clusters
-  clusterize : ->
-    if @markers_conf.do_clustering == true
-      #first clear the existing clusterer if any
-      @clearClusterer() if @markerClusterer != null
-
-      markers_array = new Array
-      for marker in @markers
-        markers_array.push(marker.serviceObject)
-
-      @markerClusterer = @createClusterer(markers_array)
-
-  #////////////////////////////////////////////////////
-  #/////////////////// INFO WINDOW ////////////////////
-  #////////////////////////////////////////////////////
-
-  #// creates infowindows
-  createInfoWindow : (marker_container) ->
-    if typeof(@jsTemplate) == "function" or marker_container.description?
-      marker_container.description = @jsTemplate(marker_container) if typeof(@jsTemplate) == "function"
-      if @markers_conf.custom_infowindow_class != null
-        #creating custom infowindow
-        boxText = document.createElement("div")
-        boxText.setAttribute("class", @markers_conf.custom_infowindow_class) #to customize
-        boxText.innerHTML = marker_container.description
-        marker_container.infowindow = new InfoBox(@infobox(boxText))
-        currentMap = this
-        google.maps.event.addListener(marker_container.serviceObject, 'click', @openInfoWindow(currentMap, marker_container.infowindow, marker_container.serviceObject))
-      else
-        #create default infowindow
-        marker_container.infowindow = new google.maps.InfoWindow({content: marker_container.description })
-        #add the listener associated
-        currentMap = this
-        google.maps.event.addListener(marker_container.serviceObject, 'click', @openInfoWindow(currentMap, marker_container.infowindow, marker_container.serviceObject))
-
-  openInfoWindow : (currentMap, infoWindow, marker) ->
-    return ->
-      # Close the latest selected marker before opening the current one.
-      currentMap.visibleInfoWindow.close() if currentMap.visibleInfoWindow != null
-      infoWindow.open(currentMap.serviceObject, marker)
-      currentMap.visibleInfoWindow = infoWindow
-
-  #////////////////////////////////////////////////////
-  #/////////////////        KML      //////////////////
-  #////////////////////////////////////////////////////
-
-  createKmlLayer : (kml) ->
-    kml_options = kml.options || {}
-    kml_options = @mergeObjectWithDefault(kml_options, @kml_options)
-    kml =  new google.maps.KmlLayer( kml.url, kml_options)
-    kml.setMap(@serviceObject)
-    return kml
-
-  #////////////////////////////////////////////////////
-  #/////////////////// POLYLINES //////////////////////
-  #////////////////////////////////////////////////////
-
-  #creates a single polyline, triggered by create_polylines
-  create_polyline : (polyline) ->
-    polyline_coordinates = []
-
-    #2 cases here, either we have a coded array of LatLng or we have an Array of LatLng
-    for element in polyline
-      #if we have a coded array
-      if element.coded_array?
-        decoded_array = new google.maps.geometry.encoding.decodePath(element.coded_array)
-        #loop through every point in the array
-        for point in decoded_array
-          polyline_coordinates.push(point)
-
-      #or we have an array of latlng
-      else
-        #by convention, a single polyline could be customized in the first array or it uses default values
-        if element == polyline[0]
-          strokeColor   = element.strokeColor   || @polylines_conf.strokeColor
-          strokeOpacity = element.strokeOpacity || @polylines_conf.strokeOpacity
-          strokeWeight  = element.strokeWeight  || @polylines_conf.strokeWeight
-          clickable     = element.clickable     || @polylines_conf.clickable
-          zIndex        = element.zIndex        || @polylines_conf.zIndex
-
-        #add latlng if positions provided
-        if element.lat? && element.lng?
-          latlng = @createLatLng(element.lat, element.lng)
-          polyline_coordinates.push(latlng)
-
-    # Construct the polyline
-    new_poly = new google.maps.Polyline
-      path:         polyline_coordinates
-      strokeColor:  strokeColor
-      strokeOpacity: strokeOpacity
-      strokeWeight: strokeWeight
-      clickable:    clickable
-      zIndex:       zIndex
-
-    #save polyline
-    polyline.serviceObject = new_poly
-    new_poly.setMap(@serviceObject)
-
-  
-  updateBoundsWithPolylines: ()->
-    for polyline in @polylines
-      polyline_points = polyline.serviceObject.latLngs.getArray()[0].getArray()
-      for point in polyline_points
-        @boundsObject.extend point
-  
-  #////////////////////////////////////////////////////
-  #/////////////////        KML      //////////////////
-  #////////////////////////////////////////////////////
-
-  create_kml : ->
-    for kml in @kml
-      kml.serviceObject = @createKmlLayer kml
-            
-  #////////////////////////////////////////////////////
-  #/////////////////// Other methods //////////////////
-  #////////////////////////////////////////////////////
-
-  fitBounds : ->
-    @serviceObject.fitBounds(@boundsObject) unless @boundsObject.isEmpty()
-
-  centerMapOnUser : ->
-    @serviceObject.setCenter(@userLocation)
-  
-  updateBoundsWithPolygons: ()->
-    for polygon in @polygons
-      polygon_points = polygon.serviceObject.latLngs.getArray()[0].getArray()
-      for point in polygon_points
-        @boundsObject.extend point
-
-  updateBoundsWithCircles: ()->
-    for circle in @circles
-      @boundsObject.extend(circle.serviceObject.getBounds().getNorthEast())
-      @boundsObject.extend(circle.serviceObject.getBounds().getSouthWest())
-
-  extendMapBounds: ()->
-    for bound in @map_options.bounds
-      #create points from bounds provided
-      @boundsObject.extend @createLatLng(bound.lat, bound.lng)
-  
-  adaptMapToBounds:()->
-    #if autozoom is false, take user info into account
-    if !@map_options.auto_zoom
-      map_center = @boundsObject.getCenter()
-      @map_options.center_latitude  = map_center.lat()
-      @map_options.center_longitude = map_center.lng()
-      @serviceObject.setCenter(map_center)
-    else
-      @fitBounds()

app/assets/javascripts/search/gmaps4rails/gmaps4rails.mapquest.js.coffee

@@ -1,145 +0,0 @@
-#######################################################################################################
-##############################################  Map Quest #############################################
-#######################################################################################################
-# http://developer.mapquest.com/web/documentation/sdk/javascript/v7.0/api/MQA.Poi.html
-
-class @Gmaps4RailsMapquest extends Gmaps4Rails
-
-  constructor: ->
-    super
-    #Map settings
-    @map_options  = {type:  "map"}  #map type (map, sat, hyb)
-    @markers_conf = {}
-    @mergeWithDefault "markers_conf"
-    @mergeWithDefault "map_options"
-
-  #////////////////////////////////////////////////////
-  #/////////////// Basic Objects         //////////////
-  #////////////////////////////////////////////////////
-
-  createPoint: (lat, lng) ->
-    return new MQA.Poi({lat: lat, lng: lng})
-
-  createLatLng: (lat, lng) ->
-    return {lat: lat, lng: lng}
-
-  createLatLngBounds: ->
-
-  createMap: ->
-    map = new MQA.TileMap(                        #// Constructs an instance of MQA.TileMap
-      document.getElementById(@map_options.id),   #//the id of the element on the page you want the map to be added into 
-      @map_options.zoom,                          #//intial zoom level of the map
-      {lat: @map_options.center_latitude, lng: @map_options.center_longitude}, 
-      @map_options.type)                          #//map type (map, sat, hyb)
-    
-    MQA.withModule('zoomcontrol3', (->
-      map.addControl(
-        new MQA.LargeZoomControl3(), 
-        new MQA.MapCornerPlacement(MQA.MapCorner.TOP_LEFT)
-      )
-    ))
-    return map
-
-  createMarkerImage: (markerPicture, markerSize, origin, anchor, scaledSize) ->
-
-  #////////////////////////////////////////////////////
-  #////////////////////// Markers /////////////////////
-  #////////////////////////////////////////////////////
-
-  createMarker: (args)->
-    marker = new MQA.Poi( {lat: args.Lat, lng: args.Lng} )
-
-    if args.marker_picture != ""  
-      icon = new MQA.Icon(args.marker_picture, args.marker_height, args.marker_width)
-      marker.setIcon(icon)
-      if args.marker_anchor != null
-        marker.setBias({x: args.marker_anchor[0], y: args.marker_anchor[1]})
-
-    if args.shadow_picture != "" 
-      icon = new MQA.Icon(args.shadow_picture, args.shadow_height, args.shadow_width)
-      marker.setShadow(icon)
-
-      if args.shadow_anchor != null
-        marker.setShadowOffset({x: args.shadow_anchor[0], y: args.shadow_anchor[1]})
-
-    @addToMap marker
-    return marker
-
-
-  #// clear markers
-  clearMarkers: ->
-    for marker in markers
-      @clearMarker marker
-
-  #//show and hide markers
-  showMarkers: ->
-    for marker in markers
-      @showMarker marker
-
-  hideMarkers: ->
-    for marker in markers
-      @hideMarker marker
-
-  clearMarker: (marker) ->
-    @removeFromMap(marker.serviceObject)
-
-  showMarker: (marker) ->
-    #// marker.serviceObject
-
-  hideMarker: (marker) ->
-    #// marker.serviceObject
-
-  extendBoundsWithMarkers: ->
-    if @markers.length >=2
-      @boundsObject = new MQA.RectLL(@markers[0].serviceObject.latLng, @markers[1].serviceObject.latLng)
-      for marker in @markers
-        @boundsObject.extend marker.serviceObject.latLng
-
-  #////////////////////////////////////////////////////
-  #/////////////////// Clusterer //////////////////////
-  #////////////////////////////////////////////////////
-
-  createClusterer: (markers_array) ->
-
-  clearClusterer: ->
-
-  #//creates clusters
-  clusterize: ->
-
-  #////////////////////////////////////////////////////
-  #/////////////////// INFO WINDOW ////////////////////
-  #////////////////////////////////////////////////////
-
-  #// creates infowindows
-  createInfoWindow: (marker_container) ->
-    marker_container.serviceObject.setInfoTitleHTML(marker_container.description)
-    #//TODO: how to disable the mouseover display when using setInfoContentHTML?
-    #//marker_container.serviceObject.setInfoContentHTML(marker_container.description);
-
-  #////////////////////////////////////////////////////
-  #/////////////////// Other methods //////////////////
-  #////////////////////////////////////////////////////
-
-  fitBounds: ->
-    @serviceObject.zoomToRect @boundsObject if @markers.length >=2
-    @serviceObject.setCenter @markers[0].serviceObject.latLng if @markers.length == 1 
-
-  centerMapOnUser: -> 
-    @serviceObject.setCenter @userLocation
-    
-  addToMap: (object) ->
-    @serviceObject.addShape object
-
-  removeFromMap: (object)->
-    @serviceObject.removeShape object
-    
-  updateBoundsWithPolylines: ()->
-
-  updateBoundsWithPolygons: ()->
-
-  updateBoundsWithCircles: ()->
-    
-  extendMapBounds :->
-
-  adaptMapToBounds: ->
-    @fitBounds()

app/assets/javascripts/search/gmaps4rails/gmaps4rails.openlayers.js.coffee

@@ -1,261 +0,0 @@
-#######################################################################################################
-##############################################  Open Layers  ##########################################
-#######################################################################################################
-
-#// http://wiki.openstreetmap.org/wiki/OpenLayers
-#// http://openlayers.org/dev/examples
-#//http://docs.openlayers.org/contents.html
-
-class @Gmaps4RailsOpenlayers extends Gmaps4Rails
-
-  constructor: ->
-    super
-    @map_options = {}
-    @mergeWithDefault "map_options"
-    @markers_conf = {}
-    @mergeWithDefault "markers_conf"
-
-    @openMarkers = null
-    @markersLayer = null
-    @markersControl = null
-    @polylinesLayer = null
-
-  #////////////////////////////////////////////////////
-  #/////////////// Basic Objects   ////////////////////
-  #////////////////////////////////////////////////////
-
-  createPoint: (lat, lng)->
-
-  createLatLng: (lat, lng)->
-    return new OpenLayers.LonLat(lng, lat).transform(new OpenLayers.Projection("EPSG:4326"), new OpenLayers.Projection("EPSG:900913")) # transform from WGS 1984 to Spherical Mercator Projection
-              
-  createAnchor: (offset)->
-    return null if offset == null
-    return new OpenLayers.Pixel(offset[0], offset[1])
-
-  createSize: (width, height)->
-    return new OpenLayers.Size(width, height)
-
-  createLatLngBounds: ->
-     return new OpenLayers.Bounds()
-  
-  createMap: ->
-    #//todo add customization: kind of map and other map options
-    map = new OpenLayers.Map(@map_options.id)
-    map.addLayer(new OpenLayers.Layer.OSM())
-    map.setCenter(@createLatLng(@map_options.center_latitude, @map_options.center_longitude), #// Center of the map
-                  @map_options.zoom) #// Zoom level
-    return map
-
-  #////////////////////////////////////////////////////
-  #////////////////////// Markers /////////////////////
-  #////////////////////////////////////////////////////
-  #//http://openlayers.org/dev/examples/marker-shadow.html
-  createMarker: (args) ->
-    style_mark = OpenLayers.Util.extend({}, OpenLayers.Feature.Vector.style['default'])
-    style_mark.fillOpacity = 1
-  
-    #//creating markers' dedicated layer 
-    if (@markersLayer == null) 
-      @markersLayer = new OpenLayers.Layer.Vector("Markers", null)
-      @serviceObject.addLayer(@markersLayer)
-      #//TODO move?
-      @markersLayer.events.register("featureselected", @markersLayer, @onFeatureSelect)
-      @markersLayer.events.register("featureunselected", @markersLayer, @onFeatureUnselect)
-      @markersControl = new OpenLayers.Control.SelectFeature(@markersLayer)
-      @serviceObject.addControl(@markersControl)
-      @markersControl.activate()
-    #//showing default pic if none available
-    if args.marker_picture == ""  
-      #style_mark.graphicWidth = 24
-      style_mark.graphicHeight = 30
-      style_mark.externalGraphic = "http://openlayers.org/dev/img/marker-blue.png"
-    #//creating custom pic
-    else
-      style_mark.graphicWidth    = args.marker_width
-      style_mark.graphicHeight   = args.marker_height
-      style_mark.externalGraphic = args.marker_picture
-      #//adding anchor if any
-      if args.marker_anchor != null 
-        style_mark.graphicXOffset = args.marker_anchor[0]
-        style_mark.graphicYOffset = args.marker_anchor[1]
-      #//adding shadow if any
-      if args.shadow_picture != ""
-        style_mark.backgroundGraphic = args.shadow_picture
-        style_mark.backgroundWidth   = args.shadow_width
-        style_mark.backgroundHeight  = args.shadow_height
-        #//adding shadow's anchor if any
-        if args.shadow_anchor != null
-          style_mark.backgroundXOffset = args.shadow_anchor[0]
-          style_mark.backgroundYOffset = args.shadow_anchor[1]
-      
-    style_mark.graphicTitle = args.marker_title
-    marker = new OpenLayers.Feature.Vector(
-               new OpenLayers.Geometry.Point(args.Lng, args.Lat),
-               null,
-              style_mark)
-    #//changing coordinates so that it actually appears on the map!
-    marker.geometry.transform(new OpenLayers.Projection("EPSG:4326"), new OpenLayers.Projection("EPSG:900913"))
-    #//adding layer to the map
-    @markersLayer.addFeatures([marker])
-  
-    return marker
-
-  #//clear markers
-  clearMarkers: ->
-    @clearMarkersLayerIfExists()
-    @markersLayer = null
-    @boundsObject = new OpenLayers.Bounds()
-  
-  clearMarkersLayerIfExists: -> 
-    @serviceObject.removeLayer(@markersLayer) if @markersLayer != null and @serviceObject.getLayer(@markersLayer.id) != null
-  
-  extendBoundsWithMarkers: ->
-    console.log "here"
-    for marker in @markers
-      @boundsObject.extend(@createLatLng(marker.lat,marker.lng))        
-
-  #////////////////////////////////////////////////////
-  #/////////////////// Clusterer //////////////////////
-  #////////////////////////////////////////////////////
-  #//too ugly to be considered valid :(
-
-  createClusterer: (markers_array)->
-     options = 
-       pointRadius: "${radius}"
-       fillColor: "#ffcc66"
-       fillOpacity: 0.8
-       strokeColor: "#cc6633"
-       strokeWidth: "${width}"
-       strokeOpacity: 0.8
-     funcs =
-       context:
-         width: (feature) ->
-           return (feature.cluster) ? 2 : 1
-         radius: (feature) ->
-           pix = 2
-           pix = Math.min(feature.attributes.count, 7) + 2 if feature.cluster
-           return pix
-     
-     style = new OpenLayers.Style options, funcs
-   
-     strategy = new OpenLayers.Strategy.Cluster()
-   
-     clusters = new OpenLayers.Layer.Vector "Clusters", 
-       strategies: [strategy]
-       styleMap: new OpenLayers.StyleMap
-         "default": style
-         "select": 
-            fillColor: "#8aeeef"
-            strokeColor: "#32a8a9"
-       
-     @clearMarkersLayerIfExists()
-     @serviceObject.addLayer(clusters)
-     clusters.addFeatures(markers_array)
-     return clusters
-   
-   clusterize: ->
-   
-     if @markers_conf.do_clustering == true
-       #//first clear the existing clusterer if any
-       if @markerClusterer != null
-         @clearClusterer()
-       markers_array = new Array
-       for marker in @markers
-         markers_array.push(marker.serviceObject)
-       @markerClusterer = @createClusterer markers_array
-   
-   clearClusterer: ->
-     @serviceObject.removeLayer @markerClusterer
-
-  #////////////////////////////////////////////////////
-  #/////////////////// INFO WINDOW ////////////////////
-  #////////////////////////////////////////////////////
-
-  #// creates infowindows
-  createInfoWindow: (marker_container) ->
-    marker_container.serviceObject.infoWindow = marker_container.description if marker_container.description?
-  
-  onPopupClose: (evt) ->
-    #// 'this' is the popup.
-    @markersControl.unselect @feature
-  
-  onFeatureSelect: (evt) ->
-    feature = evt.feature    
-    popup = new OpenLayers.Popup.FramedCloud("featurePopup",
-                               feature.geometry.getBounds().getCenterLonLat(),
-                               new OpenLayers.Size(300,200),
-                               feature.infoWindow,
-                               null, true, @onPopupClose)
-    feature.popup = popup
-    popup.feature = feature
-    @map.addPopup popup
-
-  onFeatureUnselect: (evt) ->
-    feature = evt.feature
-    if feature.popup
-      #//popup.feature = null;
-      @map.removePopup feature.popup
-      feature.popup.destroy()
-      feature.popup = null
-
-  #////////////////////////////////////////////////////
-  #/////////////////// POLYLINES //////////////////////
-  #////////////////////////////////////////////////////
-
-  create_polyline : (polyline) ->
-	
-    if(@polylinesLayer == null)
-      @polylinesLayer = new OpenLayers.Layer.Vector("Polylines", null)
-      @serviceObject.addLayer(@polylinesLayer)
-      @polylinesLayer.events.register("featureselected", @polylinesLayer, @onFeatureSelect)
-      @polylinesLayer.events.register("featureunselected", @polylinesLayer, @onFeatureUnselect)
-      @polylinesControl = new OpenLayers.Control.DrawFeature(@polylinesLayer, OpenLayers.Handler.Path)
-      @serviceObject.addControl(@polylinesControl)
-    
-    polyline_coordinates = []
-
-    for element in polyline
-      #by convention, a single polyline could be customized in the first array or it uses default values
-      if element == polyline[0]
-        strokeColor   = element.strokeColor   || @polylines_conf.strokeColor
-        strokeOpacity = element.strokeOpacity || @polylines_conf.strokeOpacity
-        strokeWeight  = element.strokeWeight  || @polylines_conf.strokeWeight
-        clickable     = element.clickable     || @polylines_conf.clickable
-        zIndex        = element.zIndex        || @polylines_conf.zIndex	  
-      
-      #add latlng if positions provided
-      if element.lat? && element.lng?
-        latlng = new OpenLayers.Geometry.Point(element.lng, element.lat)
-        polyline_coordinates.push(latlng)
-    
-    line_points = new OpenLayers.Geometry.LineString(polyline_coordinates);
-    line_style = { strokeColor: strokeColor, strokeOpacity: strokeOpacity, strokeWidth: strokeWeight };
-   
-    polyline = new OpenLayers.Feature.Vector(line_points, null, line_style);
-    polyline.geometry.transform(new OpenLayers.Projection("EPSG:4326"), new OpenLayers.Projection("EPSG:900913"))
-
-    @polylinesLayer.addFeatures([polyline])
-
-    return polyline
-
-  updateBoundsWithPolylines: ()->
-  
-  updateBoundsWithPolygons: ()->
-    
-  updateBoundsWithCircles: ()->
-  
-  # #////////////////////////////////////////////////////
-  # #/////////////////// Other methods //////////////////
-  # #////////////////////////////////////////////////////
- 
-  fitBounds: ->
-    @serviceObject.zoomToExtent(@boundsObject, true)
-  
-  centerMapOnUser: ->
-    @serviceObject.setCenter @userLocation
-    
-  extendMapBounds :->
-    
-  adaptMapToBounds: ->
-    @fitBounds()

app/assets/javascripts/search/jquery.backstretch.js

@@ -1,4 +0,0 @@
-/*! Backstretch - v2.0.4 - 2013-06-19
- * http://srobbin.com/jquery-plugins/backstretch/
- * Copyright (c) 2013 Scott Robbin; Licensed MIT */
-(function(a,d,p){a.fn.backstretch=function(c,b){(c===p||0===c.length)&&a.error("No images were supplied for Backstretch");0===a(d).scrollTop()&&d.scrollTo(0,0);return this.each(function(){var d=a(this),g=d.data("backstretch");if(g){if("string"==typeof c&&"function"==typeof g[c]){g[c](b);return}b=a.extend(g.options,b);g.destroy(!0)}g=new q(this,c,b);d.data("backstretch",g)})};a.backstretch=function(c,b){return a("body").backstretch(c,b).data("backstretch")};a.expr[":"].backstretch=function(c){return a(c).data("backstretch")!==p};a.fn.backstretch.defaults={centeredX:!0,centeredY:!0,duration:5E3,fade:0};var r={left:0,top:0,overflow:"hidden",margin:0,padding:0,height:"100%",width:"100%",zIndex:-999999},s={position:"absolute",display:"none",margin:0,padding:0,border:"none",width:"auto",height:"auto",maxHeight:"none",maxWidth:"none",zIndex:-999999},q=function(c,b,e){this.options=a.extend({},a.fn.backstretch.defaults,e||{});this.images=a.isArray(b)?b:[b];a.each(this.images,function(){a("<img />")[0].src=this});this.isBody=c===document.body;this.$container=a(c);this.$root=this.isBody?l?a(d):a(document):this.$container;c=this.$container.children(".backstretch").first();this.$wrap=c.length?c:a('<div class="backstretch"></div>').css(r).appendTo(this.$container);this.isBody||(c=this.$container.css("position"),b=this.$container.css("zIndex"),this.$container.css({position:"static"===c?"relative":c,zIndex:"auto"===b?0:b,background:"none"}),this.$wrap.css({zIndex:-999998}));this.$wrap.css({position:this.isBody&&l?"fixed":"absolute"});this.index=0;this.show(this.index);a(d).on("resize.backstretch",a.proxy(this.resize,this)).on("orientationchange.backstretch",a.proxy(function(){this.isBody&&0===d.pageYOffset&&(d.scrollTo(0,1),this.resize())},this))};q.prototype={resize:function(){try{var a={left:0,top:0},b=this.isBody?this.$root.width():this.$root.innerWidth(),e=b,g=this.isBody?d.innerHeight?d.innerHeight:this.$root.height():this.$root.innerHeight(),j=e/this.$img.data("ratio"),f;j>=g?(f=(j-g)/2,this.options.centeredY&&(a.top="-"+f+"px")):(j=g,e=j*this.$img.data("ratio"),f=(e-b)/2,this.options.centeredX&&(a.left="-"+f+"px"));this.$wrap.css({width:b,height:g}).find("img:not(.deleteable)").css({width:e,height:j}).css(a)}catch(h){}return this},show:function(c){if(!(Math.abs(c)>this.images.length-1)){var b=this,e=b.$wrap.find("img").addClass("deleteable"),d={relatedTarget:b.$container[0]};b.$container.trigger(a.Event("backstretch.before",d),[b,c]);this.index=c;clearInterval(b.interval);b.$img=a("<img />").css(s).bind("load",function(f){var h=this.width||a(f.target).width();f=this.height||a(f.target).height();a(this).data("ratio",h/f);a(this).fadeIn(b.options.speed||b.options.fade,function(){e.remove();b.paused||b.cycle();a(["after","show"]).each(function(){b.$container.trigger(a.Event("backstretch."+this,d),[b,c])})});b.resize()}).appendTo(b.$wrap);b.$img.attr("src",b.images[c]);return b}},next:function(){return this.show(this.index<this.images.length-1?this.index+1:0)},prev:function(){return this.show(0===this.index?this.images.length-1:this.index-1)},pause:function(){this.paused=!0;return this},resume:function(){this.paused=!1;this.next();return this},cycle:function(){1<this.images.length&&(clearInterval(this.interval),this.interval=setInterval(a.proxy(function(){this.paused||this.next()},this),this.options.duration));return this},destroy:function(c){a(d).off("resize.backstretch orientationchange.backstretch");clearInterval(this.interval);c||this.$wrap.remove();this.$container.removeData("backstretch")}};var l,f=navigator.userAgent,m=navigator.platform,e=f.match(/AppleWebKit\/([0-9]+)/),e=!!e&&e[1],h=f.match(/Fennec\/([0-9]+)/),h=!!h&&h[1],n=f.match(/Opera Mobi\/([0-9]+)/),t=!!n&&n[1],k=f.match(/MSIE ([0-9]+)/),k=!!k&&k[1];l=!((-1<m.indexOf("iPhone")||-1<m.indexOf("iPad")||-1<m.indexOf("iPod"))&&e&&534>e||d.operamini&&"[object OperaMini]"==={}.toString.call(d.operamini)||n&&7458>t||-1<f.indexOf("Android")&&e&&533>e||h&&6>h||"palmGetResource"in d&&e&&534>e||-1<f.indexOf("MeeGo")&&-1<f.indexOf("NokiaBrowser/8.5.0")||k&&6>=k)})(jQuery,window);

app/assets/javascripts/search/jquery.offcanvas.js

@@ -1,62 +0,0 @@
-//;(function (window, document, $) {
-//    alert($("#sidebarButton").html());
-//}(this, document, jQuery));
-
-
-
-
-//;(function (window, document, $) {
-//  // Set the negative margin on the top menu for slide-menu pages
-//  var $selector1 = $('#topMenu'),
-//    events = 'click.fndtn';
-//  if ($selector1.length > 0) $selector1.css("margin-top", $selector1.height() * -1);
-//
-//  // Watch for clicks to show the sidebar
-//  var $selector2 = $('#sidebarButton');
-//  if ($selector2.length > 0) {
-//    $('#sidebarButton').on(events, function (e) {
-//      console.log("testing one two three");
-//      e.preventDefault();
-//      $('body').toggleClass('active');
-//    });
-//  }
-//  else {
-//      console.log("not supposed to be there");
-//  }
-//
-//  // Watch for clicks to show the menu for slide-menu pages
-//  var $selector3 = $('#menuButton');
-//  if ($selector3.length > 0)  {
-//    $('#menuButton').on(events, function (e) {
-//      e.preventDefault();
-//      $('body').toggleClass('active-menu');
-//    });
-//  }
-//
-//  // // Adjust sidebars and sizes when resized
-//  // $(window).resize(function() {
-//  //   // if (!navigator.userAgent.match(/Android/i)) $('body').removeClass('active');
-//  //   var $selector4 = $('#topMenu');
-//  //   if ($selector4.length > 0) $selector4.css("margin-top", $selector4.height() * -1);
-//  // });
-//
-//  // Switch panels for the paneled nav on mobile
-//  var $selector5 = $('#switchPanels');
-//  if ($selector5.length > 0)  {
-//    $('#switchPanels dd').on(events, function (e) {
-//      e.preventDefault();
-//      var switchToPanel = $(this).children('a').attr('href'),
-//          switchToIndex = $(switchToPanel).index();
-//      $(this).toggleClass('active').siblings().removeClass('active');
-//      $(switchToPanel).parent().css("left", (switchToIndex * (-100) + '%'));
-//    });
-//  }
-//
-//  $('#nav li a').on(events, function (e) {
-//    alert("test");
-//    e.preventDefault();
-//    var href = $(this).attr('href'),
-//      $target = $(href);
-//    $('html, body').animate({scrollTop : $target.offset().top}, 300);
-//  });
-//}(this, document, jQuery));

app/assets/javascripts/shop/checkout.js.coffee

@@ -1,3 +0,0 @@
-# Place all the behaviors and hooks related to the matching controller here.
-# All this logic will automatically be available in application.js.
-# You can use CoffeeScript in this file: http://jashkenas.github.com/coffee-script/

app/assets/javascripts/store/all.js

@@ -9,7 +9,5 @@
 //= require store/spree_core
 //= require store/spree_auth
 //= require store/spree_promo
-//= require angular
-//= require angular-resource
 
 //= require_tree .

app/assets/javascripts/store/checkout_adjustments.js.coffee

@@ -1,8 +0,0 @@
-$(document).ready ->
-  $('#cart_adjustments').hide()
-
-  $('th.cart-adjustment-header').html('<a href="#">Distribution...</a>')
-  $('th.cart-adjustment-header a').click ->
-    $('#cart_adjustments').toggle()
-    $('th.cart-adjustment-header a').html('Distribution')
-    false

app/assets/javascripts/store/controllers/cart.js.coffee

@@ -1,20 +0,0 @@
-'use strict'
-
-angular.module('store', ['ngResource']).
-  controller('CartCtrl', ['$scope', '$window', 'CartFactory', ($scope, $window, CartFactory) ->
-
-    $scope.state = 'Empty'
-
-    $scope.loadCart = (cart_id) ->
-      if cart_id?
-        CartFactory.load cart_id, (cart) ->
-          $scope.cart = cart
-          if $scope.cart?.orders?.length > 0
-            $scope.state = "There's something there...."
-
-    $scope.addVariant = (variant, quantity) ->
-
-  ])
-  .config(['$httpProvider', ($httpProvider) ->
-    $httpProvider.defaults.headers.common['X-CSRF-Token'] = $('meta[name=csrf-token]').attr('content')
-  ])

app/assets/javascripts/store/factories/cart.js.coffee

@@ -1,11 +0,0 @@
-'use strict'
-
-angular.module('store').
-  factory('CartFactory', ['$resource', '$window', '$http', ($resource, $window, $http) ->
-    Cart = $resource '/open_food_network/cart/:cart_id.json', {},
-      { 'show':  { method: 'GET'} }
-
-    load: (id, callback) ->
-      Cart.show {cart_id: id}, (cart) ->
-        callback(cart)
-    ])