Adding missing equals sign to test for equality in permalink migration

This reverts commit 48dc85cfc2.

.gitignore

@@ -15,6 +15,7 @@ tmp/
 .#*
 *~
 *.~lock.*
+tags
 .emacs.desktop
 .DS_Store
 *.sublime-project*
@@ -36,5 +37,4 @@ config/initializers/feature_toggle.rb
 NERD_tree*
 coverage
 libpeerconnection.log
-tags
-app/assets/javascripts/tags
+/config/application.yml

.rspec

@@ -1,2 +1,2 @@
 --colour
---profile
+--format Fuubar

.travis.yml

@@ -7,6 +7,7 @@ before_install:
 before_script:
   - cp config/database.travis.yml config/database.yml
   - psql -c 'create database open_food_network_test;' -U postgres
+  - cp config/application.yml.example config/application.yml
 script:
   - RAILS_ENV=test bundle exec rake db:migrate --trace
   - bundle exec rake spec

Gemfile

@@ -2,6 +2,7 @@ source 'https://rubygems.org'
 ruby "1.9.3"
 
 gem 'rails', '3.2.19'
+gem 'rails-i18n', '~> 3.0.0'
 
 gem 'pg'
 gem 'spree', :github => 'openfoodfoundation/spree', :branch => '1-3-stable'
@@ -20,7 +21,7 @@ gem 'comfortable_mexican_sofa'
 gem 'simple_form', :github => 'RohanM/simple_form'
 
 gem 'unicorn'
-gem 'angularjs-rails'
+gem 'angularjs-rails', '1.2.13'
 gem 'bugsnag'
 gem 'newrelic_rpm'
 gem 'haml'
@@ -43,6 +44,8 @@ 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 'roadie-rails', '~> 1.0.3'
+gem 'figaro'
 
 gem 'foreigner'
 gem 'immigrant'
@@ -75,6 +78,7 @@ gem 'jquery-rails'
 group :test, :development do
   # Pretty printed test output
   gem 'turn', '~> 0.8.3', :require => false
+  gem 'fuubar'
   gem 'rspec-rails'
   gem 'shoulda-matchers'
   gem 'factory_girl_rails', :require => false
@@ -91,7 +95,9 @@ end
 
 group :test do
   gem 'webmock'
-  gem 'perftools.rb'
+
+  # See spec/spec_helper.rb for instructions
+  #gem 'perftools.rb'
 end
 
 group :development do

Gemfile.lock

@@ -23,7 +23,7 @@ GIT
 
 GIT
   remote: git://github.com/openfoodfoundation/spree.git
-  revision: bbe5e779bcb883a1726ad4006d7c06b06c3f5372
+  revision: 4e0075b07acb56864aca89eee3d9670136176c23
   branch: 1-3-stable
   specs:
     spree (1.3.6.beta)
@@ -50,7 +50,7 @@ GIT
       json (>= 1.5.5)
       kaminari (= 0.14.1)
       money (= 5.1.1)
-      paperclip (~> 2.8)
+      paperclip (~> 3.0)
       rabl (= 0.7.2)
       rails (~> 3.2.16)
       ransack (= 0.7.2)
@@ -121,17 +121,17 @@ GEM
     active_link_to (1.0.0)
     active_model_serializers (0.8.1)
       activemodel (>= 3.0)
-    active_utils (2.2.1)
+    active_utils (2.2.3)
       activesupport (>= 2.3.11)
       i18n
-    activemerchant (1.43.1)
-      active_utils (~> 2.0, >= 2.0.1)
-      activesupport (>= 2.3.14, < 5.0.0)
+    activemerchant (1.44.1)
+      active_utils (~> 2.2.0)
+      activesupport (>= 3.2.14, < 5.0.0)
       builder (>= 2.1.2, < 4.0.0)
-      i18n (~> 0.5)
+      i18n (>= 0.6.9)
       json (~> 1.7)
-      money (< 7.0.0)
       nokogiri (~> 1.4)
+      offsite_payments (~> 2.0.0)
     activemodel (3.2.19)
       activesupport (= 3.2.19)
       builder (~> 3.0.0)
@@ -209,6 +209,8 @@ GEM
       compass (>= 0.12.2, < 0.14)
     crack (0.4.1)
       safe_yaml (~> 0.9.0)
+    css_parser (1.3.5)
+      addressable
     dalli (2.7.2)
     database_cleaner (0.7.1)
     db2fog (0.8.0)
@@ -244,6 +246,9 @@ GEM
       railties (>= 3.0.0)
     ffaker (1.15.0)
     ffi (1.9.3)
+    figaro (0.7.0)
+      bundler (~> 1.0)
+      rails (>= 3, < 5)
     fog (1.14.0)
       builder
       excon (~> 0.25.0)
@@ -264,6 +269,9 @@ GEM
       railties (>= 3.1.0)
       sass (>= 3.2.0)
     fssm (0.2.10)
+    fuubar (1.3.3)
+      rspec (>= 2.14.0, < 3.1.0)
+      ruby-progressbar (~> 1.4)
     geocoder (1.1.8)
     gmaps4rails (1.5.6)
     guard (2.2.4)
@@ -292,7 +300,7 @@ GEM
     httparty (0.13.1)
       json (~> 1.8)
       multi_xml (>= 0.5.2)
-    i18n (0.6.9)
+    i18n (0.6.11)
     immigrant (0.1.6)
       activerecord (>= 3.0)
       foreigner (>= 1.2.1)
@@ -323,7 +331,7 @@ GEM
       treetop (~> 1.4.8)
     method_source (0.8.1)
     mime-types (1.25.1)
-    mini_portile (0.6.0)
+    mini_portile (0.6.1)
     momentjs-rails (2.5.1)
       railties (>= 3.1)
     money (5.1.1)
@@ -334,21 +342,28 @@ GEM
       net-ssh (>= 2.6.5)
     net-ssh (2.6.8)
     newrelic_rpm (3.6.7.152)
-    nokogiri (1.6.2.1)
-      mini_portile (= 0.6.0)
+    nokogiri (1.6.4.1)
+      mini_portile (~> 0.6.0)
+    offsite_payments (2.0.1)
+      active_utils (~> 2.2.0)
+      activesupport (>= 3.2.14, < 5.0.0)
+      builder (>= 2.1.2, < 4.0.0)
+      i18n (~> 0.5)
+      json (~> 1.7)
+      money (< 7.0.0)
+      nokogiri (~> 1.4)
     oj (2.1.2)
     orm_adapter (0.5.0)
-    paperclip (2.8.0)
-      activerecord (>= 2.3.0)
-      activesupport (>= 2.3.2)
-      cocaine (>= 0.0.2)
+    paperclip (3.5.4)
+      activemodel (>= 3.0.0)
+      activesupport (>= 3.0.0)
+      cocaine (~> 0.5.3)
       mime-types
     paypal-sdk-core (0.2.10)
       multi_json (~> 1.0)
       xml-simple
     paypal-sdk-merchant (1.106.1)
       paypal-sdk-core (~> 0.2.3)
-    perftools.rb (2.0.1)
     pg (0.13.2)
     poltergeist (1.5.0)
       capybara (~> 2.1)
@@ -385,6 +400,9 @@ GEM
       activesupport (= 3.2.19)
       bundler (~> 1.0)
       railties (= 3.2.19)
+    rails-i18n (3.0.1)
+      i18n (~> 0.5)
+      rails (>= 3.0.0, < 4.0.0)
     railties (3.2.19)
       actionpack (= 3.2.19)
       activesupport (= 3.2.19)
@@ -412,6 +430,12 @@ GEM
     representative_view (1.2.2)
       actionpack (> 2.3.0, < 4.0.0)
       representative (~> 1.0.2)
+    roadie (3.0.1)
+      css_parser (~> 1.3.4)
+      nokogiri (~> 1.6.0)
+    roadie-rails (1.0.3)
+      rails (>= 3.0, < 4.2)
+      roadie (~> 3.0)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
@@ -428,6 +452,7 @@ GEM
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
     ruby-hmac (0.4.0)
+    ruby-progressbar (1.7.1)
     safe_yaml (0.9.5)
     sass (3.2.19)
     sass-rails (3.2.6)
@@ -445,7 +470,7 @@ GEM
     slop (3.4.5)
     spinjs-rails (1.3)
       rails (>= 3.1)
-    sprockets (2.2.2)
+    sprockets (2.2.3)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
@@ -468,7 +493,7 @@ GEM
       sprockets (>= 2.0.0)
     turn (0.8.3)
       ansi
-    tzinfo (0.3.39)
+    tzinfo (0.3.42)
     uglifier (1.2.4)
       execjs (>= 0.3.0)
       multi_json (>= 1.0.2)
@@ -479,7 +504,7 @@ GEM
     unicorn-rails (1.1.0)
       rack
       unicorn
-    uuidtools (2.1.4)
+    uuidtools (2.1.5)
     versioncake (0.4.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
@@ -507,7 +532,7 @@ DEPENDENCIES
   andand
   angular-rails-templates
   angularjs-file-upload-rails (~> 1.1.0)
-  angularjs-rails
+  angularjs-rails (= 1.2.13)
   awesome_print
   aws-sdk
   bugsnag
@@ -522,10 +547,12 @@ DEPENDENCIES
   debugger-linecache
   deface!
   factory_girl_rails
+  figaro
   foreigner
   foundation-icons-sass-rails
   foundation-rails
   foundation_rails_helper!
+  fuubar
   geocoder
   gmaps4rails
   guard
@@ -542,7 +569,6 @@ DEPENDENCIES
   newrelic_rpm
   oj
   paperclip
-  perftools.rb
   pg
   poltergeist
   pry-debugger
@@ -550,7 +576,9 @@ DEPENDENCIES
   rack-livereload
   rack-ssl
   rails (= 3.2.19)
+  rails-i18n (~> 3.0.0)
   representative_view
+  roadie-rails (~> 1.0.3)
   rspec-rails
   sass (~> 3.2)
   sass-rails (~> 3.2.3)

README.markdown

@@ -48,11 +48,20 @@ Install the project's gem dependencies:
 
     bundle install
 
-Create the development and test databases, using the settings specified in `config/database.yml`. You can then load the schema and some seed data with the following command:
+Configure the site:
+
+    cp config/application.yml.example config/application.yml
+    edit config/application.yml
+
+Create the development and test databases, using the settings specified in `config/database.yml`:
+
+    rake db:setup
+
+Then load the schema and some seed data with the following command:
 
     rake db:schema:load db:seed
 
-Load some default data for your environment
+Load some default data for your environment:
 
     rake openfoodnetwork:dev:load_sample_data
 
@@ -65,7 +74,7 @@ At long last, your dreams of spinning up a development server can be realised:
 
 Tests, both unit and integration, are based on RSpec. To run the test suite, first prepare the test database:
 
-    bundle exec rake db:test:load
+    bundle exec rake db:test:prepare
 
 Then the tests can be run with:
 
@@ -86,7 +95,7 @@ usage instructions.
 * David Cook (http://github.com/dacook)
 * Will Marshall (http://soundcloud.com/willmarshall)
 * Laura Summers (https://github.com/summerscope)
-
+* Maikel Linke (https://github.com/mkllnk)
 
 ## Licence
 

app/assets/images/open-food-network-beta.svg

@@ -0,0 +1,840 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 18.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="0px" y="0px"
+	 viewBox="265 892.8 550 134.3" enable-background="new 265 892.8 550 134.3" xml:space="preserve">
+<g id="Layer_1_1_" display="none">
+	<g display="inline">
+		
+			<text transform="matrix(0.9994 3.560383e-02 -3.560383e-02 0.9994 1023.0334 999.8911)" font-family="'LondrinaSketch-Regular'" font-size="32.2299" letter-spacing="1">BETA</text>
+		<g>
+			<g>
+				<path fill="#444345" d="M156.5,1047.3v-20.9c0-2.3-2.1-4-4.4-4h-33.4c-2.4,0-4.6,1.6-4.6,4v20.9c0,2.3,2.4,4.2,4.6,4.2h33.4
+					C154.4,1051.4,156.5,1049.6,156.5,1047.3z M118.8,1026.3h33.8v21.3h-33.8V1026.3z"/>
+				<path fill="#444345" d="M197.5,895.5c-8.4,16.7-11.9,18.9-11.9,25.8c0,6.6,5.6,12.2,12.3,12.2c6.6,0,12.3-5.4,12.3-12.2
+					c0-7-3.1-10.9-11.9-25.8C198,895.1,197.7,895.1,197.5,895.5z M194.2,921.1c0,2.2-1.3,3-2.5,3c-1.5,0-2.5-1.1-2.5-2.6
+					c0-4.8,2.4-8,4.4-10.8c0.7-0.9,1.3-1.7,1.7-2.5C195.4,907.9,194.2,917.1,194.2,921.1z"/>
+				<path fill="#444345" d="M92.5,1032.2c-2.5-1.6-7.5-4.6-7.5-4.6s0,0,0,6.3c0,6.3,10.6,8.6,10.6,8.6
+					C95.4,1039.5,95.1,1033.8,92.5,1032.2z"/>
+				<path fill="#444345" d="M92.5,1043.5c-2.5-1.6-7.5-4.6-7.5-4.6s0,0,0,6.3c0,6.3,10.6,8.6,10.6,8.6
+					C95.4,1050.9,95.1,1045.2,92.5,1043.5z"/>
+				<path fill="#444345" d="M95.5,1065.2c-0.2-3-0.4-8.6-2.9-10.3c-2.5-1.6-7.7-4.6-7.7-4.6s0,0,0,6.3
+					C85,1062.9,95.5,1065.2,95.5,1065.2z"/>
+				<path fill="#444345" d="M99.1,1042.5c0,0,11-2.4,11-8.6c0-6.3,0-6.3,0-6.3s-6.2,3-8.7,4.6C98.8,1033.8,99.3,1039.5,99.1,1042.5z
+					"/>
+				<path fill="#444345" d="M99.1,1053.8c0,0,11-2.3,11-8.6c0-6.2,0-6.3,0-6.3s-6.2,3-8.7,4.6C98.8,1045.2,99.3,1050.9,99.1,1053.8z
+					"/>
+				<path fill="#444345" d="M110.1,1056.6c0-6.3,0-6.3,0-6.3s-6.1,2.9-8.6,4.6c-2.5,1.6-2.4,7.3-2.5,10.3
+					C99,1065.2,110.1,1062.9,110.1,1056.6z"/>
+				<path fill="#444345" d="M101.1,1025.9c0-2.9-0.7-6.6-4-10.3c0,0-3.9,4.8-3.9,9.5c0,3.1,1.7,5.7,3.9,8.4
+					C97.1,1033.7,101.1,1029,101.1,1025.9z"/>
+				<path fill="#444345" d="M84.3,851.2c0.8,0,1.5-0.1,2.2-0.4c1.6,1.5,3.7,2.2,5.8,2.2c2.1,0,4.2-0.8,5.8-2.2
+					c0.7,0.3,1.5,0.4,2.2,0.4c3.5,0,6.3-2.8,6.3-6.3s-2.8-6.3-6.3-6.3c-0.3,0-0.6,0-0.9,0.1c-1.6-2.4-4.2-3.7-7.1-3.7
+					c-2.9,0-5.5,1.3-7.1,3.7c-0.3,0-0.6-0.1-0.9-0.1c-3.5,0-6.3,2.8-6.3,6.3C78.2,848.4,81,851.2,84.3,851.2z"/>
+				<path fill="#444345" d="M94,862c0,0.9,0.8,1.7,1.8,1.7c0.9,0,1.7-0.8,1.7-1.7s-1.7-3.6-1.7-3.6S94,860.9,94,862z"/>
+				<path fill="#444345" d="M99.1,858.3c0.9,0,1.8-0.8,1.8-1.7s-1.8-3.6-1.8-3.6s-1.7,2.6-1.7,3.6C97.3,857.5,98.2,858.3,99.1,858.3
+					z"/>
+				<path fill="#444345" d="M92,859.2c0-0.9-1.7-3.6-1.7-3.6s-1.8,2.6-1.8,3.6s0.8,1.7,1.8,1.7C91.2,861,92,860.2,92,859.2z"/>
+				<path fill="#444345" d="M8.8,1010.5c0,6.4,5.2,11.7,11.7,11.7s11.7-5.2,11.7-11.7s-5.2-11.7-11.7-11.7S8.8,1004,8.8,1010.5z
+					 M29.1,1010.5c0,4.8-4,8.8-8.7,8.8c-4.8,0-8.8-4-8.8-8.8c0-4.8,4-8.8,8.8-8.8S29.1,1005.7,29.1,1010.5z"/>
+				<polygon fill="#444345" points="16,1014.9 22,1012 24.8,1006.1 19,1009.1 				"/>
+				<path fill="#444345" d="M113.9,866.3c0-0.1-0.1-0.2-0.1-0.3L113.9,866.3L113.9,866.3z"/>
+				<path fill="#444345" d="M110.6,876.1c7.1-2,14.4,3.1,15.4,10.5c0,0.3,0.1,0.6,0.1,0.9c0.3,0,0.6,0.1,0.9,0.1
+					c6-0.2,12.1-0.2,18.1-0.5c-2.5,0.7-4.4,3-4.4,5.7c0,3.3,2.7,6,6,6s6-2.7,6-6c0-3-2.2-5.4-5-5.9c4.4-0.3,3.6-0.2,4.4-4.2
+					c0.4-1.9,0.6-3.9,0.8-5.8c0.2-1.8-0.3-2.2-2.1-2.4c-2.7-0.1-5.1-0.2-7.9-0.3c-0.1,0-0.2-0.1-0.2-0.2c0-2,0.5-6.8,0.5-6.8
+					s-0.9-0.8-1.9-0.1c0,2.4,0,4.6,0,7.1c0,0-3.6-0.1-8.2-0.2c-0.2,0-0.9-0.4-1.3-1.1c-0.7-1.9-2.4-5.6-4.4-11.4
+					c0,0-1.1-2.4-3.8-2.4c-2.1,0-13.4,0-13.4,0v14.2c0,0-0.8,0.4-1.5,0.5C108.2,876.1,108.7,876.5,110.6,876.1z M149.8,892.9
+					c0,1.7-1.5,3.1-3.1,3.1c-1.7,0-3.1-1.5-3.1-3.1c0-1.7,1.5-3.1,3.1-3.1C148.4,889.8,149.8,891.1,149.8,892.9z M113.8,866v-2.7h11
+					l3.5,10.5l0.1,0.1c-4.7-0.1-10.1,0-14.6,0.2V866z"/>
+				<path fill="#444345" d="M113.3,877.3c-6,0-10.8,4.8-10.8,10.8c0,6,4.8,10.8,10.8,10.8c5.9,0,10.8-4.8,10.8-10.8
+					C124.1,882.1,119.3,877.3,113.3,877.3z M113.3,894.1c-3.3,0-6-2.7-6-6c0-3.3,2.7-6,6-6s6,2.7,6,6
+					C119.3,891.4,116.6,894.1,113.3,894.1z"/>
+				<path fill="#444345" d="M87.2,1074.3l-7.9-4.2c0.5-1.7,0.5-3.7,0-5.6c-1.6-5.5-7.9-8.9-13.4-7.3c-5.6,1.6-8.8,7.3-7.1,12.8
+					c1.6,5.5,7.9,8.9,13.4,7.3c1.8-0.6,3.5-1.5,4.6-2.8l7.9,4.4c0.8,0.4,1.7,0.1,2.2-0.7l1.1-1.9C88.4,1075.5,88,1074.8,87.2,1074.3
+					z M70.8,1073.2c-3.2,0.9-7-1.1-7.9-4.2c-0.9-3.2,0.9-6.6,4.2-7.5c3.2-0.9,7,1.1,7.9,4.2C75.9,1069,74.1,1072.3,70.8,1073.2z"/>
+				<path fill="#444345" d="M42.4,987.3c6-6.8,2.7-11.7,1.7-13.6c-0.9-1.9-1.3-4.7-1.3-4.7l0.2-0.9l0.2-1.1
+					c-1.3-0.4-2.7,0.3-2.7,0.3c0.3,2.1-0.3,4.4-0.6,5.3c-0.4,0.9-1.6,2.8-2.2,4c-0.6,1.1-2.1,4.7-9.9,8.1
+					c-7.9,3.4-18.3,0.3-18.3,0.3c-2.7-0.7-4.9,0.4-4.9,0.4L4,986.3l0.1,0.8l-0.3,0.5l0.1,0.6c7.7,11.9,23.6,7.9,23.6,7.9
+					S36.4,994,42.4,987.3z"/>
+				<path fill="#444345" d="M215.2,1059.3c3.5-0.1,6.8-0.7,10.1-2c1.1-0.5,1.5-1.3,1.6-2.5c0.1-0.7,0.1-1.3,0.1-1.9
+					c0-0.1,0-0.1,0-0.2c0-0.1-0.3-0.4-0.7-0.4c-1.6-0.1-1.9-0.5-2.4-2c-0.4-1.1-0.7-2.1-1.1-3.1c3.9-0.9,3.4-3.7,2-7.3
+					c-1.1,1.6-0.3,2.1-2.1,2.5c-1.7,0.4-3,1.3-3.8,3c-0.1,0.3-0.3,0.7-0.5,1.1c-0.2-2,0.7-3.2,2.4-4.7c-0.8-0.8-4-0.4-4.8-0.9
+					c-3.1-2.2-17.5-4.8-26.5,2c-0.5-0.5-0.9-0.9-1.5-1.3c2.1-0.9,2.9-2,2.5-3.7c-0.3-1.3-1.3-2-2.4-1.9c-1.9,0.1-2.6,0.9-2.9,4.2
+					c-0.7-0.7-1.1-1.1-1.9-1.9c0,0.6-0.2,1.1-0.1,1.5c0.3,0.9,1.1,1.5,1.9,1.8c0.7,0.1,1.1,0.5,1.3,1.1c0.2,0.4,0.4,0.9,0.8,1.1
+					c0.9,0.9,1.1,2.1,1.1,3.5c0,3,0.1,6,0.5,9c0.4,3.2,1.1,6.3,2.6,9.2c0.5,0.9,1.1,0.9,1.9,0.8c0.3-0.1,0.6-0.8,0.6-1.1
+					c0.2-2.4,1.3-4.4,2.4-6.4c4.2,1.3,8.3,1.5,12.5,1.3c0.2,0,0.6,0.4,0.8,0.7c0.8,1.5,1.5,3.2,2.2,4.8c0.4,0.9,1.3,0.9,2,0.8
+					c0.2-0.1,0.3-0.9,0.3-1.3c0-1.7,0-3.6,0-5.3c0.2-0.1,0.3-0.1,0.3-0.2C214.7,1059.3,215.1,1059.3,215.2,1059.3z M187.2,1039.8
+					c-0.5-1.1-0.2-1.9,0.6-2c0.5-0.1,1.1-0.1,1.1,0.6C189.1,1039.2,188.5,1039.7,187.2,1039.8z"/>
+				<path fill="#444345" d="M33.5,924.2c6.6-0.6,8.9-3.9,10.8-10.3c1.1-3.9,1.3-7.7,1.5-11.8c-0.3-3.3-0.3-6.6-0.7-9.9
+					c-0.7-4.6-1.8-9.3-4-13.4c-1.7-3.3-2.2-5.3-5.9-5.9c-4-0.5-8.4,1-10.1,5.6c-0.5,1.3-1.1,2.4-1.3,3.7c-0.7,2.8-2.4,5-4.4,7
+					c-5.8,5.3-7.7,12.1-6.4,19.6C14.5,918.6,23.5,925.1,33.5,924.2z M21.2,893.3c3.5-3.3,6-6.8,7.1-11.5c0.2-0.9,0.7-1.8,1.1-2.6
+					c1.3-2.3,4.2-2.7,6.1-0.8c0.8,0.9,1.3,1.9,1.7,2.9c2.8,6.6,4,13.7,4,19.9c0,4.7-0.3,8.4-1.5,11.9c-1.7,5-5.3,7.5-10.1,7
+					c-4-0.4-7.3-2.4-9.9-5.5C15.2,908.4,15.4,898.6,21.2,893.3z"/>
+				<path fill="#444345" d="M29.5,917.1c3.2,0.3,5.6-0.7,7.1-3.6c2.8-5.6,3-11.3,1.1-17.2c-0.4-1.3-1.3-2.2-2.5-2.7
+					c-3.5-1.5-7.1-1.5-10.5-0.1c-1.6,0.8-3.2,1.8-3.9,3.6c-0.4,0.9-0.3,1.6,0.7,2.1c1.5,0.8,3,1.5,4.6,2.4c0.5,0.3,0.9,0.7,1.3,0.9
+					c0,0.1-0.1,0.3-0.2,0.4c-0.4-0.1-0.8-0.1-1.1-0.2c-1.7-0.5-3.5-1.1-5.2-1.5c-0.9-0.3-1.5,0.1-1.7,0.9c-0.1,0.4-0.2,0.8-0.2,1.1
+					C17.9,910,22.8,916.4,29.5,917.1z"/>
+				<path fill="#444345" d="M30.6,889c0.9,0.3,1.9,0.5,2.9,0.7c1.9-0.1,2.7-0.6,2.7-2.5c0-1.3-0.3-2.8-0.7-4.2c-0.3-1.1-1.1-2-2.4-2
+					c-1.3-0.1-2.5,0.5-3,1.7c-0.5,1.1-0.9,2.4-1.1,3.8C28.7,887.8,29.1,888.5,30.6,889z"/>
+				<path fill="#444345" d="M56.9,983.4c-0.4,0.1-0.9-0.1-0.9-0.5c0,0-0.5-1.3-2-2.9c-0.4-0.4-0.8-0.7-1.1-0.9
+					c-0.6-0.5-1.3-0.9-1.8-1.6c0.9,8.1,4.4,14,8.3,14c4.7,0,8.6-8.4,8.6-18.9s-4-18.9-8.7-18.9c-3.1,0-5.8,3.7-7.3,9.1
+					c0.6,0.9,1.1,1.3,1.9,1.8c0.4,0.3,0.9,0.7,1.3,1.1c1.9,1.8,2.4,3.5,2.4,3.6s0,0.1,0,0.2c0,0.3-0.2,0.6-0.6,0.7s-0.9-0.1-0.9-0.5
+					c0,0-0.5-1.3-2-2.9c-0.4-0.4-0.8-0.7-1.1-0.9c-0.5-0.3-0.9-0.7-1.3-1.1c-0.2,0.9-0.4,1.8-0.5,2.8c0.7,2.4,1.6,3.1,2.8,4
+					c0.4,0.3,0.9,0.7,1.3,1.1c1.9,1.8,2.4,3.5,2.4,3.6s0,0.1,0,0.2c0,0.3-0.2,0.6-0.6,0.7s-0.9-0.1-0.9-0.5c0,0-0.5-1.3-2-2.9
+					c-0.4-0.4-0.8-0.7-1.1-0.9c-0.7-0.5-1.5-1.1-2-1.9c0,0.6,0,1.1,0,1.7c0.7,3.5,1.7,4.4,3.1,5.3c0.4,0.3,0.9,0.7,1.3,1.1
+					c1.9,1.8,2.4,3.5,2.4,3.6c0,0.1,0,0.1,0,0.2C57.5,983,57.3,983.3,56.9,983.4z"/>
+				<path fill="#444345" d="M196.9,877c1.6,1.8,3.6,3.6,6,3.8c1.7,0.3,3.9-0.9,5.2-0.9c2.8,0,2.2,0.7,5.2,0.7c2.9,0,8.5-7,9.9-14.2
+					c0.3-1.8,0-4.9-1.3-7.9c-1.6-3.5-6.4-4.8-9.5-4.2c-0.8,0.1-2.5,0.5-3.9,0.7c0.3-0.9,0.9-2.6,2.6-3.5c0.5-0.3,0.7-0.9,0.4-1.3
+					c-0.3-0.5-0.9-0.7-1.3-0.4c-2.7,1.5-3.6,4.2-3.8,5.4c-1.3-0.3-4.4-0.8-5.8-0.8c-1.7,0.1-3.4,0.6-4.9,1.7c-1.3,1.1-2,2.5-2.6,4
+					c-0.8,2.2-1.1,4.4-0.8,6.8C192.8,870.8,194.4,874.1,196.9,877z M202.8,858.9c1.5,0,2.7,1.1,2.7,2.5c0,1.8-1.3,3.3-2.8,3.3
+					c-1.1,0-2.1-1.5-2.1-3.2C200.8,860,201.5,858.9,202.8,858.9z"/>
+				<path fill="#444345" d="M204.7,852.3c1.1,0.1,2.4,0.2,2.9-0.9c0.6-1.1-0.3-2.2-1.1-3.1c-1.8-1.9-4.6-2.3-7.7-0.9
+					c0.4,0.7,0.8,1.3,1.1,1.8C200.9,851,202.6,852,204.7,852.3z"/>
+				<path fill="#444345" d="M133.7,858.3c1.9-4,4.6-7.1,4.6-7.1c4,1.5,10.8,3.2,15.6-0.2c6.4-4.6,5.8-14.6,15-19.5
+					c2.1-1.1-18.1-5.9-28.7,0.2c-7.9,4.5-7.3,12-7.1,14.6c10.1-12,25.2-11.4,25.2-11.4s-21.4,7.4-27.7,22.2
+					C130.2,858.1,133.1,859.6,133.7,858.3z"/>
+				<path fill="#444345" d="M212,1007c4.8-9.9-0.6-17-2.7-19.6c-2.1,18.9-17.9,28.5-17.9,28.5s16.7-21.8,13.2-41
+					c-0.3-1.5-4.2-1.1-3.9,0.7c0.8,5.4,0.2,10.3,0.2,10.3c-5,1.1-13,4-15.8,10.7c-3.5,8.9,4,18.7-2,29.9
+					C181.8,1029.2,205.5,1020.4,212,1007z"/>
+				<path fill="#444345" d="M37.2,932.9c-2,1.5-1.6,5.4-0.1,7.5c1.5,1.9,5.3,3.4,7.3,1.8c0.4-0.3,1.6-1.1,1.6-1.1
+					c2.2,1.7,3.6,0,4.6,1.3c1.1,1.5,3.8,4.7,4.6,5.8c0.9,1.1,2.4,1.9,3.2,1.3c0.8-0.6,3.5-2.5,4.6-3.3c1.1-0.8,1.1-1.8,0.5-2.6
+					c-0.6-0.8-2.2-0.6-3-1.5c-0.8-0.9-3.1-3.8-3.8-4.7c-0.9-1.3-0.1-2.7,1.6-3.4c11.8-4.6,16,2.3,19.7-0.5
+					c2.8-2.1-0.3-11.2-6.6-19.3s-14.6-13.4-17.4-11.1C49.5,906.8,61,914.9,37.2,932.9z M57.2,907.8c0.7-0.5,6.4,2.8,11.5,9.1
+					c4.9,6.3,6.3,12.1,5.6,12.6c-0.7,0.5-6.4-2-11.4-8.3C57.9,914.9,56.6,908.3,57.2,907.8z"/>
+				<path fill="#444345" d="M15,980.9c8.2,0,15-3.9,15-5.9c0,0,0-0.6,0-6.2c0-5.7-10.3-10.3-10.3-14.4c0-4,10.3-8.7,10.3-14.4
+					c0-5.7,0-6.2,0-6.2c0-2.1-6.8-5.9-15-5.9s-15,3.8-15,5.8c0,0,0,0.6,0,6.2c0,5.7,10.3,10.3,10.3,14.4c0,4-10.3,8.7-10.3,14.4
+					c0,5.7,0,6.2,0,6.2C0,977.1,6.8,980.9,15,980.9z M3.5,934.1c1.8-1.1,5.3-2.9,10.9-2.9s10.6,2.9,10.6,2.9
+					c0.4,0.2,1.8,1.1,0.9,1.6c-2.2,1.3-6.6,2.7-11.6,2.7s-9.3-1.5-11.5-2.8C1.8,935,3.5,934.1,3.5,934.1z M2.9,968.8
+					c0-1.7,2.7-4.4,4.7-6.4c2.8-2.7,5.4-4.7,5.4-7.9c0-3.2-2.7-5.2-5.5-7.9c-2-2-4.8-4.7-4.8-6.4l-0.1-2.6c2.7,1.5,7.1,2.9,11.7,2.9
+					c4.7,0,9.1-1.3,11.8-2.9l-0.1,2.6c0,1.7-2.8,4.4-4.8,6.4c-2.8,2.7-5.4,4.7-5.4,7.9c0,3.2,2.2,5.2,5,7.9c2,2,4.4,4.7,4.4,6.4v3.5
+					c-1.9-1.3-9.5-2-9.5-5.9c0-1.9-2.7-1.9-2.7,0c0,3.9-8.1,4.6-10.1,5.9v-3.5H2.9z"/>
+				<path fill="#444345" d="M210.9,900.8c0,11,8.9,19.9,19.9,19.9c11,0,19.9-8.9,19.9-19.9c0-10.9-8.9-19.9-19.9-19.9
+					C219.8,880.9,210.9,889.8,210.9,900.8z M236.2,884.7c6.7,2.2,11.5,8.6,11.5,16c0,3.9-1.3,7.5-3.5,10.3c-0.6-0.5-1.3-1.8-0.7-3.2
+					c0.6-1.3,0.8-4.6,0.7-5.8c-0.1-1.3-0.8-4.2-2.5-4.2c-1.7,0-2.9-0.6-4-2.7c-2.1-4.2,4-5.1,1.8-7.5c-0.6-0.7-3.7,2.7-4.2-1.8
+					C235.5,885.7,235.8,885.1,236.2,884.7z M240.2,914.9c-2.7,1.7-5.9,2.8-9.4,2.8c-1.8,0-3.7-0.3-5.3-0.9c0.9-0.6,1.1-1.3,2-1.3
+					c1.1,0,1.9-0.4,3.1-0.7c1.1-0.2,3-1.3,4.6-1.5C236.7,913.3,239.4,913.5,240.2,914.9z M228.4,884c-0.4,0.8-1.5,1.1-2.1,1.7
+					c-1.5,1.3-2,1.1-2.8,2.3c-0.8,1.3-3.3,3-3.3,3.9s1.3,1.9,1.8,1.7c0.7-0.2,2.4-0.2,3.3,0.2c0.9,0.4,8.1,0.7,5.8,6.8
+					c-0.7,1.9-3.9,1.5-4.7,4.7c-0.1,0.5-0.6,2.4-0.6,3.1c-0.1,0.9,0.7,4.8-0.3,4.8s-3.6-3.4-3.6-4c0-0.6-0.7-2.8-0.7-4.6
+					s-3.2-1.8-3.2-4.2c0-2.2,1.7-3.3,1.3-4.4c-0.4-1.1-3.4-1.1-4.6-1.3C217.1,889,222.2,884.9,228.4,884z"/>
+				<path fill="#444345" d="M135.7,1029.6c-4,0-7.3,3.3-7.3,7.3s3.3,7.3,7.3,7.3c4,0,7.3-3.3,7.3-7.3
+					C142.9,1032.9,139.7,1029.6,135.7,1029.6z M132.5,1040c0-0.2-0.3-0.9-0.3-1.6c0-0.7-1.1-0.7-1.1-1.5c0-0.8,0.7-1.3,0.5-1.6
+					c-0.1-0.4-1.3-0.4-1.6-0.5c0.8-2,2.7-3.6,4.9-4c-0.2,0.3-0.6,0.4-0.8,0.6c-0.5,0.5-0.8,0.4-1.1,0.9s-1.1,1.1-1.1,1.5
+					c0,0.3,0.5,0.7,0.7,0.7c0.2-0.1,0.9-0.1,1.1,0.1c0.4,0.1,3,0.3,2.1,2.4c-0.3,0.7-1.5,0.6-1.7,1.7c-0.1,0.2-0.2,0.9-0.2,1.1
+					c0,0.4,0.3,1.7-0.1,1.7C133.5,1041.4,132.5,1040.2,132.5,1040z M135.7,1043.1c-0.7,0-1.3-0.1-1.9-0.3c0.4-0.2,0.4-0.5,0.8-0.5
+					s0.7-0.2,1.1-0.3c0.4-0.1,1.1-0.5,1.6-0.5c0.5,0,1.5,0,1.8,0.5C138.1,1042.7,137,1043.1,135.7,1043.1z M140.7,1040.6
+					c-0.2-0.2-0.5-0.7-0.2-1.1c0.2-0.5,0.3-1.6,0.2-2.1c-0.1-0.5-0.3-1.5-0.9-1.5s-1.1-0.2-1.5-0.9c-0.8-1.5,1.5-1.8,0.7-2.7
+					c-0.2-0.3-1.3,0.9-1.5-0.7c0-0.1,0.1-0.3,0.3-0.5c2.4,0.9,4.2,3.2,4.2,5.9C141.9,1038.4,141.4,1039.6,140.7,1040.6z"/>
+				<path fill="#444345" d="M44.9,1061.1c0,0.3,0,0.5,0,0.8c0.1,1.7,1.5,3.2,3.4,3.2c1.7,0,3.2-1.3,3.4-3c0.1-0.3,0.1-0.6,0.1-0.9
+					c0-0.9,0.4-1.3,1.1-1.5c6.4-1.5,11.4-6.6,12.4-13c0.1-0.8,0.1-1.5,0.4-2.1c0.6-0.5,1.5-0.9,1.7-1.5c0.2-0.5-0.4-1.3-0.6-2.1
+					c1.1-1.1,1.1-1.6-0.2-2.9c1.3-1.3,1.3-1.9-0.1-3.2c0.9-0.4,1.3-1.1,0.9-2c-0.3-0.6-1.1-0.9-1.6-1.3c-0.1,0.1-0.1,0.2-0.2,0.2
+					c-0.1-0.6-0.1-1.1-0.4-1.5c-0.4-0.5-0.9-1.1-1.5-1.1c-0.3-0.1-0.9,0.6-1.1,0.9c-0.7,1.3-1.1,2.8-1.7,4.2s-1.3,2.7-2.2,3.9
+					c-2.7,3.4-6.3,4.4-10.4,3.6c-4-0.9-6.8-3.3-7.9-7.3c-0.2-0.8-0.2-1.5-0.4-2.3c0.9-0.6,2.1-0.9,1.6-2.2c-0.2-0.7-1.1-1.1-2-1.7
+					c0-0.5,0.2-1.5-0.9-1.9c-0.9-0.4-1.6,0.2-2.2,1.1c-0.7-0.8-1.3-1.6-2.4-1.1c-0.6,0.4-0.9,1.3-1.5,2.2c-0.7,0-1.8-0.1-2,1.3
+					c-0.1,0.9,0.6,1.5,2.4,2c-1.1,1.3-3,1.3-4.2,2.4c1.1,0.6,2,1.1,3.1,1.7c0.6,0.3,0.8,0.7,0.7,1.3c-0.2,2.1-0.3,4.4-0.5,6.4
+					c-0.8,9.2,5.5,14.3,11.5,15.9C44.7,1059.8,45,1060,44.9,1061.1z M35.7,1034.1c-0.3,0-0.7-0.4-1.3-0.8c0.7-0.4,0.9-0.9,1.3-0.9
+					c0.3,0,0.9,0.6,0.8,0.8C36.3,1033.6,35.9,1034.1,35.7,1034.1z"/>
+				<path fill="#444345" d="M211.6,940.4h-6.4c-1.1,0-2.7,0.7-3.4,1.6l-8.5,10.9c-0.7,0.9-0.3,0.9,0.9,0.9h34.6c1.1,0,1.6,0,0.9-0.9
+					l-7.4-11c-0.7-0.9-2.1-1.5-3.3-1.5h-1.6v-3.9h-5.8V940.4z"/>
+				<path fill="#444345" d="M219.2,930.1l0.5-0.1c1.1-0.2,2-1.1,2.7-2.2c0.7-1.1,0.8-3.6,0.6-4.9c-0.7,2-2.1,2.7-3.7,3.4
+					c-0.4,0.2-0.9,0.4-1.3,0.5c-0.5,0.2-0.9,0.4-1.5,0.6c-1.5,0.8-2.1,2-2.4,4c-0.2,0.8-0.3,1.6-0.3,2.8c0.8-2,1.6-3,3.3-3.6
+					C217.8,930.5,218.5,930.3,219.2,930.1z"/>
+				<path fill="#444345" d="M227,969.3h0.9v-11.9c0-1.1,0-1.6,0-1.6H227h-1.3h-15h-1.3h-11h-4v2.2v11.3h4h2.7v-8
+					c0,0,0.2,0.3,1.1,0.3h5.2c0,0,0.5-1.1,0.5-0.2v7.9h1.5h1.3h15L227,969.3L227,969.3z M222.2,965.5c0,0.2,0.7,0.9,0.5,0.9h-5.7
+					c-0.2,0-0.6-0.8-0.6-0.9v-5.7c0-0.2,0.4-0.1,0.6-0.1h5.7c0.2,0-0.5-0.1-0.5,0.1V965.5z"/>
+				<path fill="#444345" d="M143.1,1056.3c0-0.6-0.5-0.9-1.1-0.9h-13.4c-0.6,0-1.1,0.4-1.1,0.9c0,0.6,0.5,0.9,1.1,0.9h13.4
+					C142.7,1057.3,143.1,1056.9,143.1,1056.3z"/>
+				<rect x="131.4" y="1052.5" fill="#444345" width="9.7" height="2.9"/>
+				<path fill="#444345" d="M117.8,828.2c-4.6,0.8-7.9,4.6-8.2,9.1l8.7-0.5L117.8,828.2z"/>
+				<path fill="#444345" d="M119.7,839.3l-9.9,0.5c0.9,4.8,5.2,8.4,10.3,8.1c5.5-0.3,9.7-4.9,9.4-10.4c-0.3-5-4.2-9-9.1-9.4l0.5,9.9
+					C120.9,838.7,120.3,839.2,119.7,839.3z"/>
+				<path fill="#444345" d="M78.2,866c0.4,0,0.9-0.6,1.3-0.7s0.9-0.6,1.1-0.8l5.5-3.9c0.3-0.2,0.5-0.6,0.5-0.9
+					c0-0.3-0.2-0.6-0.5-0.8l-5.5-3.8c-0.3-0.2-0.8-0.9-1.1-1.1c-0.5-0.1-0.9-0.7-1.3-0.7H62.5l1.8,12.6H78.2L78.2,866z"/>
+				<path fill="#444345" d="M41,865.1l5.5,3.8c0.3,0.2,0.8,0.5,1.1,0.7c0.5,0.1,0.9,0.4,1.3,0.4h8.1V890c0,0.5,0.6,0.2,1.1,0.2h2
+					c0.5,0,0.7,0.3,0.7-0.2v-39.7c0-0.5-0.2-1.6-0.7-1.6h-2c-0.5,0-1.1,1.1-1.1,1.6v9h-8c-0.4,0-0.9,0-1.3,0.1s-0.9,0.3-1.1,0.5
+					l-5.5,3.8c-0.3,0.2-0.5,0.5-0.5,0.8C40.6,864.7,40.8,864.9,41,865.1z"/>
+				<path fill="#444345" d="M72.4,874.2v31.6c0,2.2,2.4,4.6,4.6,4.6h15.4c2.2,0,4.2-2.4,4.2-4.6v-31.6c0-2.2-2-3.4-4.2-3.4H77
+					C74.8,870.8,72.4,872,72.4,874.2z M84.7,908.2c-1.5,0-2.8-0.9-2.8-2s1.3-2,2.8-2s2.8,0.9,2.8,2
+					C87.5,907.2,86.3,908.2,84.7,908.2z M93.7,875.7v26.1H76.3v-26.1H93.7z"/>
+				<path fill="#444345" d="M162,850.1c0,13.2,13.8,30.4,13.8,30.4s13.8-17.2,13.8-30.4c0-7.7-6.2-13.8-13.8-13.8
+					C168.2,836.1,162,842.3,162,850.1z M175.8,842.7c4.2,0,7.5,3.4,7.5,7.5c0,4.2-3.4,7.5-7.5,7.5c-4.2,0-7.5-3.4-7.5-7.5
+					C168.3,846.1,171.8,842.7,175.8,842.7z"/>
+				<path fill="#444345" d="M88.9,887.4c0-2.4-1.8-4.2-4.2-4.2s-4.2,1.8-4.2,4.2c0,4,4.2,9.1,4.2,9.1S88.9,891.4,88.9,887.4z
+					 M82.4,887.6c0-1.3,0.9-2.2,2.2-2.2c1.3,0,2.2,0.9,2.2,2.2c0,1.3-0.9,2.2-2.2,2.2C83.5,889.8,82.4,888.8,82.4,887.6z"/>
+				<path fill="#444345" d="M177.1,885.5l-2.4,2.1l-2.4-2.1c-3.4-3.1-9-3.1-12.4,0c-3.9,3.6-3.9,9.3,0,12.8l14.7,13.5l14.7-13.5
+					c3.9-3.6,3.9-9.3,0-12.8C186.1,882.4,180.4,882.4,177.1,885.5z"/>
+				<path fill="#444345" d="M237.1,987.3l-3.3,2.8c-0.3,0.2-0.3,0.7-0.1,0.9l18.9,21.4c0.4,0.5,1.1,0.6,1.7,0.1l2.2-1.8
+					c0.5-0.5,0.6-1.3,0.1-1.7l-18.7-21.6C237.8,986.9,237.4,986.9,237.1,987.3z"/>
+				<path fill="#444345" d="M236.1,973.1c-2.9,0.3-6.6,3-8.4,4.2c-2.4,1.6-3.3,2.6-3.5,2.7c-0.7,0.6-0.1,1.9-1.3,3.1
+					c-1.3,1.1-2.1,0.3-2.9,0.9c-0.4,0.3-1.5,1.1-1.7,1.3c-0.3,0.3-0.4,0.7-0.1,1.1c0,0,2.9,3.2,3.1,3.5c0.2,0.3,0.9,0.5,1.3,0.2
+					c0.4-0.4,1.5-1.3,1.6-1.5c0.2-0.2-0.1-1.9,0.8-2.7c2.1-1.6,3.9-0.5,6.2,2.2c0.3,0.3,0.7-0.1,0.9-0.2c0.2-0.2,3.3-3,3.5-3.1
+					c0.2-0.1,0.3-0.4,0.1-0.7c-0.2-0.3-1.1-1.5-1.6-2.1c-4.2-5.4,11.2-9,8.9-9.1C241.6,973,236.7,973,236.1,973.1z"/>
+				<path fill="#444345" d="M224.1,1010.9l2.1,2.1c0.5,0.5,1.3,0.3,1.7-0.2l11.1-10.9l-3.4-3.9l-11.6,11.2
+					C223.7,1009.6,223.7,1010.4,224.1,1010.9z"/>
+				<path fill="#444345" d="M247.9,985.9c-0.2,0.3-0.4,0.6-0.7,0.9l-3.1,3.2l3.1,3.6l3.8-3.6c0.2-0.2,0.6-0.5,0.9-0.7
+					c0.1,0,0.1,0,0.2-0.1c0.3-0.1,0.6,0,0.9,0.2c0.7,0.5,1.3,0.9,1.9,1.5c0.5,0.4,0.9,0.4,1.3-0.1c0.6-0.7,1.1-1.3,1.7-1.9
+					c0.9-1.1,1.9-2.1,2.9-3.2c1.6-1.7,2.4-3.7,2.4-5.8c0-0.8,0-1.5-0.2-2.4c-0.3-2-1.3-3-3.3-3.3c-0.5-0.1-1.1-0.2-1.5-0.1
+					c-0.6,0-1.3,0-1.8,0.1c-1.5,0.1-3,0.5-4.2,1.6c-0.9,0.9-1.9,1.8-2.9,2.7c-1.1,1.1-2.2,2-3.3,3.1c-0.3,0.3-0.4,0.6,0,0.9
+					c0.7,0.7,1.3,1.5,1.9,2.1c0.3,0.3,0.4,0.5,0.2,0.9C248,985.6,247.9,985.6,247.9,985.9z M250.3,985.4l4.7-4.4
+					c0.1-0.1,0.4-0.1,0.5,0c0.1,0.1,0.1,0.3,0,0.5l-4.2,5c-0.1,0.1-0.2-0.7-0.3,0.3l0,0c-0.1,0-0.2-0.2-0.2-0.2l-0.6-0.6
+					c-0.1-0.1-0.1-0.2-0.1-0.3C250.2,985.6,250.3,985.4,250.3,985.4z"/>
+				<path fill="#444345" d="M237.6,934c0,0.8-0.1,1.5,0.6,1.5h10.1v2.5c0,0.6-0.4,0.4,0.2,0.4h4c0.6,0,0.7,0.2,0.7-0.4v-2.5h9.5
+					c0.8,0,1.1-0.9,1.1-1.5v-5.2h-26.1L237.6,934L237.6,934z"/>
+				<path fill="#444345" d="M251.2,948.8V947c0-0.3-0.2-0.6-0.5-0.6s-0.5,0.3-0.5,0.6v1.7c-2.9,0.3-4.8,2.5-4.8,5.1
+					c0,2.9,2.2,5.2,5.1,5.2c2.9,0,5.2-2.4,5.2-5.2C255.7,951.3,254.1,949.1,251.2,948.8z"/>
+				<path fill="#444345" d="M261.5,939.4h-22c-1.1,0-2,1.1-2.2,2.2l-2.6,22.8c-0.1,0.6,0.1,1.5,0.6,2c0.4,0.5,1.1,0.9,1.6,0.9h27.3
+					c0.7,0,1.3-0.5,1.6-0.9c0.4-0.5,0.6-1.1,0.6-1.8l-2.6-23C263.5,940.6,262.5,939.4,261.5,939.4z M250.4,963c-5,0-9.1-4-9.1-9.1
+					s4-9.1,9.1-9.1c5,0,9.1,4,9.1,9.1S255.4,963,250.4,963z"/>
+				<path fill="#444345" d="M155,1069.4v0.4h11.3c0.6,0,1.1-0.9,1.1-1.5c0-0.6-0.5-1.5-1.1-1.5H155h-1.3h-2.4c-3,0-5.4,1.9-6.2,4.8
+					h-7.9v2.9h7.9c0.8,2.9,3.2,5.8,6.2,5.8h2.4l0,0h12.6c0.6,0,1.1-0.9,1.1-1.5s-0.5-1.5-1.1-1.5H155c-0.4,0-0.7-0.1-0.7-0.5
+					c0-0.4,0.3-0.5,0.7-0.5h11.3c0.6,0,1.1-0.4,1.1-0.9c0-0.6-0.5-0.9-1.1-0.9H155l0,0c-0.4,0-0.7-0.6-0.7-0.9
+					c0-0.4,0.3-0.9,0.7-0.9h11.3c0.6,0,1.1-0.4,1.1-0.9c0-0.6-0.5-0.9-1.1-0.9h-10.7v-0.4c-0.9,0-0.9-0.1-0.9-0.5
+					C154.6,1069.5,154.6,1069.4,155,1069.4z"/>
+				<path fill="#444345" d="M105.5,1076.6h27.3c1.3,0,3.3-0.7,3.3-1.6v-3.3c0-0.9-2.1-1.8-3.3-1.8h-27.3c-1.8,0-3.3,1.5-3.3,3.4
+					C102.4,1075,103.9,1076.6,105.5,1076.6z"/>
+				<path fill="#444345" d="M165.8,1086.7c0-1.8-1.5-3.4-3.4-3.4h-28.2c-1.3,0-1.9,0.6-2.9,1.6v3.4c0.9,0.9,1.6,1.7,2.9,1.7h28.2
+					C164.3,1090.1,165.8,1088.6,165.8,1086.7z"/>
+				<path fill="#444345" d="M131.4,1088.2v-2.9h-4h-5.8H96.6c0,0-2.5,1.1,1.3,2.8c5.7,2.4,10.3,2.8,14.7,3.4
+					c1.5,0.2,6.6,1.3,9.9-1.5c1.1-1.1,2.4-1.8,3.4-1.8H131.4z"/>
+				<path fill="#444345" d="M169.3,1059.4l8.2-0.8c-0.1-0.9-0.3-1.8-0.3-2.7c-0.1-2.3-0.2-4.6-0.3-7c-0.1-1.7,0-3.5,0-5.2
+					c0.1-2,0.2-4.2,0.3-6.2c0.1-1.6,0.2-3.4,0.4-5c0.2-2,0.5-4,0.8-6c0.2-1.5,0.5-3.2,0.7-4.7c0.1-0.5-0.2-0.9-0.7-0.9
+					c-0.3-0.1-0.6-0.1-0.9-0.1c-4.2,0-8.5,0-12.4,0c0,0,0,0,0,0.1c-0.9,0-1.9,0-2.9,0c-0.6,0-0.7,0-0.7,0.6
+					c-0.1,0.8-0.2,1.5-0.2,2.2c0,1.5,0,3.1,0.1,4.6c0,1.5,0.1,3.1,0.2,4.6c0.1,1.5,0.2,3.1,0.3,4.6c0.1,1.5,0.2,2.8,0.3,4.2
+					c0.1,1.9,0.3,3.9,0.5,5.8c0.1,1.6,0.3,3.2,0.4,4.8c0.2,1.5,0.3,3.2,0.5,4.8c0.1,0.8,0.2,1.5,0.3,2.2c0,0.2,0.1,0.4,0.4,0.4
+					c0.5,0,0.9-0.1,1.5-0.1c0.8-0.1,1.6-0.1,2.4-0.2C168.6,1059.5,168.9,1059.4,169.3,1059.4z M174.8,1023.7c0.7,0,1.1,0.4,1.1,1.1
+					c0,0.6-0.5,1.1-1.1,1.1c-0.6,0-1.1-0.5-1.1-1.1C173.7,1024.1,174.2,1023.7,174.8,1023.7z"/>
+				<path fill="#444345" d="M175.7,1082.3c-0.5,1.5,0.9,3.3,2.6,3.3c1.3,0,2.5-0.9,2.9-2.4c0.3-1.3,0.3-2.5,0.1-3.8
+					c-0.5-2.6-1.1-5.2-1.5-7.7c-0.4-2-0.9-4-1.3-6.1c-0.3-1.5-0.6-3.1-0.7-4.6v-0.1l-5.2,0.5c0.2,0.9,0.4,2,0.6,3
+					c0.6,3.2,1.1,6.3,1.8,9.4c0.5,1.9,0.9,4,1.3,5.9c0.1,0.4,0,0.9-0.1,1.3C176,1081.3,175.8,1081.8,175.7,1082.3z"/>
+				<path fill="#444345" d="M85.5,1019.1c1.3,0.1,2.6-0.1,4-0.2c0.1,0,0.1-0.1,0.1-0.2c0.6-1.1-0.1-2.9-1.3-3.4c0-1.1,0.2-2.4,0-3.6
+					c-0.2-1.5-0.2-3.5-1.1-4.6c-2-2.9-5-6.3-7.5-8.9c-1.7-1.9-3.6-2.2-6.2-2.2c-10.1-0.1-20.1-0.2-30.1-0.3c-3.2,0-4.4,1.3-4.4,4.4
+					c-0.1,4.9-0.1,9.9-0.2,15c-1.1-0.1-1.3,0.5-1.3,1.3c0,0.4,0,0.8,0,1.3c0,0.7,0.3,1.1,0.9,1.1c0.9,0,1.7,0,2.7,0
+					c0.9,0.1,1.3-0.3,1.5-1.1c0.9-2.8,3.1-4.4,6-4.4c2.9,0,5.1,1.6,6,4.6c0.3,0.9,0.8,1.1,1.6,1.1c4.8,0,9.7,0.1,14.6,0.2
+					c0.9,0,1.5-0.4,1.7-1.3c0.9-2.7,3.2-4.4,6-4.4c2.8,0,4.9,1.6,5.9,4.4C84.6,1018.3,85.1,1019.1,85.5,1019.1z M82.8,1007
+					L82.8,1007l-9.5,0.4c-0.7,0-1.3-0.4-1.3-1.1l0.1-6.8c0-0.7,0.6-1.3,1.3-1.3l3,0.1c0.1,0,0.3,0,0.4,0.1c0.4,0.1,0.6,0.2,6.8,7.3
+					c0.2,0.2,0.4,0.1,0.4,0.5C84.1,1006.9,83.5,1007,82.8,1007z"/>
+				<path fill="#444345" d="M48.8,1014.1c-3,0-5.5,2.4-5.5,5.4s2.4,5.5,5.4,5.5s5.5-2.4,5.5-5.4
+					C54.2,1016.6,51.8,1014.2,48.8,1014.1z"/>
+				<path fill="#444345" d="M78.6,1014.5c-3,0-5.5,2.4-5.5,5.4c0,3,2.4,5.5,5.4,5.5s5.5-2.4,5.5-5.4
+					C84.1,1017,81.6,1014.5,78.6,1014.5z"/>
+				<path fill="#444345" d="M247.8,1026.3c0-0.9-2.4-1.7-10.3-0.7c0,0,1.9-1.6,2.7-1.9c0.8-0.3,4.2-2.4,3.6-5.1
+					c-0.6-2.7-1.6-1.1-2.9,1.1c-1.1,2.1-2.7,4-4.9,5.3c0,0-0.7-4.2-3.1-4.4c-0.8,0-4,0-7.7,0.4l-0.7,0.1c-0.4,0-0.9,0.1-1.3,0.2
+					c0,0.1-0.2,0.1-0.2,0.2v4.6c0,0.4-0.1,0.7-0.5,0.7s-0.5-0.3-0.5-0.7v-4.6l0,0c-0.9,0.1-1.3,0.2-1.8,0.3c0,0-7.1,1.1-11.8,2.5
+					h-0.1c-0.1,0-0.2,0.1-0.3,0.1c-0.3,0.1-0.6,0.2-0.9,0.3c-0.2,0.1-0.4,0.1-0.6,0.2c-0.1,0-0.1,0.1-0.2,0.1
+					c-0.1,0-0.2,0.1-0.3,0.1l0,0c-0.9,0.4-1.6,0.6-2.4,1.1c0,0-0.8,0.4-0.3,1.5c0.3,0.7,4.2,2.4,12,3.6v-3.5c0-0.4,0.1-0.7,0.5-0.7
+					s0.5,0.3,0.5,0.7v3.7c0.9,0.1,1.3,0.1,1.7,0.2l0.9,0.1c2.6,0.3,5.1,0.5,9.9,0.6v-2.9c0-0.4,0.1-0.7,0.5-0.7s0.5,0.3,0.5,0.7v2.9
+					h0.8c1.1,0,1.6,0,2.6-0.1c0,0,2.5,0.2,2.7-4.4c0,0,4.4-0.8,4,4.2c-0.2,3.7,3,3.8,3,1.1c0-2.5-0.7-5.4-5.5-6.4c0,0,3.9,0.5,7,1.1
+					C247.5,1028.4,247.8,1027.3,247.8,1026.3z"/>
+			</g>
+			<g>
+				<polygon fill="#444345" points="678.1,1020.6 677.4,1020.6 650.5,985.8 642.4,985.8 642.4,1038 654,1038 654,1003.2 
+					653.4,1003.2 680.4,1038 687.7,1038 687.7,987.7 678.1,987.7 				"/>
+				<polygon fill="#444345" points="706.1,1038 731.3,1038 731.3,1028.3 714.8,1028.3 714.8,1015.7 731.3,1015.7 731.3,1007 
+					714.8,1007 714.8,994.4 731.3,994.4 731.3,987.7 706.1,987.7 				"/>
+				<polygon fill="#444345" points="744.8,994.4 755.4,994.4 755.4,1038 764.1,1038 764.1,994.4 776.6,994.4 776.6,987.7 
+					744.8,987.7 				"/>
+				<polygon fill="#444345" points="832.4,1022.5 832.3,1022.5 821.6,985.8 815.8,985.8 805.5,1022.5 805.5,1022.5 795.1,987.7 
+					784.6,987.7 800.9,1038 808.2,1038 817.9,1007 818.1,1007 828.2,1038 835.6,1038 853,987.7 842.4,987.7 				"/>
+				<path fill="#444345" d="M888.7,985.4c-15.2,0-25.3,11.7-25.3,26.9c0,15,9.7,27.1,25.3,27.1c15.6,0,25.3-12,25.3-27.1
+					C914.1,997.1,904,985.4,888.7,985.4z M888.7,1029.6c-11.1,0-15-9.7-15-17.6c0-8.3,5.6-16.6,15-16.6c9.5,0,15,8.4,15,16.6
+					C903.7,1019.8,899.8,1029.6,888.7,1029.6z"/>
+				<path fill="#444345" d="M959.8,1002.7c0-10.9-7.1-15-17.1-15h-14.4v50.2h11.6v-20.3h-0.7l12.5,20.3h12.1l-14.5-21.4
+					C956.3,1015.5,959.8,1009.1,959.8,1002.7z M940.4,1010.9h-0.5v-16.5h0.6c5.3,0,9.3,1.7,9.3,8
+					C949.9,1008.7,945.9,1010.9,940.4,1010.9z"/>
+				<polygon fill="#444345" points="1015.5,987.7 1003.2,987.7 987.4,1008 987.2,1008 987.2,987.7 976.6,987.7 976.6,1038 
+					987.2,1038 987.2,1013.8 987.4,1013.8 1003.7,1038 1016.6,1038 996.1,1010.9 				"/>
+				<path fill="#444345" d="M360.6,873.3c-25,0-41.6,19.1-41.6,44c0,24.7,15.9,44.3,41.6,44.3c25.6,0,41.6-19.6,41.6-44.3
+					C402.1,892.4,385.6,873.3,360.6,873.3z M360.6,945.5c-18.1,0-24.6-15.9-24.6-28.8c0-13.6,9.2-27.3,24.6-27.3
+					s24.6,13.7,24.6,27.3C385.2,929.6,378.8,945.5,360.6,945.5z"/>
+				<path fill="#444345" d="M443.5,876.6h-22.4v83.1h15.4v-31.9h9.3c17.2,0,26.9-8,26.9-25.8C472.6,883,461.1,876.6,443.5,876.6z
+					 M441,915.3h-4.4v-26.1h4c9.2,0,15.4,1.9,15.4,12.8C456,912.9,450.7,915.3,441,915.3z"/>
+				<polygon fill="#444345" points="491.7,959.7 535.1,959.7 535.1,945.2 508.1,945.2 508.1,923 533.3,923 533.3,908.5 508.1,908.5 
+					508.1,889.2 535.1,889.2 535.1,876.6 491.7,876.6 				"/>
+				<polygon fill="#444345" points="612.4,932.7 612.7,932.7 568.6,872.8 556.4,872.8 556.4,959.7 573.8,959.7 573.8,901.7 
+					573.3,901.7 617.6,961.6 629.8,961.6 629.8,876.6 612.4,876.6 				"/>
+				<polygon fill="#444345" points="695.5,959.7 711.9,959.7 711.9,923 736.1,923 736.1,908.5 711.9,908.5 711.9,889.2 738,889.2 
+					738,876.6 695.5,876.6 				"/>
+				<path fill="#444345" d="M795.8,961.6c25.6,0,41.6-19.6,41.6-44.3c0-24.9-16.5-44-41.6-44s-41.6,19.1-41.6,44
+					C754.4,942,770.3,961.6,795.8,961.6z M795.8,889.4c15.4,0,24.6,13.7,24.6,27.3c0,13-6.4,28.8-24.6,28.8
+					c-18.1,0-24.6-15.9-24.6-28.8C771.3,903.1,780.4,889.4,795.8,889.4z"/>
+				<path fill="#444345" d="M894.1,873.3c-25,0-41.6,19.1-41.6,44c0,24.7,15.9,44.3,41.6,44.3c25.6,0,41.6-19.6,41.6-44.3
+					C935.6,892.4,919.3,873.3,894.1,873.3z M894.1,945.5c-18.1,0-24.6-15.9-24.6-28.8c0-13.6,9.2-27.3,24.6-27.3
+					c15.4,0,24.6,13.7,24.6,27.3C918.7,929.6,912.3,945.5,894.1,945.5z"/>
+				<path fill="#444345" d="M1018.7,918.2c0-24-16.2-41.6-40.6-41.6h-21.8v83.1h21.8C1002,959.7,1018.7,941.8,1018.7,918.2z
+					 M971.8,945.2v-56.1h2.1c18.5,0,27.9,9.7,27.9,28c0,16.6-7.9,28-27.9,28L971.8,945.2L971.8,945.2z"/>
+			</g>
+		</g>
+		<g>
+			<path d="M1039.4,1045.1h-1.2c-0.1-0.4-0.2-0.6-0.3-0.7l-0.5-0.5l-0.2-0.3l-0.1-0.3c-0.1,0-0.2-0.1-0.3-0.3h-0.1l-0.3-0.5
+				l-0.3-0.3l-0.3-0.3c-0.6-0.5-1.3-1.1-2.1-2c-0.7-0.9-1.1-1.3-1.1-1.3l-0.3-0.3h-0.7l0.1-0.1l-0.3,0.3l0.1-0.1
+				c-0.1,0.1-0.3,0.3-0.5,0.5l-1.3,1.3v-0.1l-1.3,1.3l-0.9,0.9l0,0c-1.2,1.2-1.9,1.9-2.2,2.1v0.1c0,0.1-0.1,0.3-0.5,0.7l-0.6-0.3
+				l-0.4-0.1c0-0.3-0.1-0.4-0.1-0.5l-0.2-0.1c-0.1-0.3-0.3-0.5-0.4-0.5l-1.7-1.7c0,0,0.1,0.1,0.1,0.1s0,0.1,0,0.1s-0.1,0.1-0.3,0.1
+				l0.1-1.1l0.9-0.9c0.3-0.2,0.7-0.5,1.1-0.9l0.7-0.7c0.2-0.1,0.4-0.3,0.7-0.7l1.7-1.7v0.1l0.1-0.1h-0.1c0.8-0.7,1.2-1.1,1.3-1.1
+				l1.7-1.7c0.4-0.4,0.9-0.9,1.5-1.3l0.5-0.7l0.5-0.5l0.5,0.2c0.1,0.1,0.2,0.1,0.2,0.1l1,0.9c0.2,0.1,0.5,0.4,0.8,0.8
+				c0.3,0.3,0.5,0.6,0.6,0.7l0.7,0.7v0.1l5.8,6c0.3,0.3,0.5,0.5,0.7,0.7c0.2,0.2,0.5,0.4,0.7,0.7l-0.3,0.5l-0.5,0.5h0.1
+				c-0.4,0.1-0.6,0.3-0.7,0.7l-1.1,1.1c-0.1,0.1-0.3,0.3-0.3,0.3L1039.4,1045.1L1039.4,1045.1
+				C1039.4,1044.9,1039.4,1044.9,1039.4,1045.1z M1021.5,1041l-0.3,0.3v0.3h0.1c0.1,0,0.1,0.1,0.2,0.1l0.7,0.7
+				c0.1,0.1,0.3,0.3,0.7,0.6c0.7,0.6,0.9,0.9,0.9,1.1l0.1,0.3l0.1-0.1c0.1,0.1,0.1,0.1,0.2,0.3l0.1-0.1v0.1l0.1-0.1h-0.1l0.1-0.1
+				c0,0-0.1,0-0.1-0.1c0-0.1,0-0.1-0.1-0.1l1.1-1.1l0.1,0.1l2.2-2.1l0.1,0.1l2.7-2.7l0.1,0.1c0.3-0.2,0.7-0.6,1.1-1.1h0.1l0.1-0.1
+				c1.3,1.4,2.6,2.8,3.8,4c0.5,0.4,0.8,0.7,0.9,0.9l0.7,0.6l0.1,0.1c0.3,0.3,0.5,0.6,0.8,0.8l0.5,0.5l-0.1,0.1
+				c0.1,0.1,0.1,0.1,0.1,0.3v0.1h0.3l0.9-0.9c0.8-0.9,1.5-1.5,1.9-1.7c0-0.1,0.1-0.2,0.3-0.3l-0.1-0.1l-0.1,0.1c0,0,0-0.1-0.1-0.1
+				s-0.1,0-0.1,0.1l-1.1-1.1l0.1-0.1l-0.3-0.3c0,0-0.1,0-0.1-0.1l0.1-0.1l-1.9-1.9c-0.5-0.5-0.9-1-1.5-1.5c-0.5-0.5-0.9-0.9-1.1-1.2
+				l-0.7-0.7h0.1l-1.1-1.1c-0.1-0.1-0.3-0.3-0.5-0.5l-1.7-1.6c-0.1,0-0.1,0-0.1,0.1c-0.1-0.1-0.1-0.1-0.3-0.1l-0.2,0.1h0.1l-2.1,1.9
+				h0.1l-1.9,1.9c-0.4,0.3-0.8,0.7-1.3,1.1l-1.5,1.4l-0.2,0.1l-1.1,1.1l-0.3,0.3c-0.3,0.2-0.5,0.5-0.7,0.7s-0.5,0.5-0.9,0.9
+				L1021.5,1041z"/>
+		</g>
+	</g>
+</g>
+<g id="OFN_beta__x28_new_x29_" display="none">
+	<g display="inline">
+		
+			<text transform="matrix(0.9994 3.560383e-02 -3.560383e-02 0.9994 1024.377 998.5481)" fill="#444345" font-family="'BubblegumSans-Regular'" font-size="26.8582">BETA</text>
+		
+			<text transform="matrix(3.560383e-02 -0.9994 0.9994 3.560383e-02 1038.5093 1045.8531)" fill="#444345" font-family="'BubblegumSans-Regular'" font-size="29.5441">&gt;</text>
+		<g>
+			<g>
+				<path fill="#444345" d="M156.5,1047.3v-20.9c0-2.3-2.1-4-4.4-4h-33.4c-2.4,0-4.6,1.6-4.6,4v20.9c0,2.3,2.4,4.2,4.6,4.2h33.4
+					C154.4,1051.4,156.5,1049.6,156.5,1047.3z M118.8,1026.3h33.8v21.3h-33.8V1026.3z"/>
+				<path fill="#444345" d="M197.5,895.5c-8.4,16.7-11.9,18.9-11.9,25.8c0,6.6,5.6,12.2,12.3,12.2c6.6,0,12.3-5.4,12.3-12.2
+					c0-7-3.1-10.9-11.9-25.8C198,895.1,197.7,895.1,197.5,895.5z M194.2,921.1c0,2.2-1.3,3-2.5,3c-1.5,0-2.5-1.1-2.5-2.6
+					c0-4.8,2.4-8,4.4-10.8c0.7-0.9,1.3-1.7,1.7-2.5C195.4,907.9,194.2,917.1,194.2,921.1z"/>
+				<path fill="#444345" d="M92.5,1032.2c-2.5-1.6-7.5-4.6-7.5-4.6s0,0,0,6.3c0,6.3,10.6,8.6,10.6,8.6
+					C95.4,1039.5,95.1,1033.8,92.5,1032.2z"/>
+				<path fill="#444345" d="M92.5,1043.5c-2.5-1.6-7.5-4.6-7.5-4.6s0,0,0,6.3c0,6.3,10.6,8.6,10.6,8.6
+					C95.4,1050.9,95.1,1045.2,92.5,1043.5z"/>
+				<path fill="#444345" d="M95.5,1065.2c-0.2-3-0.4-8.6-2.9-10.3c-2.5-1.6-7.7-4.6-7.7-4.6s0,0,0,6.3
+					C85,1062.9,95.5,1065.2,95.5,1065.2z"/>
+				<path fill="#444345" d="M99.1,1042.5c0,0,11-2.4,11-8.6c0-6.3,0-6.3,0-6.3s-6.2,3-8.7,4.6C98.8,1033.8,99.3,1039.5,99.1,1042.5z
+					"/>
+				<path fill="#444345" d="M99.1,1053.8c0,0,11-2.3,11-8.6c0-6.2,0-6.3,0-6.3s-6.2,3-8.7,4.6C98.8,1045.2,99.3,1050.9,99.1,1053.8z
+					"/>
+				<path fill="#444345" d="M110.1,1056.6c0-6.3,0-6.3,0-6.3s-6.1,2.9-8.6,4.6c-2.5,1.6-2.4,7.3-2.5,10.3
+					C99,1065.2,110.1,1062.9,110.1,1056.6z"/>
+				<path fill="#444345" d="M101.1,1025.9c0-2.9-0.7-6.6-4-10.3c0,0-3.9,4.8-3.9,9.5c0,3.1,1.7,5.7,3.9,8.4
+					C97.1,1033.7,101.1,1029,101.1,1025.9z"/>
+				<path fill="#444345" d="M84.3,851.2c0.8,0,1.5-0.1,2.2-0.4c1.6,1.5,3.7,2.2,5.8,2.2c2.1,0,4.2-0.8,5.8-2.2
+					c0.7,0.3,1.5,0.4,2.2,0.4c3.5,0,6.3-2.8,6.3-6.3s-2.8-6.3-6.3-6.3c-0.3,0-0.6,0-0.9,0.1c-1.6-2.4-4.2-3.7-7.1-3.7
+					c-2.9,0-5.5,1.3-7.1,3.7c-0.3,0-0.6-0.1-0.9-0.1c-3.5,0-6.3,2.8-6.3,6.3C78.2,848.4,81,851.2,84.3,851.2z"/>
+				<path fill="#444345" d="M94,862c0,0.9,0.8,1.7,1.8,1.7c0.9,0,1.7-0.8,1.7-1.7s-1.7-3.6-1.7-3.6S94,860.9,94,862z"/>
+				<path fill="#444345" d="M99.1,858.3c0.9,0,1.8-0.8,1.8-1.7s-1.8-3.6-1.8-3.6s-1.7,2.6-1.7,3.6C97.3,857.5,98.2,858.3,99.1,858.3
+					z"/>
+				<path fill="#444345" d="M92,859.2c0-0.9-1.7-3.6-1.7-3.6s-1.8,2.6-1.8,3.6s0.8,1.7,1.8,1.7C91.2,861,92,860.2,92,859.2z"/>
+				<path fill="#444345" d="M8.8,1010.5c0,6.4,5.2,11.7,11.7,11.7s11.7-5.2,11.7-11.7s-5.2-11.7-11.7-11.7S8.8,1004,8.8,1010.5z
+					 M29.1,1010.5c0,4.8-4,8.8-8.7,8.8c-4.8,0-8.8-4-8.8-8.8c0-4.8,4-8.8,8.8-8.8S29.1,1005.7,29.1,1010.5z"/>
+				<polygon fill="#444345" points="16,1014.9 22,1012 24.8,1006.1 19,1009.1 				"/>
+				<path fill="#444345" d="M113.9,866.3c0-0.1-0.1-0.2-0.1-0.3L113.9,866.3L113.9,866.3z"/>
+				<path fill="#444345" d="M110.6,876.1c7.1-2,14.4,3.1,15.4,10.5c0,0.3,0.1,0.6,0.1,0.9c0.3,0,0.6,0.1,0.9,0.1
+					c6-0.2,12.1-0.2,18.1-0.5c-2.5,0.7-4.4,3-4.4,5.7c0,3.3,2.7,6,6,6s6-2.7,6-6c0-3-2.2-5.4-5-5.9c4.4-0.3,3.6-0.2,4.4-4.2
+					c0.4-1.9,0.6-3.9,0.8-5.8c0.2-1.8-0.3-2.2-2.1-2.4c-2.7-0.1-5.1-0.2-7.9-0.3c-0.1,0-0.2-0.1-0.2-0.2c0-2,0.5-6.8,0.5-6.8
+					s-0.9-0.8-1.9-0.1c0,2.4,0,4.6,0,7.1c0,0-3.6-0.1-8.2-0.2c-0.2,0-0.9-0.4-1.3-1.1c-0.7-1.9-2.4-5.6-4.4-11.4
+					c0,0-1.1-2.4-3.8-2.4c-2.1,0-13.4,0-13.4,0v14.2c0,0-0.8,0.4-1.5,0.5C108.2,876.1,108.7,876.5,110.6,876.1z M149.8,892.9
+					c0,1.7-1.5,3.1-3.1,3.1c-1.7,0-3.1-1.5-3.1-3.1c0-1.7,1.5-3.1,3.1-3.1C148.4,889.8,149.8,891.1,149.8,892.9z M113.8,866v-2.7h11
+					l3.5,10.5l0.1,0.1c-4.7-0.1-10.1,0-14.6,0.2V866z"/>
+				<path fill="#444345" d="M113.3,877.3c-6,0-10.8,4.8-10.8,10.8c0,6,4.8,10.8,10.8,10.8c5.9,0,10.8-4.8,10.8-10.8
+					C124.1,882.1,119.3,877.3,113.3,877.3z M113.3,894.1c-3.3,0-6-2.7-6-6c0-3.3,2.7-6,6-6s6,2.7,6,6
+					C119.3,891.4,116.6,894.1,113.3,894.1z"/>
+				<path fill="#444345" d="M87.2,1074.3l-7.9-4.2c0.5-1.7,0.5-3.7,0-5.6c-1.6-5.5-7.9-8.9-13.4-7.3c-5.6,1.6-8.8,7.3-7.1,12.8
+					c1.6,5.5,7.9,8.9,13.4,7.3c1.8-0.6,3.5-1.5,4.6-2.8l7.9,4.4c0.8,0.4,1.7,0.1,2.2-0.7l1.1-1.9C88.4,1075.5,88,1074.8,87.2,1074.3
+					z M70.8,1073.2c-3.2,0.9-7-1.1-7.9-4.2c-0.9-3.2,0.9-6.6,4.2-7.5c3.2-0.9,7,1.1,7.9,4.2C75.9,1069,74.1,1072.3,70.8,1073.2z"/>
+				<path fill="#444345" d="M42.4,987.3c6-6.8,2.7-11.7,1.7-13.6c-0.9-1.9-1.3-4.7-1.3-4.7l0.2-0.9l0.2-1.1
+					c-1.3-0.4-2.7,0.3-2.7,0.3c0.3,2.1-0.3,4.4-0.6,5.3c-0.4,0.9-1.6,2.8-2.2,4c-0.6,1.1-2.1,4.7-9.9,8.1
+					c-7.9,3.4-18.3,0.3-18.3,0.3c-2.7-0.7-4.9,0.4-4.9,0.4L4,986.3l0.1,0.8l-0.3,0.5l0.1,0.6c7.7,11.9,23.6,7.9,23.6,7.9
+					S36.4,994,42.4,987.3z"/>
+				<path fill="#444345" d="M215.2,1059.3c3.5-0.1,6.8-0.7,10.1-2c1.1-0.5,1.5-1.3,1.6-2.5c0.1-0.7,0.1-1.3,0.1-1.9
+					c0-0.1,0-0.1,0-0.2c0-0.1-0.3-0.4-0.7-0.4c-1.6-0.1-1.9-0.5-2.4-2c-0.4-1.1-0.7-2.1-1.1-3.1c3.9-0.9,3.4-3.7,2-7.3
+					c-1.1,1.6-0.3,2.1-2.1,2.5c-1.7,0.4-3,1.3-3.8,3c-0.1,0.3-0.3,0.7-0.5,1.1c-0.2-2,0.7-3.2,2.4-4.7c-0.8-0.8-4-0.4-4.8-0.9
+					c-3.1-2.2-17.5-4.8-26.5,2c-0.5-0.5-0.9-0.9-1.5-1.3c2.1-0.9,2.9-2,2.5-3.7c-0.3-1.3-1.3-2-2.4-1.9c-1.9,0.1-2.6,0.9-2.9,4.2
+					c-0.7-0.7-1.1-1.1-1.9-1.9c0,0.6-0.2,1.1-0.1,1.5c0.3,0.9,1.1,1.5,1.9,1.8c0.7,0.1,1.1,0.5,1.3,1.1c0.2,0.4,0.4,0.9,0.8,1.1
+					c0.9,0.9,1.1,2.1,1.1,3.5c0,3,0.1,6,0.5,9c0.4,3.2,1.1,6.3,2.6,9.2c0.5,0.9,1.1,0.9,1.9,0.8c0.3-0.1,0.6-0.8,0.6-1.1
+					c0.2-2.4,1.3-4.4,2.4-6.4c4.2,1.3,8.3,1.5,12.5,1.3c0.2,0,0.6,0.4,0.8,0.7c0.8,1.5,1.5,3.2,2.2,4.8c0.4,0.9,1.3,0.9,2,0.8
+					c0.2-0.1,0.3-0.9,0.3-1.3c0-1.7,0-3.6,0-5.3c0.2-0.1,0.3-0.1,0.3-0.2C214.7,1059.3,215.1,1059.3,215.2,1059.3z M187.2,1039.8
+					c-0.5-1.1-0.2-1.9,0.6-2c0.5-0.1,1.1-0.1,1.1,0.6C189.1,1039.2,188.5,1039.7,187.2,1039.8z"/>
+				<path fill="#444345" d="M33.5,924.2c6.6-0.6,8.9-3.9,10.8-10.3c1.1-3.9,1.3-7.7,1.5-11.8c-0.3-3.3-0.3-6.6-0.7-9.9
+					c-0.7-4.6-1.8-9.3-4-13.4c-1.7-3.3-2.2-5.3-5.9-5.9c-4-0.5-8.4,1-10.1,5.6c-0.5,1.3-1.1,2.4-1.3,3.7c-0.7,2.8-2.4,5-4.4,7
+					c-5.8,5.3-7.7,12.1-6.4,19.6C14.5,918.6,23.5,925.1,33.5,924.2z M21.2,893.3c3.5-3.3,6-6.8,7.1-11.5c0.2-0.9,0.7-1.8,1.1-2.6
+					c1.3-2.3,4.2-2.7,6.1-0.8c0.8,0.9,1.3,1.9,1.7,2.9c2.8,6.6,4,13.7,4,19.9c0,4.7-0.3,8.4-1.5,11.9c-1.7,5-5.3,7.5-10.1,7
+					c-4-0.4-7.3-2.4-9.9-5.5C15.2,908.4,15.4,898.6,21.2,893.3z"/>
+				<path fill="#444345" d="M29.5,917.1c3.2,0.3,5.6-0.7,7.1-3.6c2.8-5.6,3-11.3,1.1-17.2c-0.4-1.3-1.3-2.2-2.5-2.7
+					c-3.5-1.5-7.1-1.5-10.5-0.1c-1.6,0.8-3.2,1.8-3.9,3.6c-0.4,0.9-0.3,1.6,0.7,2.1c1.5,0.8,3,1.5,4.6,2.4c0.5,0.3,0.9,0.7,1.3,0.9
+					c0,0.1-0.1,0.3-0.2,0.4c-0.4-0.1-0.8-0.1-1.1-0.2c-1.7-0.5-3.5-1.1-5.2-1.5c-0.9-0.3-1.5,0.1-1.7,0.9c-0.1,0.4-0.2,0.8-0.2,1.1
+					C17.9,910,22.8,916.4,29.5,917.1z"/>
+				<path fill="#444345" d="M30.6,889c0.9,0.3,1.9,0.5,2.9,0.7c1.9-0.1,2.7-0.6,2.7-2.5c0-1.3-0.3-2.8-0.7-4.2c-0.3-1.1-1.1-2-2.4-2
+					c-1.3-0.1-2.5,0.5-3,1.7c-0.5,1.1-0.9,2.4-1.1,3.8C28.7,887.8,29.1,888.5,30.6,889z"/>
+				<path fill="#444345" d="M56.9,983.4c-0.4,0.1-0.9-0.1-0.9-0.5c0,0-0.5-1.3-2-2.9c-0.4-0.4-0.8-0.7-1.1-0.9
+					c-0.6-0.5-1.3-0.9-1.8-1.6c0.9,8.1,4.4,14,8.3,14c4.7,0,8.6-8.4,8.6-18.9s-4-18.9-8.7-18.9c-3.1,0-5.8,3.7-7.3,9.1
+					c0.6,0.9,1.1,1.3,1.9,1.8c0.4,0.3,0.9,0.7,1.3,1.1c1.9,1.8,2.4,3.5,2.4,3.6s0,0.1,0,0.2c0,0.3-0.2,0.6-0.6,0.7s-0.9-0.1-0.9-0.5
+					c0,0-0.5-1.3-2-2.9c-0.4-0.4-0.8-0.7-1.1-0.9c-0.5-0.3-0.9-0.7-1.3-1.1c-0.2,0.9-0.4,1.8-0.5,2.8c0.7,2.4,1.6,3.1,2.8,4
+					c0.4,0.3,0.9,0.7,1.3,1.1c1.9,1.8,2.4,3.5,2.4,3.6s0,0.1,0,0.2c0,0.3-0.2,0.6-0.6,0.7s-0.9-0.1-0.9-0.5c0,0-0.5-1.3-2-2.9
+					c-0.4-0.4-0.8-0.7-1.1-0.9c-0.7-0.5-1.5-1.1-2-1.9c0,0.6,0,1.1,0,1.7c0.7,3.5,1.7,4.4,3.1,5.3c0.4,0.3,0.9,0.7,1.3,1.1
+					c1.9,1.8,2.4,3.5,2.4,3.6c0,0.1,0,0.1,0,0.2C57.5,983,57.3,983.3,56.9,983.4z"/>
+				<path fill="#444345" d="M196.9,877c1.6,1.8,3.6,3.6,6,3.8c1.7,0.3,3.9-0.9,5.2-0.9c2.8,0,2.2,0.7,5.2,0.7c2.9,0,8.5-7,9.9-14.2
+					c0.3-1.8,0-4.9-1.3-7.9c-1.6-3.5-6.4-4.8-9.5-4.2c-0.8,0.1-2.5,0.5-3.9,0.7c0.3-0.9,0.9-2.6,2.6-3.5c0.5-0.3,0.7-0.9,0.4-1.3
+					c-0.3-0.5-0.9-0.7-1.3-0.4c-2.7,1.5-3.6,4.2-3.8,5.4c-1.3-0.3-4.4-0.8-5.8-0.8c-1.7,0.1-3.4,0.6-4.9,1.7c-1.3,1.1-2,2.5-2.6,4
+					c-0.8,2.2-1.1,4.4-0.8,6.8C192.8,870.8,194.4,874.1,196.9,877z M202.8,858.9c1.5,0,2.7,1.1,2.7,2.5c0,1.8-1.3,3.3-2.8,3.3
+					c-1.1,0-2.1-1.5-2.1-3.2C200.8,860,201.5,858.9,202.8,858.9z"/>
+				<path fill="#444345" d="M204.7,852.3c1.1,0.1,2.4,0.2,2.9-0.9c0.6-1.1-0.3-2.2-1.1-3.1c-1.8-1.9-4.6-2.3-7.7-0.9
+					c0.4,0.7,0.8,1.3,1.1,1.8C200.9,851,202.6,852,204.7,852.3z"/>
+				<path fill="#444345" d="M133.7,858.3c1.9-4,4.6-7.1,4.6-7.1c4,1.5,10.8,3.2,15.6-0.2c6.4-4.6,5.8-14.6,15-19.5
+					c2.1-1.1-18.1-5.9-28.7,0.2c-7.9,4.5-7.3,12-7.1,14.6c10.1-12,25.2-11.4,25.2-11.4s-21.4,7.4-27.7,22.2
+					C130.2,858.1,133.1,859.6,133.7,858.3z"/>
+				<path fill="#444345" d="M212,1007c4.8-9.9-0.6-17-2.7-19.6c-2.1,18.9-17.9,28.5-17.9,28.5s16.7-21.8,13.2-41
+					c-0.3-1.5-4.2-1.1-3.9,0.7c0.8,5.4,0.2,10.3,0.2,10.3c-5,1.1-13,4-15.8,10.7c-3.5,8.9,4,18.7-2,29.9
+					C181.8,1029.2,205.5,1020.4,212,1007z"/>
+				<path fill="#444345" d="M37.2,932.9c-2,1.5-1.6,5.4-0.1,7.5c1.5,1.9,5.3,3.4,7.3,1.8c0.4-0.3,1.6-1.1,1.6-1.1
+					c2.2,1.7,3.6,0,4.6,1.3c1.1,1.5,3.8,4.7,4.6,5.8c0.9,1.1,2.4,1.9,3.2,1.3c0.8-0.6,3.5-2.5,4.6-3.3c1.1-0.8,1.1-1.8,0.5-2.6
+					c-0.6-0.8-2.2-0.6-3-1.5c-0.8-0.9-3.1-3.8-3.8-4.7c-0.9-1.3-0.1-2.7,1.6-3.4c11.8-4.6,16,2.3,19.7-0.5
+					c2.8-2.1-0.3-11.2-6.6-19.3s-14.6-13.4-17.4-11.1C49.5,906.8,61,914.9,37.2,932.9z M57.2,907.8c0.7-0.5,6.4,2.8,11.5,9.1
+					c4.9,6.3,6.3,12.1,5.6,12.6c-0.7,0.5-6.4-2-11.4-8.3C57.9,914.9,56.6,908.3,57.2,907.8z"/>
+				<path fill="#444345" d="M15,980.9c8.2,0,15-3.9,15-5.9c0,0,0-0.6,0-6.2c0-5.7-10.3-10.3-10.3-14.4c0-4,10.3-8.7,10.3-14.4
+					c0-5.7,0-6.2,0-6.2c0-2.1-6.8-5.9-15-5.9s-15,3.8-15,5.8c0,0,0,0.6,0,6.2c0,5.7,10.3,10.3,10.3,14.4c0,4-10.3,8.7-10.3,14.4
+					c0,5.7,0,6.2,0,6.2C0,977.1,6.8,980.9,15,980.9z M3.5,934.1c1.8-1.1,5.3-2.9,10.9-2.9s10.6,2.9,10.6,2.9
+					c0.4,0.2,1.8,1.1,0.9,1.6c-2.2,1.3-6.6,2.7-11.6,2.7s-9.3-1.5-11.5-2.8C1.8,935,3.5,934.1,3.5,934.1z M2.9,968.8
+					c0-1.7,2.7-4.4,4.7-6.4c2.8-2.7,5.4-4.7,5.4-7.9c0-3.2-2.7-5.2-5.5-7.9c-2-2-4.8-4.7-4.8-6.4l-0.1-2.6c2.7,1.5,7.1,2.9,11.7,2.9
+					c4.7,0,9.1-1.3,11.8-2.9l-0.1,2.6c0,1.7-2.8,4.4-4.8,6.4c-2.8,2.7-5.4,4.7-5.4,7.9c0,3.2,2.2,5.2,5,7.9c2,2,4.4,4.7,4.4,6.4v3.5
+					c-1.9-1.3-9.5-2-9.5-5.9c0-1.9-2.7-1.9-2.7,0c0,3.9-8.1,4.6-10.1,5.9v-3.5H2.9z"/>
+				<path fill="#444345" d="M210.9,900.8c0,11,8.9,19.9,19.9,19.9c11,0,19.9-8.9,19.9-19.9c0-10.9-8.9-19.9-19.9-19.9
+					C219.8,880.9,210.9,889.8,210.9,900.8z M236.2,884.7c6.7,2.2,11.5,8.6,11.5,16c0,3.9-1.3,7.5-3.5,10.3c-0.6-0.5-1.3-1.8-0.7-3.2
+					c0.6-1.3,0.8-4.6,0.7-5.8c-0.1-1.3-0.8-4.2-2.5-4.2c-1.7,0-2.9-0.6-4-2.7c-2.1-4.2,4-5.1,1.8-7.5c-0.6-0.7-3.7,2.7-4.2-1.8
+					C235.5,885.7,235.8,885.1,236.2,884.7z M240.2,914.9c-2.7,1.7-5.9,2.8-9.4,2.8c-1.8,0-3.7-0.3-5.3-0.9c0.9-0.6,1.1-1.3,2-1.3
+					c1.1,0,1.9-0.4,3.1-0.7c1.1-0.2,3-1.3,4.6-1.5C236.7,913.3,239.4,913.5,240.2,914.9z M228.4,884c-0.4,0.8-1.5,1.1-2.1,1.7
+					c-1.5,1.3-2,1.1-2.8,2.3c-0.8,1.3-3.3,3-3.3,3.9s1.3,1.9,1.8,1.7c0.7-0.2,2.4-0.2,3.3,0.2c0.9,0.4,8.1,0.7,5.8,6.8
+					c-0.7,1.9-3.9,1.5-4.7,4.7c-0.1,0.5-0.6,2.4-0.6,3.1c-0.1,0.9,0.7,4.8-0.3,4.8s-3.6-3.4-3.6-4c0-0.6-0.7-2.8-0.7-4.6
+					s-3.2-1.8-3.2-4.2c0-2.2,1.7-3.3,1.3-4.4c-0.4-1.1-3.4-1.1-4.6-1.3C217.1,889,222.2,884.9,228.4,884z"/>
+				<path fill="#444345" d="M135.7,1029.6c-4,0-7.3,3.3-7.3,7.3s3.3,7.3,7.3,7.3c4,0,7.3-3.3,7.3-7.3
+					C142.9,1032.9,139.7,1029.6,135.7,1029.6z M132.5,1040c0-0.2-0.3-0.9-0.3-1.6c0-0.7-1.1-0.7-1.1-1.5c0-0.8,0.7-1.3,0.5-1.6
+					c-0.1-0.4-1.3-0.4-1.6-0.5c0.8-2,2.7-3.6,4.9-4c-0.2,0.3-0.6,0.4-0.8,0.6c-0.5,0.5-0.8,0.4-1.1,0.9s-1.1,1.1-1.1,1.5
+					c0,0.3,0.5,0.7,0.7,0.7c0.2-0.1,0.9-0.1,1.1,0.1c0.4,0.1,3,0.3,2.1,2.4c-0.3,0.7-1.5,0.6-1.7,1.7c-0.1,0.2-0.2,0.9-0.2,1.1
+					c0,0.4,0.3,1.7-0.1,1.7C133.5,1041.4,132.5,1040.2,132.5,1040z M135.7,1043.1c-0.7,0-1.3-0.1-1.9-0.3c0.4-0.2,0.4-0.5,0.8-0.5
+					s0.7-0.2,1.1-0.3c0.4-0.1,1.1-0.5,1.6-0.5c0.5,0,1.5,0,1.8,0.5C138.1,1042.7,137,1043.1,135.7,1043.1z M140.7,1040.6
+					c-0.2-0.2-0.5-0.7-0.2-1.1c0.2-0.5,0.3-1.6,0.2-2.1c-0.1-0.5-0.3-1.5-0.9-1.5s-1.1-0.2-1.5-0.9c-0.8-1.5,1.5-1.8,0.7-2.7
+					c-0.2-0.3-1.3,0.9-1.5-0.7c0-0.1,0.1-0.3,0.3-0.5c2.4,0.9,4.2,3.2,4.2,5.9C141.9,1038.4,141.4,1039.6,140.7,1040.6z"/>
+				<path fill="#444345" d="M44.9,1061.1c0,0.3,0,0.5,0,0.8c0.1,1.7,1.5,3.2,3.4,3.2c1.7,0,3.2-1.3,3.4-3c0.1-0.3,0.1-0.6,0.1-0.9
+					c0-0.9,0.4-1.3,1.1-1.5c6.4-1.5,11.4-6.6,12.4-13c0.1-0.8,0.1-1.5,0.4-2.1c0.6-0.5,1.5-0.9,1.7-1.5c0.2-0.5-0.4-1.3-0.6-2.1
+					c1.1-1.1,1.1-1.6-0.2-2.9c1.3-1.3,1.3-1.9-0.1-3.2c0.9-0.4,1.3-1.1,0.9-2c-0.3-0.6-1.1-0.9-1.6-1.3c-0.1,0.1-0.1,0.2-0.2,0.2
+					c-0.1-0.6-0.1-1.1-0.4-1.5c-0.4-0.5-0.9-1.1-1.5-1.1c-0.3-0.1-0.9,0.6-1.1,0.9c-0.7,1.3-1.1,2.8-1.7,4.2s-1.3,2.7-2.2,3.9
+					c-2.7,3.4-6.3,4.4-10.4,3.6c-4-0.9-6.8-3.3-7.9-7.3c-0.2-0.8-0.2-1.5-0.4-2.3c0.9-0.6,2.1-0.9,1.6-2.2c-0.2-0.7-1.1-1.1-2-1.7
+					c0-0.5,0.2-1.5-0.9-1.9c-0.9-0.4-1.6,0.2-2.2,1.1c-0.7-0.8-1.3-1.6-2.4-1.1c-0.6,0.4-0.9,1.3-1.5,2.2c-0.7,0-1.8-0.1-2,1.3
+					c-0.1,0.9,0.6,1.5,2.4,2c-1.1,1.3-3,1.3-4.2,2.4c1.1,0.6,2,1.1,3.1,1.7c0.6,0.3,0.8,0.7,0.7,1.3c-0.2,2.1-0.3,4.4-0.5,6.4
+					c-0.8,9.2,5.5,14.3,11.5,15.9C44.7,1059.8,45,1060,44.9,1061.1z M35.7,1034.1c-0.3,0-0.7-0.4-1.3-0.8c0.7-0.4,0.9-0.9,1.3-0.9
+					c0.3,0,0.9,0.6,0.8,0.8C36.3,1033.6,35.9,1034.1,35.7,1034.1z"/>
+				<path fill="#444345" d="M211.6,940.4h-6.4c-1.1,0-2.7,0.7-3.4,1.6l-8.5,10.9c-0.7,0.9-0.3,0.9,0.9,0.9h34.6c1.1,0,1.6,0,0.9-0.9
+					l-7.4-11c-0.7-0.9-2.1-1.5-3.3-1.5h-1.6v-3.9h-5.8V940.4z"/>
+				<path fill="#444345" d="M219.2,930.1l0.5-0.1c1.1-0.2,2-1.1,2.7-2.2c0.7-1.1,0.8-3.6,0.6-4.9c-0.7,2-2.1,2.7-3.7,3.4
+					c-0.4,0.2-0.9,0.4-1.3,0.5c-0.5,0.2-0.9,0.4-1.5,0.6c-1.5,0.8-2.1,2-2.4,4c-0.2,0.8-0.3,1.6-0.3,2.8c0.8-2,1.6-3,3.3-3.6
+					C217.8,930.5,218.5,930.3,219.2,930.1z"/>
+				<path fill="#444345" d="M227,969.3h0.9v-11.9c0-1.1,0-1.6,0-1.6H227h-1.3h-15h-1.3h-11h-4v2.2v11.3h4h2.7v-8
+					c0,0,0.2,0.3,1.1,0.3h5.2c0,0,0.5-1.1,0.5-0.2v7.9h1.5h1.3h15L227,969.3L227,969.3z M222.2,965.5c0,0.2,0.7,0.9,0.5,0.9h-5.7
+					c-0.2,0-0.6-0.8-0.6-0.9v-5.7c0-0.2,0.4-0.1,0.6-0.1h5.7c0.2,0-0.5-0.1-0.5,0.1V965.5z"/>
+				<path fill="#444345" d="M143.1,1056.3c0-0.6-0.5-0.9-1.1-0.9h-13.4c-0.6,0-1.1,0.4-1.1,0.9c0,0.6,0.5,0.9,1.1,0.9h13.4
+					C142.7,1057.3,143.1,1056.9,143.1,1056.3z"/>
+				<rect x="131.4" y="1052.5" fill="#444345" width="9.7" height="2.9"/>
+				<path fill="#444345" d="M117.8,828.2c-4.6,0.8-7.9,4.6-8.2,9.1l8.7-0.5L117.8,828.2z"/>
+				<path fill="#444345" d="M119.7,839.3l-9.9,0.5c0.9,4.8,5.2,8.4,10.3,8.1c5.5-0.3,9.7-4.9,9.4-10.4c-0.3-5-4.2-9-9.1-9.4l0.5,9.9
+					C120.9,838.7,120.3,839.2,119.7,839.3z"/>
+				<path fill="#444345" d="M78.2,866c0.4,0,0.9-0.6,1.3-0.7s0.9-0.6,1.1-0.8l5.5-3.9c0.3-0.2,0.5-0.6,0.5-0.9
+					c0-0.3-0.2-0.6-0.5-0.8l-5.5-3.8c-0.3-0.2-0.8-0.9-1.1-1.1c-0.5-0.1-0.9-0.7-1.3-0.7H62.5l1.8,12.6H78.2L78.2,866z"/>
+				<path fill="#444345" d="M41,865.1l5.5,3.8c0.3,0.2,0.8,0.5,1.1,0.7c0.5,0.1,0.9,0.4,1.3,0.4h8.1V890c0,0.5,0.6,0.2,1.1,0.2h2
+					c0.5,0,0.7,0.3,0.7-0.2v-39.7c0-0.5-0.2-1.6-0.7-1.6h-2c-0.5,0-1.1,1.1-1.1,1.6v9h-8c-0.4,0-0.9,0-1.3,0.1s-0.9,0.3-1.1,0.5
+					l-5.5,3.8c-0.3,0.2-0.5,0.5-0.5,0.8C40.6,864.7,40.8,864.9,41,865.1z"/>
+				<path fill="#444345" d="M72.4,874.2v31.6c0,2.2,2.4,4.6,4.6,4.6h15.4c2.2,0,4.2-2.4,4.2-4.6v-31.6c0-2.2-2-3.4-4.2-3.4H77
+					C74.8,870.8,72.4,872,72.4,874.2z M84.7,908.2c-1.5,0-2.8-0.9-2.8-2s1.3-2,2.8-2s2.8,0.9,2.8,2
+					C87.5,907.2,86.3,908.2,84.7,908.2z M93.7,875.7v26.1H76.3v-26.1H93.7z"/>
+				<path fill="#444345" d="M162,850.1c0,13.2,13.8,30.4,13.8,30.4s13.8-17.2,13.8-30.4c0-7.7-6.2-13.8-13.8-13.8
+					C168.2,836.1,162,842.3,162,850.1z M175.8,842.7c4.2,0,7.5,3.4,7.5,7.5c0,4.2-3.4,7.5-7.5,7.5c-4.2,0-7.5-3.4-7.5-7.5
+					C168.3,846.1,171.8,842.7,175.8,842.7z"/>
+				<path fill="#444345" d="M88.9,887.4c0-2.4-1.8-4.2-4.2-4.2s-4.2,1.8-4.2,4.2c0,4,4.2,9.1,4.2,9.1S88.9,891.4,88.9,887.4z
+					 M82.4,887.6c0-1.3,0.9-2.2,2.2-2.2c1.3,0,2.2,0.9,2.2,2.2c0,1.3-0.9,2.2-2.2,2.2C83.5,889.8,82.4,888.8,82.4,887.6z"/>
+				<path fill="#444345" d="M177.1,885.5l-2.4,2.1l-2.4-2.1c-3.4-3.1-9-3.1-12.4,0c-3.9,3.6-3.9,9.3,0,12.8l14.7,13.5l14.7-13.5
+					c3.9-3.6,3.9-9.3,0-12.8C186.1,882.4,180.4,882.4,177.1,885.5z"/>
+				<path fill="#444345" d="M237.1,987.3l-3.3,2.8c-0.3,0.2-0.3,0.7-0.1,0.9l18.9,21.4c0.4,0.5,1.1,0.6,1.7,0.1l2.2-1.8
+					c0.5-0.5,0.6-1.3,0.1-1.7l-18.7-21.6C237.8,986.9,237.4,986.9,237.1,987.3z"/>
+				<path fill="#444345" d="M236.1,973.1c-2.9,0.3-6.6,3-8.4,4.2c-2.4,1.6-3.3,2.6-3.5,2.7c-0.7,0.6-0.1,1.9-1.3,3.1
+					c-1.3,1.1-2.1,0.3-2.9,0.9c-0.4,0.3-1.5,1.1-1.7,1.3c-0.3,0.3-0.4,0.7-0.1,1.1c0,0,2.9,3.2,3.1,3.5c0.2,0.3,0.9,0.5,1.3,0.2
+					c0.4-0.4,1.5-1.3,1.6-1.5c0.2-0.2-0.1-1.9,0.8-2.7c2.1-1.6,3.9-0.5,6.2,2.2c0.3,0.3,0.7-0.1,0.9-0.2c0.2-0.2,3.3-3,3.5-3.1
+					c0.2-0.1,0.3-0.4,0.1-0.7c-0.2-0.3-1.1-1.5-1.6-2.1c-4.2-5.4,11.2-9,8.9-9.1C241.6,973,236.7,973,236.1,973.1z"/>
+				<path fill="#444345" d="M224.1,1010.9l2.1,2.1c0.5,0.5,1.3,0.3,1.7-0.2l11.1-10.9l-3.4-3.9l-11.6,11.2
+					C223.7,1009.6,223.7,1010.4,224.1,1010.9z"/>
+				<path fill="#444345" d="M247.9,985.9c-0.2,0.3-0.4,0.6-0.7,0.9l-3.1,3.2l3.1,3.6l3.8-3.6c0.2-0.2,0.6-0.5,0.9-0.7
+					c0.1,0,0.1,0,0.2-0.1c0.3-0.1,0.6,0,0.9,0.2c0.7,0.5,1.3,0.9,1.9,1.5c0.5,0.4,0.9,0.4,1.3-0.1c0.6-0.7,1.1-1.3,1.7-1.9
+					c0.9-1.1,1.9-2.1,2.9-3.2c1.6-1.7,2.4-3.7,2.4-5.8c0-0.8,0-1.5-0.2-2.4c-0.3-2-1.3-3-3.3-3.3c-0.5-0.1-1.1-0.2-1.5-0.1
+					c-0.6,0-1.3,0-1.8,0.1c-1.5,0.1-3,0.5-4.2,1.6c-0.9,0.9-1.9,1.8-2.9,2.7c-1.1,1.1-2.2,2-3.3,3.1c-0.3,0.3-0.4,0.6,0,0.9
+					c0.7,0.7,1.3,1.5,1.9,2.1c0.3,0.3,0.4,0.5,0.2,0.9C248,985.6,247.9,985.6,247.9,985.9z M250.3,985.4l4.7-4.4
+					c0.1-0.1,0.4-0.1,0.5,0c0.1,0.1,0.1,0.3,0,0.5l-4.2,5c-0.1,0.1-0.2-0.7-0.3,0.3l0,0c-0.1,0-0.2-0.2-0.2-0.2l-0.6-0.6
+					c-0.1-0.1-0.1-0.2-0.1-0.3C250.2,985.6,250.3,985.4,250.3,985.4z"/>
+				<path fill="#444345" d="M237.6,934c0,0.8-0.1,1.5,0.6,1.5h10.1v2.5c0,0.6-0.4,0.4,0.2,0.4h4c0.6,0,0.7,0.2,0.7-0.4v-2.5h9.5
+					c0.8,0,1.1-0.9,1.1-1.5v-5.2h-26.1L237.6,934L237.6,934z"/>
+				<path fill="#444345" d="M251.2,948.8V947c0-0.3-0.2-0.6-0.5-0.6s-0.5,0.3-0.5,0.6v1.7c-2.9,0.3-4.8,2.5-4.8,5.1
+					c0,2.9,2.2,5.2,5.1,5.2c2.9,0,5.2-2.4,5.2-5.2C255.7,951.3,254.1,949.1,251.2,948.8z"/>
+				<path fill="#444345" d="M261.5,939.4h-22c-1.1,0-2,1.1-2.2,2.2l-2.6,22.8c-0.1,0.6,0.1,1.5,0.6,2c0.4,0.5,1.1,0.9,1.6,0.9h27.3
+					c0.7,0,1.3-0.5,1.6-0.9c0.4-0.5,0.6-1.1,0.6-1.8l-2.6-23C263.5,940.6,262.5,939.4,261.5,939.4z M250.4,963c-5,0-9.1-4-9.1-9.1
+					s4-9.1,9.1-9.1c5,0,9.1,4,9.1,9.1S255.4,963,250.4,963z"/>
+				<path fill="#444345" d="M155,1069.4v0.4h11.3c0.6,0,1.1-0.9,1.1-1.5c0-0.6-0.5-1.5-1.1-1.5H155h-1.3h-2.4c-3,0-5.4,1.9-6.2,4.8
+					h-7.9v2.9h7.9c0.8,2.9,3.2,5.8,6.2,5.8h2.4l0,0h12.6c0.6,0,1.1-0.9,1.1-1.5s-0.5-1.5-1.1-1.5H155c-0.4,0-0.7-0.1-0.7-0.5
+					c0-0.4,0.3-0.5,0.7-0.5h11.3c0.6,0,1.1-0.4,1.1-0.9c0-0.6-0.5-0.9-1.1-0.9H155l0,0c-0.4,0-0.7-0.6-0.7-0.9
+					c0-0.4,0.3-0.9,0.7-0.9h11.3c0.6,0,1.1-0.4,1.1-0.9c0-0.6-0.5-0.9-1.1-0.9h-10.7v-0.4c-0.9,0-0.9-0.1-0.9-0.5
+					C154.6,1069.5,154.6,1069.4,155,1069.4z"/>
+				<path fill="#444345" d="M105.5,1076.6h27.3c1.3,0,3.3-0.7,3.3-1.6v-3.3c0-0.9-2.1-1.8-3.3-1.8h-27.3c-1.8,0-3.3,1.5-3.3,3.4
+					C102.4,1075,103.9,1076.6,105.5,1076.6z"/>
+				<path fill="#444345" d="M165.8,1086.7c0-1.8-1.5-3.4-3.4-3.4h-28.2c-1.3,0-1.9,0.6-2.9,1.6v3.4c0.9,0.9,1.6,1.7,2.9,1.7h28.2
+					C164.3,1090.1,165.8,1088.6,165.8,1086.7z"/>
+				<path fill="#444345" d="M131.4,1088.2v-2.9h-4h-5.8H96.6c0,0-2.5,1.1,1.3,2.8c5.7,2.4,10.3,2.8,14.7,3.4
+					c1.5,0.2,6.6,1.3,9.9-1.5c1.1-1.1,2.4-1.8,3.4-1.8H131.4z"/>
+				<path fill="#444345" d="M169.3,1059.4l8.2-0.8c-0.1-0.9-0.3-1.8-0.3-2.7c-0.1-2.3-0.2-4.6-0.3-7c-0.1-1.7,0-3.5,0-5.2
+					c0.1-2,0.2-4.2,0.3-6.2c0.1-1.6,0.2-3.4,0.4-5c0.2-2,0.5-4,0.8-6c0.2-1.5,0.5-3.2,0.7-4.7c0.1-0.5-0.2-0.9-0.7-0.9
+					c-0.3-0.1-0.6-0.1-0.9-0.1c-4.2,0-8.5,0-12.4,0c0,0,0,0,0,0.1c-0.9,0-1.9,0-2.9,0c-0.6,0-0.7,0-0.7,0.6
+					c-0.1,0.8-0.2,1.5-0.2,2.2c0,1.5,0,3.1,0.1,4.6c0,1.5,0.1,3.1,0.2,4.6c0.1,1.5,0.2,3.1,0.3,4.6c0.1,1.5,0.2,2.8,0.3,4.2
+					c0.1,1.9,0.3,3.9,0.5,5.8c0.1,1.6,0.3,3.2,0.4,4.8c0.2,1.5,0.3,3.2,0.5,4.8c0.1,0.8,0.2,1.5,0.3,2.2c0,0.2,0.1,0.4,0.4,0.4
+					c0.5,0,0.9-0.1,1.5-0.1c0.8-0.1,1.6-0.1,2.4-0.2C168.6,1059.5,168.9,1059.4,169.3,1059.4z M174.8,1023.7c0.7,0,1.1,0.4,1.1,1.1
+					c0,0.6-0.5,1.1-1.1,1.1c-0.6,0-1.1-0.5-1.1-1.1C173.7,1024.1,174.2,1023.7,174.8,1023.7z"/>
+				<path fill="#444345" d="M175.7,1082.3c-0.5,1.5,0.9,3.3,2.6,3.3c1.3,0,2.5-0.9,2.9-2.4c0.3-1.3,0.3-2.5,0.1-3.8
+					c-0.5-2.6-1.1-5.2-1.5-7.7c-0.4-2-0.9-4-1.3-6.1c-0.3-1.5-0.6-3.1-0.7-4.6v-0.1l-5.2,0.5c0.2,0.9,0.4,2,0.6,3
+					c0.6,3.2,1.1,6.3,1.8,9.4c0.5,1.9,0.9,4,1.3,5.9c0.1,0.4,0,0.9-0.1,1.3C176,1081.3,175.8,1081.8,175.7,1082.3z"/>
+				<path fill="#444345" d="M85.5,1019.1c1.3,0.1,2.6-0.1,4-0.2c0.1,0,0.1-0.1,0.1-0.2c0.6-1.1-0.1-2.9-1.3-3.4c0-1.1,0.2-2.4,0-3.6
+					c-0.2-1.5-0.2-3.5-1.1-4.6c-2-2.9-5-6.3-7.5-8.9c-1.7-1.9-3.6-2.2-6.2-2.2c-10.1-0.1-20.1-0.2-30.1-0.3c-3.2,0-4.4,1.3-4.4,4.4
+					c-0.1,4.9-0.1,9.9-0.2,15c-1.1-0.1-1.3,0.5-1.3,1.3c0,0.4,0,0.8,0,1.3c0,0.7,0.3,1.1,0.9,1.1c0.9,0,1.7,0,2.7,0
+					c0.9,0.1,1.3-0.3,1.5-1.1c0.9-2.8,3.1-4.4,6-4.4c2.9,0,5.1,1.6,6,4.6c0.3,0.9,0.8,1.1,1.6,1.1c4.8,0,9.7,0.1,14.6,0.2
+					c0.9,0,1.5-0.4,1.7-1.3c0.9-2.7,3.2-4.4,6-4.4c2.8,0,4.9,1.6,5.9,4.4C84.6,1018.3,85.1,1019.1,85.5,1019.1z M82.8,1007
+					L82.8,1007l-9.5,0.4c-0.7,0-1.3-0.4-1.3-1.1l0.1-6.8c0-0.7,0.6-1.3,1.3-1.3l3,0.1c0.1,0,0.3,0,0.4,0.1c0.4,0.1,0.6,0.2,6.8,7.3
+					c0.2,0.2,0.4,0.1,0.4,0.5C84.1,1006.9,83.5,1007,82.8,1007z"/>
+				<path fill="#444345" d="M48.8,1014.1c-3,0-5.5,2.4-5.5,5.4s2.4,5.5,5.4,5.5s5.5-2.4,5.5-5.4
+					C54.2,1016.6,51.8,1014.2,48.8,1014.1z"/>
+				<path fill="#444345" d="M78.6,1014.5c-3,0-5.5,2.4-5.5,5.4c0,3,2.4,5.5,5.4,5.5s5.5-2.4,5.5-5.4
+					C84.1,1017,81.6,1014.5,78.6,1014.5z"/>
+				<path fill="#444345" d="M247.8,1026.3c0-0.9-2.4-1.7-10.3-0.7c0,0,1.9-1.6,2.7-1.9c0.8-0.3,4.2-2.4,3.6-5.1
+					c-0.6-2.7-1.6-1.1-2.9,1.1c-1.1,2.1-2.7,4-4.9,5.3c0,0-0.7-4.2-3.1-4.4c-0.8,0-4,0-7.7,0.4l-0.7,0.1c-0.4,0-0.9,0.1-1.3,0.2
+					c0,0.1-0.2,0.1-0.2,0.2v4.6c0,0.4-0.1,0.7-0.5,0.7s-0.5-0.3-0.5-0.7v-4.6l0,0c-0.9,0.1-1.3,0.2-1.8,0.3c0,0-7.1,1.1-11.8,2.5
+					h-0.1c-0.1,0-0.2,0.1-0.3,0.1c-0.3,0.1-0.6,0.2-0.9,0.3c-0.2,0.1-0.4,0.1-0.6,0.2c-0.1,0-0.1,0.1-0.2,0.1
+					c-0.1,0-0.2,0.1-0.3,0.1l0,0c-0.9,0.4-1.6,0.6-2.4,1.1c0,0-0.8,0.4-0.3,1.5c0.3,0.7,4.2,2.4,12,3.6v-3.5c0-0.4,0.1-0.7,0.5-0.7
+					s0.5,0.3,0.5,0.7v3.7c0.9,0.1,1.3,0.1,1.7,0.2l0.9,0.1c2.6,0.3,5.1,0.5,9.9,0.6v-2.9c0-0.4,0.1-0.7,0.5-0.7s0.5,0.3,0.5,0.7v2.9
+					h0.8c1.1,0,1.6,0,2.6-0.1c0,0,2.5,0.2,2.7-4.4c0,0,4.4-0.8,4,4.2c-0.2,3.7,3,3.8,3,1.1c0-2.5-0.7-5.4-5.5-6.4c0,0,3.9,0.5,7,1.1
+					C247.5,1028.4,247.8,1027.3,247.8,1026.3z"/>
+			</g>
+			<g>
+				<polygon fill="#444345" points="678.1,1020.6 677.4,1020.6 650.5,985.8 642.4,985.8 642.4,1038 654,1038 654,1003.2 
+					653.4,1003.2 680.4,1038 687.7,1038 687.7,987.7 678.1,987.7 				"/>
+				<polygon fill="#444345" points="706.1,1038 731.3,1038 731.3,1028.3 714.8,1028.3 714.8,1015.7 731.3,1015.7 731.3,1007 
+					714.8,1007 714.8,994.4 731.3,994.4 731.3,987.7 706.1,987.7 				"/>
+				<polygon fill="#444345" points="744.8,994.4 755.4,994.4 755.4,1038 764.1,1038 764.1,994.4 776.6,994.4 776.6,987.7 
+					744.8,987.7 				"/>
+				<polygon fill="#444345" points="832.4,1022.5 832.3,1022.5 821.6,985.8 815.8,985.8 805.5,1022.5 805.5,1022.5 795.1,987.7 
+					784.6,987.7 800.9,1038 808.2,1038 817.9,1007 818.1,1007 828.2,1038 835.6,1038 853,987.7 842.4,987.7 				"/>
+				<path fill="#444345" d="M888.7,985.4c-15.2,0-25.3,11.7-25.3,26.9c0,15,9.7,27.1,25.3,27.1c15.6,0,25.3-12,25.3-27.1
+					C914.1,997.1,904,985.4,888.7,985.4z M888.7,1029.6c-11.1,0-15-9.7-15-17.6c0-8.3,5.6-16.6,15-16.6c9.5,0,15,8.4,15,16.6
+					C903.7,1019.8,899.8,1029.6,888.7,1029.6z"/>
+				<path fill="#444345" d="M959.8,1002.7c0-10.9-7.1-15-17.1-15h-14.4v50.2h11.6v-20.3h-0.7l12.5,20.3h12.1l-14.5-21.4
+					C956.3,1015.5,959.8,1009.1,959.8,1002.7z M940.4,1010.9h-0.5v-16.5h0.6c5.3,0,9.3,1.7,9.3,8
+					C949.9,1008.7,945.9,1010.9,940.4,1010.9z"/>
+				<polygon fill="#444345" points="1015.5,987.7 1003.2,987.7 987.4,1008 987.2,1008 987.2,987.7 976.6,987.7 976.6,1038 
+					987.2,1038 987.2,1013.8 987.4,1013.8 1003.7,1038 1016.6,1038 996.1,1010.9 				"/>
+				<path fill="#444345" d="M360.6,873.3c-25,0-41.6,19.1-41.6,44c0,24.7,15.9,44.3,41.6,44.3c25.6,0,41.6-19.6,41.6-44.3
+					C402.1,892.4,385.6,873.3,360.6,873.3z M360.6,945.5c-18.1,0-24.6-15.9-24.6-28.8c0-13.6,9.2-27.3,24.6-27.3
+					s24.6,13.7,24.6,27.3C385.2,929.6,378.8,945.5,360.6,945.5z"/>
+				<path fill="#444345" d="M443.5,876.6h-22.4v83.1h15.4v-31.9h9.3c17.2,0,26.9-8,26.9-25.8C472.6,883,461.1,876.6,443.5,876.6z
+					 M441,915.3h-4.4v-26.1h4c9.2,0,15.4,1.9,15.4,12.8C456,912.9,450.7,915.3,441,915.3z"/>
+				<polygon fill="#444345" points="491.7,959.7 535.1,959.7 535.1,945.2 508.1,945.2 508.1,923 533.3,923 533.3,908.5 508.1,908.5 
+					508.1,889.2 535.1,889.2 535.1,876.6 491.7,876.6 				"/>
+				<polygon fill="#444345" points="612.4,932.7 612.7,932.7 568.6,872.8 556.4,872.8 556.4,959.7 573.8,959.7 573.8,901.7 
+					573.3,901.7 617.6,961.6 629.8,961.6 629.8,876.6 612.4,876.6 				"/>
+				<polygon fill="#444345" points="695.5,959.7 711.9,959.7 711.9,923 736.1,923 736.1,908.5 711.9,908.5 711.9,889.2 738,889.2 
+					738,876.6 695.5,876.6 				"/>
+				<path fill="#444345" d="M795.8,961.6c25.6,0,41.6-19.6,41.6-44.3c0-24.9-16.5-44-41.6-44s-41.6,19.1-41.6,44
+					C754.4,942,770.3,961.6,795.8,961.6z M795.8,889.4c15.4,0,24.6,13.7,24.6,27.3c0,13-6.4,28.8-24.6,28.8
+					c-18.1,0-24.6-15.9-24.6-28.8C771.3,903.1,780.4,889.4,795.8,889.4z"/>
+				<path fill="#444345" d="M894.1,873.3c-25,0-41.6,19.1-41.6,44c0,24.7,15.9,44.3,41.6,44.3c25.6,0,41.6-19.6,41.6-44.3
+					C935.6,892.4,919.3,873.3,894.1,873.3z M894.1,945.5c-18.1,0-24.6-15.9-24.6-28.8c0-13.6,9.2-27.3,24.6-27.3
+					c15.4,0,24.6,13.7,24.6,27.3C918.7,929.6,912.3,945.5,894.1,945.5z"/>
+				<path fill="#444345" d="M1018.7,918.2c0-24-16.2-41.6-40.6-41.6h-21.8v83.1h21.8C1002,959.7,1018.7,941.8,1018.7,918.2z
+					 M971.8,945.2v-56.1h2.1c18.5,0,27.9,9.7,27.9,28c0,16.6-7.9,28-27.9,28L971.8,945.2L971.8,945.2z"/>
+			</g>
+		</g>
+	</g>
+</g>
+<g id="OFN_beta__x28_outlined_x29_">
+	<g>
+		<g>
+			<path fill="#FFFFFF" d="M787.9,977.7l0.2-5.2c0-0.4,0-0.5,0-0.6c-0.1-0.1-0.2-0.3-0.4-0.7c-0.1-0.3-0.2-0.6-0.2-0.7v0
+				c0.1,0,0.3-0.1,0.9-0.1c0.5,0,1.1,0,1.6,0c0.5,0,1,0.1,1.4,0.1c0.4,0.1,0.9,0.2,1.2,0.3c0.4,0.1,0.7,0.4,1,0.6
+				c0.2,0.3,0.3,0.6,0.3,0.9s-0.1,0.6-0.2,0.9c-0.1,0.3-0.3,0.5-0.5,0.6c-0.3,0.3-0.6,0.4-1,0.6c0,0,0,0,0,0s0.1,0,0.2,0.1
+				s0.2,0.1,0.3,0.1c0.1,0,0.2,0.1,0.4,0.2c0.2,0.1,0.3,0.2,0.4,0.3s0.2,0.2,0.4,0.4c0.2,0.3,0.4,0.8,0.3,1.3c0,0.5-0.2,1-0.5,1.5
+				c-0.3,0.4-0.8,0.8-1.4,1.1c-1.1,0.5-2.4,0.7-3.8,0.6l-0.7-0.1c0,0,0-0.4,0-1C787.9,978.6,787.9,978.2,787.9,977.7z M789.8,978.8
+				c0.6,0,1.2-0.1,1.7-0.5c0.5-0.3,0.9-0.8,0.9-1.2c0-0.3-0.1-0.6-0.4-0.9c-0.4-0.4-1.1-0.6-1.9-0.6c-0.2,0-0.3,0-0.3,0
+				s0,0.4-0.1,1.3C789.6,977.7,789.6,978.3,789.8,978.8C789.7,978.8,789.7,978.8,789.8,978.8z M791,973.9c0.2-0.1,0.4-0.2,0.6-0.4
+				c0.2-0.2,0.3-0.4,0.3-0.6c0-0.2,0-0.4-0.2-0.5s-0.3-0.2-0.5-0.3c-0.2-0.1-0.4-0.1-0.5-0.2c-0.2,0-0.3-0.1-0.5-0.1s-0.2,0-0.3,0
+				c0,0,0,0.4-0.1,1.1c0,0.7-0.1,1.1-0.1,1.2c0,0,0.1,0,0.1,0c0.1,0,0.2,0,0.4-0.1C790.5,974.1,790.8,974.1,791,973.9z"/>
+			<path fill="#FFFFFF" d="M796.1,974.6l0.1-1.5c0-0.4,0-0.6,0-0.6c-0.1-0.1-0.2-0.3-0.4-0.8c-0.1-0.4-0.2-0.6-0.2-0.8
+				c0.1-0.1,1.7-0.1,4.8,0c0.8,0,1.2,0.1,1.2,0.1c0,0.2-0.1,0.4-0.1,0.6c-0.1,0.2-0.2,0.4-0.3,0.5s-0.2,0.2-0.2,0.2c0,0-0.2,0-0.5,0
+				c-0.3,0-0.8,0-1.4,0c-0.6,0-0.9,0.1-1,0.1c-0.1,0.1-0.1,0.5-0.1,1.5v0.6c0.4,0,0.9,0,1.6,0c0.7,0,1.1,0.1,1.1,0.1
+				c0,0.3-0.1,0.7-0.4,1.1c-0.1,0.1-0.1,0.2-0.2,0.2c-0.2,0-0.6,0-1.2,0c-0.6,0-0.9,0.1-1,0.1c0,0,0,0.4-0.1,1.2c0,0.8,0,1.2,0,1.2
+				c0.1,0.1,0.9,0.2,2.4,0.3c0.6,0,1,0,1.2,0s0.3,0,0.3,0c0,0.2-0.1,0.5-0.2,0.8c-0.2,0.3-0.3,0.5-0.5,0.7c-0.1,0.1-0.9,0.1-2.5,0
+				c-1.5-0.1-2.4-0.1-2.4-0.2c-0.1,0-0.1-0.5,0-1.3c0-0.9,0.1-1.7,0.1-2.6c-0.2-0.1-0.3-0.4-0.4-0.7s-0.2-0.6-0.2-0.8
+				C795.3,974.6,795.6,974.6,796.1,974.6z"/>
+			<path fill="#FFFFFF" d="M803.8,979.1l0.3-5.7c0-0.5,0-0.7,0-0.7c0,0-0.1,0-0.2,0c-0.3,0-0.8,0-1.5,0.1l-0.4,0l0-0.3
+				c0-0.4,0.1-0.8,0.3-1.1l0.1-0.2c0.7,0,1.5,0,2.4,0c0.9,0,1.7,0,2.4,0c0.7,0,1.1,0.1,1.1,0.1c0,0.3,0,0.6-0.1,1
+				c-0.1,0.4-0.1,0.6-0.2,0.6c-0.2-0.1-0.6-0.1-1.2-0.1c-0.6,0-0.9,0-0.9,0c-0.1,0.1-0.1,1.3-0.2,3.6c-0.1,2.3,0,3.7,0.3,4.2l0,0
+				c0,0.1-0.2,0.1-0.5,0.2c-0.3,0.1-0.6,0.1-0.9,0.1c-0.3,0-0.5-0.1-0.7-0.1C803.8,980.6,803.8,980.1,803.8,979.1z"/>
+			<path fill="#FFFFFF" d="M812.2,977.5c-0.1,0-0.5,0-1.2-0.1c-0.6,0-1,0-1.2,0c-0.5,1.6-0.9,2.7-1,3.4c0,0-0.1,0-0.3,0
+				c-0.2,0-0.4,0-0.7-0.1c-0.5-0.1-0.8-0.2-0.8-0.2c0-0.4,0.4-1.4,1.1-3.1c-0.1-0.1-0.2-0.3-0.4-0.6c-0.1-0.3-0.2-0.6-0.2-0.8
+				c0,0,0.4,0,1.1,0c0.8-2.2,1.3-3.3,1.4-3.4c0,0,0.2-0.1,0.5-0.1s0.5-0.1,0.5-0.1l0-0.2c0-0.1,0-0.3,0-0.4c0-0.1,0-0.2,0-0.3
+				c0,0,0.1-0.1,0.2-0.2c0.4-0.2,0.9-0.3,1.4-0.3c0.1,0.5,0.2,1.2,0.3,2.1c0.1,0.9,0.4,2.1,0.8,3.9c0.4,1.7,0.8,2.9,1.1,3.6l0.1,0.2
+				c0,0-0.1,0.1-0.3,0.2c-0.2,0.1-0.4,0.2-0.7,0.3c-0.3,0.1-0.5,0.1-0.8,0.1c-0.1,0-0.3-0.5-0.5-1.6S812.2,978,812.2,977.5z
+				 M811.9,976.1c-0.3-1.3-0.4-2.1-0.4-2.2c0-0.2,0-0.2-0.1-0.2s0,0-0.1,0.1c-0.1,0.1-0.2,0.5-0.5,1.1c-0.2,0.6-0.4,1-0.5,1.2
+				C811.3,976,811.9,976,811.9,976.1z"/>
+		</g>
+		<g>
+			<path fill="#FFFFFF" d="M791.1,1003.2c-0.1-0.1-0.5-1.3-1.3-3.4l-0.4-1.1c0,0,0-0.1,0-0.1c-0.1,0.1-0.5,0.9-1.2,2.1
+				c-0.6,1.3-1,2-1.1,2.1c-0.7,0-1.1-0.1-1.2-0.4c0.1-0.3,0.4-1,0.9-1.9c0.5-0.9,1-1.8,1.4-2.5l0.7-1.2c0.1-0.1,0.3-0.1,0.6-0.2h0.1
+				l0.5,0.1c1,3.1,1.7,5.1,2,6.1C791.9,1003,791.5,1003.2,791.1,1003.2L791.1,1003.2z"/>
+		</g>
+		<g>
+			<g>
+				<path fill="#FFFFFF" d="M344.7,1004.5v-10.6c0-1.2-1.1-2-2.2-2h-17c-1.2,0-2.4,0.8-2.4,2v10.6c0,1.2,1.2,2.1,2.4,2.1h17
+					C343.6,1006.6,344.7,1005.6,344.7,1004.5z M325.5,993.8h17.2v10.8h-17.2V993.8z"/>
+				<path fill="#FFFFFF" d="M365.6,927.2c-4.3,8.5-6.1,9.6-6.1,13.1c0,3.4,2.8,6.2,6.3,6.2c3.4,0,6.3-2.8,6.3-6.2
+					c0-3.6-1.6-5.6-6.1-13.1C365.8,927,365.7,927,365.6,927.2z M363.9,940.2c0,1.1-0.7,1.5-1.3,1.5c-0.8,0-1.3-0.6-1.3-1.3
+					c0-2.5,1.2-4.1,2.3-5.5c0.3-0.4,0.6-0.9,0.9-1.3C364.5,933.5,363.9,938.1,363.9,940.2z"/>
+				<path fill="#FFFFFF" d="M312.1,996.8c-1.3-0.8-3.8-2.4-3.8-2.4s0,0,0,3.2s5.4,4.4,5.4,4.4C313.6,1000.5,313.5,997.6,312.1,996.8
+					z"/>
+				<path fill="#FFFFFF" d="M312.1,1002.5c-1.3-0.8-3.8-2.4-3.8-2.4s0,0,0,3.2s5.4,4.4,5.4,4.4
+					C313.6,1006.3,313.5,1003.4,312.1,1002.5z"/>
+				<path fill="#FFFFFF" d="M313.7,1013.6c-0.1-1.5-0.2-4.4-1.5-5.3c-1.3-0.8-3.9-2.4-3.9-2.4s0,0,0,3.2S313.7,1013.6,313.7,1013.6z
+					"/>
+				<path fill="#FFFFFF" d="M315.5,1002c0,0,5.6-1.2,5.6-4.4c0-3.2,0-3.2,0-3.2s-3.1,1.5-4.4,2.4
+					C315.3,997.6,315.6,1000.5,315.5,1002z"/>
+				<path fill="#FFFFFF" d="M315.5,1007.8c0,0,5.6-1.2,5.6-4.4c0-3.2,0-3.2,0-3.2s-3.1,1.5-4.4,2.4
+					C315.3,1003.4,315.6,1006.3,315.5,1007.8z"/>
+				<path fill="#FFFFFF" d="M321.1,1009.2c0-3.2,0-3.2,0-3.2s-3.1,1.5-4.4,2.4c-1.3,0.8-1.2,3.7-1.3,5.3
+					C315.4,1013.6,321.1,1012.4,321.1,1009.2z"/>
+				<path fill="#FFFFFF" d="M316.5,993.6c0-1.5-0.3-3.4-2.1-5.2c0,0-2,2.5-2,4.9c0,1.6,0.9,2.9,2,4.3
+					C314.4,997.5,316.5,995.1,316.5,993.6z"/>
+				<path fill="#FFFFFF" d="M307.9,904.6c0.4,0,0.8,0,1.1-0.2c0.8,0.8,1.9,1.1,2.9,1.1c1.1,0,2.2-0.4,2.9-1.1
+					c0.3,0.1,0.8,0.2,1.1,0.2c1.8,0,3.2-1.4,3.2-3.2s-1.4-3.2-3.2-3.2c-0.1,0-0.3,0-0.4,0c-0.8-1.2-2.2-1.9-3.6-1.9
+					c-1.5,0-2.8,0.7-3.6,1.9c-0.1,0-0.3,0-0.4,0c-1.8,0-3.2,1.4-3.2,3.2C304.8,903.2,306.2,904.6,307.9,904.6z"/>
+				<path fill="#FFFFFF" d="M312.9,910.1c0,0.5,0.4,0.9,0.9,0.9c0.5,0,0.9-0.4,0.9-0.9s-0.9-1.8-0.9-1.8S312.9,909.5,312.9,910.1z"
+					/>
+				<path fill="#FFFFFF" d="M315.5,908.2c0.5,0,0.9-0.4,0.9-0.9s-0.9-1.8-0.9-1.8s-0.9,1.3-0.9,1.8
+					C314.5,907.8,315,908.2,315.5,908.2z"/>
+				<path fill="#FFFFFF" d="M311.8,908.7c0-0.5-0.9-1.8-0.9-1.8s-0.9,1.3-0.9,1.8c0,0.5,0.4,0.9,0.9,0.9
+					C311.4,909.6,311.8,909.2,311.8,908.7z"/>
+				<path fill="#FFFFFF" d="M269.5,985.7c0,3.3,2.7,5.9,5.9,5.9c3.3,0,5.9-2.7,5.9-5.9c0-3.3-2.7-5.9-5.9-5.9
+					S269.5,982.4,269.5,985.7z M279.8,985.7c0,2.5-2,4.5-4.4,4.5c-2.5,0-4.5-2-4.5-4.5s2-4.5,4.5-4.5
+					C277.9,981.2,279.8,983.3,279.8,985.7z"/>
+				<polygon fill="#FFFFFF" points="273.2,987.9 276.2,986.5 277.7,983.5 274.7,985 				"/>
+				<path fill="#FFFFFF" d="M323,912.3c0,0,0-0.1,0-0.1L323,912.3L323,912.3z"/>
+				<path fill="#FFFFFF" d="M321.3,917.3c3.6-1,7.3,1.6,7.8,5.4c0,0.1,0,0.3,0,0.5c0.1,0,0.3,0,0.4,0c3-0.1,6.2-0.1,9.2-0.2
+					c-1.3,0.3-2.2,1.5-2.2,2.9c0,1.7,1.4,3,3,3s3-1.4,3-3c0-1.5-1.1-2.8-2.6-3c2.3-0.1,1.8-0.1,2.2-2.1c0.2-1,0.3-2,0.4-2.9
+					c0.1-0.9-0.1-1.1-1.1-1.2c-1.4,0-2.6-0.1-4-0.1c0,0-0.1,0-0.1-0.1c0-1,0.2-3.5,0.2-3.5s-0.5-0.4-1,0c0,1.2,0,2.3,0,3.6
+					c0,0-1.8,0-4.2-0.1c-0.1,0-0.5-0.2-0.6-0.5c-0.3-1-1.2-2.8-2.2-5.8c0,0-0.6-1.2-1.9-1.2c-1.1,0-6.8,0-6.8,0v7.2
+					c0,0-0.4,0.2-0.8,0.2C320.1,917.3,320.4,917.5,321.3,917.3z M341.3,925.8c0,0.9-0.8,1.6-1.6,1.6c-0.9,0-1.6-0.8-1.6-1.6
+					c0-0.9,0.8-1.6,1.6-1.6C340.6,924.2,341.3,924.9,341.3,925.8z M323,912.1v-1.4h5.6l1.8,5.4l0,0c-2.4,0-5.2,0-7.4,0.1V912.1z"/>
+				<path fill="#FFFFFF" d="M322.7,917.9c-3,0-5.5,2.5-5.5,5.5s2.5,5.5,5.5,5.5c3,0,5.5-2.5,5.5-5.5S325.8,917.9,322.7,917.9z
+					 M322.7,926.5c-1.7,0-3-1.4-3-3s1.4-3,3-3c1.7,0,3,1.4,3,3S324.4,926.5,322.7,926.5z"/>
+				<path fill="#FFFFFF" d="M309.4,1018.2l-4-2.2c0.2-0.9,0.2-1.9,0-2.8c-0.8-2.8-4-4.5-6.8-3.7c-2.8,0.8-4.5,3.7-3.6,6.5
+					c0.8,2.8,4,4.5,6.8,3.7c0.9-0.3,1.8-0.8,2.4-1.4l4,2.2c0.4,0.2,0.9,0,1.1-0.3l0.5-1C310,1018.8,309.8,1018.5,309.4,1018.2z
+					 M301.1,1017.6c-1.6,0.5-3.6-0.5-4-2.2c-0.5-1.6,0.5-3.4,2.1-3.8c1.6-0.5,3.6,0.5,4,2.2C303.7,1015.5,302.7,1017.2,301.1,1017.6
+					z"/>
+				<path fill="#FFFFFF" d="M286.6,973.9c3-3.5,1.4-5.9,0.9-6.9c-0.5-1-0.6-2.4-0.6-2.4l0.1-0.5l0.1-0.5c-0.7-0.2-1.4,0.1-1.4,0.1
+					c0.1,1.1-0.1,2.3-0.3,2.7c-0.2,0.5-0.8,1.4-1.1,2s-1.1,2.4-5.1,4.1c-4,1.7-9.3,0.1-9.3,0.1c-1.4-0.3-2.5,0.2-2.5,0.2l-0.3,0.5
+					l0,0.4l-0.1,0.2l0,0.3c3.9,6.1,12,4,12,4S283.5,977.3,286.6,973.9z"/>
+				<path fill="#FFFFFF" d="M374.6,1010.6c1.8,0,3.5-0.3,5.1-1c0.6-0.2,0.8-0.6,0.8-1.3c0-0.3,0-0.7,0-1c0,0,0,0,0-0.1
+					c0,0-0.1-0.2-0.3-0.2c-0.8,0-1-0.2-1.2-1c-0.2-0.5-0.3-1.1-0.6-1.6c2-0.5,1.7-1.9,1-3.7c-0.6,0.8-0.1,1.1-1.1,1.3
+					c-0.9,0.2-1.5,0.7-1.9,1.5c0,0.1-0.1,0.3-0.2,0.6c-0.1-1,0.3-1.6,1.2-2.4c-0.4-0.4-2-0.2-2.5-0.5c-1.6-1.1-8.9-2.5-13.5,1
+					c-0.2-0.2-0.5-0.4-0.8-0.6c1.1-0.4,1.5-1,1.3-1.9c-0.1-0.6-0.6-1-1.2-1c-1,0-1.3,0.5-1.5,2.1c-0.3-0.3-0.6-0.6-1-1
+					c0,0.3-0.1,0.5,0,0.8c0.1,0.5,0.5,0.8,1,0.9c0.3,0,0.5,0.2,0.7,0.5c0.1,0.2,0.2,0.4,0.4,0.6c0.5,0.5,0.5,1.1,0.5,1.8
+					c0,1.5,0,3,0.2,4.6c0.2,1.6,0.6,3.2,1.3,4.7c0.2,0.5,0.6,0.5,1,0.4c0.1,0,0.3-0.4,0.3-0.6c0.1-1.2,0.6-2.2,1.2-3.2
+					c2.1,0.6,4.2,0.8,6.4,0.6c0.1,0,0.3,0.2,0.4,0.3c0.4,0.8,0.8,1.6,1.1,2.5c0.2,0.5,0.6,0.5,1,0.4c0.1,0,0.1-0.4,0.1-0.7
+					c0-0.9,0-1.8,0-2.7c0.1,0,0.1,0,0.1-0.1C374.4,1010.6,374.5,1010.6,374.6,1010.6z M360.3,1000.6c-0.2-0.6-0.1-1,0.3-1
+					c0.2,0,0.5,0,0.6,0.3C361.3,1000.3,361,1000.6,360.3,1000.6z"/>
+				<path fill="#FFFFFF" d="M282.1,941.8c3.4-0.3,4.5-2,5.5-5.3c0.6-2,0.7-3.9,0.8-6c-0.1-1.7-0.1-3.4-0.3-5.1
+					c-0.3-2.4-0.9-4.7-2.1-6.8c-0.9-1.7-1.1-2.7-3-3c-2-0.3-4.3,0.5-5.2,2.8c-0.2,0.6-0.5,1.2-0.7,1.9c-0.3,1.4-1.2,2.6-2.3,3.6
+					c-2.9,2.7-3.9,6.2-3.2,10C272.4,938.9,277,942.2,282.1,941.8z M275.8,926c1.8-1.7,3-3.5,3.6-5.8c0.1-0.5,0.3-0.9,0.6-1.3
+					c0.7-1.2,2.2-1.4,3.1-0.4c0.4,0.4,0.7,1,0.9,1.5c1.4,3.4,2,7,2.1,10.1c0,2.4-0.1,4.3-0.8,6.1c-0.9,2.6-2.7,3.8-5.1,3.6
+					c-2.1-0.2-3.7-1.2-5-2.8C272.7,933.7,272.9,928.7,275.8,926z"/>
+				<path fill="#FFFFFF" d="M280,938.1c1.6,0.1,2.8-0.3,3.6-1.8c1.4-2.8,1.5-5.7,0.5-8.8c-0.2-0.6-0.7-1.1-1.3-1.4
+					c-1.8-0.8-3.6-0.8-5.4,0c-0.8,0.4-1.6,0.9-2,1.8c-0.2,0.5-0.1,0.8,0.3,1.1c0.8,0.4,1.5,0.8,2.3,1.2c0.2,0.1,0.4,0.3,0.7,0.5
+					c0,0,0,0.1-0.1,0.2c-0.2,0-0.4,0-0.6-0.1c-0.9-0.2-1.8-0.5-2.7-0.8c-0.5-0.1-0.8,0-0.9,0.5c0,0.2-0.1,0.4-0.1,0.6
+					C274.1,934.6,276.6,937.8,280,938.1z"/>
+				<path fill="#FFFFFF" d="M280.6,923.8c0.5,0.1,1,0.2,1.5,0.3c1,0,1.4-0.3,1.4-1.3c0-0.7-0.1-1.4-0.3-2.1c-0.1-0.6-0.5-1-1.2-1
+					c-0.7,0-1.3,0.2-1.5,0.9c-0.2,0.6-0.4,1.2-0.6,1.9C279.6,923.2,279.8,923.6,280.6,923.8z"/>
+				<path fill="#FFFFFF" d="M294,971.9c-0.2,0-0.4,0-0.5-0.2c0,0-0.2-0.7-1-1.5c-0.2-0.2-0.4-0.3-0.6-0.5c-0.3-0.2-0.6-0.5-0.9-0.8
+					c0.5,4.1,2.2,7.1,4.2,7.1c2.4,0,4.4-4.3,4.4-9.6s-2-9.6-4.4-9.6c-1.6,0-2.9,1.9-3.7,4.6c0.3,0.4,0.6,0.7,1,0.9
+					c0.2,0.1,0.4,0.3,0.6,0.5c1,0.9,1.2,1.8,1.2,1.8c0,0,0,0,0,0.1c0,0.1-0.1,0.3-0.3,0.3c-0.2,0-0.4,0-0.5-0.2c0,0-0.2-0.7-1-1.5
+					c-0.2-0.2-0.4-0.3-0.6-0.5c-0.2-0.1-0.4-0.3-0.7-0.5c-0.1,0.4-0.2,0.9-0.2,1.4c0.3,1.2,0.8,1.6,1.4,2c0.2,0.1,0.4,0.3,0.6,0.5
+					c1,0.9,1.2,1.8,1.2,1.8c0,0,0,0,0,0.1c0,0.1-0.1,0.3-0.3,0.3c-0.2,0-0.4,0-0.5-0.2c0,0-0.2-0.7-1-1.5c-0.2-0.2-0.4-0.3-0.6-0.5
+					c-0.3-0.2-0.8-0.5-1-1c0,0.3,0,0.6,0,0.9c0.3,1.8,0.9,2.2,1.6,2.7c0.2,0.1,0.4,0.3,0.6,0.5c1,0.9,1.2,1.8,1.2,1.8c0,0,0,0,0,0.1
+					C294.3,971.7,294.2,971.9,294,971.9z"/>
+				<path fill="#FFFFFF" d="M365.3,917.7c0.8,0.9,1.8,1.8,3,1.9c0.9,0.1,2-0.4,2.7-0.4c1.4,0,1.1,0.3,2.7,0.3c1.5,0,4.3-3.6,5-7.2
+					c0.1-0.9,0-2.5-0.7-4c-0.8-1.8-3.3-2.5-4.8-2.2c-0.4,0-1.3,0.2-2,0.3c0.1-0.5,0.5-1.3,1.3-1.8c0.2-0.1,0.3-0.4,0.2-0.7
+					c-0.1-0.2-0.4-0.3-0.7-0.2c-1.4,0.8-1.8,2.2-1.9,2.8c-0.6-0.1-2.3-0.4-2.9-0.4c-0.9,0-1.7,0.3-2.5,0.9c-0.7,0.5-1,1.3-1.3,2.1
+					c-0.4,1.1-0.5,2.3-0.4,3.5C363.2,914.6,364,916.3,365.3,917.7z M368.3,908.5c0.8,0,1.4,0.6,1.4,1.3c0,0.9-0.6,1.7-1.4,1.7
+					c-0.6,0-1.1-0.8-1.1-1.6C367.2,909.1,367.6,908.5,368.3,908.5z"/>
+				<path fill="#FFFFFF" d="M369.3,905.2c0.5,0,1.2,0.1,1.5-0.5c0.3-0.6-0.1-1.1-0.5-1.6c-0.9-1-2.4-1.2-3.9-0.5
+					c0.2,0.3,0.4,0.6,0.5,0.9C367.3,904.5,368.2,905,369.3,905.2z"/>
+				<path fill="#FFFFFF" d="M333.1,908.2c1-2.1,2.4-3.6,2.4-3.6c2,0.8,5.5,1.6,8-0.1c3.3-2.3,2.9-7.4,7.6-10c1.1-0.6-9.2-3-14.6,0.1
+					c-4,2.3-3.7,6.1-3.6,7.5c5.2-6.1,12.8-5.8,12.8-5.8s-10.9,3.8-14.1,11.3C331.3,908.1,332.8,908.9,333.1,908.2z"/>
+				<path fill="#FFFFFF" d="M373,983.9c2.5-5-0.3-8.7-1.4-10c-1.1,9.6-9.1,14.5-9.1,14.5s8.5-11.1,6.7-20.9c-0.1-0.8-2.1-0.6-2,0.3
+					c0.4,2.8,0.1,5.3,0.1,5.3c-2.6,0.6-6.6,2.1-8,5.5c-1.8,4.5,2,9.5-1,15.2C357.6,995.2,369.6,990.7,373,983.9z"/>
+				<path fill="#FFFFFF" d="M283.9,946.2c-1,0.8-0.8,2.8,0,3.8c0.8,1,2.7,1.7,3.7,0.9c0.2-0.1,0.8-0.6,0.8-0.6
+					c1.1,0.9,1.8,0,2.3,0.6c0.6,0.8,1.9,2.4,2.4,2.9c0.4,0.5,1.2,1,1.6,0.7c0.4-0.3,1.8-1.3,2.3-1.7c0.5-0.4,0.5-0.9,0.2-1.3
+					s-1.1-0.3-1.5-0.8c-0.4-0.4-1.6-1.9-1.9-2.4c-0.5-0.6,0-1.4,0.8-1.7c6-2.3,8.2,1.2,10-0.2c1.4-1.1-0.1-5.7-3.4-9.8
+					c-3.2-4.1-7.4-6.8-8.9-5.6C290.2,932.9,296,937.1,283.9,946.2z M294.1,933.4c0.3-0.2,3.3,1.4,5.8,4.6c2.5,3.2,3.2,6.2,2.8,6.4
+					c-0.4,0.2-3.2-1-5.8-4.2C294.5,937,293.8,933.7,294.1,933.4z"/>
+				<path fill="#FFFFFF" d="M272.6,970.7c4.2,0,7.6-2,7.6-3c0,0,0-0.3,0-3.1c0-2.9-5.2-5.3-5.2-7.3c0-2.1,5.2-4.4,5.2-7.3
+					s0-3.1,0-3.1c0-1.1-3.5-3-7.6-3c-4.2,0-7.6,1.9-7.6,3c0,0,0,0.3,0,3.1c0,2.9,5.2,5.3,5.2,7.3c0,2.1-5.2,4.4-5.2,7.3s0,3.1,0,3.1
+					C265,968.7,268.5,970.7,272.6,970.7z M266.8,946.8c0.9-0.6,2.7-1.5,5.6-1.5c2.9,0,5.4,1.5,5.4,1.5c0.2,0.1,0.9,0.5,0.4,0.8
+					c-1.1,0.7-3.4,1.4-5.9,1.4c-2.6,0-4.7-0.8-5.8-1.4C265.9,947.2,266.8,946.8,266.8,946.8z M266.5,964.5c0-0.9,1.4-2.3,2.4-3.3
+					c1.4-1.4,2.8-2.4,2.8-4c0-1.6-1.4-2.7-2.8-4c-1-1-2.5-2.4-2.5-3.3l0-1.3c1.4,0.8,3.6,1.5,5.9,1.5c2.4,0,4.6-0.7,6-1.5l0,1.3
+					c0,0.9-1.4,2.3-2.5,3.3c-1.4,1.4-2.8,2.4-2.8,4c0,1.6,1.1,2.7,2.6,4c1,1,2.3,2.4,2.3,3.3v1.8c-1-0.6-4.8-1-4.8-3
+					c0-1-1.4-1-1.4,0c0,2-4.1,2.3-5.1,3L266.5,964.5L266.5,964.5z"/>
+				<path fill="#FFFFFF" d="M372.4,929.8c0,5.6,4.5,10.1,10.1,10.1c5.6,0,10.1-4.5,10.1-10.1c0-5.6-4.5-10.1-10.1-10.1
+					C376.9,919.7,372.4,924.2,372.4,929.8z M385.3,921.6c3.4,1.1,5.9,4.4,5.9,8.1c0,2-0.7,3.8-1.8,5.3c-0.3-0.2-0.6-0.9-0.3-1.6
+					c0.3-0.7,0.4-2.3,0.3-2.9c0-0.6-0.4-2.1-1.3-2.2c-0.9,0-1.5-0.3-2-1.4c-1.1-2.2,2.1-2.6,0.9-3.8c-0.3-0.3-1.9,1.4-2.1-0.9
+					C385,922.1,385.1,921.9,385.3,921.6z M387.3,937c-1.4,0.9-3,1.4-4.8,1.4c-0.9,0-1.9-0.1-2.7-0.4c0.5-0.3,0.6-0.6,1-0.6
+					c0.5,0,1-0.2,1.6-0.3c0.5-0.1,1.5-0.6,2.4-0.8C385.5,936.2,386.9,936.3,387.3,937z M381.3,921.3c-0.2,0.4-0.8,0.6-1.1,0.9
+					c-0.8,0.6-1,0.5-1.4,1.2c-0.4,0.6-1.7,1.5-1.7,2s0.6,1,0.9,0.9c0.3-0.1,1.2-0.1,1.7,0.1c0.5,0.2,4.1,0.3,2.9,3.5
+					c-0.3,1-2,0.8-2.4,2.4c0,0.2-0.3,1.2-0.3,1.6c0,0.5,0.3,2.5-0.1,2.5c-0.5,0-1.8-1.7-1.8-2.1c0-0.3-0.3-1.4-0.3-2.4
+					s-1.6-0.9-1.6-2.2c0-1.1,0.9-1.7,0.7-2.2c-0.2-0.5-1.7-0.5-2.4-0.6C375.6,923.8,378.2,921.7,381.3,921.3z"/>
+				<path fill="#FFFFFF" d="M334.1,995.5c-2,0-3.7,1.7-3.7,3.7s1.7,3.7,3.7,3.7c2,0,3.7-1.7,3.7-3.7
+					C337.8,997.1,336.1,995.5,334.1,995.5z M332.5,1000.7c0-0.1-0.1-0.5-0.1-0.8s-0.6-0.3-0.6-0.8c0-0.4,0.3-0.6,0.2-0.8
+					c0-0.2-0.6-0.2-0.8-0.2c0.4-1,1.4-1.8,2.5-2c-0.1,0.1-0.3,0.2-0.4,0.3c-0.2,0.2-0.4,0.2-0.5,0.4c-0.1,0.2-0.6,0.5-0.6,0.8
+					c0,0.1,0.2,0.3,0.3,0.3c0.1,0,0.4,0,0.6,0c0.2,0,1.5,0.1,1.1,1.2c-0.1,0.3-0.8,0.3-0.9,0.9c0,0.1-0.1,0.4-0.1,0.6
+					c0,0.2,0.1,0.9,0,0.9C333,1001.5,332.5,1000.8,332.5,1000.7z M334.1,1002.3c-0.3,0-0.7,0-1-0.1c0.2-0.1,0.2-0.2,0.4-0.2
+					c0.2,0,0.3-0.1,0.6-0.1c0.2,0,0.5-0.2,0.8-0.2c0.2,0,0.8,0,0.9,0.2C335.3,1002.1,334.8,1002.3,334.1,1002.3z M336.6,1001.1
+					c-0.1-0.1-0.2-0.3-0.1-0.6c0.1-0.2,0.1-0.8,0.1-1.1c0-0.2-0.1-0.8-0.5-0.8c-0.3,0-0.5-0.1-0.8-0.5c-0.4-0.8,0.8-0.9,0.3-1.4
+					c-0.1-0.1-0.7,0.5-0.8-0.3c0,0,0-0.1,0.1-0.2c1.2,0.4,2.2,1.6,2.2,3C337.3,999.9,337,1000.5,336.6,1001.1z"/>
+				<path fill="#FFFFFF" d="M287.9,1011.5c0,0.1,0,0.2,0,0.4c0,0.9,0.8,1.6,1.7,1.6c0.9,0,1.6-0.6,1.7-1.5c0-0.1,0-0.3,0-0.4
+					c0-0.5,0.2-0.6,0.6-0.8c3.3-0.8,5.8-3.4,6.3-6.6c0-0.4,0-0.8,0.2-1.1c0.3-0.2,0.8-0.4,0.9-0.8c0.1-0.2-0.2-0.7-0.3-1.1
+					c0.5-0.5,0.5-0.8-0.1-1.5c0.7-0.6,0.7-1,0-1.6c0.4-0.2,0.7-0.6,0.5-1c-0.1-0.3-0.5-0.5-0.8-0.7c0,0,0,0.1-0.1,0.1
+					c0-0.3,0-0.6-0.2-0.8c-0.2-0.2-0.5-0.5-0.8-0.6c-0.1,0-0.5,0.3-0.6,0.5c-0.3,0.7-0.5,1.4-0.9,2.1c-0.3,0.7-0.7,1.4-1.1,2
+					c-1.4,1.7-3.2,2.3-5.3,1.8c-2.1-0.4-3.5-1.7-4-3.7c-0.1-0.4-0.1-0.8-0.2-1.2c0.4-0.3,1.1-0.5,0.8-1.1c-0.1-0.3-0.6-0.5-1-0.9
+					c0-0.2,0.1-0.8-0.4-1c-0.5-0.2-0.8,0.1-1.1,0.6c-0.3-0.4-0.7-0.8-1.2-0.5c-0.3,0.2-0.4,0.7-0.8,1.1c-0.3,0-0.9,0-1,0.6
+					c0,0.4,0.3,0.8,1.2,1c-0.6,0.7-1.5,0.6-2.2,1.2c0.5,0.3,1,0.6,1.6,0.9c0.3,0.1,0.4,0.3,0.3,0.6c-0.1,1.1-0.1,2.2-0.2,3.3
+					c-0.4,4.7,2.8,7.3,5.8,8.1C287.7,1010.8,287.9,1010.9,287.9,1011.5z M283.2,997.7c-0.1,0-0.3-0.2-0.7-0.4
+					c0.3-0.2,0.5-0.4,0.7-0.4c0.1,0,0.4,0.3,0.4,0.4C283.5,997.5,283.3,997.7,283.2,997.7z"/>
+				<path fill="#FFFFFF" d="M372.7,950h-3.3c-0.6,0-1.4,0.3-1.7,0.8l-4.3,5.6c-0.3,0.5-0.1,0.5,0.4,0.5h17.6c0.6,0,0.8,0,0.5-0.5
+					l-3.8-5.6c-0.3-0.5-1.1-0.8-1.7-0.8h-0.8v-2h-2.9V950z"/>
+				<path fill="#FFFFFF" d="M376.6,944.8l0.2,0c0.5-0.1,1-0.5,1.4-1.1c0.3-0.6,0.4-1.8,0.3-2.5c-0.3,1-1.1,1.4-1.9,1.7
+					c-0.2,0.1-0.4,0.2-0.6,0.2c-0.2,0.1-0.5,0.2-0.8,0.3c-0.8,0.4-1.1,1-1.2,2c-0.1,0.4-0.1,0.8-0.1,1.4c0.4-1,0.8-1.5,1.7-1.8
+					C375.9,945,376.3,944.9,376.6,944.8z"/>
+				<path fill="#FFFFFF" d="M380.6,964.8h0.5v-6.1c0-0.6,0-0.8,0-0.8h-0.5h-0.7h-7.7h-0.7H366h-2.1v1.1v5.7h2.1h1.4v-4.1
+					c0,0,0.1,0.1,0.5,0.1h2.7c0,0,0.2-0.5,0.2-0.1v4h0.8h0.7h7.7H380.6L380.6,964.8z M378.1,962.8c0,0.1,0.3,0.5,0.2,0.5h-2.9
+					c-0.1,0-0.3-0.4-0.3-0.5v-2.9c0-0.1,0.2,0,0.3,0h2.9c0.1,0-0.2,0-0.2,0V962.8z"/>
+				<path fill="#FFFFFF" d="M337.9,1009c0-0.3-0.2-0.5-0.5-0.5h-6.8c-0.3,0-0.5,0.2-0.5,0.5c0,0.3,0.2,0.5,0.5,0.5h6.8
+					C337.7,1009.5,337.9,1009.3,337.9,1009z"/>
+				<rect x="331.9" y="1007.1" fill="#FFFFFF" width="4.9" height="1.5"/>
+				<path fill="#FFFFFF" d="M325,892.9c-2.3,0.4-4,2.3-4.2,4.6l4.4-0.2L325,892.9z"/>
+				<path fill="#FFFFFF" d="M326,898.6l-5.1,0.2c0.4,2.5,2.7,4.3,5.2,4.1c2.8-0.1,4.9-2.5,4.8-5.3c-0.1-2.6-2.2-4.6-4.6-4.8l0.2,5.1
+					C326.5,898.2,326.2,898.5,326,898.6z"/>
+				<path fill="#FFFFFF" d="M304.8,912.1c0.2,0,0.4-0.3,0.7-0.3c0.2,0,0.4-0.3,0.6-0.4l2.8-2c0.1-0.1,0.2-0.3,0.2-0.4
+					c0-0.1-0.1-0.3-0.2-0.4l-2.8-1.9c-0.1-0.1-0.4-0.4-0.6-0.5c-0.2,0-0.5-0.3-0.7-0.3h-8l0.9,6.4H304.8L304.8,912.1z"/>
+				<path fill="#FFFFFF" d="M285.9,911.7l2.8,1.9c0.1,0.1,0.4,0.2,0.6,0.3c0.2,0,0.5,0.2,0.7,0.2h4.1v10.2c0,0.2,0.3,0.1,0.5,0.1h1
+					c0.2,0,0.3,0.1,0.3-0.1v-20.2c0-0.2-0.1-0.8-0.3-0.8h-1c-0.2,0-0.5,0.6-0.5,0.8v4.6H290c-0.2,0-0.4,0-0.7,0s-0.4,0.1-0.6,0.2
+					l-2.8,1.9c-0.1,0.1-0.2,0.2-0.2,0.4C285.7,911.4,285.8,911.5,285.9,911.7z"/>
+				<path fill="#FFFFFF" d="M301.9,916.3v16.1c0,1.1,1.2,2.4,2.3,2.4h7.8c1.1,0,2.2-1.2,2.2-2.4v-16.1c0-1.1-1-1.7-2.2-1.7h-7.8
+					C303.1,914.6,301.9,915.2,301.9,916.3z M308.2,933.6c-0.8,0-1.4-0.4-1.4-1c0-0.6,0.6-1,1.4-1s1.4,0.4,1.4,1
+					C309.6,933.1,308.9,933.6,308.2,933.6z M312.7,917.1v13.3h-8.9v-13.3H312.7z"/>
+				<path fill="#FFFFFF" d="M347.5,904c0,6.7,7,15.5,7,15.5s7-8.8,7-15.5c0-3.9-3.1-7-7-7C350.7,896.9,347.5,900.1,347.5,904z
+					 M354.5,900.3c2.1,0,3.8,1.7,3.8,3.8c0,2.1-1.7,3.8-3.8,3.8c-2.1,0-3.8-1.7-3.8-3.8C350.7,902,352.5,900.3,354.5,900.3z"/>
+				<path fill="#FFFFFF" d="M310.3,923c0-1.2-0.9-2.1-2.1-2.1s-2.1,0.9-2.1,2.1c0,2,2.1,4.6,2.1,4.6S310.3,925.1,310.3,923z
+					 M307,923.1c0-0.6,0.5-1.1,1.1-1.1s1.1,0.5,1.1,1.1s-0.5,1.1-1.1,1.1C307.5,924.2,307,923.7,307,923.1z"/>
+				<path fill="#FFFFFF" d="M355.2,922.1l-1.2,1.1l-1.2-1.1c-1.7-1.6-4.6-1.6-6.3,0c-2,1.8-2,4.7,0,6.5l7.5,6.9l7.5-6.9
+					c2-1.8,2-4.7,0-6.5C359.7,920.5,356.9,920.5,355.2,922.1z"/>
+				<path fill="#FFFFFF" d="M385.7,973.9l-1.7,1.4c-0.1,0.1-0.1,0.3,0,0.4l9.6,10.9c0.2,0.2,0.6,0.3,0.9,0l1.1-0.9
+					c0.2-0.2,0.3-0.6,0-0.9l-9.5-11C386.1,973.7,385.9,973.7,385.7,973.9z"/>
+				<path fill="#FFFFFF" d="M385.2,966.7c-1.5,0.1-3.4,1.5-4.3,2.2c-1.2,0.8-1.7,1.3-1.8,1.4c-0.3,0.3,0,1-0.7,1.6
+					c-0.6,0.6-1.1,0.1-1.5,0.5c-0.2,0.1-0.8,0.6-0.9,0.7c-0.1,0.1-0.2,0.3,0,0.5c0,0,1.5,1.6,1.6,1.8c0.1,0.1,0.4,0.2,0.6,0.1
+					c0.2-0.2,0.8-0.6,0.8-0.8c0.1-0.1,0-1,0.4-1.4c1.1-0.8,2-0.2,3.1,1.1c0.1,0.1,0.3,0,0.4-0.1c0.1-0.1,1.7-1.5,1.8-1.6
+					c0.1,0,0.1-0.2,0-0.3c-0.1-0.1-0.6-0.8-0.8-1.1c-2.1-2.8,5.7-4.6,4.5-4.6C388,966.6,385.6,966.6,385.2,966.7z"/>
+				<path fill="#FFFFFF" d="M379.1,985.9l1.1,1.1c0.2,0.2,0.6,0.1,0.9-0.1l5.6-5.6l-1.7-2l-5.9,5.7
+					C378.9,985.3,378.9,985.7,379.1,985.9z"/>
+				<path fill="#FFFFFF" d="M391.2,973.2c-0.1,0.1-0.2,0.3-0.3,0.4l-1.6,1.6l1.6,1.8l1.9-1.8c0.1-0.1,0.3-0.2,0.4-0.3c0,0,0,0,0.1,0
+					c0.1,0,0.3,0,0.4,0.1c0.3,0.2,0.7,0.5,1,0.8c0.2,0.2,0.4,0.2,0.7,0c0.3-0.3,0.6-0.6,0.9-1c0.5-0.5,1-1.1,1.5-1.6
+					c0.8-0.9,1.2-1.9,1.2-2.9c0-0.4,0-0.8-0.1-1.2c-0.1-1-0.6-1.5-1.7-1.7c-0.2,0-0.5-0.1-0.8,0c-0.3,0-0.6,0-0.9,0
+					c-0.8,0-1.5,0.2-2.2,0.8c-0.5,0.4-1,0.9-1.5,1.4c-0.5,0.5-1.1,1-1.7,1.6c-0.1,0.1-0.2,0.3,0,0.4c0.3,0.3,0.6,0.8,1,1.1
+					c0.1,0.1,0.2,0.2,0.1,0.4C391.3,973,391.2,973.1,391.2,973.2z M392.5,972.9l2.4-2.2c0,0,0.2,0,0.2,0c0,0,0,0.1,0,0.2l-2.1,2.6
+					c0,0-0.1-0.3-0.1,0.1l0,0c0,0-0.1-0.1-0.1-0.1l-0.3-0.3c0,0,0-0.1,0-0.1C392.4,973,392.5,972.9,392.5,972.9z"/>
+				<path fill="#FFFFFF" d="M386,946.8c0,0.4,0,0.8,0.3,0.8h5.1v1.3c0,0.3-0.2,0.2,0.1,0.2h2c0.3,0,0.3,0.1,0.3-0.2v-1.3h4.9
+					c0.4,0,0.5-0.4,0.5-0.8v-2.7H386L386,946.8L386,946.8z"/>
+				<path fill="#FFFFFF" d="M392.9,954.3v-0.9c0-0.1-0.1-0.3-0.2-0.3s-0.2,0.1-0.2,0.3v0.9c-1.5,0.1-2.5,1.3-2.5,2.6
+					c0,1.5,1.1,2.7,2.6,2.7c1.5,0,2.7-1.2,2.7-2.7C395.2,955.6,394.4,954.4,392.9,954.3z"/>
+				<path fill="#FFFFFF" d="M398.2,949.5H387c-0.6,0-1,0.5-1.1,1.1l-1.3,11.6c0,0.3,0,0.8,0.3,1c0.2,0.2,0.5,0.5,0.8,0.5h13.9
+					c0.3,0,0.6-0.2,0.8-0.5c0.2-0.2,0.3-0.6,0.3-0.9l-1.3-11.7C399.2,950.1,398.7,949.5,398.2,949.5z M392.5,961.5
+					c-2.6,0-4.6-2.1-4.6-4.6s2.1-4.6,4.6-4.6c2.6,0,4.6,2.1,4.6,4.6S395.1,961.5,392.5,961.5z"/>
+				<path fill="#FFFFFF" d="M343.9,1015.7v0.2h5.7c0.3,0,0.5-0.4,0.5-0.8s-0.2-0.8-0.5-0.8h-5.7h-0.7H342c-1.5,0-2.8,1-3.1,2.5h-4
+					v1.5h4c0.4,1.5,1.6,2.9,3.1,2.9h1.2l0,0h6.4c0.3,0,0.5-0.4,0.5-0.8s-0.2-0.8-0.5-0.8h-5.7c-0.2,0-0.3,0-0.3-0.2
+					c0-0.2,0.1-0.2,0.3-0.2h5.7c0.3,0,0.5-0.2,0.5-0.5c0-0.3-0.2-0.5-0.5-0.5h-5.7l0,0c-0.2,0-0.3-0.3-0.3-0.5
+					c0-0.2,0.1-0.5,0.3-0.5h5.7c0.3,0,0.5-0.2,0.5-0.5c0-0.3-0.2-0.5-0.5-0.5h-5.5v-0.2c-0.5,0-0.5,0-0.5-0.2
+					C343.7,1015.8,343.7,1015.7,343.9,1015.7z"/>
+				<path fill="#FFFFFF" d="M318.8,1019.4h13.9c0.6,0,1.7-0.3,1.7-0.8v-1.7c0-0.5-1.1-0.9-1.7-0.9h-13.9c-0.9,0-1.7,0.8-1.7,1.7
+					C317.1,1018.6,317.9,1019.4,318.8,1019.4z"/>
+				<path fill="#FFFFFF" d="M349.5,1024.5c0-0.9-0.8-1.7-1.7-1.7h-14.4c-0.6,0-1,0.3-1.5,0.8v1.7c0.5,0.5,0.8,0.9,1.5,0.9h14.4
+					C348.7,1026.3,349.5,1025.5,349.5,1024.5z"/>
+				<path fill="#FFFFFF" d="M331.9,1025.3v-1.5h-2H327h-12.8c0,0-1.3,0.6,0.6,1.4c2.9,1.2,5.2,1.4,7.5,1.7c0.8,0.1,3.4,0.7,5-0.8
+					c0.6-0.5,1.2-0.9,1.7-0.9H331.9z"/>
+				<path fill="#FFFFFF" d="M351.2,1010.6l4.2-0.4c0-0.4-0.1-0.9-0.1-1.4c0-1.2-0.1-2.4-0.1-3.6c0-0.9,0-1.8,0-2.7
+					c0-1,0.1-2.1,0.1-3.1c0-0.8,0.1-1.7,0.2-2.6c0.1-1,0.2-2,0.4-3c0.1-0.8,0.2-1.6,0.3-2.4c0-0.2-0.1-0.4-0.3-0.5
+					c-0.1,0-0.3,0-0.4,0c-2.1,0-4.3,0-6.3,0c0,0,0,0,0,0c-0.5,0-1,0-1.5,0c-0.3,0-0.3,0-0.3,0.3c0,0.4-0.1,0.8-0.1,1.1
+					c0,0.8,0,1.6,0,2.4c0,0.8,0,1.6,0.1,2.4c0,0.8,0.1,1.6,0.1,2.4c0,0.8,0.1,1.4,0.1,2.2c0,1,0.1,2,0.2,2.9c0,0.8,0.1,1.6,0.2,2.5
+					c0.1,0.8,0.1,1.6,0.2,2.5c0,0.4,0.1,0.8,0.1,1.1c0,0.1,0,0.2,0.2,0.2c0.2,0,0.5,0,0.8,0c0.4,0,0.8,0,1.2-0.1
+					C350.9,1010.7,351,1010.6,351.2,1010.6z M354,992.4c0.3,0,0.6,0.2,0.6,0.5c0,0.3-0.2,0.5-0.5,0.5c-0.3,0-0.5-0.2-0.6-0.6
+					C353.5,992.6,353.7,992.4,354,992.4z"/>
+				<path fill="#FFFFFF" d="M354.5,1022.3c-0.2,0.8,0.5,1.7,1.3,1.7c0.7,0,1.3-0.5,1.5-1.2c0.1-0.6,0.1-1.3,0-1.9
+					c-0.2-1.3-0.5-2.7-0.8-3.9c-0.2-1-0.4-2.1-0.6-3.1c-0.1-0.8-0.3-1.6-0.3-2.4v0l-2.7,0.2c0.1,0.5,0.2,1,0.3,1.5
+					c0.3,1.6,0.5,3.2,0.9,4.8c0.2,1,0.4,2,0.7,3c0,0.2,0,0.4,0,0.6C354.6,1021.8,354.5,1022,354.5,1022.3z"/>
+				<path fill="#FFFFFF" d="M308.5,990.1c0.7,0,1.3,0,2-0.1c0,0,0,0,0-0.1c0.3-0.6,0-1.5-0.7-1.7c0-0.6,0.1-1.2,0-1.8
+					c-0.1-0.8-0.1-1.8-0.5-2.4c-1-1.5-2.6-3.2-3.8-4.5c-0.9-1-1.8-1.1-3.1-1.1c-5.1,0-10.2-0.1-15.4-0.1c-1.6,0-2.3,0.6-2.3,2.2
+					c0,2.5,0,5-0.1,7.7c-0.5,0-0.7,0.2-0.6,0.7c0,0.2,0,0.4,0,0.6c0,0.3,0.1,0.5,0.5,0.5c0.4,0,0.9,0,1.4,0c0.4,0,0.6-0.1,0.8-0.5
+					c0.4-1.4,1.6-2.3,3-2.3c1.5,0,2.6,0.8,3,2.3c0.1,0.5,0.4,0.6,0.8,0.6c2.5,0,5,0,7.4,0.1c0.5,0,0.8-0.2,0.9-0.6
+					c0.4-1.4,1.6-2.2,3-2.2c1.4,0,2.5,0.8,3,2.2C308.1,989.7,308.3,990.1,308.5,990.1z M307.2,983.9L307.2,983.9l-4.8,0.2
+					c-0.3,0-0.6-0.2-0.6-0.5l0-3.5c0-0.3,0.3-0.6,0.7-0.6l1.5,0c0,0,0.1,0,0.2,0c0.2,0,0.3,0.1,3.5,3.7c0.1,0.1,0.2,0,0.2,0.2
+					C307.8,983.9,307.5,983.9,307.2,983.9z"/>
+				<path fill="#FFFFFF" d="M289.9,987.5c-1.5,0-2.8,1.2-2.8,2.8s1.2,2.8,2.8,2.8s2.8-1.2,2.8-2.8
+					C292.6,988.8,291.4,987.6,289.9,987.5z"/>
+				<path fill="#FFFFFF" d="M305,987.7c-1.5,0-2.8,1.2-2.8,2.8s1.2,2.8,2.8,2.8s2.8-1.2,2.8-2.8C307.8,989,306.6,987.7,305,987.7z"
+					/>
+				<path fill="#FFFFFF" d="M391.2,993.8c0-0.4-1.2-0.9-5.2-0.3c0,0,1-0.8,1.4-1c0.4-0.1,2.2-1.2,1.8-2.6c-0.3-1.4-0.8-0.5-1.5,0.5
+					c-0.6,1.1-1.4,2.1-2.5,2.7c0,0-0.3-2.2-1.6-2.2c-0.4,0-2.1,0-3.9,0.2l-0.3,0c-0.2,0-0.5,0-0.7,0.1c0,0-0.1,0-0.1,0.1v2.3
+					c0,0.2,0,0.3-0.2,0.3c-0.2,0-0.2-0.1-0.2-0.3v-2.3l0,0c-0.5,0-0.6,0.1-0.9,0.1c0,0-3.6,0.5-6,1.3h0c0,0-0.1,0-0.1,0
+					c-0.1,0-0.3,0.1-0.4,0.1c-0.1,0-0.2,0-0.3,0.1c0,0,0,0-0.1,0c0,0-0.1,0-0.1,0l0,0c-0.4,0.2-0.8,0.3-1.2,0.5c0,0-0.4,0.2-0.1,0.8
+					c0.1,0.3,2.2,1.2,6.1,1.8v-1.8c0-0.2,0-0.3,0.2-0.3c0.2,0,0.2,0.1,0.2,0.3v1.9c0.5,0,0.6,0,0.9,0.1l0.4,0
+					c1.3,0.1,2.6,0.2,5.1,0.3v-1.5c0-0.2,0-0.3,0.2-0.3c0.2,0,0.2,0.1,0.2,0.3v1.5h0.4c0.5,0,0.8,0,1.3,0c0,0,1.3,0.1,1.4-2.3
+					c0,0,2.2-0.4,2.1,2.2c-0.1,1.9,1.5,1.9,1.5,0.6c0-1.3-0.3-2.8-2.8-3.3c0,0,2,0.2,3.6,0.5C391,994.8,391.2,994.3,391.2,993.8z"/>
+			</g>
+			<g>
+				<polygon fill="#FFFFFF" points="610.4,990.8 610,990.8 596.3,973.1 592.1,973.1 592.1,999.7 598,999.7 598,982 597.7,982 
+					611.5,999.7 615.2,999.7 615.2,974.1 610.4,974.1 				"/>
+				<polygon fill="#FFFFFF" points="624.6,999.7 637.4,999.7 637.4,994.8 629,994.8 629,988.4 637.4,988.4 637.4,983.9 629,983.9 
+					629,977.5 637.4,977.5 637.4,974.1 624.6,974.1 				"/>
+				<polygon fill="#FFFFFF" points="644.3,977.5 649.7,977.5 649.7,999.7 654.1,999.7 654.1,977.5 660.5,977.5 660.5,974.1 
+					644.3,974.1 				"/>
+				<polygon fill="#FFFFFF" points="688.9,991.8 688.9,991.8 683.4,973.1 680.4,973.1 675.2,991.8 675.2,991.8 669.9,974.1 
+					664.5,974.1 672.9,999.7 676.6,999.7 681.5,983.9 681.6,983.9 686.8,999.7 690.5,999.7 699.4,974.1 694,974.1 				"/>
+				<path fill="#FFFFFF" d="M717.6,972.9c-7.8,0-12.9,5.9-12.9,13.7c0,7.7,5,13.8,12.9,13.8c8,0,12.9-6.1,12.9-13.8
+					C730.5,978.9,725.3,972.9,717.6,972.9z M717.6,995.4c-5.6,0-7.6-5-7.6-9c0-4.2,2.8-8.4,7.6-8.4c4.8,0,7.6,4.3,7.6,8.4
+					C725.2,990.4,723.2,995.4,717.6,995.4z"/>
+				<path fill="#FFFFFF" d="M753.8,981.7c0-5.6-3.6-7.6-8.7-7.6h-7.3v25.6h5.9v-10.3h-0.3l6.4,10.3h6.2l-7.4-10.9
+					C752,988.2,753.8,985,753.8,981.7z M743.9,985.9h-0.2v-8.4h0.3c2.7,0,4.7,0.9,4.7,4.1C748.7,984.8,746.7,985.9,743.9,985.9z"/>
+				<polygon fill="#FFFFFF" points="782.2,974.1 775.9,974.1 767.8,984.4 767.7,984.4 767.7,974.1 762.3,974.1 762.3,999.7 
+					767.7,999.7 767.7,987.4 767.8,987.4 776.2,999.7 782.7,999.7 772.3,985.9 				"/>
+				<path fill="#FFFFFF" d="M448.7,915.8c-12.8,0-21.2,9.7-21.2,22.4c0,12.6,8.1,22.6,21.2,22.6c13.1,0,21.2-10,21.2-22.6
+					C469.8,925.6,461.4,915.8,448.7,915.8z M448.7,952.6c-9.2,0-12.5-8.1-12.5-14.7c0-6.9,4.7-13.9,12.5-13.9s12.5,7,12.5,13.9
+					C461.2,944.5,457.9,952.6,448.7,952.6z"/>
+				<path fill="#FFFFFF" d="M490.9,917.5h-11.4v42.3h7.9v-16.2h4.7c8.8,0,13.7-4.1,13.7-13.1C505.7,920.8,499.8,917.5,490.9,917.5z
+					 M489.6,937.2h-2.2v-13.3h2c4.7,0,7.8,1,7.8,6.5C497.2,936,494.5,937.2,489.6,937.2z"/>
+				<polygon fill="#FFFFFF" points="515.4,959.8 537.5,959.8 537.5,952.5 523.7,952.5 523.7,941.2 536.6,941.2 536.6,933.8 
+					523.7,933.8 523.7,923.9 537.5,923.9 537.5,917.5 515.4,917.5 				"/>
+				<polygon fill="#FFFFFF" points="576.9,946.1 577,946.1 554.5,915.6 548.4,915.6 548.4,959.8 557.2,959.8 557.2,930.3 557,930.3 
+					579.5,960.8 585.7,960.8 585.7,917.5 576.9,917.5 				"/>
+				<polygon fill="#FFFFFF" points="619.2,959.8 627.6,959.8 627.6,941.2 639.9,941.2 639.9,933.8 627.6,933.8 627.6,923.9 
+					640.9,923.9 640.9,917.5 619.2,917.5 				"/>
+				<path fill="#FFFFFF" d="M670.3,960.8c13,0,21.2-10,21.2-22.6c0-12.7-8.4-22.4-21.2-22.4c-12.8,0-21.2,9.7-21.2,22.4
+					C649.2,950.8,657.3,960.8,670.3,960.8z M670.3,924c7.9,0,12.5,7,12.5,13.9c0,6.6-3.3,14.7-12.5,14.7c-9.2,0-12.5-8.1-12.5-14.7
+					C657.8,931,662.4,924,670.3,924z"/>
+				<path fill="#FFFFFF" d="M720.3,915.8c-12.8,0-21.2,9.7-21.2,22.4c0,12.6,8.1,22.6,21.2,22.6s21.2-10,21.2-22.6
+					C741.5,925.6,733.1,915.8,720.3,915.8z M720.3,952.6c-9.2,0-12.5-8.1-12.5-14.7c0-6.9,4.7-13.9,12.5-13.9
+					c7.9,0,12.5,7,12.5,13.9C732.9,944.5,729.6,952.6,720.3,952.6z"/>
+				<path fill="#FFFFFF" d="M783.8,938.7c0-12.2-8.3-21.2-20.7-21.2H752v42.3h11.1C775.3,959.8,783.8,950.7,783.8,938.7z
+					 M759.9,952.5v-28.6h1.1c9.4,0,14.2,5,14.2,14.3c0,8.4-4,14.3-14.2,14.3L759.9,952.5L759.9,952.5z"/>
+			</g>
+		</g>
+	</g>
+</g>
+</svg>

app/assets/images/spinning-circles.svg

@@ -0,0 +1,55 @@
+<!-- By Sam Herbert (@sherb), for everyone. More @ http://goo.gl/7AJzbL -->
+<svg width="58" height="58" viewBox="0 0 58 58" xmlns="http://www.w3.org/2000/svg">
+    <g fill="none" fill-rule="evenodd">
+        <g transform="translate(2 1)" stroke="#0096ad" stroke-width="1.5">
+            <circle cx="42.601" cy="11.462" r="5" fill-opacity="1" fill="#0096ad">
+                <animate attributeName="fill-opacity"
+                     begin="0s" dur="1.3s"
+                     values="1;0;0;0;0;0;0;0" calcMode="linear"
+                     repeatCount="indefinite" />
+            </circle>
+            <circle cx="49.063" cy="27.063" r="5" fill-opacity="0" fill="#0096ad">
+                <animate attributeName="fill-opacity"
+                     begin="0s" dur="1.3s"
+                     values="0;1;0;0;0;0;0;0" calcMode="linear"
+                     repeatCount="indefinite" />
+            </circle>
+            <circle cx="42.601" cy="42.663" r="5" fill-opacity="0" fill="#0096ad">
+                <animate attributeName="fill-opacity"
+                     begin="0s" dur="1.3s"
+                     values="0;0;1;0;0;0;0;0" calcMode="linear"
+                     repeatCount="indefinite" />
+            </circle>
+            <circle cx="27" cy="49.125" r="5" fill-opacity="0" fill="#0096ad">
+                <animate attributeName="fill-opacity"
+                     begin="0s" dur="1.3s"
+                     values="0;0;0;1;0;0;0;0" calcMode="linear"
+                     repeatCount="indefinite" />
+            </circle>
+            <circle cx="11.399" cy="42.663" r="5" fill-opacity="0" fill="#0096ad">
+                <animate attributeName="fill-opacity"
+                     begin="0s" dur="1.3s"
+                     values="0;0;0;0;1;0;0;0" calcMode="linear"
+                     repeatCount="indefinite" />
+            </circle>
+            <circle cx="4.938" cy="27.063" r="5" fill-opacity="0" fill="#0096ad">
+                <animate attributeName="fill-opacity"
+                     begin="0s" dur="1.3s"
+                     values="0;0;0;0;0;1;0;0" calcMode="linear"
+                     repeatCount="indefinite" />
+            </circle>
+            <circle cx="11.399" cy="11.462" r="5" fill-opacity="0" fill="#0096ad">
+                <animate attributeName="fill-opacity"
+                     begin="0s" dur="1.3s"
+                     values="0;0;0;0;0;0;1;0" calcMode="linear"
+                     repeatCount="indefinite" />
+            </circle>
+            <circle cx="27" cy="5" r="5" fill-opacity="0" fill="#0096ad">
+                <animate attributeName="fill-opacity"
+                     begin="0s" dur="1.3s"
+                     values="0;0;0;0;0;0;0;1" calcMode="linear"
+                     repeatCount="indefinite" />
+            </circle>
+        </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) ->
+angular.module("ofn.admin", ["ngResource", "ngAnimate", "ofn.dropdown", "admin.products", "admin.taxons", "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,6 +22,11 @@
 //= require ./payment_methods/payment_methods
 //= require ./products/products
 //= require ./shipping_methods/shipping_methods
+//= require ./side_menu/side_menu
+//= require ./taxons/taxons
+//= require ./utils/utils
 //= require ./users/users
+//= require textAngular.min.js
+//= require textAngular-sanitize.min.js
 
 //= require_tree .

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

@@ -1,11 +1,7 @@
-angular.module("ofn.admin").controller "AdminProductEditCtrl", [
-  "$scope", "$timeout", "$http", "dataFetcher", "DirtyProducts", "VariantUnitManager", "producers", "Taxons", "SpreeApiKey",
-  ($scope, $timeout, $http, dataFetcher, DirtyProducts, VariantUnitManager, producers, Taxons, SpreeApiKey) ->
+angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout, $http, BulkProducts, DisplayProperties, dataFetcher, DirtyProducts, VariantUnitManager, StatusMessage, producers, Taxons, SpreeApiAuth) ->
     $scope.loading = true
 
-    $scope.updateStatusMessage =
-      text: ""
-      style: {}
+    $scope.StatusMessage = StatusMessage
 
     $scope.columns =
       producer:     {name: "Producer",      visible: true}
@@ -38,59 +34,35 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", [
     $scope.filterTaxons = [{id: "0", name: ""}].concat $scope.taxons
     $scope.producerFilter = "0"
     $scope.categoryFilter = "0"
-    $scope.products = []
+    $scope.products = BulkProducts.products
     $scope.filteredProducts = []
     $scope.currentFilters = []
     $scope.limit = 15
     $scope.productsWithUnsavedVariants = []
+    $scope.query = ""
+    $scope.DisplayProperties = DisplayProperties
 
     $scope.initialise = ->
-      authorise_api_reponse = ""
-      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"] = SpreeApiKey
-          $scope.fetchProducts()
-        else if authorise_api_reponse.hasOwnProperty("error")
-          $scope.api_error_msg = authorise_api_reponse("error")
-        else
-          api_error_msg = "You don't have an API key yet. An attempt was made to generate one, but you are currently not authorised, please contact your site administrator for access."
+      SpreeApiAuth.authorise()
+      .then ->
+        $scope.spree_api_key_ok = true
+        $scope.fetchProducts()
+      .catch (message) ->
+        $scope.api_error_msg = message
 
     $scope.$watchCollection '[query, producerFilter, categoryFilter]', ->
       $scope.limit = 15 # Reset limit whenever searching
 
-    $scope.fetchProducts = -> # WARNING: returns a promise
+    $scope.fetchProducts = ->
       $scope.loading = true
-      queryString = $scope.currentFilters.reduce (qs,f) ->
-        return qs + "q[#{f.property.db_column}_#{f.predicate.predicate}]=#{f.value};"
-      , ""
-      return dataFetcher("/api/products/bulk_products?page=1;per_page=20;#{queryString}").then (data) ->
-        $scope.resetProducts data.products
+      BulkProducts.fetch($scope.currentFilters).then ->
+        $scope.resetProducts()
         $scope.loading = false
-        if data.pages > 1
-          for page in [2..data.pages]
-            dataFetcher("/api/products/bulk_products?page=#{page};per_page=20;#{queryString}").then (data) ->
-              for product in data.products
-                $scope.unpackProduct product
-                $scope.products.push product
 
 
-    $scope.resetProducts = (data) ->
-      $scope.products = data
+    $scope.resetProducts = ->
       DirtyProducts.clear()
-      $scope.setMessage $scope.updateStatusMessage, "", {}, false
-      $scope.displayProperties ||= {}
-      angular.forEach $scope.products, (product) ->
-        $scope.unpackProduct product
-
-
-    $scope.unpackProduct = (product) ->
-      $scope.displayProperties ||= {}
-      $scope.displayProperties[product.id] ||= showVariants: false
-      #$scope.matchProducer product
-      $scope.loadVariantUnit product
-
+      StatusMessage.clear()
 
     # $scope.matchProducer = (product) ->
     #   for producer in $scope.producers
@@ -98,37 +70,6 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", [
     #       product.producer = producer
     #       break
 
-    $scope.loadVariantUnit = (product) ->
-      product.variant_unit_with_scale =
-        if product.variant_unit && product.variant_unit_scale && product.variant_unit != 'items'
-          "#{product.variant_unit}_#{product.variant_unit_scale}"
-        else if product.variant_unit
-          product.variant_unit
-        else
-          null
-
-      $scope.loadVariantUnitValues product if product.variants
-      $scope.loadVariantUnitValue product, product.master if product.master
-
-    $scope.loadVariantUnitValues = (product) ->
-      for variant in product.variants
-        $scope.loadVariantUnitValue product, variant
-
-    $scope.loadVariantUnitValue = (product, variant) ->
-      unit_value = $scope.variantUnitValue product, variant
-      unit_value = if unit_value? then unit_value else ''
-      variant.unit_value_with_description = "#{unit_value} #{variant.unit_description || ''}".trim()
-
-
-    $scope.variantUnitValue = (product, variant) ->
-      if variant.unit_value?
-        if product.variant_unit_scale
-          variant.unit_value / product.variant_unit_scale
-        else
-          variant.unit_value
-      else
-        null
-
 
     $scope.updateOnHand = (product) ->
       on_demand_variants = []
@@ -174,7 +115,7 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", [
         on_hand: null
         price: null
       $scope.productsWithUnsavedVariants.push product
-      $scope.displayProperties[product.id].showVariants = true
+      DisplayProperties.setShowVariants product.id, true
 
 
     $scope.nextVariantId = ->
@@ -182,12 +123,6 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", [
       $scope.variantIdCounter -= 1
       $scope.variantIdCounter
 
-    $scope.updateVariantLists = (server_products) ->
-      for product in $scope.productsWithUnsavedVariants
-        server_product = $scope.findProduct(product.id, server_products)
-        product.variants = server_product.variants
-        $scope.loadVariantUnitValues product
-
     $scope.deleteProduct = (product) ->
       if confirm("Are you sure?")
         $http(
@@ -217,18 +152,7 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", [
 
 
     $scope.cloneProduct = (product) ->
-      dataFetcher("/admin/products/" + product.permalink_live + "/clone.json").then (data) ->
-        # Ideally we would use Spree's built in respond_override helper here to redirect the
-        # user after a successful clone with .json in the accept headers
-        # However, at the time of writing there appears to be an issue which causes the
-        # respond_with block in the destroy action of Spree::Admin::Product to break
-        # when a respond_overrride for the clone action is used.
-        id = data.product.id
-        dataFetcher("/api/products/" + id + "?template=bulk_show").then (data) ->
-          newProduct = data
-          $scope.unpackProduct newProduct
-          $scope.products.push newProduct
-
+      BulkProducts.cloneProduct product
 
     $scope.hasVariants = (product) ->
       product.variants.length > 0
@@ -256,7 +180,7 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", [
       if productsToSubmit.length > 0
         $scope.updateProducts productsToSubmit # Don't submit an empty list
       else
-        $scope.setMessage $scope.updateStatusMessage, "No changes to save.", color: "grey", 3000
+        StatusMessage.display 'alert', 'No changes to save.'
 
 
     $scope.updateProducts = (productsToSubmit) ->
@@ -269,7 +193,7 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", [
           filters: $scope.currentFilters
       ).success((data) ->
         DirtyProducts.clear()
-        $scope.updateVariantLists(data.products)
+        BulkProducts.updateVariantLists(data.products, $scope.productsWithUnsavedVariants)
         $timeout -> $scope.displaySuccess()
       ).error (data, status) ->
         if status == 400 && data.errors? && data.errors.length > 0
@@ -303,57 +227,36 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", [
       if variant.hasOwnProperty("unit_value_with_description")
         match = variant.unit_value_with_description.match(/^([\d\.]+(?= |$)|)( |)(.*)$/)
         if match
-          product = $scope.findProduct(product.id, $scope.products)
+          product = BulkProducts.find product.id
           variant.unit_value  = parseFloat(match[1])
           variant.unit_value  = null if isNaN(variant.unit_value)
           variant.unit_value *= product.variant_unit_scale if variant.unit_value && product.variant_unit_scale
           variant.unit_description = match[3]
 
-    $scope.findProduct = (id, product_list) ->
-      products = (product for product in product_list when product.id == id)
-      if products.length == 0 then null else products[0]
-
     $scope.incrementLimit = ->
       if $scope.limit < $scope.products.length
         $scope.limit = $scope.limit + 5
 
-    $scope.setMessage = (model, text, style, timeout) ->
-      model.text = text
-      model.style = style
-      $timeout.cancel model.timeout  if model.timeout
-      if timeout
-        model.timeout = $timeout(->
-          $scope.setMessage model, "", {}, false
-        , timeout, true)
-
 
     $scope.displayUpdating = ->
-      $scope.setMessage $scope.updateStatusMessage, "Saving...",
-        color: "#FF9906"
-      , false
+      StatusMessage.display 'progress', 'Saving...'
 
 
     $scope.displaySuccess = ->
-      $scope.setMessage $scope.updateStatusMessage, "Changes saved.",
-        color: "#9fc820"
-      , 3000
+      StatusMessage.display 'success', 'Changes saved.'
 
 
     $scope.displayFailure = (failMessage) ->
-      $scope.setMessage $scope.updateStatusMessage, "Saving failed. " + failMessage,
-        color: "#DA5354"
-      , false
+      StatusMessage.display 'failure', "Saving failed. #{failMessage}"
 
 
     $scope.displayDirtyProducts = ->
       if DirtyProducts.count() > 0
         message = if DirtyProducts.count() == 1 then "one product" else DirtyProducts.count() + " products"
-        $scope.setMessage $scope.updateStatusMessage, "Changes to " + message + " remain unsaved.",
-          color: "gray"
-        , false
+        StatusMessage.display 'notice', "Changes to #{message} remain unsaved."
       else
-        $scope.setMessage $scope.updateStatusMessage, "", {}, false
-]
+        StatusMessage.clear()
+
 
 filterSubmitProducts = (productsToFilter) ->
   filteredProducts = []
@@ -385,8 +288,8 @@ filterSubmitProducts = (productsToFilter) ->
         if product.hasOwnProperty("name")
           filteredProduct.name = product.name
           hasUpdatableProperty = true
-        if product.hasOwnProperty("producer")
-          filteredProduct.supplier_id = product.producer
+        if product.hasOwnProperty("producer_id")
+          filteredProduct.supplier_id = product.producer_id
           hasUpdatableProperty = true
         if product.hasOwnProperty("price")
           filteredProduct.price = product.price
@@ -401,8 +304,8 @@ filterSubmitProducts = (productsToFilter) ->
         if product.hasOwnProperty("on_hand") and filteredVariants.length == 0 #only update if no variants present
           filteredProduct.on_hand = product.on_hand
           hasUpdatableProperty = true
-        if product.hasOwnProperty("category")
-          filteredProduct.primary_taxon_id = product.category
+        if product.hasOwnProperty("category_id")
+          filteredProduct.primary_taxon_id = product.category_id
           hasUpdatableProperty = true
         if product.hasOwnProperty("available_on")
           filteredProduct.available_on = product.available_on

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

@@ -0,0 +1,67 @@
+angular.module("ofn.admin").controller "AdminVariantOverridesCtrl", ($scope, $timeout, Indexer, SpreeApiAuth, PagedFetcher, StatusMessage, hubs, producers, hubPermissions, VariantOverrides, DirtyVariantOverrides) ->
+  $scope.hubs = hubs
+  $scope.hub = null
+  $scope.products = []
+  $scope.producers = Indexer.index producers
+  $scope.hubPermissions = hubPermissions
+  $scope.variantOverrides = VariantOverrides.variantOverrides
+  $scope.StatusMessage = StatusMessage
+
+  $scope.initialise = ->
+    SpreeApiAuth.authorise()
+    .then ->
+      $scope.spree_api_key_ok = true
+      $scope.fetchProducts()
+    .catch (message) ->
+      $scope.api_error_msg = message
+
+
+  $scope.fetchProducts = ->
+    url = "/api/products/distributable?page=::page::;per_page=100"
+    PagedFetcher.fetch url, (data) => $scope.addProducts data.products
+
+
+  $scope.addProducts = (products) ->
+    $scope.products = $scope.products.concat products
+    VariantOverrides.ensureDataFor hubs, products
+
+
+  $scope.selectHub = ->
+    $scope.hub = (hub for hub in hubs when hub.id == $scope.hub_id)[0]
+
+
+  $scope.displayDirty = ->
+    if DirtyVariantOverrides.count() > 0
+      num = if DirtyVariantOverrides.count() == 1 then "one override" else "#{DirtyVariantOverrides.count()} overrides"
+      StatusMessage.display 'notice', "Changes to #{num} remain unsaved."
+    else
+      StatusMessage.clear()
+
+
+  $scope.update = ->
+    if DirtyVariantOverrides.count() == 0
+      StatusMessage.display 'alert', 'No changes to save.'
+    else
+      StatusMessage.display 'progress', 'Saving...'
+      DirtyVariantOverrides.save()
+      .success (updatedVos) ->
+        DirtyVariantOverrides.clear()
+        VariantOverrides.updateIds updatedVos
+        $timeout -> StatusMessage.display 'success', 'Changes saved.'
+      .error (data, status) ->
+        $timeout -> StatusMessage.display 'failure', $scope.updateError(data, status)
+
+
+  $scope.updateError = (data, status) ->
+    if status == 401
+      "I couldn't get authorisation to save those changes, so they remain unsaved."
+
+    else if status == 400 && data.errors?
+      errors = []
+      for field, field_errors of data.errors
+        errors = errors.concat field_errors
+      errors = errors.join ', '
+      "I had some trouble saving: #{errors}"
+
+    else
+      "Oh no! I was unable to save your changes."

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

@@ -1,19 +0,0 @@
-angular.module("ofn.admin").directive "ofnTaxonAutocomplete", (Taxons) ->
-  # Adapted from Spree's existing taxon autocompletion
-  require: "ngModel"
-  link: (scope,element,attrs,ngModel) ->
-    setTimeout ->
-      element.select2
-        placeholder: "Category"
-        multiple: false
-        initSelection: (element, callback) ->
-          callback Taxons.findByID(scope.product.category)
-        query: (query) ->
-          query.callback { results: Taxons.findByTerm(query.term) }
-        formatResult: (taxon) ->
-          taxon.name
-        formatSelection: (taxon) ->
-          taxon.name
-    element.on "change", ->
-      scope.$apply ->
-        ngModel.$setViewValue element.val()

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

@@ -1,18 +1,19 @@
-angular.module("ofn.admin").directive "ofnToggleVariants", ->
+angular.module("ofn.admin").directive "ofnToggleVariants", (DisplayProperties) ->
   link: (scope, element, attrs) ->
-    if scope.displayProperties[scope.product.id].showVariants
+    if DisplayProperties.showVariants scope.product.id
       element.removeClass "icon-chevron-right"
       element.addClass "icon-chevron-down"
     else
       element.removeClass "icon-chevron-down"
       element.addClass "icon-chevron-right"
+
     element.on "click", ->
       scope.$apply ->
-        if scope.displayProperties[scope.product.id].showVariants
-          scope.displayProperties[scope.product.id].showVariants = false
+        if DisplayProperties.showVariants scope.product.id
+          DisplayProperties.setShowVariants scope.product.id, false
           element.removeClass "icon-chevron-down"
           element.addClass "icon-chevron-right"
         else
-          scope.displayProperties[scope.product.id].showVariants = true
+          DisplayProperties.setShowVariants scope.product.id, true
           element.removeClass "icon-chevron-right"
           element.addClass "icon-chevron-down"

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

@@ -0,0 +1,9 @@
+angular.module("ofn.admin").directive "ofnTrackVariantOverride", (DirtyVariantOverrides) ->
+  require: "ngModel"
+  link: (scope, element, attrs, ngModel) ->
+    ngModel.$parsers.push (viewValue) ->
+      if ngModel.$dirty
+        variantOverride = scope.variantOverrides[scope.hub.id][scope.variant.id]
+        DirtyVariantOverrides.add variantOverride
+        scope.displayDirty()
+      viewValue

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,35 +1,19 @@
 angular.module("admin.enterprises")
-  .controller "enterpriseCtrl", ($scope, Enterprise, PaymentMethods, ShippingMethods) ->
+  .controller "enterpriseCtrl", ($scope, NavigationCheck, Enterprise, EnterprisePaymentMethods, EnterpriseShippingMethods, SideMenu) ->
     $scope.Enterprise = Enterprise.enterprise
-    $scope.PaymentMethods = PaymentMethods.paymentMethods
-    $scope.ShippingMethods = ShippingMethods.shippingMethods
+    console.log Enterprise
+    $scope.PaymentMethods = EnterprisePaymentMethods.paymentMethods
+    $scope.ShippingMethods = EnterpriseShippingMethods.shippingMethods
+    $scope.navClear = NavigationCheck.clear
+    $scope.pristineEmail = $scope.Enterprise.email
+    $scope.menu = SideMenu
 
-    for payment_method in $scope.PaymentMethods
-      payment_method.selected = payment_method.id in $scope.Enterprise.payment_method_ids
+    # 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 .
+    enterpriseNavCallback = ->
+      if $scope.Enterprise.$dirty
+        "Your changes to the enterprise are not saved yet."
 
-    $scope.paymentMethodsColor = ->
-      if $scope.PaymentMethods.length > 0
-        if $scope.selectedPaymentMethodsCount() > 0 then "blue" else "red"
-      else
-        "red"
-
-    $scope.selectedPaymentMethodsCount = ->
-      $scope.PaymentMethods.reduce (count, payment_method) ->
-        count++ if payment_method.selected
-        count
-      , 0
-
-    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
-        if $scope.selectedShippingMethodsCount() > 0 then "blue" else "red"
-      else
-        "red"
-
-    $scope.selectedShippingMethodsCount = ->
-      $scope.ShippingMethods.reduce (count, shipping_method) ->
-        count++ if shipping_method.selected
-        count
-      , 0
+    # Register the NavigationCheck callback
+    NavigationCheck.register(enterpriseNavCallback)

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

@@ -0,0 +1,23 @@
+angular.module("admin.enterprises")
+  .controller "permalinkCtrl", ($scope, PermalinkChecker) ->
+    # locals
+    initialPermalink = $scope.Enterprise.permalink
+    pendingRequest = null
+
+    # variables on $scope
+    $scope.availablility = ""
+    $scope.checking = false
+
+    $scope.$watch "Enterprise.permalink", (newValue, oldValue) ->
+      $scope.checking = true
+      pendingRequest = PermalinkChecker.check(newValue)
+
+      pendingRequest.then (data) ->
+        if data.permalink == initialPermalink
+          $scope.availability = ""
+        else
+          $scope.availability = data.available
+        $scope.Enterprise.permalink = data.permalink
+        $scope.checking = false
+      , (data) ->
+        # Do nothing (this is hopefully an aborted request)

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

@@ -0,0 +1,41 @@
+angular.module("admin.enterprises")
+  .controller "sideMenuCtrl", ($scope, $parse, Enterprise, SideMenu, enterprisePermissions) ->
+    $scope.Enterprise = Enterprise.enterprise
+    $scope.menu = SideMenu
+    $scope.select = SideMenu.select
+
+    $scope.menu.setItems [
+      { name: 'Primary Details', icon_class: "icon-user" }
+      { name: 'Address', icon_class: "icon-map-marker" }
+      { name: 'Contact', icon_class: "icon-phone" }
+      { name: 'Social', icon_class: "icon-twitter" }
+      { name: 'About', icon_class: "icon-pencil" }
+      { name: 'Business Details', icon_class: "icon-briefcase" }
+      { name: 'Images', icon_class: "icon-picture" }
+      { name: "Shipping Methods", icon_class: "icon-truck", show: "showShippingMethods()" }
+      { name: "Payment Methods", icon_class: "icon-money", show: "showPaymentMethods()" }
+      { name: "Enterprise Fees", icon_class: "icon-tasks", show: "showEnterpriseFees()" }
+      { name: "Shop Preferences", icon_class: "icon-shopping-cart", show: "showShopPreferences()" }
+    ]
+
+    $scope.select(0)
+
+
+    $scope.showItem = (item) ->
+      if item.show?
+        $parse(item.show)($scope)
+      else
+        true
+
+    $scope.showShippingMethods = ->
+      enterprisePermissions.can_manage_shipping_methods && $scope.Enterprise.sells != "none"
+
+    $scope.showPaymentMethods = ->
+      enterprisePermissions.can_manage_payment_methods && $scope.Enterprise.sells != "none"
+
+    $scope.showEnterpriseFees = ->
+      enterprisePermissions.can_manage_enterprise_fees && ($scope.Enterprise.sells != "none" || $scope.Enterprise.is_primary_producer)
+
+    $scope.showShopPreferences = ->
+      $scope.Enterprise.sells != "none"
+

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

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

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/enterprises/services/enterprise_payment_methods.js.coffee

@@ -0,0 +1,20 @@
+angular.module("admin.enterprises")
+  .factory "EnterprisePaymentMethods", (Enterprise, PaymentMethods) ->
+    new class EnterprisePaymentMethods
+      paymentMethods: PaymentMethods.paymentMethods
+
+      constructor: ->
+        for payment_method in @paymentMethods
+          payment_method.selected = payment_method.id in Enterprise.enterprise.payment_method_ids
+
+      displayColor: ->
+        if @paymentMethods.length > 0 && @selectedCount() > 0
+          "blue"
+        else
+          "red"
+
+      selectedCount: ->
+        @paymentMethods.reduce (count, payment_method) ->
+          count++ if payment_method.selected
+          count
+        , 0

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

@@ -0,0 +1,20 @@
+angular.module("admin.enterprises")
+  .factory "EnterpriseShippingMethods", (Enterprise, ShippingMethods) ->
+    new class EnterpriseShippingMethods
+      shippingMethods: ShippingMethods.shippingMethods
+
+      constructor: ->
+        for shipping_method in @shippingMethods
+          shipping_method.selected = shipping_method.id in Enterprise.enterprise.shipping_method_ids
+
+      displayColor: ->
+        if @shippingMethods.length > 0 && @selectedCount() > 0
+          "blue"
+        else
+          "red"
+
+      selectedCount: ->
+        @shippingMethods.reduce (count, shipping_method) ->
+          count++ if shipping_method.selected
+          count
+        , 0

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

@@ -0,0 +1,36 @@
+angular.module("admin.enterprises").factory 'PermalinkChecker', ($q, $http) ->
+  new class PermalinkChecker
+    deferredRequest: null
+    deferredAbort: null
+
+    check: (permalink) =>
+      @abort(@deferredAbort) if @deferredRequest && @deferredRequest.promise
+      @deferredRequest = deferredRequest = $q.defer()
+      @deferredAbort = deferredAbort = $q.defer()
+      request = $http(
+        method:   "GET"
+        url:      "/enterprises/check_permalink?permalink=#{permalink}"
+        headers:
+          Accept: 'application/javascript'
+        timeout: deferredAbort.promise
+      )
+      .success( (data) =>
+        deferredRequest.resolve
+          permalink: data
+          available: "Available"
+      ).error (data,status) =>
+        if status == 409
+          deferredRequest.resolve
+            permalink: data
+            available: "Unavailable"
+        else
+          # Something went wrong or request was aborted
+          deferredRequest.reject()
+
+      deferredRequest.promise.finally ->
+        request = deferredRequest.promise = null;
+
+      deferredRequest.promise
+
+    abort: (deferredAbort) ->
+      deferredAbort.resolve()

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

@@ -1,4 +1,4 @@
 angular.module("ofn.admin").filter "category", ($filter) ->
   return (products, taxonID) ->
     return products if taxonID == "0"
-    return $filter('filter')( products, { category: taxonID }, true )
+    return $filter('filter')( products, { category_id: taxonID }, true )

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

@@ -0,0 +1,4 @@
+angular.module("ofn.admin").filter "hubPermissions", ($filter) ->
+  return (products, hubPermissions, hub_id) ->
+    return [] if !hub_id
+    return $filter('filter')(products, ((product) -> hubPermissions[hub_id].indexOf(product.producer_id) > -1), true)

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

@@ -1,4 +1,4 @@
 angular.module("ofn.admin").filter "producer", ($filter) ->
   return (products, producerID) ->
     return products if producerID == "0"
-    $filter('filter')( products, { producer: producerID }, true )
+    $filter('filter')( products, { producer_id: producerID }, true )

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
@@ -74,7 +74,8 @@ angular.module('order_cycle', ['ngResource'])
     $scope.removeDistributionOfVariant = (variant_id) ->
       OrderCycle.removeDistributionOfVariant(variant_id)
 
-    $scope.submit = ->
+    $scope.submit = (event) ->
+      event.preventDefault()
       OrderCycle.create()
   ])
 
@@ -154,7 +155,8 @@ angular.module('order_cycle', ['ngResource'])
     $scope.removeDistributionOfVariant = (variant_id) ->
       OrderCycle.removeDistributionOfVariant(variant_id)
 
-    $scope.submit = ->
+    $scope.submit = (event) ->
+      event.preventDefault()
       OrderCycle.update()
   ])
 
@@ -162,235 +164,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) ->
-        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) ->
-        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/for_order_cycle/: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,44 @@
+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 = (event) ->
+    event.preventDefault()
+    OrderCycle.mirrorIncomingToOutgoingProducts()
+    OrderCycle.create()

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

@@ -0,0 +1,38 @@
+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 = (event) ->
+    event.preventDefault()
+    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,180 @@
+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) ->
+        delete oc.$promise
+        delete oc.$resolved
+        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/payment_methods/services/payment_methods.js.coffee

@@ -2,7 +2,7 @@ angular.module("admin.payment_methods")
   .factory "PaymentMethods", (paymentMethods) ->
     new class PaymentMethods
       paymentMethods: paymentMethods
-      
+
       findByID: (id) ->
         for paymentMethod in @paymentMethods
           return paymentMethod if paymentMethod.id is id

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

@@ -0,0 +1,74 @@
+angular.module("ofn.admin").factory "BulkProducts", (PagedFetcher, dataFetcher) ->
+  new class BulkProducts
+    products: []
+
+    fetch: (filters, onComplete) ->
+      queryString = filters.reduce (qs,f) ->
+        return qs + "q[#{f.property.db_column}_#{f.predicate.predicate}]=#{f.value};"
+      , ""
+
+      url = "/api/products/bulk_products?page=::page::;per_page=20;#{queryString}"
+      PagedFetcher.fetch url, (data) => @addProducts data.products
+
+    cloneProduct: (product) ->
+      dataFetcher("/admin/products/" + product.permalink_live + "/clone.json").then (data) =>
+        # Ideally we would use Spree's built in respond_override helper here to redirect the
+        # user after a successful clone with .json in the accept headers
+        # However, at the time of writing there appears to be an issue which causes the
+        # respond_with block in the destroy action of Spree::Admin::Product to break
+        # when a respond_overrride for the clone action is used.
+        id = data.product.id
+        dataFetcher("/api/products/" + id + "?template=bulk_show").then (newProduct) =>
+          @addProducts [newProduct]
+
+    updateVariantLists: (serverProducts, productsWithUnsavedVariants) ->
+      for product in productsWithUnsavedVariants
+        server_product = @findProductInList(product.id, serverProducts)
+        product.variants = server_product.variants
+        @loadVariantUnitValues product
+
+    find: (id) ->
+      @findProductInList id, @products
+
+    findProductInList: (id, product_list) ->
+      products = (product for product in product_list when product.id == id)
+      if products.length == 0 then null else products[0]
+
+    addProducts: (products) ->
+      for product in products
+        @unpackProduct product
+        @products.push product
+
+    unpackProduct: (product) ->
+      #$scope.matchProducer product
+      @loadVariantUnit product
+
+    loadVariantUnit: (product) ->
+      product.variant_unit_with_scale =
+        if product.variant_unit && product.variant_unit_scale && product.variant_unit != 'items'
+          "#{product.variant_unit}_#{product.variant_unit_scale}"
+        else if product.variant_unit
+          product.variant_unit
+        else
+          null
+
+      @loadVariantUnitValues product if product.variants
+      @loadVariantUnitValue product, product.master if product.master
+
+    loadVariantUnitValues: (product) ->
+      for variant in product.variants
+        @loadVariantUnitValue product, variant
+
+    loadVariantUnitValue: (product, variant) ->
+      unit_value = @variantUnitValue product, variant
+      unit_value = if unit_value? then unit_value else ''
+      variant.unit_value_with_description = "#{unit_value} #{variant.unit_description || ''}".trim()
+
+    variantUnitValue: (product, variant) ->
+      if variant.unit_value?
+        if product.variant_unit_scale
+          variant.unit_value / product.variant_unit_scale
+        else
+          variant.unit_value
+      else
+        null

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

@@ -0,0 +1,29 @@
+angular.module("ofn.admin").factory "DirtyVariantOverrides", ($http) ->
+  new class DirtyVariantOverrides
+    dirtyVariantOverrides: {}
+
+    add: (vo) ->
+      @dirtyVariantOverrides[vo.hub_id] ||= {}
+      @dirtyVariantOverrides[vo.hub_id][vo.variant_id] = vo
+
+    count: ->
+      count = 0
+      for hub_id, vos of @dirtyVariantOverrides
+        count += Object.keys(vos).length
+      count
+
+    clear: ->
+      @dirtyVariantOverrides = {}
+
+    all: ->
+      all_vos = []
+      for hub_id, vos of @dirtyVariantOverrides
+        all_vos.push vo for variant_id, vo of vos
+      all_vos
+
+    save: ->
+      $http
+        method: "POST"
+        url: "/admin/variant_overrides/bulk_update"
+        data:
+          variant_overrides: @all()

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

@@ -0,0 +1,14 @@
+angular.module("ofn.admin").factory "DisplayProperties", ->
+  new class DisplayProperties
+    displayProperties: {}
+
+    showVariants: (product_id) ->
+      @initProduct product_id
+      @displayProperties[product_id].showVariants
+
+    setShowVariants: (product_id, showVariants) ->
+      @initProduct product_id
+      @displayProperties[product_id].showVariants = showVariants
+
+    initProduct: (product_id) ->
+      @displayProperties[product_id] ||= {showVariants: false}

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

@@ -4,6 +4,7 @@ angular.module("ofn.admin").factory 'EnterpriseRelationships', ($http, enterpris
     all_permissions: [
       'add_to_order_cycle'
       'manage_products'
+      'edit_profile'
     ]
 
     constructor: ->
@@ -26,3 +27,4 @@ angular.module("ofn.admin").factory 'EnterpriseRelationships', ($http, enterpris
       switch permission
         when "add_to_order_cycle" then "to add to order cycle"
         when "manage_products" then "to manage products"
+        when "edit_profile" then "to edit profile"

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

@@ -0,0 +1,13 @@
+# Convert an array of objects into a hash, indexed by the objects' ids
+#
+# producers = [{id: 1, name: 'one'}, {id: 2, name: 'two'}]
+# Indexer.index producers
+# -> {1: {id: 1, name: 'one'}, 2: {id: 2, name: 'two'}}
+
+angular.module("ofn.admin").factory 'Indexer', ->
+  new class Indexer
+    index: (data, key='id') ->
+      index = {}
+      for e in data
+        index[e[key]] = e
+      index

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

@@ -0,0 +1,16 @@
+angular.module("ofn.admin").factory "PagedFetcher", (dataFetcher) ->
+  new class PagedFetcher
+    # Given a URL like http://example.com/foo?page=::page::&per_page=20
+    # And the response includes an attribute pages with the number of pages to fetch
+    # Fetch each page async, and call the processData callback with the resulting data
+    fetch: (url, processData) ->
+      dataFetcher(@urlForPage(url, 1)).then (data) =>
+        processData data
+
+        if data.pages > 1
+          for page in [2..data.pages]
+            dataFetcher(@urlForPage(url, page)).then (data) ->
+              processData data
+
+    urlForPage: (url, page) ->
+      url.replace("::page::", page)

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

@@ -0,0 +1,16 @@
+angular.module("ofn.admin").factory "SpreeApiAuth", ($q, $http, SpreeApiKey) ->
+  new class SpreeApiAuth
+    authorise: ->
+      deferred = $q.defer()
+
+      $http.get("/api/users/authorise_api?token=" + SpreeApiKey)
+      .success (response) ->
+        if response?.success == "Use of API Authorised"
+          $http.defaults.headers.common["X-Spree-Token"] = SpreeApiKey
+          deferred.resolve()
+
+      .error (response) ->
+        error = response?.error || "You are unauthorised to access this page."
+        deferred.reject(error)
+
+      deferred.promise

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

@@ -0,0 +1,26 @@
+angular.module("ofn.admin").factory "StatusMessage", ($timeout) ->
+  new class StatusMessage
+    types:
+      progress: {timeout: false, style: {color: '#ff9906'}}
+      alert:    {timeout: 5000,  style: {color: 'grey'}}
+      notice:   {timeout: false, style: {color: 'grey'}}
+      success:  {timeout: 5000,  style: {color: '#9fc820'}}
+      failure:  {timeout: false, style: {color: '#da5354'}}
+
+    statusMessage:
+      text: ""
+      style: {}
+
+    display: (type, text) ->
+      @statusMessage.text = text
+      @statusMessage.style = @types[type].style
+      $timeout.cancel @statusMessage.timeout  if @statusMessage.timeout
+      timeout = @types[type].timeout
+      if timeout
+        @statusMessage.timeout = $timeout =>
+          @clear()
+        , timeout, true
+
+    clear: ->
+      @statusMessage.text = ''
+      @statusMessage.style = {}

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

@@ -1,15 +0,0 @@
-angular.module("ofn.admin").factory "Taxons", (taxons, $filter) ->
-  new class Taxons
-    constructor: ->
-      @taxons = taxons
-
-    # For finding a single Taxon
-    findByID: (id) ->
-      $filter('filter')(@taxons, {id: id}, true)[0]
-
-    # For finding multiple Taxons represented by comma delimited string
-    findByIDs: (ids) ->
-      taxon for taxon in @taxons when taxon.id.toString() in ids.split(",")
-
-    findByTerm: (term) ->
-      $filter('filter')(@taxons, term)

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

@@ -0,0 +1,23 @@
+angular.module("ofn.admin").factory "VariantOverrides", (variantOverrides, Indexer) ->
+  new class VariantOverrides
+    variantOverrides: {}
+
+    constructor: ->
+      for vo in variantOverrides
+        @variantOverrides[vo.hub_id] ||= {}
+        @variantOverrides[vo.hub_id][vo.variant_id] = vo
+
+    ensureDataFor: (hubs, products) ->
+      for hub in hubs
+        @variantOverrides[hub.id] ||= {}
+        for product in products
+          for variant in product.variants
+            @variantOverrides[hub.id][variant.id] ||=
+              variant_id: variant.id
+              hub_id: hub.id
+              price: ''
+              count_on_hand: ''
+
+    updateIds: (updatedVos) ->
+      for vo in updatedVos
+        @variantOverrides[vo.hub_id][vo.variant_id].id = vo.id

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

@@ -2,7 +2,7 @@ angular.module("admin.shipping_methods")
   .factory "ShippingMethods", (shippingMethods) ->
     new class ShippingMethods
       shippingMethods: shippingMethods
-      
+
       findByID: (id) ->
         for shippingMethod in @shippingMethods
           return shippingMethod if shippingMethod.id is id

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

@@ -0,0 +1,28 @@
+angular.module("admin.side_menu")
+  .factory "SideMenu", ->
+    new class SideMenu
+      items: []
+      selected: null
+
+      setItems: (items) =>
+        @items = items
+        item.visible = true for item in @items
+
+      select: (index) =>
+        if index < @items.length
+          @selected.selected = false if @selected
+          @selected = @items[index]
+          @selected.selected = true
+
+      find_by_name: (name) =>
+        for item in @items when item.name is name
+          return item
+        null
+
+      hide_item_by_name: (name) =>
+        item = @find_by_name(name)
+        item.visible = false if item
+
+      show_item_by_name: (name) =>
+        item = @find_by_name(name)
+        item.visible = true if item

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

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

app/assets/javascripts/admin/taxons/directives/taxon_autocomplete.js.coffee

@@ -0,0 +1,30 @@
+angular.module("admin.taxons").directive "ofnTaxonAutocomplete", (Taxons) ->
+  # Adapted from Spree's existing taxon autocompletion
+  scope: true
+  link: (scope,element,attrs) ->
+    multiple = scope.$eval attrs.multipleSelection
+    placeholder = attrs.placeholder
+    initalSelection = scope.$eval attrs.ngModel
+
+    setTimeout ->
+      element.select2
+        placeholder: placeholder
+        multiple: multiple
+        initSelection: (element, callback) ->
+          if multiple
+            callback Taxons.findByIDs(initalSelection)
+          else
+            callback Taxons.findByID(initalSelection)
+        query: (query) ->
+          query.callback { results: Taxons.findByTerm(query.term) }
+        formatResult: (taxon) ->
+          taxon.name
+        formatSelection: (taxon) ->
+          taxon.name
+
+      #Allows drag and drop
+      if multiple
+        element.select2("container").find("ul.select2-choices").sortable
+          containment: 'parent'
+          start: -> element.select2("onSortStart")
+          update: -> element.select2("onSortEnd")

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

@@ -0,0 +1,19 @@
+angular.module("admin.taxons").factory "Taxons", (taxons, $filter) ->
+  new class Taxons
+    taxons: taxons
+    taxonsByID: {}
+
+    constructor: ->
+      for taxon in @taxons
+        @taxonsByID[taxon.id] = taxon
+
+    # For finding a single Taxon
+    findByID: (id) ->
+      @taxonsByID[id]
+
+    # For finding multiple Taxons represented by comma delimited string
+    findByIDs: (ids) ->
+      @taxonsByID[taxon_id] for taxon_id in ids.split(",") when @taxonsByID[taxon_id]
+
+    findByTerm: (term) ->
+      $filter('filter')(@taxons, term)

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

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

app/assets/javascripts/admin/util.js.erb

@@ -28,3 +28,10 @@ show_flash_error = function(message) {
     }
   }
 }
+
+$(document).ready(function(){
+    $('a.close').click(function(event){
+      event.preventDefault();
+      $(this).parent().slideUp(250);
+    });
+});

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

@@ -0,0 +1,47 @@
+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
+          # following: https://developer.mozilla.org/en-US/docs/Web/Events/beforeunload
+          ($event or $window.event).returnValue = message
+          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/cart.js.coffee

@@ -13,8 +13,7 @@ $ ->
 $(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')
+    $(this).html('Item Handling Fees (included in item totals)')
     false

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

@@ -1,11 +1,28 @@
-Darkswarm.controller "AccordionCtrl", ($scope, storage, $timeout, CurrentHub) ->
+Darkswarm.controller "AccordionCtrl", ($scope, storage, $timeout, $document, CurrentHub) ->
   $scope.accordion = 
     details: true 
+    billing: false
     shipping: false
     payment: false
-    billing: false
+  $scope.accordionSections = ["details", "billing", "shipping", "payment"]
   storage.bind $scope, "accordion", {storeName: "accordion_#{$scope.order.id}#{CurrentHub.hub.id}#{$scope.order.user_id}"}
 
-  $scope.show = (name)->
-    $scope.accordion[name] = true
+  $scope.show = (section)->
+    $scope.accordion[section] = true
 
+  $scope.$on 'purchaseFormInvalid', (event, form) ->
+    # Scroll to first invalid section
+    for section in $scope.accordionSections
+      if not form[section].$valid
+        $scope.show section
+
+        # If we call scrollTo() directly after show(), when one of the accordions above the
+        # scroll location is closed by show(), scrollTo() will scroll to the old location of
+        # the element. Putting this in a zero-length timeout is enough delay for the DOM to
+        # have updated.
+        $timeout ->
+          # Scrolling is confused by our position:fixed top bar - add an offset to scroll
+          # to the correct location, plus 5px buffer
+          offset_height = $("nav.top-bar").height() + 5
+          $document.scrollTo $("##{section}"), offset_height, 500
+        break

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

@@ -1,9 +1,10 @@
 Darkswarm.controller "CheckoutCtrl", ($scope, storage, Checkout, CurrentUser, CurrentHub) ->
   $scope.Checkout = Checkout
+  $scope.submitted = false
 
   # Bind to local storage
   $scope.fieldsToBind = ["bill_address", "email", "payment_method_id", "shipping_method_id", "ship_address"]
-  prefix = "order_#{Checkout.order.id}#{CurrentUser?.id}#{CurrentHub.hub.id}"
+  prefix = "order_#{Checkout.order.id}#{CurrentUser.id or ""}#{CurrentHub.hub.id}"
 
   for field in $scope.fieldsToBind
     storage.bind $scope, "Checkout.order.#{field}",
@@ -15,8 +16,12 @@ Darkswarm.controller "CheckoutCtrl", ($scope, storage, Checkout, CurrentUser, Cu
   $scope.order = Checkout.order # Ordering is important
   $scope.secrets = Checkout.secrets
 
-  $scope.enabled = if CurrentUser then true else false
+  $scope.enabled = !!CurrentUser.id?
 
-  $scope.purchase = (event)->
+  $scope.purchase = (event, form) ->
     event.preventDefault()
-    $scope.Checkout.submit()
+    $scope.submitted = true
+    if form.$valid
+      $scope.Checkout.submit()
+    else
+      $scope.$broadcast 'purchaseFormInvalid', form

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

@@ -20,4 +20,8 @@ Darkswarm.controller "PaymentCtrl", ($scope, $timeout) ->
   $scope.years = [moment().year()..(moment().year()+15)]
   $scope.secrets.card_month = "1"
   $scope.secrets.card_year = moment().year()
+
+  $scope.summary = ->
+    [$scope.Checkout.paymentMethod()?.name]
+
   $timeout $scope.onTimeout

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

@@ -3,5 +3,8 @@ Darkswarm.controller "ShippingCtrl", ($scope, $timeout, ShippingMethods) ->
   $scope.ShippingMethods = ShippingMethods
   $scope.name = "shipping"
   $scope.nextPanel = "payment"
+
+  $scope.summary = ->
+    [$scope.Checkout.shippingMethod()?.name]
   
   $timeout $scope.onTimeout 

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

@@ -1,13 +1,14 @@
-Darkswarm.controller "HubsCtrl", ($scope, Hubs, Search, $document, $rootScope, HashNavigation, FilterSelectorsService, MapModal) ->
-  $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.openModal = MapModal.open
+  $scope.filtersActive = false
 
   $scope.$watch "query", (query)->
     Search.search query

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

@@ -1,14 +0,0 @@
-Darkswarm.controller "ProducersCtrl", ($scope, Producers, $filter, FilterSelectorsService, Search, MapModal) ->
-  $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.show_profiles = false
-  $scope.openModal = MapModal.open
-
-  $scope.$watch "query", (query)->
-    Search.search query

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

@@ -5,14 +5,13 @@ Darkswarm.controller "ProductsCtrl", ($scope, $rootScope, Products, OrderCycle,
   $scope.clearAll =  FilterSelectorsService.clearAll
   $scope.filterText =  FilterSelectorsService.filterText
   $scope.FilterSelectorsService =  FilterSelectorsService
+  $scope.filtersActive = true
   $scope.limit = 3
-  $scope.ordering = 
-    order: "primary_taxon.name"
   $scope.order_cycle = OrderCycle.order_cycle
 
   $scope.incrementLimit = ->
     if $scope.limit < Products.products.length
-      $scope.limit = $scope.limit + 1 
+      $scope.limit = $scope.limit + 1
 
   $scope.searchKeypress = (e)->
     code = e.keyCode || e.which

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

@@ -3,7 +3,7 @@ Darkswarm.controller "RegistrationCtrl", ($scope, RegistrationService, Enterpris
   $scope.enterprise = EnterpriseRegistrationService.enterprise
   $scope.select = RegistrationService.select
 
-  $scope.steps = ['details','address','contact','about','images','social']
+  $scope.steps = ['details','contact','type','about','images','social']
 
   $scope.countries = availableCountries
 

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/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/inline_flash.js.coffee

@@ -1,6 +0,0 @@
-Darkswarm.directive "ofnInlineFlash", ->
-  restrict: 'E'
-  controller: ($scope) ->
-    $scope.visible = true
-    $scope.closeFlash = ->
-      $scope.visible = false

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

@@ -3,7 +3,7 @@ Darkswarm.directive "ofnRegistrationLimitModal", (Navigation, $modal, Loading) -
   link: (scope, elem, attr)->
     scope.modalInstance = $modal.open
       templateUrl: 'registration/limit_reached.html'
-      windowClass: "login-modal large"
+      windowClass: "login-modal register-modal xlarge"
       backdrop: 'static'
 
     scope.modalInstance.result.then scope.close, scope.close

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

@@ -1,15 +1,14 @@
-# Convert number to string currency using injected currency configuration.
-#
-# @requires currencyConfig json - /app/serializers/api/currency_config_serializer.rb
-# @return: string
 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 be a passed in as a string.
+    # 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.
+    # 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

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/show_profiles.js.coffee

@@ -1,7 +0,0 @@
-Darkswarm.filter 'showProfiles', ()->
-  (enterprises, show_profiles) ->
-    enterprises ||= []
-    show_profiles ?= true
-
-    enterprises.filter (enterprise)=>
-      show_profiles or enterprise.has_shopfront

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

@@ -20,7 +20,7 @@ window.FieldsetMixin = ($scope)->
     not ($scope.dirty(path) and $scope.invalid(path))
 
   $scope.dirty = (name)->
-    $scope.field(name).$dirty
+    $scope.field(name).$dirty || $scope.submitted
 
   $scope.invalid = (name)->
     $scope.field(name).$invalid

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

@@ -1,4 +1,4 @@
-Darkswarm.factory "AuthenticationService", (Navigation, $modal, $location, Redirections)->
+Darkswarm.factory "AuthenticationService", (Navigation, $modal, $location, Redirections, Loading)->
 
   new class AuthenticationService
     selectedPath: "/login"
@@ -25,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

@@ -43,6 +43,11 @@ Darkswarm.factory 'Cart', (CurrentOrder, Variants, $timeout, $http)->
       @line_items.filter (li)->
         li.quantity > 0
 
+    total_item_count: =>
+      @line_items_present().reduce (sum,li) ->
+        sum = sum + li.quantity
+      , 0
+
     empty: =>
       @line_items_present().length == 0
 
@@ -62,4 +67,4 @@ Darkswarm.factory 'Cart', (CurrentOrder, Variants, $timeout, $http)->
         variant: variant
         quantity: null
         max_quantity: null
-      @line_items.push variant.line_item
+      @line_items.push variant.line_item

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/current_user.js.coffee

@@ -1,7 +1,4 @@
 Darkswarm.factory 'CurrentUser', (user)-> # This is for the current user
-  if user and !$.isEmptyObject(user)
-    new class CurrentUser
-      constructor: ->
-        @[k] = v for k, v of user
-  else
-    undefined
+  new class CurrentUser
+    constructor: ->
+      @[k] = v for k, v of user if user and !$.isEmptyObject(user)

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/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/hash_navigation.js.coffee

@@ -1,9 +1,14 @@
 Darkswarm.factory 'HashNavigation', ($location) ->
   new class HashNavigation
-    hash: null 
+    hash: null
+
+    constructor: ->
+      # Make sure we have a path as hashes
+      # dont seem to work so well without them
+      $location.path("") if !$location.path()
 
     active: (hash)->
-      $location.hash() == hash 
+      $location.hash() == hash
 
     navigate: (hash)->
       @hash = hash

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.has_hub_listing
-      @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/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,6 +5,7 @@ Darkswarm.factory 'Variants', ->
       @variants[variant.id] ||= @extend variant
 
     extend: (variant)->
+      # 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)

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()