Adding shortcuts for both sales tax reports to the reports index

Add a new "Invoice" page in the admin backend
with a checkbox to toggle between layouts

Gemfile

@@ -9,7 +9,7 @@ gem 'i18n', '~> 0.6.11'
 gem 'nokogiri', '>= 1.6.7.1'
 
 gem 'pg'
-gem 'spree', github: 'openfoodfoundation/spree', branch: '1-3-stable'
+gem 'spree', github: 'openfoodfoundation/spree', branch: 'spree-upgrade-step1c'
 gem 'spree_i18n', github: 'spree/spree_i18n', branch: '1-3-stable'
 gem 'spree_auth_devise', github: 'spree/spree_auth_devise', branch: '1-3-stable'
 
@@ -50,7 +50,7 @@ gem 'gmaps4rails'
 gem 'spinjs-rails'
 gem 'rack-ssl', :require => 'rack/ssl'
 gem 'custom_error_message', :github => 'jeremydurham/custom-err-msg'
-gem 'angularjs-file-upload-rails', '~> 1.1.0'
+gem 'angularjs-file-upload-rails', '~> 1.1.6'
 gem 'roadie-rails', '~> 1.0.3'
 gem 'figaro'
 gem 'blockenspiel'
@@ -87,8 +87,10 @@ gem "foundation-rails"
 gem 'foundation_rails_helper', github: 'willrjmarshall/foundation_rails_helper', branch: "rails3"
 
 gem 'jquery-rails'
+gem 'jquery-migrate-rails'
 gem 'css_splitter'
 
+gem 'ofn-qz', github: 'openfoodfoundation/ofn-qz'
 
 group :test, :development do
   # Pretty printed test output

Gemfile.lock

@@ -22,46 +22,56 @@ GIT
       spree_core (~> 1.3.4)
 
 GIT
-  remote: git://github.com/openfoodfoundation/spree.git
-  revision: 6e3edfe40a5de8eba0095b2c5f3db9ea54c3afda
-  branch: 1-3-stable
+  remote: git://github.com/openfoodfoundation/ofn-qz.git
+  revision: 024680ccea429b2e5428d7b964fa67c52add34ec
   specs:
-    spree (1.3.6.beta)
-      spree_api (= 1.3.6.beta)
-      spree_cmd (= 1.3.6.beta)
-      spree_core (= 1.3.6.beta)
-      spree_promo (= 1.3.6.beta)
-      spree_sample (= 1.3.6.beta)
-    spree_api (1.3.6.beta)
-      spree_core (= 1.3.6.beta)
+    ofn-qz (0.1.0)
+      railties (~> 3.1)
+
+GIT
+  remote: git://github.com/openfoodfoundation/spree.git
+  revision: a4c439570b77afa50f9e36299811f293232bd281
+  branch: spree-upgrade-step1c
+  specs:
+    spree (1.3.99)
+      spree_api (= 1.3.99)
+      spree_cmd (= 1.3.99)
+      spree_core (= 1.3.99)
+      spree_dash (= 1.3.99)
+      spree_promo (= 1.3.99)
+      spree_sample (= 1.3.99)
+    spree_api (1.3.99)
+      spree_core (= 1.3.99)
       versioncake (= 0.4.0)
-    spree_cmd (1.3.6.beta)
+    spree_cmd (1.3.99)
       thor (>= 0.14.6)
-    spree_core (1.3.6.beta)
-      activemerchant (~> 1.34)
+    spree_core (1.3.99)
+      activemerchant (~> 1.50.0)
       acts_as_list (= 0.1.4)
       awesome_nested_set (= 2.1.5)
       aws-sdk (~> 1.11.1)
       cancan (= 1.6.8)
       deface (>= 0.9.0)
       ffaker (~> 1.15.0)
-      highline (= 1.6.18)
-      jquery-rails (~> 2.2.0)
+      highline (= 1.6.11)
+      jquery-rails (~> 2.0)
       json (>= 1.5.5)
-      kaminari (= 0.14.1)
-      money (= 5.1.1)
+      kaminari (= 0.13.0)
+      money (= 5.0.0)
       paperclip (~> 3.0)
       rabl (= 0.7.2)
-      rails (~> 3.2.16)
+      rails (~> 3.2.13)
       ransack (= 0.7.2)
-      select2-rails (= 3.5.9.3)
-      state_machine (= 1.1.2)
+      select2-rails (~> 3.2)
+      state_machine (= 1.2.0)
       stringex (~> 1.3.2)
-      truncate_html (~> 0.5.5)
-    spree_promo (1.3.6.beta)
-      spree_core (= 1.3.6.beta)
-    spree_sample (1.3.6.beta)
-      spree_core (= 1.3.6.beta)
+    spree_dash (1.3.99)
+      httparty (~> 0.8.1)
+      spree_core (= 1.3.99)
+    spree_promo (1.3.99)
+      spree_core (= 1.3.99)
+    spree_sample (1.3.99)
+      spree_core (= 1.3.99)
 
 GIT
   remote: git://github.com/spree/deface.git
@@ -123,8 +133,8 @@ GEM
       sprockets (~> 2.2.1)
     active_model_serializers (0.8.3)
       activemodel (>= 3.0)
-    activemerchant (1.57.0)
-      activesupport (>= 3.2.14, < 5.1)
+    activemerchant (1.50.0)
+      activesupport (>= 3.2.14, < 5.0.0)
       builder (>= 2.1.2, < 4.0.0)
       i18n (>= 0.6.9)
       nokogiri (~> 1.4)
@@ -151,7 +161,7 @@ GEM
       railties (>= 3.1)
       sprockets (~> 2)
       tilt
-    angularjs-file-upload-rails (1.1.0)
+    angularjs-file-upload-rails (1.1.6)
     angularjs-rails (1.5.5)
     ansi (1.4.2)
     arel (3.0.3)
@@ -167,9 +177,7 @@ GEM
     bcrypt-ruby (3.1.5)
       bcrypt (>= 3.1.3)
     blockenspiel (0.4.5)
-    bugsnag (1.5.2)
-      httparty (>= 0.6, < 1.0)
-      multi_json (~> 1.0)
+    bugsnag (4.1.0)
     builder (3.0.4)
     byebug (2.7.0)
       columnize (~> 0.3)
@@ -189,7 +197,7 @@ GEM
     climate_control (0.0.3)
       activesupport (>= 3.0)
     cliver (0.3.2)
-    cocaine (0.5.7)
+    cocaine (0.5.8)
       climate_control (>= 0.0.3, < 1.0)
     coderay (1.0.9)
     coffee-rails (3.2.2)
@@ -404,12 +412,12 @@ GEM
       zeus
     haml (4.0.4)
       tilt
-    highline (1.6.18)
+    highline (1.6.11)
     hike (1.2.3)
     http_parser.rb (0.5.3)
-    httparty (0.13.1)
-      json (~> 1.8)
-      multi_xml (>= 0.5.2)
+    httparty (0.8.3)
+      multi_json (~> 1.0)
+      multi_xml
     i18n (0.6.11)
     immigrant (0.1.6)
       activerecord (>= 3.0)
@@ -417,16 +425,18 @@ GEM
     inflecto (0.0.2)
     ipaddress (0.8.0)
     journey (1.0.4)
-    jquery-rails (2.2.2)
+    jquery-migrate-rails (1.2.1)
+    jquery-rails (2.3.0)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     json (1.8.3)
     json_spec (1.1.1)
       multi_json (~> 1.0)
       rspec (~> 2.0)
-    kaminari (0.14.1)
+    kaminari (0.13.0)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
+      railties (>= 3.0.0)
     kgio (2.9.3)
     knapsack (1.5.1)
       rake
@@ -449,8 +459,9 @@ GEM
     mini_portile2 (2.0.0)
     momentjs-rails (2.5.1)
       railties (>= 3.1)
-    money (5.1.1)
-      i18n (~> 0.6.0)
+    money (5.0.0)
+      i18n (~> 0.4)
+      json
     multi_json (1.12.1)
     multi_xml (0.5.5)
     newrelic_rpm (3.12.0.288)
@@ -494,7 +505,7 @@ GEM
       activesupport (>= 2.3.14)
       multi_json (~> 1.0)
     rack (1.4.7)
-    rack-cache (1.2)
+    rack-cache (1.6.1)
       rack (>= 0.4)
     rack-livereload (0.3.15)
       rack
@@ -521,7 +532,7 @@ GEM
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
     raindrops (0.13.0)
-    rake (10.4.2)
+    rake (11.1.2)
     ransack (0.7.2)
       actionpack (~> 3.0)
       activerecord (~> 3.0)
@@ -571,7 +582,7 @@ GEM
       railties (~> 3.2.0)
       sass (>= 3.1.10)
       tilt (~> 1.3)
-    select2-rails (3.5.9.3)
+    select2-rails (3.5.10)
       thor (~> 0.14)
     shoulda-matchers (1.1.0)
       activesupport (>= 3.0.0)
@@ -583,14 +594,14 @@ GEM
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    state_machine (1.1.2)
+    state_machine (1.2.0)
     stringex (1.3.3)
     therubyracer (0.12.0)
       libv8 (~> 3.16.14.0)
       ref
     thor (0.19.1)
     tilt (1.4.1)
-    timecop (0.6.2.2)
+    timecop (0.8.1)
     timers (1.1.0)
     treetop (1.4.15)
       polyglot
@@ -601,7 +612,7 @@ GEM
       sprockets (>= 2.0.0)
     turn (0.8.3)
       ansi
-    tzinfo (0.3.44)
+    tzinfo (0.3.49)
     uglifier (2.7.1)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
@@ -645,7 +656,7 @@ DEPENDENCIES
   acts-as-taggable-on (~> 3.4)
   andand
   angular-rails-templates (~> 0.2.0)
-  angularjs-file-upload-rails (~> 1.1.0)
+  angularjs-file-upload-rails (~> 1.1.6)
   angularjs-rails (= 1.5.5)
   atomic
   awesome_print
@@ -682,6 +693,7 @@ DEPENDENCIES
   haml
   i18n (~> 0.6.11)
   immigrant
+  jquery-migrate-rails
   jquery-rails
   json_spec
   knapsack
@@ -689,6 +701,7 @@ DEPENDENCIES
   momentjs-rails
   newrelic_rpm
   nokogiri (>= 1.6.7.1)
+  ofn-qz!
   oj
   paper_trail (~> 3.0.8)
   paperclip
@@ -728,5 +741,8 @@ DEPENDENCIES
   wicked_pdf
   wkhtmltopdf-binary
 
+RUBY VERSION
+   ruby 2.1.5p273
+
 BUNDLED WITH
-   1.12.5
+   1.14.3

app/assets/javascripts/admin/all.js

@@ -6,6 +6,7 @@
 //
 
 //= require jquery
+//= require jquery-migrate-min
 //= require jquery_ujs
 //= require jquery-ui
 //= require shared/jquery-ui-timepicker-addon
@@ -36,6 +37,7 @@
 //= require ./order_cycles/order_cycles
 //= require ./payment_methods/payment_methods
 //= require ./products/products
+//= require ./resources/resources
 //= require ./shipping_methods/shipping_methods
 //= require ./side_menu/side_menu
 //= require ./tag_rules/tag_rules

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

@@ -22,7 +22,7 @@ angular.module("ofn.admin").controller "AdminProductEditCtrl", ($scope, $timeout
 
 
     $scope.producers = producers
-    $scope.taxons = Taxons.taxons
+    $scope.taxons = Taxons.all
     $scope.tax_categories = tax_categories
     $scope.filterProducers = [{id: "0", name: ""}].concat $scope.producers
     $scope.filterTaxons = [{id: "0", name: ""}].concat $scope.taxons

app/assets/javascripts/admin/customers/controllers/customers_controller.js.coffee

@@ -3,8 +3,8 @@ angular.module("admin.customers").controller "customersCtrl", ($scope, $q, $filt
   $scope.availableCountries = availableCountries
   $scope.RequestMonitor = RequestMonitor
   $scope.submitAll = pendingChanges.submitAll
-  $scope.add = Customers.add
   $scope.customerLimit = 20
+  $scope.customers = Customers.all
   $scope.columns = Columns.columns
 
   $scope.confirmRefresh = (event) ->
@@ -16,7 +16,6 @@ angular.module("admin.customers").controller "customersCtrl", ($scope, $q, $filt
       Customers.index({enterprise_id: $scope.shop_id}).then (data) ->
         pendingChanges.removeAll()
         $scope.customers_form.$setPristine()
-        $scope.customers = data
 
   $scope.shop_id = shops[0].id if shops.length == 1
 

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

@@ -11,7 +11,7 @@ angular.module("admin.enterprises")
     $scope.StatusMessage = StatusMessage
 
     $scope.$watch 'enterprise_form.$dirty', (newValue) ->
-      StatusMessage.display 'notice', 'You have unsaved changes' if newValue
+      StatusMessage.display 'notice', t('admin.unsaved_changes') if newValue
 
     $scope.setFormDirty = ->
       $scope.$apply ->
@@ -24,13 +24,12 @@ angular.module("admin.enterprises")
       $scope.navClear()
       enterprise_form.submit()
 
-
     # 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 .
+    # 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."
+      if $scope.enterprise_form.$dirty
+        t('admin.unsaved_confirm_leave')
 
     # Register the NavigationCheck callback
     NavigationCheck.register(enterpriseNavCallback)
@@ -39,6 +38,8 @@ angular.module("admin.enterprises")
       if manager.id?
         for i, user of $scope.Enterprise.users when user.id == manager.id
           $scope.Enterprise.users.splice i, 1
+        if $scope.enterprise_form?
+          $scope.enterprise_form.$setDirty()
 
     $scope.addManager = (manager) ->
       if manager.id? and manager.email?

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

@@ -6,7 +6,6 @@ angular.module("admin.enterprises")
 
     $scope.menu.setItems [
       { name: 'primary_details', label: t('primary_details'), icon_class: "icon-home" }
-      { name: 'users', label: t('users'), icon_class: "icon-user" }
       { name: 'address', label: t('address'), icon_class: "icon-map-marker" }
       { name: 'contact', label: t('contact'), icon_class: "icon-phone" }
       { name: 'social', label: t('social'), icon_class: "icon-twitter" }
@@ -20,11 +19,11 @@ angular.module("admin.enterprises")
       { name: 'inventory_settings', label: t('inventory_settings'), icon_class: "icon-list-ol", show: "enterpriseIsShop()" }
       { name: 'tag_rules', label: t('tag_rules'), icon_class: "icon-random", show: "enterpriseIsShop()" }
       { name: 'shop_preferences', label: t('shop_preferences'), icon_class: "icon-shopping-cart", show: "enterpriseIsShop()" }
+      { name: 'users', label: t('users'), icon_class: "icon-user" }
     ]
 
     $scope.select(0)
 
-
     $scope.showItem = (item) ->
       if item.show?
         $parse(item.show)($scope)

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

@@ -0,0 +1,16 @@
+angular.module('admin.enterprises').directive 'enterpriseSwitcher', (NavigationCheck) ->
+  restrict: 'A'
+  require: 'ngModel'
+  link: (scope, element, attr, ngModel) ->
+    initial = element[0].getAttribute('data-initial')
+
+    element.on 'change', ->
+      if not NavigationCheck.confirmLeave()
+        # Reset the current dropdown selection if staying on page
+        ngModel.$setViewValue initial
+        ngModel.$render()
+        element.select2 'val', initial
+        return
+
+      NavigationCheck.clear() # Don't ask twice if leaving
+      window.location = element[0].querySelector('option[selected]').getAttribute('data-url')

app/assets/javascripts/admin/index_utils/directives/ofn-select2.js.coffee

@@ -3,19 +3,42 @@ angular.module("admin.indexUtils").directive "ofnSelect2", ($sanitize, $timeout,
   restrict: 'C'
   scope:
     data: "="
-    minSearch: "@?"
-    text: "@?"
+    minSearch: "@"
+    text: "@"
     blank: "=?"
     filter: "=?"
     onSelecting: "=?"
+    multiple: '@'
   link: (scope, element, attrs, ngModel) ->
     $timeout ->
-      scope.text ||= 'name'
-      scope.filter ||= -> true
+      scope.text ?= 'name'
+      scope.multiple ?= false
+      scope.filter ?= -> true
+
+      if scope.data.$promise
+        scope.data.$promise.then -> init()
+      else
+        init()
+
+    element.on "select2-opening", scope.onSelecting || angular.noop
+
+    attrs.$observe 'disabled', (value) ->
+      element.select2('enable', !value)
+
+    ngModel.$formatters.push (value) ->
+      element.select2('val', value)
+      value
+
+    ngModel.$parsers.push (value) ->
+      return value.split(",") if scope.multiple
+      value
+
+    init = ->
       scope.data.unshift(scope.blank) if scope.blank? && typeof scope.blank is "object"
 
       item.name = $sanitize(item.name) for item in scope.data
       element.select2
+        multiple: scope.multiple
         minimumResultsForSearch: scope.minSearch || 0
         data: ->
           filtered = $filter('filter')(scope.data,scope.filter)
@@ -24,12 +47,3 @@ angular.module("admin.indexUtils").directive "ofnSelect2", ($sanitize, $timeout,
           item[scope.text]
         formatResult: (item) ->
           item[scope.text]
-
-      element.on "select2-opening", scope.onSelecting || angular.noop
-
-    attrs.$observe 'disabled', (value) ->
-      element.select2('enable', !value)
-
-    ngModel.$formatters.push (value) ->
-      element.select2('val', value)
-      value

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

@@ -1 +1 @@
-angular.module("admin.indexUtils", ['ngResource', 'ngSanitize', 'templates', 'admin.utils']).config ($httpProvider) ->
+angular.module("admin.indexUtils", ['admin.resources', 'ngSanitize', 'templates', 'admin.utils']).config ($httpProvider) ->

app/assets/javascripts/admin/index_utils/services/dereferencer.js.coffee

@@ -3,7 +3,8 @@ angular.module("admin.indexUtils").factory 'Dereferencer', ->
     dereference: (array, data)->
       if array
         for object, i in array
-          array[i] = data[object.id]
+          match = data[object.id]
+          array[i] = match if match?
 
     dereferenceAttr: (array, attr, data)->
       if array

app/assets/javascripts/admin/line_items/controllers/line_items_controller.js.coffee

@@ -1,4 +1,4 @@
-angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout, $http, $q, StatusMessage, Columns, Dereferencer, Orders, LineItems, Enterprises, OrderCycles, blankOption, VariantUnitManager, RequestMonitor) ->
+angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout, $http, $q, StatusMessage, Columns, Dereferencer, Orders, LineItems, Enterprises, OrderCycles, VariantUnitManager, RequestMonitor) ->
   $scope.initialized = false
   $scope.RequestMonitor = RequestMonitor
   $scope.filteredLineItems = []
@@ -15,31 +15,31 @@ angular.module("admin.lineItems").controller 'LineItemsCtrl', ($scope, $timeout,
     LineItems.allSaved() || confirm(t("unsaved_changes_warning"))
 
   $scope.resetSelectFilters = ->
-    $scope.distributorFilter = blankOption().id
-    $scope.supplierFilter = blankOption().id
-    $scope.orderCycleFilter = blankOption().id
+    $scope.distributorFilter = 0
+    $scope.supplierFilter = 0
+    $scope.orderCycleFilter = 0
     $scope.quickSearch = ""
 
   $scope.refreshData = ->
-    unless !$scope.orderCycleFilter? || $scope.orderCycleFilter == "0"
-      $scope.startDate = OrderCycles.orderCyclesByID[$scope.orderCycleFilter].first_order
-      $scope.endDate = OrderCycles.orderCyclesByID[$scope.orderCycleFilter].last_order
+    unless !$scope.orderCycleFilter? || $scope.orderCycleFilter == 0
+      $scope.startDate = OrderCycles.byID[$scope.orderCycleFilter].first_order
+      $scope.endDate = OrderCycles.byID[$scope.orderCycleFilter].last_order
 
     RequestMonitor.load $scope.orders = Orders.index("q[state_not_eq]": "canceled", "q[completed_at_not_null]": "true", "q[completed_at_gt]": "#{parseDate($scope.startDate)}", "q[completed_at_lt]": "#{parseDate($scope.endDate)}")
     RequestMonitor.load $scope.lineItems = LineItems.index("q[order][state_not_eq]": "canceled", "q[order][completed_at_not_null]": "true", "q[order][completed_at_gt]": "#{parseDate($scope.startDate)}", "q[order][completed_at_lt]": "#{parseDate($scope.endDate)}")
 
     unless $scope.initialized
-      RequestMonitor.load $scope.distributors = Enterprises.index(includeBlank: true, action: "for_line_items", ams_prefix: "basic", "q[sells_in][]": ["own", "any"])
-      RequestMonitor.load $scope.orderCycles = OrderCycles.index(includeBlank: true, ams_prefix: "basic", as: "distributor", "q[orders_close_at_gt]": "#{daysFromToday(-90)}")
-      RequestMonitor.load $scope.suppliers = Enterprises.index(includeBlank: true, action: "for_line_items", ams_prefix: "basic", "q[is_primary_producer_eq]": "true")
+      RequestMonitor.load $scope.distributors = Enterprises.index(action: "for_line_items", ams_prefix: "basic", "q[sells_in][]": ["own", "any"])
+      RequestMonitor.load $scope.orderCycles = OrderCycles.index(ams_prefix: "basic", as: "distributor", "q[orders_close_at_gt]": "#{daysFromToday(-90)}")
+      RequestMonitor.load $scope.suppliers = Enterprises.index(action: "for_line_items", ams_prefix: "basic", "q[is_primary_producer_eq]": "true")
 
     RequestMonitor.load $q.all([$scope.orders.$promise, $scope.distributors.$promise, $scope.orderCycles.$promise]).then ->
-      Dereferencer.dereferenceAttr $scope.orders, "distributor", Enterprises.enterprisesByID
-      Dereferencer.dereferenceAttr $scope.orders, "order_cycle", OrderCycles.orderCyclesByID
+      Dereferencer.dereferenceAttr $scope.orders, "distributor", Enterprises.byID
+      Dereferencer.dereferenceAttr $scope.orders, "order_cycle", OrderCycles.byID
 
     RequestMonitor.load $q.all([$scope.orders.$promise, $scope.suppliers.$promise, $scope.lineItems.$promise]).then ->
-      Dereferencer.dereferenceAttr $scope.lineItems, "supplier", Enterprises.enterprisesByID
-      Dereferencer.dereferenceAttr $scope.lineItems, "order", Orders.ordersByID
+      Dereferencer.dereferenceAttr $scope.lineItems, "supplier", Enterprises.byID
+      Dereferencer.dereferenceAttr $scope.lineItems, "order", Orders.byID
       $scope.bulk_order_form.$setPristine()
       StatusMessage.clear()
       unless $scope.initialized

app/assets/javascripts/admin/line_items/filters/select_filter.js.coffee

@@ -1,8 +1,8 @@
-angular.module("admin.lineItems").filter "selectFilter", (blankOption, RequestMonitor) ->
+angular.module("admin.lineItems").filter "selectFilter", (RequestMonitor) ->
     return (lineItems,selectedSupplier,selectedDistributor,selectedOrderCycle) ->
       filtered = []
       unless RequestMonitor.loading
-        filtered.push lineItem for lineItem in lineItems when (angular.equals(selectedSupplier,"0") || lineItem.supplier.id == selectedSupplier) &&
-          (angular.equals(selectedDistributor,"0") || lineItem.order.distributor.id == selectedDistributor) &&
-          (angular.equals(selectedOrderCycle,"0") || lineItem.order.order_cycle.id == selectedOrderCycle)
+        filtered.push lineItem for lineItem in lineItems when (angular.equals(selectedSupplier,0) || lineItem.supplier.id == selectedSupplier) &&
+          (angular.equals(selectedDistributor,0) || lineItem.order.distributor.id == selectedDistributor) &&
+          (angular.equals(selectedOrderCycle,0) || lineItem.order.order_cycle.id == selectedOrderCycle)
       filtered

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

@@ -68,6 +68,7 @@ angular.module('admin.orderCycles')
     $scope.removeCoordinatorFee = ($event, index) ->
       $event.preventDefault()
       OrderCycle.removeCoordinatorFee(index)
+      $scope.order_cycle_form.$dirty = true
 
     $scope.addExchangeFee = ($event, exchange) ->
       $event.preventDefault()
@@ -76,6 +77,7 @@ angular.module('admin.orderCycles')
     $scope.removeExchangeFee = ($event, exchange, index) ->
       $event.preventDefault()
       OrderCycle.removeExchangeFee(exchange, index)
+      $scope.order_cycle_form.$dirty = true
 
     $scope.removeDistributionOfVariant = (variant_id) ->
       OrderCycle.removeDistributionOfVariant(variant_id)

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

@@ -1,4 +1,4 @@
-angular.module('admin.orderCycles', ['ngResource', 'admin.utils', 'admin.indexUtils', 'ngTagsInput'])
+angular.module('admin.orderCycles', ['admin.utils', 'admin.indexUtils', 'ngTagsInput'])
 
   .config ($httpProvider) ->
     $httpProvider.defaults.headers.common['X-CSRF-Token'] = $('meta[name=csrf-token]').attr('content')

app/assets/javascripts/admin/payment_methods/controllers/payment_methods_controller.js.coffee

@@ -1,3 +1,3 @@
 angular.module("admin.paymentMethods").controller "paymentMethodsCtrl", ($scope, PaymentMethods) ->
   $scope.findPaymentMethodByID = (id) ->
-    $scope.PaymentMethod = PaymentMethods.findByID(id)
+    $scope.PaymentMethod = PaymentMethods.byID[id]

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

@@ -1,8 +0,0 @@
-angular.module("admin.paymentMethods")
-  .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/products/products.js.coffee

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

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

@@ -0,0 +1 @@
+angular.module("admin.resources", ['ngResource'])

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

@@ -1,4 +1,4 @@
-angular.module("admin.customers").factory 'CustomerResource', ($resource) ->
+angular.module("admin.resources").factory 'CustomerResource', ($resource) ->
   $resource('/admin/customers/:id.json', {}, {
     'index':
       method: 'GET'

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

@@ -1,4 +1,4 @@
-angular.module("admin.enterprises").factory 'EnterpriseResource', ($resource) ->
+angular.module("admin.resources").factory 'EnterpriseResource', ($resource) ->
   ignoredAttrs = ->
     ["$$hashKey", "producer", "package", "producerError", "packageError", "status"]
 

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

@@ -1,4 +1,4 @@
-angular.module("admin.lineItems").factory 'LineItemResource', ($resource) ->
+angular.module("admin.resources").factory 'LineItemResource', ($resource) ->
   $resource('/admin/:orders/:order_number/line_items/:id.json', {}, {
     'index':
       method: 'GET'

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

@@ -1,4 +1,4 @@
-angular.module("admin.orderCycles").factory 'OrderCycleResource', ($resource) ->
+angular.module("admin.resources").factory 'OrderCycleResource', ($resource) ->
   $resource('/admin/order_cycles/:id/:action.json', {}, {
     'index':
       method: 'GET'

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

@@ -1,4 +1,4 @@
-angular.module("admin.orders").factory 'OrderResource', ($resource) ->
+angular.module("admin.resources").factory 'OrderResource', ($resource) ->
   $resource('/admin/orders/:id/:action.json', {}, {
     'index':
       method: 'GET'

app/assets/javascripts/admin/resources/services/customers.js.coffee

@@ -1,19 +1,24 @@
-angular.module("admin.customers").factory "Customers", ($q, InfoDialog, RequestMonitor, CustomerResource, CurrentShop) ->
+angular.module("admin.resources").factory "Customers", ($q, InfoDialog, RequestMonitor, CustomerResource, CurrentShop) ->
   new class Customers
-    customers: []
+    all: []
+    byID: {}
+    pristineByID: {}
 
     add: (email) ->
       params =
         enterprise_id: CurrentShop.shop.id
         email: email
       CustomerResource.create params, (customer) =>
-        @customers.unshift customer if customer.id
+        if customer.id
+          @all.unshift customer
+          @byID[customer.id] = customer
+          @pristineByID[customer.id] = angular.copy(customer)
 
     remove: (customer) ->
       params = id: customer.id
       CustomerResource.destroy params, =>
-        i = @customers.indexOf customer
-        @customers.splice i, 1 unless i < 0
+        i = @all.indexOf customer
+        @all.splice i, 1 unless i < 0
       , (response) =>
         errors = response.data.errors
         if errors?
@@ -22,10 +27,17 @@ angular.module("admin.customers").factory "Customers", ($q, InfoDialog, RequestM
           InfoDialog.open 'error', "Could not delete customer: #{customer.email}"
 
     index: (params) ->
-      request = CustomerResource.index(params, (data) => @customers = data)
+      @clear()
+      request = CustomerResource.index(params, (data) => @load(data))
       RequestMonitor.load(request.$promise)
       request.$promise
 
+    load: (customers) ->
+      for customer in customers
+        @all.push customer
+        @byID[customer.id] = customer
+        @pristineByID[customer.id] = angular.copy(customer)
+
     update: (address, customer, addressType) ->
       params =
         id: customer.id
@@ -33,3 +45,5 @@ angular.module("admin.customers").factory "Customers", ($q, InfoDialog, RequestM
           "#{addressType}_attributes": address
       CustomerResource.update params
 
+    clear: ->
+      @all.length = 0

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

@@ -1,21 +1,18 @@
-angular.module("admin.enterprises").factory 'Enterprises', ($q, EnterpriseResource, blankOption) ->
+angular.module("admin.resources").factory 'Enterprises', ($q, EnterpriseResource) ->
   new class Enterprises
-    enterprisesByID: {}
+    byID: {}
     pristineByID: {}
 
     index: (params={}, callback=null) ->
-      includeBlank = !!params['includeBlank']
-      delete params['includeBlank']
-      EnterpriseResource.index(params, (data) =>
-        for enterprise in data
-          @enterprisesByID[enterprise.id] = enterprise
-          @pristineByID[enterprise.id] = angular.copy(enterprise)
-
+      EnterpriseResource.index params, (data) =>
+        @load(data)
         (callback || angular.noop)(data)
-
-        data.unshift(blankOption()) if includeBlank
         data
-      )
+
+    load: (enterprises) ->
+      for enterprise in enterprises
+        @byID[enterprise.id] = enterprise
+        @pristineByID[enterprise.id] = angular.copy(enterprise)
 
     save: (enterprise) ->
       deferred = $q.defer()

app/assets/javascripts/admin/resources/services/line_items.js.coffee

@@ -1,23 +1,25 @@
-angular.module("admin.lineItems").factory 'LineItems', ($q, LineItemResource) ->
+angular.module("admin.resources").factory 'LineItems', ($q, LineItemResource) ->
   new class LineItems
-    lineItemsByID: {}
+    byID: {}
     pristineByID: {}
 
     index: (params={}, callback=null) ->
     	LineItemResource.index params, (data) =>
-        @resetData()
-        for lineItem in data
-          @lineItemsByID[lineItem.id] = lineItem
-          @pristineByID[lineItem.id] = angular.copy(lineItem)
-
+        @load(data)
         (callback || angular.noop)(data)
 
     resetData: ->
-      @lineItemsByID = {}
+      @byID = {}
       @pristineByID = {}
 
+    load: (lineItems) ->
+      @resetData()
+      for lineItem in lineItems
+        @byID[lineItem.id] = lineItem
+        @pristineByID[lineItem.id] = angular.copy(lineItem)
+
     saveAll: ->
-      for id, lineItem of @lineItemsByID
+      for id, lineItem of @byID
         lineItem.errors = {} # removes errors when line_item has been returned to original state
         @save(lineItem) if !@isSaved(lineItem)
 
@@ -34,7 +36,7 @@ angular.module("admin.lineItems").factory 'LineItems', ($q, LineItemResource) ->
       deferred.promise
 
     allSaved: ->
-      for id, lineItem of @lineItemsByID
+      for id, lineItem of @byID
         return false unless @isSaved(lineItem)
       true
 
@@ -54,7 +56,7 @@ angular.module("admin.lineItems").factory 'LineItems', ($q, LineItemResource) ->
       deferred = $q.defer()
       lineItem.$delete({id: lineItem.id, orders: "orders", order_number: lineItem.order.number})
       .then( (data) =>
-        delete @lineItemsByID[lineItem.id]
+        delete @byID[lineItem.id]
         delete @pristineByID[lineItem.id]
         (callback || angular.noop)(data)
         deferred.resolve(data)

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

@@ -1,21 +1,24 @@
-angular.module("admin.orderCycles").factory 'OrderCycles', ($q, OrderCycleResource, blankOption) ->
+angular.module("admin.resources").factory 'OrderCycles', ($q, $injector, OrderCycleResource) ->
   new class OrderCycles
-    orderCyclesByID: {}
+    all: []
+    byID: {}
     pristineByID: {}
 
+    constructor: ->
+      if $injector.has('orderCycles')
+        @load($injector.get('orderCycles'))
+
     index: (params={}, callback=null) ->
-      includeBlank = !!params['includeBlank']
-      delete params['includeBlank']
-      OrderCycleResource.index(params, (data) =>
-        for orderCycle in data
-          @orderCyclesByID[orderCycle.id] = orderCycle
-          @pristineByID[orderCycle.id] = angular.copy(orderCycle)
-
+      OrderCycleResource.index params, (data) =>
+        @load(data)
         (callback || angular.noop)(data)
-
-        data.unshift(blankOption()) if includeBlank
         data
-      )
+
+    load: (orderCycles) ->
+      for orderCycle in orderCycles
+        @all.push orderCycle
+        @byID[orderCycle.id] = orderCycle
+        @pristineByID[orderCycle.id] = angular.copy(orderCycle)
 
     save: (order_cycle) ->
       deferred = $q.defer()

app/assets/javascripts/admin/resources/services/orders.js.coffee

@@ -1,16 +1,18 @@
-angular.module("admin.orders").factory 'Orders', ($q, OrderResource) ->
+angular.module("admin.resources").factory 'Orders', ($q, OrderResource) ->
   new class Orders
-    ordersByID: {}
+    byID: {}
     pristineByID: {}
 
     index: (params={}, callback=null) ->
     	OrderResource.index params, (data) =>
-        for order in data
-          @ordersByID[order.id] = order
-          @pristineByID[order.id] = angular.copy(order)
-
+        @load(data)
         (callback || angular.noop)(data)
 
+    load: (orders) ->
+      for order in orders
+        @byID[order.id] = order
+        @pristineByID[order.id] = angular.copy(order)
+
     save: (order) ->
       deferred = $q.defer()
       order.$update({id: order.number})

app/assets/javascripts/admin/resources/services/payment_methods.js.coffee

@@ -0,0 +1,16 @@
+angular.module("admin.resources")
+  .factory "PaymentMethods", ($injector) ->
+    new class PaymentMethods
+      paymentMethods: []
+      byID: {}
+      pristineByID: {}
+
+      constructor: ->
+        if $injector.has('paymentMethods')
+          @load($injector.get('paymentMethods'))
+
+      load: (paymentMethods) ->
+        for paymentMethod in paymentMethods
+          @paymentMethods.push paymentMethod
+          @byID[paymentMethod.id] = paymentMethod
+          @pristineByID[paymentMethod.id] = angular.copy(paymentMethod)

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

@@ -0,0 +1,16 @@
+angular.module("admin.resources")
+  .factory "ShippingMethods", ($injector) ->
+    new class ShippingMethods
+      shippingMethods: []
+      byID: {}
+      pristineByID: {}
+
+      constructor: ->
+        if $injector.has('shippingMethods')
+          @load($injector.get('shippingMethods'))
+
+      load: (shippingMethods) ->
+        for shippingMethod in shippingMethods
+          @shippingMethods.push shippingMethod
+          @byID[shippingMethod.id] = shippingMethod
+          @pristineByID[shippingMethod.id] = angular.copy(shippingMethod)

app/assets/javascripts/admin/shipping_methods/controllers/shipping_methods_controller.js.coffee

@@ -1,3 +1,3 @@
 angular.module("admin.shippingMethods").controller "shippingMethodsCtrl", ($scope, ShippingMethods) ->
   $scope.findShippingMethodByID = (id) ->
-    $scope.ShippingMethod = ShippingMethods.findByID(id)
+    $scope.ShippingMethod = ShippingMethods.byID[id]

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

@@ -1,8 +0,0 @@
-angular.module("admin.shippingMethods")
-  .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/tag_rules/controllers/tag_rules_controller.js.coffee

@@ -38,7 +38,6 @@ angular.module("admin.tagRules").controller "TagRulesCtrl", ($scope, $http, $fil
         newRule.peferred_exchange_tags = []
         newRule.preferred_matched_order_cycles_visibility = "visible"
     tagGroup.rules.push(newRule)
-    $scope.enterprise_form.$setDirty()
     $scope.updateRuleCounts()
 
   $scope.addNewTag = ->
@@ -58,3 +57,4 @@ angular.module("admin.tagRules").controller "TagRulesCtrl", ($scope, $http, $fil
         .success ->
           tagGroup.rules.splice(index, 1)
           $scope.updateRuleCounts()
+          $scope.enterprise_form.$setDirty()

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

@@ -1,19 +1,20 @@
 angular.module("admin.taxons").factory "Taxons", (taxons, $filter) ->
   new class Taxons
-    taxons: taxons
-    taxonsByID: {}
+    all: []
+    byID: {}
 
     constructor: ->
-      for taxon in @taxons
-        @taxonsByID[taxon.id] = taxon
+      for taxon in taxons
+        @all.push taxon
+        @byID[taxon.id] = taxon
 
     # For finding a single Taxon
     findByID: (id) ->
-      @taxonsByID[id]
+      @byID[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]
+      @byID[taxon_id] for taxon_id in ids.split(",") when @byID[taxon_id]
 
     findByTerm: (term) ->
-      $filter('filter')(@taxons, term)
+      $filter('filter')(@all, term)

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

@@ -30,8 +30,16 @@ show_flash_error = function(message) {
 }
 
 $(document).ready(function(){
-    $('a.close').click(function(event){
-      event.preventDefault();
-      $(this).parent().slideUp(250);
-    });
+  $('a.close').click(function(event){
+    event.preventDefault();
+    $(this).parent().slideUp(250);
+  });
+
+  // Spree locates hidden with prev(), which with our current version of jQuery
+  // does not locate the hidden field, resulting in the delete failing. This
+  // handler updates the hidden field, fixing the problem.
+  $('body').on('click', 'a.remove_fields', function() {
+    $(this).next("input[type=hidden]").val("1");
+    return false;
+  });
 });

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

@@ -1,2 +0,0 @@
-angular.module("admin.utils").value "blankOption", ->
-  { id: "0", name: "All" }

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

@@ -10,7 +10,6 @@ angular.module("admin.utils")
 
         $rootScope.$on "$locationChangeStart", @locationChangeStartHandler
 
-
       # Action for regular browser navigation.
       onBeforeUnloadHandler: ($event) =>
         message = @getMessage()
@@ -21,13 +20,17 @@ angular.module("admin.utils")
 
       # Action for angular navigation.
       locationChangeStartHandler: ($event) =>
-        message = @getMessage()
-        if message and not $window.confirm(message)
+        if not @confirmLeave()
           $event.stopPropagation() if $event.stopPropagation
           $event.preventDefault() if $event.preventDefault
           $event.cancelBubble = true
           $event.returnValue = false
 
+      # Check if leaving is okay
+      confirmLeave: =>
+        message = @getMessage()
+        !message or $window.confirm(message)
+
       # Runs callback functions to retreive most recently added non-empty message.
       getMessage: ->
         message = null

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

@@ -1,4 +1,4 @@
-Darkswarm.controller "ShoppingTabsCtrl", ($scope, $controller, Navigation) ->
+Darkswarm.controller "ShoppingTabsCtrl", ($scope, $controller, Navigation, $location) ->
   angular.extend this, $controller('TabsCtrl', {$scope: $scope})
 
   $scope.tabs =
@@ -6,3 +6,7 @@ Darkswarm.controller "ShoppingTabsCtrl", ($scope, $controller, Navigation) ->
     producers: { active: Navigation.isActive('/producers') }
     contact: { active: Navigation.isActive('/contact') }
     groups: { active: Navigation.isActive('/groups') }
+
+  $scope.$on '$locationChangeStart', (event, url) ->
+    tab = $location.path().replace(/^\//, '')
+    $scope.tabs[tab]?.active = true

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

@@ -15,7 +15,7 @@ Darkswarm.directive 'mapOsmTiles', ($timeout) ->
           if x < 0
             x = tilesPerGlobe + x
           # Wrap y (latitude) in a like manner if you want to enable vertical infinite scroll
-          'http://tile.openstreetmap.org/' + zoom + '/' + x + '/' + coord.y + '.png'
+          'https://a.tile.openstreetmap.org/' + zoom + '/' + x + '/' + coord.y + '.png'
         tileSize: new google.maps.Size(256, 256)
         name: 'OpenStreetMap'
         maxZoom: 18

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

@@ -4,5 +4,5 @@ Darkswarm.filter 'products', (Matcher) ->
     text ?= ""
     return products if text == ""
     products.filter (product) =>
-      propertiesToMatch = [product.name, product.supplier.name, product.primary_taxon.name]
+      propertiesToMatch = [product.name, product.variant_names, product.supplier.name, product.primary_taxon.name]
       Matcher.match propertiesToMatch, text

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

@@ -1,13 +1,17 @@
 Darkswarm.filter 'properties', ->
   # Filter anything that responds to object.supplied_properties
-  (objects, ids) ->
+  (objects, ids, source) ->
     objects ||= []
     ids ?= []
+
+    source ||= 'properties'
+    return [] unless source in ['properties', 'supplied_properties', 'distributed_properties']
+
     if ids.length == 0
       # No properties selected, pass all objects through.
       objects
     else
       objects.filter (obj) ->
-        properties = obj.supplied_properties || obj.properties
+        properties = obj[source]
         properties.some (property) ->
           property.id in ids

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

@@ -1,12 +1,12 @@
 Darkswarm.filter 'propertiesOf', ->
-  (objects) ->
+  (objects, source) ->
+    source ||= 'properties'
+    return {} unless source in ['properties', 'supplied_properties', 'distributed_properties']
+
     properties = {}
     for object in objects
-      if object.supplied_properties?
-        for property in object.supplied_properties
-          properties[property.id] = property
-      else
-        for property in object.properties
+      if object[source]?
+        for property in object[source]
           properties[property.id] = property
 
     properties

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

@@ -25,7 +25,6 @@ Darkswarm.factory 'Products', ($resource, Enterprises, Dereferencer, Taxons, Pro
           prices = (v.price for v in product.variants)
           product.price = Math.min.apply(null, prices)
         product.hasVariants = product.variants?.length > 0
-
         product.primaryImage = product.images[0]?.small_url if product.images
         product.primaryImageOrMissing = product.primaryImage || "/assets/noimage/small.png"
         product.largeImage = product.images[0]?.large_url if product.images
@@ -45,5 +44,7 @@ Darkswarm.factory 'Products', ($resource, Enterprises, Dereferencer, Taxons, Pro
         if product.variants
           product.variants = for variant in product.variants
             variant = Variants.register variant
+            if product.name != variant.name_to_display
+              product.variant_names += variant.name_to_display
             variant.product = product
             variant

app/assets/javascripts/templates/admin/links_dropdown.html.haml

@@ -1,7 +1,7 @@
 .ofn-drop-down
   %span
     %i.icon-check
-    Actions
+    = t('admin.actions')
     %i{ 'ng-class' => "expanded && 'icon-caret-up' || !expanded && 'icon-caret-down'" }
   %div.menu{ 'ng-show' => "expanded" }
     %a.menu_item{ 'ng-repeat' => "link in links", href: '{{link.url}}', target: "{{link.target || '_self'}}", data: { method: "{{ link.method || 'get' }}", confirm: "{{link.confirm}}" } }

app/assets/javascripts/templates/admin/modals/tag_rule_help.html.haml

@@ -1,18 +1,19 @@
 #tag-rule-help
   .margin-bottom-30.text-center
-    .text-big Tag Rules
+    .text-big
+      = t('js.admin.modals.tag_rule_help.title')
 
   .margin-bottom-30
-    .text-normal Overview
-    %p Tag rules provide a way to describe which items are visible or otherwise to which customers. Items can be Shipping Methods, Payment Methods, Products and Order Cycles.
+    .text-normal= t('js.admin.modals.tag_rule_help.overview')
+    %p= t('js.admin.modals.tag_rule_help.overview_text')
 
   .margin-bottom-30
-    .text-normal 'By Default...' Rules
-    %p Default rules allow you to hide items so that they are not visible by default. This behaviour can then be overriden by non-default rules for customers with particular tags.
+    .text-normal= t('js.admin.modals.tag_rule_help.by_default_rules')
+    %p= t('js.admin.modals.tag_rule_help.by_default_rules_text')
 
   .margin-bottom-30
-    .text-normal 'Customers Tagged...' Rules
-    %p By creating rules related to a specific customer tag, you can override the default behaviour (whether it be to show or to hide items) for customers with the specified tag.
+    .text-normal= t('js.admin.modals.tag_rule_help.customer_tagged_rules')
+    %p= t('js.admin.modals.tag_rule_help.customer_tagged_rules_text')
 
   .text-center
-    %input.button.red.icon-plus{ type: 'button', value: 'Got it', ng: { click: 'close()' } }
+    %input.button.red.icon-plus{ type: 'button', value: t('js.admin.modals.got_it'), ng: { click: 'close()' } }

app/assets/javascripts/templates/admin/new_tag_rule_dialog.html.haml

@@ -1,6 +1,6 @@
 #new-tag-rule-dialog
   .text-normal.margin-bottom-30.text-center
-    Select a rule type:
+    = t('js.admin.new_tag_rule_dialog.select_rule_type')
 
   .text-center.margin-bottom-30
     -# %select.fullwidth{ 'select2-min-search' => 5, 'ng-model' => 'newRuleType', 'ng-options' => 'ruleType.id as ruleType.name for ruleType in availableRuleTypes' }

app/assets/javascripts/templates/admin/panels/enterprise_package.html.haml

@@ -2,130 +2,128 @@
   .alpha.eight.columns
     %div{ ng: { if: "!enterprise.is_primary_producer", switch: "enterprise.sells" } }
       .info{ ng: { switch: { when: "none" } } }
-        %h3 Hub Profile
+        %h3= t('js.admin.panels.enterprise_package.hub_profile')
 
         %p
-          %strong COST: ALWAYS FREE
+          %strong= t('js.admin.panels.enterprise_package.hub_profile_cost')
 
-        %p People can find and contact you on the Open Food Network. Your enterprise will be visible on the map, and will be searchable in listings.
+        %p= t('js.admin.panels.enterprise_package.hub_profile_text1')
 
-        %p Having a profile, and making connections within your local food system through the Open Food Network will always be free.
+        %p= t('js.admin.panels.enterprise_package.hub_profile_text2')
 
       .info{ ng: { switch: { when: "any" } } }
-        %h3 Hub Shop
+        %h3= t('js.admin.panels.enterprise_package.hub_shop')
 
         %p
           %strong
             %monthly-pricing-description{ joiner: "comma" }
 
-        %p Your enterprise is the backbone of your local food system. You aggregate produce from other enterprises and can sell it through your shop on the Open Food Network.
+        %p= t('js.admin.panels.enterprise_package.hub_shop_text1')
 
-        %p Hubs can take many forms, whether they be a food co-op, a buying group, a veggie-box program, or a local grocery store.
+        %p= t('js.admin.panels.enterprise_package.hub_shop_text2')
 
-        %p If you also want to sell your own products, you will need to switch this enterprise to be a producer.
+        %p= t('js.admin.panels.enterprise_package.hub_shop_text3')
 
       .info{ ng: { switch: { default: true } } }
         %h3
-          Please Choose a Package
+          = t('js.admin.panels.enterprise_package.choose_package')
           %i.icon-arrow-right
 
         %p
-          %strong Your enterprise will not be fully activated until a package is selected from the options on the left.
+          %strong= t('js.admin.panels.enterprise_package.choose_package_text1')
 
         %p
-          Click on an option to see more detailed information about each package, and hit the red SAVE button when you are done!
-
-
+          = t('js.admin.panels.enterprise_package.choose_package_text2')
 
     %div{ ng: { if: "enterprise.is_primary_producer", switch: "enterprise.sells" } }
       .info{ ng: { switch: { when: "none" } } }
-        %h3 Profile Only
+        %h3= t('js.admin.panels.enterprise_package.profile_only')
 
         %p
-          %strong COST: ALWAYS FREE
+          %strong= t('js.admin.panels.enterprise_package.profile_only_cost')
 
-        %p A profile makes you visible and contactable to others and is a way to share your story.
+        %p= t('js.admin.panels.enterprise_package.profile_only_text1')
 
-        %p If you prefer to focus on producing food, and want to leave the work of selling it to someone else, you won't require a shop on the Open Food Network.
+        %p= t('js.admin.panels.enterprise_package.profile_only_text2')
 
-        %p Add your products to Open Food Network, allowing hubs to stock your products in their stores.
+        %p= t('js.admin.panels.enterprise_package.profile_only_text3')
 
       .info{ ng: { switch: { when: "own" } } }
-        %h3 Producer Shop
+        %h3= t('js.admin.panels.enterprise_package.producer_shop')
 
         %p
           %strong
             %monthly-pricing-description{ joiner: "comma" }
 
-        %p Sell your products directly to customers through your very own Open Food Network shopfront.
+        %p= t('js.admin.panels.enterprise_package.producer_shop_text1')
 
-        %p A Producer Shop is for your produce only, if you want to sell produce grown/produced off site, please select 'Producer Hub'.
+        %p= t('js.admin.panels.enterprise_package.producer_shop_text2')
 
       .info{ ng: { switch: { when: "any" } } }
-        %h3 Producer Hub
+        %h3= t('js.admin.panels.enterprise_package.producer_hub')
 
         %p
           %strong
             %monthly-pricing-description{ joiner: "comma" }
 
-        %p Your enterprise is the backbone of your local food system. You can sell your own produce as well as produce aggregated from other enterprises through your shopfront on the Open Food Network.
+        %p= t('js.admin.panels.enterprise_package.producer_hub_text1')
 
-        %p Producer Hubs can take many forms, whether they be a CSA, a veggie-box program, or a food co-op with a rooftop garden.
+        %p= t('js.admin.panels.enterprise_package.producer_hub_text2')
 
-        %p The Open Food Network aims to support as many hub models as possible, so no matter your situation, we want to provide the tools you need to run your organisation or local food business.
+        %p= t('js.admin.panels.enterprise_package.producer_hub_text3')
 
       .info{ ng: { switch: { default: true } } }
         %h3
-          Please Choose a Package
+          = t('js.admin.panels.enterprise_package.choose_package')
           %i.icon-arrow-right
 
         %p
-          %strong Your producer enterprise will not be fully activated until a package is selected from the options on the left.
+          %strong= t('js.admin.panels.enterprise_package.choose_package_text1')
 
         %p
-          Click on an option to see more detailed information about each package, and hit the red SAVE button when you are done!
+          = t('js.admin.panels.enterprise_package.choose_package_text2')
 
   .omega.eight.columns{ ng: { switch: "enterprise.is_primary_producer" } }
     %div{ ng: { switch: { when: "false" } } }
       %a.button.selector.hub-profile{ ng: { click: "enterprise.owned && (enterprise.sells='none')", class: "{selected: enterprise.sells=='none', disabled: !enterprise.owned}" } }
         .top
-          %h3 Profile Only
-          %p Get a listing
-        .bottom ALWAYS FREE
+          %h3= t('js.admin.panels.enterprise_package.profile_only')
+          %p= t('js.admin.panels.enterprise_package.get_listing')
+        .bottom= t('js.admin.panels.enterprise_package.always_free')
       %a.button.selector.hub{ ng: { click: "enterprise.owned && (enterprise.sells='any')", class: "{selected: enterprise.sells=='any', disabled: !enterprise.owned}" } }
         .top
-          %h3 Hub Shop
-          %p Sell produce from others
+          %h3= t('js.admin.panels.enterprise_package.hub_shop')
+          %p= t('js.admin.panels.enterprise_package.sell_produce_others')
         .bottom
           %monthly-pricing-description{ joiner: "newline" }
 
     %div{ ng: { switch: { when: "true" } } }
       %a.button.selector.producer-profile{ ng: { click: "enterprise.owned && (enterprise.sells='none')", class: "{selected: enterprise.sells=='none', disabled: !enterprise.owned}" } }
         .top
-          %h3 Profile Only
-          %p Get a listing
-        .bottom ALWAYS FREE
+          %h3= t('js.admin.panels.enterprise_package.profile_only')
+          %p= t('js.admin.panels.enterprise_package.get_listing')
+        .bottom= t('js.admin.panels.enterprise_package.always_free')
       %a.button.selector.producer-shop{ ng: { click: "enterprise.owned && (enterprise.sells='own')", class: "{selected: enterprise.sells=='own', disabled: !enterprise.owned}" } }
         .top
-          %h3 Producer Shop
-          %p Sell your own produce
+          %h3= t('js.admin.panels.enterprise_package.producer_shop')
+          %p= t('js.admin.panels.enterprise_package.sell_own_produce')
         .bottom
           %monthly-pricing-description{ joiner: "newline" }
 
       %a.button.selector.producer-hub{ ng: { click: "enterprise.owned && (enterprise.sells='any')", class: "{selected: enterprise.sells=='any', disabled: !enterprise.owned}" } }
         .top
-          %h3 Producer Hub
-          %p Sell produce from self and others
+          %h3= t('js.admin.panels.enterprise_package.producer_hub')
+          %p= t('js.admin.panels.enterprise_package.sell_both')
         .bottom
           %monthly-pricing-description{ joiner: "newline" }
 
     %a.button.update.fullwidth{ ng: { show: "enterprise.owned", class: "{disabled: saved() && !saving, saving: saving}", click: "save()" } }
       %span{ ng: {hide: "saved() || saving" } }
-        SAVE
+        = t('js.admin.panels.save')
         %i.icon-save
       %span{ ng: {show: "saved() && !saving" } }
-        SAVED
+        = t('js.admin.panels.saved')
         %i.icon-ok-sign
       %span{ ng: {show: "saving" } }
-        SAVING
+        = t('js.admin.panels.saving')
         %i.icon-refresh

app/assets/javascripts/templates/admin/panels/enterprise_producer.html.haml

@@ -1,39 +1,37 @@
 .row.enterprise_producer_panel{ ng: { controller: 'indexProducerPanelCtrl' } }
-
   .alpha.eight.columns
     .info{ ng: { show: "enterprise.is_primary_producer==true" } }
-      %h3 Producer
-      %p Producers make yummy things to eat &/or drink. You're a producer if you grow it, raise it, brew it, bake it, ferment it, milk it or mould it.
-
-      %p Producers can also perform other functions, such as aggregating food from other enterprises and selling it through a shop on the Open Food Network.
+      %h3= t('js.admin.panels.enterprise_producer.producer')
+      %p= t('js.admin.panels.enterprise_producer.producer_text1')
 
+      %p= t('js.admin.panels.enterprise_producer.producer_text2')
 
     .info{ ng: { show: "enterprise.is_primary_producer==false" } }
-      %h3 Non-Producer
-      %p Non-producers do not produce any food themselves, meaning that they cannot create their own products for sale through the Open Food Network.
+      %h3= t('js.admin.panels.enterprise_producer.non_producer')
+      %p= t('js.admin.panels.enterprise_producer.non_producer_text1')
 
-      %p Instead, non-producers specialise in linking producers to the end eater, whether it be by aggregating, grading, packing, selling or delivering food.
+      %p= t('js.admin.panels.enterprise_producer.non_producer_text2')
 
   .omega.eight.columns
     %a.button.selector.producer{ ng: { click: 'enterprise.owned && changeToProducer()', class: "{selected: enterprise.is_primary_producer==true, disabled: !enterprise.owned}" } }
       .top
-        %h3 PRODUCER
-        %p Producers of food
-      .bottom eg. GROWERS, BAKERS, BREWERS, MAKERS
+        %h3= t('js.admin.panels.enterprise_producer.producer')
+        %p= t('js.admin.panels.enterprise_producer.producer_desc')
+      .bottom= t('js.admin.panels.enterprise_producer.producer_example')
 
     %a.button.selector.non-producer{ ng: { click: 'enterprise.owned && changeToNonProducer()', class: "{selected: enterprise.is_primary_producer==false, disabled: !enterprise.owned}" } }
       .top
-        %h3 Non-Producer
-        %p All other food enterprises
-      .bottom eg. Grocery stores, Food co-ops, Buying groups
+        %h3= t('js.admin.panels.enterprise_producer.non_producer')
+        %p= t('js.admin.panels.enterprise_producer.non_producer_desc')
+      .bottom= t('js.admin.panels.enterprise_producer.non_producer_example')
 
     %a.button.update.fullwidth{ ng: { show: "enterprise.owned", class: "{disabled: saved() && !saving, saving: saving}", click: "save()" } }
       %span{ ng: {hide: "saved() || saving" } }
-        SAVE
+        = t('js.admin.panels.save')
         %i.icon-save
       %span{ ng: {show: "saved() && !saving" } }
-        SAVED
+        = t('js.admin.panels.saved')
         %i.icon-ok-sign
       %span{ ng: {show: "saving" } }
-        SAVING
+        = t('js.admin.panels.saving')
         %i.icon-refresh

app/assets/javascripts/templates/admin/panels/enterprise_status.html.haml

@@ -1,18 +1,17 @@
 .row.enterprise_status_panel{ ng: { controller: 'indexStatusPanelCtrl' } }
   .alpha.omega.sixteen.columns
-
     %h4.status-ok.text-center{ ng: { show: "issues.length == 0 && warnings.length == 0" } }
       %i.icon-ok-sign
-      {{ object.name }} is set up and ready to go!
+      = t('js.admin.panels.enterprise_status.status_title', name: '{{ object.name }}')
 
     %table{ ng: { show: "issues.length > 0 || warnings.length > 0" } }
       %thead
         %th.severity
-          Severity
+          = t('js.admin.panels.enterprise_status.severity')
         %th.description
-          Description
+          = t('js.admin.panels.enterprise_status.description')
         %th.resolve
-          Resolve
+          = t('js.admin.panels.enterprise_status.resolve')
       %tr{ ng: { repeat: "issue in issues"} }
         %td.severity
           %i.icon-warning-sign.issue

app/assets/javascripts/templates/admin/panels/exchange_distributed_products.html.haml

@@ -14,9 +14,6 @@
       .exchange-product{'ng-repeat' => 'product in supplied_products | filter:productSuppliedToOrderCycle | visibleProducts:exchange:order_cycle.visible_variants_for_outgoing_exchanges | orderBy:"name"' }
         .exchange-product-details
           %label
-            -# MASTER_VARIANTS: No longer required
-            -# = check_box_tag 'order_cycle_outgoing_exchange_{{ $parent.$index }}_variants_{{ product.master_id }}', 1, 1, 'ng-hide' => 'product.variants.length > 0', 'ng-model' => 'exchange.variants[product.master_id]', 'id' => 'order_cycle_outgoing_exchange_{{ $parent.$index }}_variants_{{ product.master_id }}',
-            -# 'ng-disabled' => 'product.variants.length > 0 || !order_cycle.editable_variants_for_outgoing_exchanges.hasOwnProperty(exchange.enterprise_id) || order_cycle.editable_variants_for_outgoing_exchanges[exchange.enterprise_id].indexOf(product.master_id) < 0'
             %img{'ng-src' => '{{ product.image_url }}'}
             .name {{ product.name }}
           .supplier {{ product.supplier_name }}

app/assets/javascripts/templates/admin/show_more.html.haml

@@ -1,4 +1,4 @@
 %div{ ng: { show: "data.length > limit" } }
-  %input{ type: 'button', value: 'Show More', ng: { click: 'limit = limit + increment' } }
+  %input{ type: 'button', value: t(:show_more), ng: { click: 'limit = limit + increment' } }
   or
-  %input{ type: 'button', value: "Show All ({{ data.length - limit }}  More)", ng: { click: 'limit = data.length' } }
+  %input{ type: 'button', value: t(:show_more_with_more, num: '{{ data.length - limit }}'), ng: { click: 'limit = data.length' } }

app/assets/javascripts/templates/admin/tag_autocomplete.html.haml

@@ -3,9 +3,9 @@
     {{$getDisplayText()}}
     %span.tag-with-rules{ ng: { if: "data.rules == 1" } }
       —
-      = t 'admin.has_one_rule'
+      = t('admin.has_one_rule')
     %span.tag-with-rules{ ng: { if: "data.rules > 1" } }
       —
-      = t 'admin.has_n_rules', { num: '{{data.rules}}' }
+      = t('admin.has_n_rules', { num: '{{data.rules}}' })
   %span{ ng: { if: "!data.rules" } }
     {{$getDisplayText()}}

app/assets/javascripts/templates/out_of_stock.html.haml

@@ -1,13 +1,13 @@
 %a.close-reveal-modal{"ng-click" => "$close()"}
   %i.ofn-i_009-close
 
-%h3 Reduced stock available
+%h3= t('js.out_of_stock.reduced_stock_available')
 
-%p While you've been shopping, the stock levels for one or more of the products in your cart have reduced. Here's what's changed:
+%p= t('js.out_of_stock.out_of_stock_text')
 
 %p{'ng-repeat' => "v in variants"}
   %em {{ v.name_to_display }} - {{ v.unit_to_display }}
   %span{'ng-if' => "v.count_on_hand == 0"}
-    is now out of stock.
+    = t('js.out_of_stock.now_out_of_stock')
   %span{'ng-if' => "v.count_on_hand > 0"}
-    now only has {{ v.count_on_hand }} remaining.
+    = t('js.out_of_stock.only_n_remainging', num: '{{ v.count_on_hand }}')

app/assets/javascripts/templates/registration.html.haml

@@ -1,10 +0,0 @@
-%div#registration-modal{"ng-controller" => "RegistrationCtrl"}
-  %div{ ng: { show: "currentStep() == 'introduction'" } }
-    %ng-include{ src: "'registration/introduction.html'" }
-  %div{ ng: { repeat: 'step in steps', show: "currentStep() == step" } }
-    %ng-include{ src: "'registration/'+ step + '.html'" }
-  %div{ ng: { show: "currentStep() == 'finished'" } }
-    %ng-include{ src: "'registration/finished.html'" }
-        
-%a.close-reveal-modal{"ng-click" => "$close()"}  
-  %i.ofn-i_009-close

app/assets/javascripts/templates/registration/about.html.haml

@@ -1,57 +0,0 @@
-.container#registration-about
-  %ng-include{ src: "'registration/steps.html'" }
-  .row
-    .small-12.columns
-      %header
-        %h2 {{'enterprise_about_headline' | t}}
-        %h5
-          {{'enterprise_about_message' | t}}
-          %span{ ng: { class: "{brick: !enterprise.is_primary_producer, turquoise: enterprise.is_primary_producer}" } }
-            {{ enterprise.name }}
-
-  %form{ name: 'about', novalidate: true, ng: { controller: "RegistrationFormCtrl", submit: "update('images',about)" } }
-    .row
-      .small-12.columns
-        .alert-box.info{ "ofn-inline-alert" => true, ng: { show: "visible" } }
-          %h6{ "ng-bind" => "'enterprise_success' | t:{enterprise: enterprise.name}" }
-          %span {{'enterprise_registration_exit_message' | t}}
-          %a.close{ ng: { click: "close()" } } ×
-
-      .small-12.large-8.columns
-        .row
-          .small-12.columns
-            .field
-              %label{ for: 'enterprise_description' } {{'enterprise_description' | t}}:
-              %input.chunky{ id: 'enterprise_description', placeholder: "{{'enterprise_description_placeholder' | t}}", ng: { model: 'enterprise.description' } }
-        .row
-          .small-12.columns
-            .field
-              %label{ for: 'enterprise_long_desc' } {{'enterprise_long_desc' | t}}:
-              %textarea.chunky{ id: 'enterprise_long_desc',  rows: 6, placeholder: "{{'enterprise_long_desc_placeholder' | t}}", ng: { model: 'enterprise.long_description' } }
-                %small{ "ng-bind" => "'enterprise_long_desc_length' | t:{num: enterprise.long_description.length}" }
-      .small-12.large-4.columns
-        .row
-          .small-12.columns
-            .field
-              %label{ for: 'enterprise_abn' } {{'enterprise_abn' | t}}:
-              %input.chunky{ id: 'enterprise_abn', placeholder: "{{'enterprise_abn_placeholder' | t}}", ng: { model: 'enterprise.abn' } }
-        .row
-          .small-12.columns
-            .field
-              %label{ for: 'enterprise_acn' } {{'enterprise_acn' | t}}:
-              %input.chunky{ id: 'enterprise_acn', placeholder: "{{'enterprise_acn_placeholder' | t}}", ng: { model: 'enterprise.acn' } }
-        .row
-          .small-12.columns
-            .field
-              %label{ for: 'enterprise_charges_sales_tax' }= t(:charges_sales_tax)
-              %input{ id: 'enterprise_charges_sales_tax_true', type: 'radio', name: 'charges_sales_tax', value: 'true', required: true, ng: { model: 'enterprise.charges_sales_tax' } }
-              %label{ for: 'enterprise_charges_sales_tax_true' } {{'say_yes' | t}}
-              %input{ id: 'enterprise_charges_sales_tax_false', type: 'radio', name: 'charges_sales_tax', value: 'false', required: true, ng: { model: 'enterprise.charges_sales_tax' } }
-              %label{ for: 'enterprise_charges_sales_tax_false' } {{'say_no' | t}}
-              %span.error.small-12.columns{ ng: { show: "about.charges_sales_tax.$error.required && submitted" } }
-                {{'enterprise_tax_required' | t}}
-
-    .row.buttons.pad-top
-      .small-12.columns
-        %input.button.primary.right{ type: "submit", value: "{{'continue' | t}}" }
-        

app/assets/javascripts/templates/registration/contact.html.haml

@@ -1,31 +0,0 @@
-.container#registration-contact
-  %ng-include{ src: "'registration/steps.html'" }
-  .row
-    .small-12.columns
-      %header
-        %h2 {{'registration_greeting' | t}}
-        %h5{ "ng-bind" => "'who_is_managing_enterprise' | t:{enterprise: enterprise.name}" }
-  
-  %form{ name: 'contact', novalidate: true, ng: { controller: "RegistrationFormCtrl", submit: "selectIfValid('type',contact)" } }
-    .row.content
-      .small-12.medium-12.large-7.columns
-        .row
-          .small-12.columns.field
-            %label{ for: 'enterprise_contact' } {{'enterprise_contact' | t}}:
-            %input.chunky.small-12.columns{ id: 'enterprise_contact', name: 'contact', required: true, placeholder: "Contact Name", ng: { model: 'enterprise.contact' } }
-            %span.error.small-12.columns{ ng: { show: "contact.contact.$error.required && submitted" } }
-              {{'enterprise_contact_required' | t}}
-        .row
-          .small-12.columns.field
-            %label{ for: 'enterprise_email_address' } {{'enterprise_email_address' | t}}:
-            %input.chunky.small-12.columns{ id: 'enterprise_email_address', name: 'email_address', type: 'email', placeholder: "eg. charlie@thefarm.com", ng: { model: 'enterprise.email_address' } }
-        .row
-          .small-12.columns.field
-            %label{ for: 'enterprise_phone' } {{'enterprise_phone' | t}}:
-            %input.chunky.small-12.columns{ id: 'enterprise_phone', name: 'phone', placeholder: "eg. (03) 1234 5678", ng: { model: 'enterprise.phone' } }
-      .small-12.medium-12.large-5.hide-for-small-only
-
-    .row.buttons
-      .small-12.columns
-        %input.button.secondary{ type: "button", value: "{{'back' | t}}", ng: { click: "select('details')" } }
-        %input.button.primary.right{ type: "submit", value: "{{'continue' | t}}" }

app/assets/javascripts/templates/registration/details.html.haml

@@ -1,64 +0,0 @@
-.container#registration-details
-  %ng-include{ src: "'registration/steps.html'" }
-  .row
-    .small-12.columns
-      %header
-        %h2 {{'registration_detail_headline' | t}}
-        %h5{ ng: { if: "::enterprise.type != 'own'" } } {{'registration_detail_enterprise' | t}}
-        %h5{ ng: { if: "::enterprise.type == 'own'" } } {{'registration_detail_producer' | t}}
-
-  %form{ name: 'details', novalidate: true, ng: { controller: "RegistrationFormCtrl", submit: "selectIfValid('contact',details)" } }
-
-    .row
-      .small-12.medium-9.large-12.columns.end
-        .field
-          %label{ for: 'enterprise_name', ng: { if: "::enterprise.type != 'own'" } } {{'registration_detail_name_enterprise' | t}}
-          %label{ for: 'enterprise_name', ng: { if: "::enterprise.type == 'own'" } } {{'registration_detail_name_producer' | t}}
-          %input.chunky{ id: 'enterprise_name', name: 'name', placeholder: "{{'registration_detail_name_placeholder' | t}}", required: true, ng: { model: 'enterprise.name' } }
-          %span.error{ ng: { show: "details.name.$error.required && submitted" } }
-            {{'registration_detail_name_error' | t}}
-
-    .row
-      .small-12.medium-9.large-6.columns
-        .field
-          %label{ for: 'enterprise_address' } {{'registration_detail_address1' | t}}
-          %input.chunky{ id: 'enterprise_address', name: 'address1', required: true, placeholder: "{{'registration_detail_address1_placeholder' | t}}", required: true, ng: { model: 'enterprise.address.address1' } }
-          %span.error{ ng: { show: "details.address1.$error.required && submitted" } }
-            {{'registration_detail_address1_error' | t}}
-        .field
-          %label{ for: 'enterprise_address2' } {{'registration_detail_address2' | t}}
-          %input.chunky{ id: 'enterprise_address2', name: 'address2', required: false, placeholder: "", required: false, ng: { model: 'enterprise.address.address2' } }
-
-      .small-12.medium-9.large-6.columns.end
-        .row
-          .small-12.medium-8.large-8.columns
-            .field
-              %label{ for: 'enterprise_city' } {{'registration_detail_suburb' | t}}
-              %input.chunky{ id: 'enterprise_city', name: 'city', required: true, placeholder: "{{'registration_detail_suburb_placeholder' | t}}", ng: { model: 'enterprise.address.city' } }
-              %span.error{ ng: { show: "details.city.$error.required && submitted" } }
-                {{'registration_detail_suburb_error' | t}}
-          .small-12.medium-4.large-4.columns
-            .field
-              %label{ for: 'enterprise_zipcode' } {{'registration_detail_postcode' | t}}
-              %input.chunky{ id: 'enterprise_zipcode', name: 'zipcode', required: true, placeholder: "{{'registration_detail_postcode_placeholder' | t}}", ng: { model: 'enterprise.address.zipcode' } }
-              %span.error{ ng: { show: "details.zipcode.$error.required && submitted" } }
-                {{'registration_detail_postcode_error' | t}}
-        .row
-          .small-12.medium-4.large-4.columns
-            .field
-              %label{ for: 'enterprise_state' } {{'registration_detail_state' | t}}
-              %select.chunky{ id: 'enterprise_state', name: 'state', ng: { model: 'enterprise.address.state_id', options: 's.id as s.abbr for s in enterprise.country.states', show: 'countryHasStates()', required: 'countryHasStates()' } }
-              %span.error{ ng: { show: "details.state.$error.required && submitted" } }
-                {{'registration_detail_state_error' | t}}
-          .small-12.medium-8.large-8.columns
-            .field
-              %label{ for: 'enterprise_country' } {{'registration_detail_country' | t}}
-              %select.chunky{ id: 'enterprise_country', name: 'country', required: true, ng: { model: 'enterprise.country', options: 'c as c.name for c in countries' } }
-              %span.error{ ng: { show: "details.country.$error.required && submitted" } }
-                {{'registration_detail_country_error' | t}}
-
-
-    .row.buttons
-      .small-12.columns
-        %hr
-        %input.button.primary.right{ type: "submit", value: "{{'continue' | t}}" }

app/assets/javascripts/templates/registration/finished.html.haml

@@ -1,15 +0,0 @@
-.container#registration-finished
-  .row
-    .small-12.columns.pad-top
-      %header
-        %h2 {{'registration_finished_headline' | t}}
-        .panel.callout
-          %p{ "ng-bind" => "'registration_finished_thanks' | t:{enterprise: enterprise.name}" }
-          %p {{'registration_finished_login' | t}}
-  .row
-    .small-12.columns.text-center
-      %h4{ "ng-bind" => "'registration_finished_activate' | t:{enterprise: enterprise.name}" }
-
-      %p{ "ng-bind-html" => "'registration_finished_activate_instruction_html' | t:{email: enterprise.email}"}
-
-      %a.button.primary{ type: "button", href: "/" } {{'registration_finished_action' | t}} >

app/assets/javascripts/templates/registration/images.html.haml

@@ -1,22 +0,0 @@
-.container#registration-images{ 'nv-file-drop' => true, uploader: "imageUploader", options:"{ alias: imageStep }", ng: { controller: "EnterpriseImageCtrl" } }
-  %ng-include{ src: "'registration/steps.html'" }
-  .row
-    .small-12.columns
-      %header
-        %h2 {{'registration_images_headline' | t}}
-        %h5 {{'registration_images_description' | t}}
-        
-  %form{ name: 'images', novalidate: true, ng: { controller: "RegistrationFormCtrl", submit: "select('social')" } }
-    .row{ ng: { repeat: 'image_step in imageSteps', show: "imageStep == image_step" } }
-      %ng-include{ src: "'registration/images/'+ image_step + '.html'" }
-
-    .row.buttons.pad-top{ ng: { if: "imageStep == 'logo'" } }
-      .small-12.columns
-        %input.button.secondary{ type: "button", value: "Back", ng: { click: "select('about')" } }
-         
-        %input.button.primary.right{ type: "button", value: "Continue", ng: { click: "imageSelect('promo')" } }
-
-    .row.buttons.pad-top{ ng: { if: "imageStep == 'promo'" } }
-      .small-12.columns
-        %input.button.secondary{ type: "button", value: "{{'back' | t}}", ng: { click: "imageSelect('logo')" } }
-          %input.button.primary.right{ type: "submit", value: "{{'continue' | t}}" }

app/assets/javascripts/templates/registration/images/logo.html.haml

@@ -1,45 +0,0 @@
-.small-12.medium-12.large-6.columns
-  .row
-    .small-12.columns.center
-      .row
-        .small-12.columns.center
-          %h4
-            {{'select_logo' | t}}
-      .row
-        .small-12.columns.center
-          %span.small
-            {{'logo_tip' | t}}
-      .row.pad-top
-        .small-12.columns
-          .image-select.small-12.columns
-            %label.small-12.columns.button{ for: 'image-select' } {{'logo_label' | t}}
-            %input#image-select{ type: 'file', hidden: true, 'nv-file-select' => true, uploader: "imageUploader", options: '{ alias: imageStep }' }
-  .row.show-for-large-up
-    .large-12.columns
-      %span#or.large-12.columns
-        {{'action_or' | t}}
-  .row.show-for-large-up
-    .large-12.columns
-      #image-over{ 'nv-file-over' => true, uploader: "imageUploader" }
-        {{'logo_drag' | t}}
-.small-12.medium-12.large-6.columns
-  .row
-    .small-12.columns.center
-      .row
-        .small-12.columns.center
-          %h4
-            {{'review_logo' | t}}
-      .row
-        .small-12.columns.center
-          %span.small
-            {{'review_logo_tip' | t}}
-      .row.pad-top
-        .small-12.columns.center
-          #image-placeholder.logo
-            %img{ ng: { show: "imageSrc() && !imageUploader.isUploading", src: '{{ imageSrc() }}' } }
-            .message{ ng: { hide: "imageSrc() || imageUploader.isUploading" } }
-              {{'logo_placeholder' | t}}
-            .loading{ ng: { hide: "!imageUploader.isUploading" } }
-              %img.spinner{ src: "/assets/spinning-circles.svg" }
-              %br/
-              {{'uploading' | t}}

app/assets/javascripts/templates/registration/images/promo.html.haml

@@ -1,43 +0,0 @@
-.small-12.medium-12.large-12.columns
-  .row
-    .small-12.columns.center
-      %h4
-        {{'select_promo_image' | t}}
-  .row
-    .small-12.medium-12.large-5.columns.center
-      .row
-        .small-12.columns.center
-          %span.small
-            {{'promo_image_tip' | t}}
-      .row.pad-top
-        .small-12.columns
-          .image-select.small-12.columns
-            %label.small-12.columns.button{ for: 'image-select' } {{'promo_image_label' | t}}
-            %input#image-select{ type: 'file', hidden: true, 'nv-file-select' => true, uploader: "imageUploader", options: '{ alias: imageStep }' }
-    .large-2.columns
-      %span#or.horizontal.large-12.columns
-        {{'action_or' | t}}
-    .large-5.columns
-      #image-over{ 'nv-file-over' => true, uploader: "imageUploader" }
-        {{'promo_image_drag' | t}}
-.small-12.medium-12.large-12.columns.pad-top
-  .row
-    .small-12.columns.center
-      %h4
-        {{'review_promo_image' | t}}
-  .row
-    .small-12.columns.center
-      .row
-        .small-12.columns.center
-          %span.small
-            {{'review_promo_image_tip' | t}}
-      .row.pad-top
-        .small-12.columns.center
-          #image-placeholder.promo
-            %img{ ng: { show: "imageSrc() && !imageUploader.isUploading", src: '{{ imageSrc() }}' } }
-            .message{ ng: { hide: "imageSrc() || imageUploader.isUploading" } }
-              {{'promo_image_placeholder' | t}}
-            .loading{ ng: { hide: "!imageUploader.isUploading" } }
-              %img.spinner{ src: "/assets/spinning-circles.svg" }
-              %br/
-              {{'uploading' | t}}

app/assets/javascripts/templates/registration/introduction.html.haml

@@ -1,41 +0,0 @@
-.row
-  .small-12.columns
-    %header
-      %h2 {{'registration_greeting' | t}}
-      %h4
-        %small
-          %i.ofn-i_040-hub
-        {{'registration_intro' | t}}
-    .hide-for-large-up
-      %hr
-      %input.button.small.primary{ type: "button", value: "{{'registration_action' | t}}", ng: { click: "select('details')" } } 
-    %hr 
-
-.row{ 'data-equalizer' => true }
-  .small-12.medium-12.large-6.columns.pad-top{ 'data-equalizer-watch' => true }
-    %h5 {{'registration_checklist' | t}}:
-    %ul.check-list
-      %li 
-        {{'registration_time' | t}}
-      %li 
-        {{'registration_enterprise_address' | t}}
-      %li 
-        {{'registration_contact_details' | t}}
-      %li 
-        {{'registration_logo' | t}}
-      %li 
-        {{'registration_promo_image' | t}}
-      %li 
-        {{'registration_about_us' | t}}
-
-  .small-9.medium-8.large-5.columns.pad-top.end{ 'data-equalizer-watch' => true}
-    %h5
-      {{'registration_outcome_headline' | t}}
-    %p{ "ng-bind-html" => "t('registration_outcome1_html')" }
-    %p {{'registration_outcome2' | t}}
-    %p {{'registration_outcome3' | t}}
-
-.row.show-for-large-up
-  .small-12.columns
-    %hr
-    %input.button.primary.right{ type: "button", value: "{{'registration_action' | t}}", ng: { click: "select('details')" } }

app/assets/javascripts/templates/registration/limit_reached.html.haml

@@ -1,16 +0,0 @@
-.row
-  .small-12.columns
-    %header
-      %h2 {{'limit_reached_headline' | t}}
-      %h4 {{'limit_reached_message' | t}}
-.row
-  .small-12.medium-3.large-2.columns.text-right.hide-for-small-only
-    %img{:src => "/assets/potatoes.png"}
-  .small-12.medium-9.large-10.columns
-    %p
-      {{'limit_reached_text' | t}}
-      %strong Open Food Network.
-.row
-  .small-12.columns
-    %hr
-    %input.button.primary{ type: "button", value: "{{'limit_reached_action' | t}}", ng: { click: "close()" } }

app/assets/javascripts/templates/registration/social.html.haml

@@ -1,45 +0,0 @@
-.container#registration-social
-  %ng-include{ src: "'registration/steps.html'" }
-
-  .row
-    .small-12.columns
-      %header
-        %h2 {{'enterprise_final_step' | t}}
-        %h5{ "ng-bind" => "'enterprise_social_text' | t:{enterprise: enterprise.name}" }
-
-  %form{ name: 'social', novalidate: true, ng: { controller: "RegistrationFormCtrl", submit: "update('finished',social)" } }
-    .row.content
-      .small-12.large-7.columns
-        .row
-          .small-12.columns
-            .field
-              %label{ for: 'enterprise_website' } {{'website' | t}}:
-              %input.chunky{ id: 'enterprise_website', placeholder: "{{'website_placeholder' | t}}", ng: { model: 'enterprise.website' } }
-        .row
-          .small-12.columns
-            .field
-              %label{ for: 'enterprise_facebook' } {{'facebook' | t}}:
-              %input.chunky{ id: 'enterprise_facebook', placeholder: "{{'facebook_placeholder' | t}}", ng: { model: 'enterprise.facebook' } }
-        .row
-          .small-12.columns
-            .field
-              %label{ for: 'enterprise_linkedin' } {{'linkedin' | t}}:
-              %input.chunky{ id: 'enterprise_linkedin', placeholder: "{{'linkedin_placeholder' | t}}", ng: { model: 'enterprise.linkedin' } }
-      .small-12.large-5.columns
-        .row
-          .small-12.columns
-            .field
-              %label{ for: 'enterprise_twitter' } {{'twitter' | t}}:
-              %input.chunky{ id: 'enterprise_twitter', placeholder: "{{'twitter_placeholder' | t}}", ng: { model: 'enterprise.twitter' } }
-        .row
-          .small-12.columns
-            .field
-              %label{ for: 'enterprise_instagram' } {{'instagram' | t}}:
-              %input.chunky{ id: 'enterprise_instagram', placeholder: "{{'instagram_placeholder' | t}}", ng: { model: 'enterprise.instagram' } }
-
-    .row.buttons
-      .small-12.columns
-        %input.button.secondary{ type: "button", value: "{{'back' | t}}", ng: { click: "select('images')" } }
-          %input.button.primary.right{ type: "submit", value: "{{'continue' | t}}" }
-
-

app/assets/javascripts/templates/registration/steps.html.haml

@@ -1,3 +0,0 @@
-.row#progress-bar
-  .small-12.medium-2.columns.item{ ng: { repeat: 'step in steps', class: "{active: (currentStep() == step),'show-for-medium-up': (currentStep() != step)}" } }
-    {{ $index+1 + ". " + step }}

app/assets/javascripts/templates/registration/type.html.haml

@@ -1,47 +0,0 @@
-.container#registration-type
-
-  %ng-include{ src: "'registration/steps.html'" }
-
-  .row
-    .small-12.columns
-      %header
-        %h2{ "ng-bind" => "'registration_type_headline' | t:{enterprise: enterprise.name}" }
-        %h4
-          {{'registration_type_question' | t}}
-
-  %form{ name: 'type', novalidate: true, ng: { controller: "RegistrationFormCtrl", submit: "create(type)" } }
-    .row#enterprise-types{ 'data-equalizer' => true, ng: { if: "::enterprise.type != 'own'" } }
-      .small-12.columns.field
-        .row
-          .small-12.medium-6.large-6.columns{ 'data-equalizer-watch' => true }
-            %a.btnpanel#producer-panel{ href: "#", ng: { click: "enterprise.is_primary_producer = true", class: "{selected: enterprise.is_primary_producer}" } }
-              %i.ofn-i_059-producer
-              %h4 {{'registration_type_producer' | t}}
-
-          .small-12.medium-6.large-6.columns{ 'data-equalizer-watch' => true }
-            %a.btnpanel#hub-panel{ href: "#", ng: { click: "enterprise.is_primary_producer = false", class: "{selected: enterprise.is_primary_producer == false}" } }
-              %i.ofn-i_063-hub
-              %h4 {{'registration_type_no_producer' | t}}
-
-        .row
-          .small-12.columns
-            %input.chunky{ id: 'enterprise_is_primary_producer', name: 'is_primary_producer', hidden: true, required: true, ng: { model: 'enterprise.is_primary_producer' } }
-            %span.error{ ng: { show: "type.is_primary_producer.$error.required && submitted" } }
-              {{'registration_type_error' | t}}
-        .row
-          .small-12.columns
-            .panel.callout
-              .left
-                %i.ofn-i_013-help
-                 
-              %p {{'registration_type_producer_help' | t}}
-            .panel.callout
-              .left
-                %i.ofn-i_013-help
-                 
-              %p {{'registration_type_no_producer_help' | t}}
-
-    .row.buttons
-      .small-12.columns
-        %input.button.secondary{ type: "button", value: "{{'back' | t}}", ng: { click: "select('contact')" } }
-        %input.button.primary.right{ type: "submit", value: "{{'create_profile' | t}}" }

app/assets/stylesheets/admin/alert.css.sass

@@ -1,15 +0,0 @@
-.alert
-  border: 3px solid #919191
-  border-radius: 6px
-  margin-bottom: 20px
-  color: #919191
-  padding: 5px 10px
-  h6
-    color: #919191
-  .message
-    font-weight: bold
-  &:hover
-    border-color: #DA5354
-    color: #DA5354
-    h6
-      color: #DA5354

app/assets/stylesheets/admin/alert.css.scss

@@ -0,0 +1,24 @@
+.alert {
+  border: 3px solid #919191;
+  border-radius: 6px;
+  margin-bottom: 20px;
+  color: #919191;
+  padding: 5px 10px;
+
+  h6 {
+    color: #919191;
+  }
+
+  .message {
+    font-weight: bold;
+  }
+
+  &:hover {
+    border-color: #DA5354;
+    color: #DA5354;
+
+    h6 {
+      color: #DA5354;
+    }
+  }
+}

app/assets/stylesheets/admin/animations.css.scss

@@ -1,10 +1,14 @@
-@-webkit-keyframes slideInUp
-  0%
-    -webkit-transform: translateY(20px)
-    transform: translateY(20px)
-  100%
-    -webkit-transform: translateY(0)
-    transform: translateY(0)
+@-webkit-keyframes slideInUp {
+  0% {
+    -webkit-transform: translateY(20px);
+    transform: translateY(20px);
+  }
+
+  100% {
+    -webkit-transform: translateY(0);
+    transform: translateY(0);
+  }
+}
 
 // @-webkit-keyframes slideOutDown
 //   0%
@@ -14,13 +18,14 @@
 //     -webkit-transform: translateY(20px)
 //     transform: translateY(20px)
 
-.animate-show
-  -webkit-animation-name: slideInUp
-  animation-name: slideInUp
-  -webkit-animation-duration: 0.3s
-  animation-duration: 0.3s
-  -webkit-animation-fill-mode: both
-  animation-fill-mode: both
+.animate-show {
+  -webkit-animation-name: slideInUp;
+  animation-name: slideInUp;
+  -webkit-animation-duration: 0.3s;
+  animation-duration: 0.3s;
+  -webkit-animation-fill-mode: both;
+  animation-fill-mode: both;
+
   // line-height: 20px
   // opacity: 1
 
@@ -33,3 +38,4 @@
   //   animation-fill-mode: both
   //   // line-height: 20px
   //   // opacity: 1
+}

app/assets/stylesheets/admin/change_type_form.css.sass

@@ -1,72 +0,0 @@
-@import ../darkswarm/branding
-@import ../darkswarm/mixins
-
-#change_type
-  section
-    margin: 2em 0 0 0
-    &, & *
-      color: #5498da
-
-  .description
-    background-color: #eff5fc
-    margin-top: -2em
-    padding: 4em 2em 2em 1em
-    @media all and (max-width: 786px)
-      margin-bottom: 2em
-
-  .admin-cta
-    border: 1px solid #5498da
-    @include border-radius(3px)
-    text-align: center
-    padding: 1em
-
-  .error
-    display: block
-    color: #f57e80
-    border: 1px solid #f57e80
-    background-color: #fde6e7
-    @include border-radius(3px)
-    margin-bottom: 1em
-    padding: 0.5em
-
-  a.selector
-    position: relative
-    border: 2px solid black
-    text-align: center
-    width: 100%
-    cursor: pointer
-    &, & *
-      color: white
-    &:after, &:before
-      top: 100%
-      left: 50%
-      border: solid transparent
-      content: " "
-      height: 0
-      width: 0
-      position: absolute
-      pointer-events: none
-    &:after
-      border-color: rgba(136, 183, 213, 0)
-      border-top-color: #5498da
-      border-width: 12px
-      margin-left: -12px
-    &:hover
-      &:after
-        border-top-color: #9fc820
-    &:before
-      border-color: rgba(84, 152, 218, 0)
-      border-top-color: black
-      border-width: 15px
-      margin-left: -15px
-    .bottom
-      background: repeating-linear-gradient(60deg, rgba(84, 152, 218, 0), rgba(84, 152, 218, 0) 5px, rgba(255, 255, 255, 0.25) 5px, rgba(255, 255, 255, 0.25) 10px)
-      margin-top: 1em
-      margin-left: -15px
-      margin-right: -15px
-      padding: 5px
-      text-transform: uppercase
-    &.selected
-      background-color: black
-      &:after, &:hover &:after
-        border-top-color: black

app/assets/stylesheets/admin/change_type_form.css.scss

@@ -0,0 +1,103 @@
+@import "../darkswarm/branding";
+@import "../darkswarm/mixins";
+
+#change_type {
+  section {
+    margin: 2em 0 0 0;
+
+    &, & * {
+      color: #5498da;
+    }
+  }
+
+  .description {
+    background-color: #eff5fc;
+    margin-top: -2em;
+    padding: 4em 2em 2em 1em;
+
+    @media all and (max-width: 786px) {
+      margin-bottom: 2em;
+    }
+  }
+
+  .admin-cta {
+    border: 1px solid #5498da;
+
+    @include border-radius(3px);
+
+    text-align: center;
+    padding: 1em;
+  }
+
+  .error {
+    display: block;
+    color: #f57e80;
+    border: 1px solid #f57e80;
+    background-color: #fde6e7;
+
+    @include border-radius(3px);
+
+    margin-bottom: 1em;
+    padding: 0.5em;
+  }
+
+  a.selector {
+    position: relative;
+    border: 2px solid black;
+    text-align: center;
+    width: 100%;
+    cursor: pointer;
+
+    &, & * {
+      color: white;
+    }
+
+    &:after, &:before {
+      top: 100%;
+      left: 50%;
+      border: solid transparent;
+      content: " ";
+      height: 0;
+      width: 0;
+      position: absolute;
+      pointer-events: none;
+    }
+
+    &:after {
+      border-color: rgba(136, 183, 213, 0);
+      border-top-color: #5498da;
+      border-width: 12px;
+      margin-left: -12px;
+    }
+
+    &:hover {
+      &:after {
+        border-top-color: #9fc820;
+      }
+    }
+
+    &:before {
+      border-color: rgba(84, 152, 218, 0);
+      border-top-color: black;
+      border-width: 15px;
+      margin-left: -15px;
+    }
+
+    .bottom {
+      background: repeating-linear-gradient(60deg, rgba(84, 152, 218, 0), rgba(84, 152, 218, 0) 5px, rgba(255, 255, 255, 0.25) 5px, rgba(255, 255, 255, 0.25) 10px);
+      margin-top: 1em;
+      margin-left: -15px;
+      margin-right: -15px;
+      padding: 5px;
+      text-transform: uppercase;
+    }
+
+    &.selected {
+      background-color: black;
+
+      &:after, &:hover &:after {
+        border-top-color: black;
+      }
+    }
+  }
+}

app/assets/stylesheets/admin/components/save_bar.sass

@@ -1,14 +0,0 @@
-#save-bar
-  position: fixed
-  width: 100%
-  z-index: 100
-  bottom: 0px
-  left: 0
-  padding: 8px 8px
-  font-weight: bold
-  background-color: #eff5fc
-  color: #5498da
-  h5
-    color: #5498da
-  input
-    margin-right: 5px

app/assets/stylesheets/admin/components/save_bar.scss

@@ -0,0 +1,19 @@
+#save-bar {
+  position: fixed;
+  width: 100%;
+  z-index: 100;
+  bottom: 0px;
+  left: 0;
+  padding: 8px 8px;
+  font-weight: bold;
+  background-color: #eff5fc;
+  color: #5498da;
+
+  h5 {
+    color: #5498da;
+  }
+
+  input {
+    margin-right: 5px;
+  }
+}

app/assets/stylesheets/admin/components/trial_progess_bar.sass

@@ -1,9 +0,0 @@
-#trial_progress_bar
-  position: fixed
-  left: 0px
-  bottom: 0px
-  width: 100vw
-  padding: 8px 10px
-  font-weight: bold
-  background-color: #5498da
-  color: white

app/assets/stylesheets/admin/components/trial_progess_bar.scss

@@ -0,0 +1,10 @@
+#trial_progress_bar {
+  position: fixed;
+  left: 0px;
+  bottom: 0px;
+  width: 100vw;
+  padding: 8px 10px;
+  font-weight: bold;
+  background-color: #5498da;
+  color: white;
+}

app/assets/stylesheets/admin/dashboard-single-ent.css.sass

@@ -1,33 +0,0 @@
-@import ../darkswarm/mixins
-
-.alert-box
-  position: relative
-  display: block
-  background-color: #eff5dc
-  border: 1px solid #9fc820
-  color: #666
-  margin-top: 1em
-  margin-bottom: 1em
-  @include border-radius(3px)
-  transition: opacity 300ms ease-out
-  padding: 0.77778em 1.33333em 0.77778em 0.77778em
-  a.close
-    position: absolute
-    right: 5px
-    top: 0px
-    font-size: 1.5em
-
-
-.dashboard_item.single-ent
-  .header
-    padding: 0.77778em 1.33333em 0.77778em 0.77778em
-    height: auto !important
-  .list
-    .button.bottom
-      width: 100%
-
-.button.big
-  width: 100%
-  font-size: 1rem
-  @include border-radius(25px)
-  padding: 15px

app/assets/stylesheets/admin/dashboard-single-ent.css.scss

@@ -0,0 +1,45 @@
+@import "../darkswarm/mixins";
+
+.alert-box {
+  position: relative;
+  display: block;
+  background-color: #eff5dc;
+  border: 1px solid #9fc820;
+  color: #666;
+  margin-top: 1em;
+  margin-bottom: 1em;
+
+  @include border-radius(3px);
+
+  transition: opacity 300ms ease-out;
+  padding: 0.77778em 1.33333em 0.77778em 0.77778em;
+
+  a.close {
+    position: absolute;
+    right: 5px;
+    top: 0px;
+    font-size: 1.5em;
+  }
+}
+
+.dashboard_item.single-ent {
+  .header {
+    padding: 0.77778em 1.33333em 0.77778em 0.77778em;
+    height: auto !important;
+  }
+
+  .list {
+    .button.bottom {
+      width: 100%;
+    }
+  }
+}
+
+.button.big {
+  width: 100%;
+  font-size: 1rem;
+
+  @include border-radius(25px);
+
+  padding: 15px;
+}

app/assets/stylesheets/admin/dashboard_item.css.sass

@@ -1,159 +0,0 @@
-div.dashboard_item
-  margin-bottom: 30px
-
-  .centered
-    text-align: center
-
-  .text-icon
-    margin-top: 8px
-    display: block
-    font-size: 16px
-    font-weight: bold
-    color: #fff
-    padding: 0px 6px
-    border-radius: 10px
-    &.green
-      background-color: #9fc820
-    &.red
-      background-color: #DA5354
-    &.orange
-      background-color: #DA7F52
-
-  div.header
-    height: 50px
-    border-radius: 6px 6px 0px 0px
-    border: 1px solid #5498da
-    position: relative
-
-    a[ofn-with-tip]
-      position: absolute
-      right: 5px
-      bottom: 5px
-
-    &.red
-      border-color: #DA5354
-      border-width: 3px
-      h3
-        color: #DA5354
-
-    &.orange
-      border-color: #DA7F52
-      border-width: 3px
-      h3
-        color: #DA7F52
-
-    h3.alpha
-      height: 100%
-      padding: 10px 5px 0px 3%
-
-    a
-      border-radius: 0px 4px 0px 0px
-      margin-left: 8px
-      height: 100%
-      padding: 15px 2px 0px 2px
-
-  .tabs
-    height: 30px
-    border: solid #5498da
-    border-width: 0px 0px 1px 0px
-    margin-top: 3px
-    div.dashboard_tab
-      cursor: pointer
-      height: 30px
-      color: #fff
-      background-color: #5498da
-      padding: 5px 5px 0px 5px
-      text-align: center
-      font-weight: bold
-      border: solid #5498da
-      border-width: 1px 1px 0px 1px
-      &:hover
-        background-color: #9fc820
-      &.selected
-        color: #5498da
-        background-color: #fff
-
-  .list
-    max-height: 250px
-    overflow-y: auto
-    overflow-x: hidden
-
-  .list-title
-    border: solid #5498da
-    border-width: 0px 1px 0px 1px
-    span
-      font-size: 105%
-      padding: 10px 0px
-      font-weight: bold
-    span.alpha
-      padding: 10px 2px 10px 5%
-
-  .list-item
-    border: solid #5498da
-    border-width: 0px 1px 0px 1px
-    height: 38px
-    span.alpha
-      font-weight: bold
-      margin-left: -3px
-      padding: 10px 2px 0px 5%
-    span.omega
-      padding-right: 13px
-      margin-right: -3px
-      text-align: right
-    .icon-arrow-right
-      padding-top: 6px
-      font-size: 20px
-    .icon-warning-sign
-      color: #DA7F52
-      font-size: 30px
-    .icon-remove-sign
-      color: #DA5354
-      font-size: 30px
-    .icon-ok-sign
-      color: #9fc820
-      font-size: 30px
-    &.orange
-      color: #DA7F52
-      border: solid #DA7F52
-    &.red
-      color: #DA5354
-      border: solid #DA5354
-    &.orange, &.red
-      border-width: 0px 3px 0px 3px
-    &.even
-      background-color: #fff
-    &.odd
-      background-color: #eff5fc
-    &.even, &.odd
-      &:hover
-        color: #ffffff
-        background-color: #9fc820
-        .icon-arrow-right
-          color: #fff
-        .icon-remove-sign
-          color: #fff
-        .icon-warning-sign
-          color: #fff
-        .icon-ok-sign
-          color: #fff
-        .text-icon
-          &.green
-            color: #9fc820
-            background-color: #fff
-
-  a.button
-    color: #fff
-    font-size: 110%
-    font-weight: bold
-    text-align: center
-    &.orange
-      background-color: #DA7F52
-    &.blue
-      background-color: #5498da
-    &.red
-      background-color: #DA5354
-    &:hover
-      background-color: #9fc820
-    &.bottom
-      border-radius: 0px 0px 6px 6px
-      padding: 15px 15px

app/assets/stylesheets/admin/dashboard_item.css.scss

@@ -0,0 +1,239 @@
+div.dashboard_item {
+  margin-bottom: 30px;
+
+  .centered {
+    text-align: center;
+  }
+
+  .text-icon {
+    margin-top: 8px;
+    display: block;
+    font-size: 16px;
+    font-weight: bold;
+    color: #fff;
+    padding: 0px 6px;
+    border-radius: 10px;
+
+    &.green {
+      background-color: #9fc820;
+    }
+
+    &.red {
+      background-color: #DA5354;
+    }
+
+    &.orange {
+      background-color: #DA7F52;
+    }
+  }
+
+  div.header {
+    height: 50px;
+    border-radius: 6px 6px 0px 0px;
+    border: 1px solid #5498da;
+    position: relative;
+
+    a[ofn-with-tip] {
+      position: absolute;
+      right: 5px;
+      bottom: 5px;
+    }
+
+    &.red {
+      border-color: #DA5354;
+      border-width: 3px;
+
+      h3 {
+        color: #DA5354;
+      }
+    }
+
+    &.orange {
+      border-color: #DA7F52;
+      border-width: 3px;
+
+      h3 {
+        color: #DA7F52;
+      }
+    }
+
+    h3.alpha {
+      height: 100%;
+      padding: 10px 5px 0px 3%;
+    }
+
+    a {
+      border-radius: 0px 4px 0px 0px;
+      margin-left: 8px;
+      height: 100%;
+      padding: 15px 2px 0px 2px;
+    }
+  }
+
+  .tabs {
+    height: 30px;
+    border: solid #5498da;
+    border-width: 0px 0px 1px 0px;
+    margin-top: 3px;
+
+    div.dashboard_tab {
+      cursor: pointer;
+      height: 30px;
+      color: #fff;
+      background-color: #5498da;
+      padding: 5px 5px 0px 5px;
+      text-align: center;
+      font-weight: bold;
+      border: solid #5498da;
+      border-width: 1px 1px 0px 1px;
+
+      &:hover {
+        background-color: #9fc820;
+      }
+
+      &.selected {
+        color: #5498da;
+        background-color: #fff;
+      }
+    }
+  }
+
+  .list {
+    max-height: 250px;
+    overflow-y: auto;
+    overflow-x: hidden;
+  }
+
+  .list-title {
+    border: solid #5498da;
+    border-width: 0px 1px 0px 1px;
+
+    span {
+      font-size: 105%;
+      padding: 10px 0px;
+      font-weight: bold;
+    }
+
+    span.alpha {
+      padding: 10px 2px 10px 5%;
+    }
+  }
+
+  .list-item {
+    border: solid #5498da;
+    border-width: 0px 1px 0px 1px;
+    height: 38px;
+
+    span.alpha {
+      font-weight: bold;
+      margin-left: -3px;
+      padding: 10px 2px 0px 5%;
+    }
+
+    span.omega {
+      padding-right: 13px;
+      margin-right: -3px;
+      text-align: right;
+    }
+
+    .icon-arrow-right {
+      padding-top: 6px;
+      font-size: 20px;
+    }
+
+    .icon-warning-sign {
+      color: #DA7F52;
+      font-size: 30px;
+    }
+
+    .icon-remove-sign {
+      color: #DA5354;
+      font-size: 30px;
+    }
+
+    .icon-ok-sign {
+      color: #9fc820;
+      font-size: 30px;
+    }
+
+    &.orange {
+      color: #DA7F52;
+      border: solid #DA7F52;
+    }
+
+    &.red {
+      color: #DA5354;
+      border: solid #DA5354;
+    }
+
+    &.orange, &.red {
+      border-width: 0px 3px 0px 3px;
+    }
+
+    &.even {
+      background-color: #fff;
+    }
+
+    &.odd {
+      background-color: #eff5fc;
+    }
+
+    &.even, &.odd {
+      &:hover {
+        color: #ffffff;
+        background-color: #9fc820;
+
+        .icon-arrow-right {
+          color: #fff;
+        }
+
+        .icon-remove-sign {
+          color: #fff;
+        }
+
+        .icon-warning-sign {
+          color: #fff;
+        }
+
+        .icon-ok-sign {
+          color: #fff;
+        }
+
+        .text-icon {
+          &.green {
+            color: #9fc820;
+            background-color: #fff;
+          }
+        }
+      }
+    }
+  }
+
+  a.button {
+    color: #fff;
+    font-size: 110%;
+    font-weight: bold;
+    text-align: center;
+
+    &.orange {
+      background-color: #DA7F52;
+    }
+
+    &.blue {
+      background-color: #5498da;
+    }
+
+    &.red {
+      background-color: #DA5354;
+    }
+
+    &:hover {
+      background-color: #9fc820;
+    }
+
+    &.bottom {
+      border-radius: 0px 0px 6px 6px;
+      padding: 15px 15px;
+    }
+  }
+}

app/assets/stylesheets/admin/enterprise_index_panels.css.scss

@@ -111,3 +111,27 @@
     }
   }
 }
+
+tags-input .tags li.tag-item  {
+  -webkit-border-radius: 3px;
+  -moz-border-radius: 3px;
+  -ms-border-radius: 3px;
+  -o-border-radius: 3px;
+  border-radius: 3px;
+  margin: 2px 0 2px 3px;
+  background-image: none;
+  background-color: #5fa5e8;
+  border: none;
+  box-shadow: none;
+  color: white !important;
+  font-size: 85%;
+  height: 25px;
+}
+
+tags-input .tags .tag-item .remove-button {
+  color: white;
+}
+
+table th.actions .no-text[class*="icon-"], table td.actions .no-text[class*="icon-"] {
+  cursor: pointer;
+}

app/assets/stylesheets/admin/openfoodnetwork.css.scss

@@ -203,6 +203,10 @@ text-angular {
   .ta-scroll-window > .ta-bind {
     max-height: 400px;
     min-height: 100px;
+    outline: none;
+    p {
+      margin-bottom: 1.5rem;
+    }
   }
   .ta-scroll-window.form-control {
     min-height: 100px;

app/assets/stylesheets/admin/relationships.css.sass

@@ -1,23 +0,0 @@
-// TODO: Provide -moz- and -o- directives
-@-webkit-keyframes alert-flash
-  0%
-    background-color: #f9f1ae
-
-  100%
-    background-color: #fff
-
-
-table#enterprise-relationships, table#enterprise-roles
-  ul
-    list-style-type: none
-
-  th.actions, td.actions
-    width: 16%
-    .errors
-      color: #f00
-
-  tr.ng-enter
-    -webkit-animation-name: alert-flash
-    -webkit-animation-duration: 1200ms
-    -webkit-animation-iteration-count: 1
-    -webkit-animation-timing-function: ease-in-out

app/assets/stylesheets/admin/relationships.css.scss

@@ -0,0 +1,31 @@
+// TODO: Provide -moz- and -o- directives
+@-webkit-keyframes alert-flash {
+  0% {
+    background-color: #f9f1ae;
+  }
+
+  100% {
+    background-color: #fff;
+  }
+}
+
+table#enterprise-relationships, table#enterprise-roles {
+  ul {
+    list-style-type: none;
+  }
+
+  th.actions, td.actions {
+    width: 16%;
+
+    .errors {
+      color: #f00;
+    }
+  }
+
+  tr.ng-enter {
+    -webkit-animation-name: alert-flash;
+    -webkit-animation-duration: 1200ms;
+    -webkit-animation-iteration-count: 1;
+    -webkit-animation-timing-function: ease-in-out;
+  }
+}

app/assets/stylesheets/admin/side_menu.css.sass

@@ -1,18 +0,0 @@
-.side_menu
-  border-right: 2px solid #f6f6f6
-  border-top: 2px solid #f6f6f6
-  .menu_item
-    display: block
-    padding: 8px 15px
-    font-size: 120%
-    cursor: pointer
-    text-transform: uppercase
-    &:nth-child(odd)
-      background-color: #ebf3fb
-    &:nth-child(even)
-      background-color: #ffffff
-    &:hover
-      background-color: #eaf0f5
-    &.selected
-      background-color: #5498da
-      color: #ffffff

app/assets/stylesheets/admin/side_menu.css.scss

@@ -0,0 +1,29 @@
+.side_menu {
+  border-right: 2px solid #f6f6f6;
+  border-top: 2px solid #f6f6f6;
+
+  .menu_item {
+    display: block;
+    padding: 8px 15px;
+    font-size: 120%;
+    cursor: pointer;
+    text-transform: uppercase;
+
+    &:nth-child(odd) {
+      background-color: #ebf3fb;
+    }
+
+    &:nth-child(even) {
+      background-color: #ffffff;
+    }
+
+    &:hover {
+      background-color: #eaf0f5;
+    }
+
+    &.selected {
+      background-color: #5498da;
+      color: #ffffff;
+    }
+  }
+}

app/assets/stylesheets/admin/sidebar-item.css.sass

@@ -1,77 +0,0 @@
-div.sidebar_item
-  margin-bottom: 30px
-
-  .centered
-    text-align: center
-
-  div.header
-    font-size: 105%
-    color: #fff
-    padding: 10px 0px
-    position: relative
-    &.blue
-      background-color: #5498da
-    &.red
-      background-color: #DA5354
-
-  .list
-    max-height: 400px
-    overflow-y: auto
-    overflow-x: hidden
-    &.red
-      color: #DA5354
-      .list-item
-        border: solid #DA5354
-        border-width: 0px 3px 0px 3px
-        a.alpha, span.alpha
-          margin-left: -3px
-        &.odd
-          background-color: #fcf6ef
-          &:hover
-            background-color: #9fc820
-      a
-        color: #DA5354
-
-  .list-item
-    .icon-arrow-right
-      padding-top: 6px
-      font-size: 20px
-    border: solid #5498da
-    border-width: 0px 1px 0px 1px
-    a.alpha, span.alpha
-      font-weight: bold
-      margin-left: -1px
-      padding: 10px 2px 10px 5%
-      overflow: hidden
-      text-overflow: ellipsis
-    span.omega
-      padding: 8px 18px 8px 0px
-      margin-right: -3px
-      text-align: right
-    .icon-remove-sign
-      color: #DA5354
-      font-size: 18px
-    &.even
-      background-color: #fff
-    &.odd
-      background-color: #eff5fc
-    &.even, &.odd
-      &:hover
-        color: #ffffff
-        background-color: #9fc820
-        a
-          color: #ffffff
-
-  a.button
-    color: #fff
-    padding: 15px 15px
-    font-weight: bold
-    text-align: center
-    border-radius: 0px
-    &.blue
-      background-color: #5498da
-    &.red
-      background-color: #DA5354
-    &:hover
-      background-color: #9fc820
-      

app/assets/stylesheets/admin/sidebar-item.css.scss

@@ -0,0 +1,121 @@
+div.sidebar_item {
+  margin-bottom: 30px;
+
+  .centered {
+    text-align: center;
+  }
+
+  div.header {
+    font-size: 105%;
+    color: #fff;
+    padding: 10px 0px;
+    position: relative;
+
+    &.blue {
+      background-color: #5498da;
+    }
+
+    &.red {
+      background-color: #DA5354;
+    }
+  }
+
+  .list {
+    max-height: 400px;
+    overflow-y: auto;
+    overflow-x: hidden;
+
+    &.red {
+      color: #DA5354;
+
+      .list-item {
+        border: solid #DA5354;
+        border-width: 0px 3px 0px 3px;
+
+        a.alpha, span.alpha {
+          margin-left: -3px;
+        }
+
+        &.odd {
+          background-color: #fcf6ef;
+
+          &:hover {
+            background-color: #9fc820;
+          }
+        }
+      }
+
+      a {
+        color: #DA5354;
+      }
+    }
+  }
+
+  .list-item {
+    .icon-arrow-right {
+      padding-top: 6px;
+      font-size: 20px;
+    }
+
+    border: solid #5498da;
+    border-width: 0px 1px 0px 1px;
+
+    a.alpha, span.alpha {
+      font-weight: bold;
+      margin-left: -1px;
+      padding: 10px 2px 10px 5%;
+      overflow: hidden;
+      text-overflow: ellipsis;
+    }
+
+    span.omega {
+      padding: 8px 18px 8px 0px;
+      margin-right: -3px;
+      text-align: right;
+    }
+
+    .icon-remove-sign {
+      color: #DA5354;
+      font-size: 18px;
+    }
+
+    &.even {
+      background-color: #fff;
+    }
+
+    &.odd {
+      background-color: #eff5fc;
+    }
+
+    &.even, &.odd {
+      &:hover {
+        color: #ffffff;
+        background-color: #9fc820;
+
+        a {
+          color: #ffffff;
+        }
+      }
+    }
+  }
+
+  a.button {
+    color: #fff;
+    padding: 15px 15px;
+    font-weight: bold;
+    text-align: center;
+    border-radius: 0px;
+
+    &.blue {
+      background-color: #5498da;
+    }
+
+    &.red {
+      background-color: #DA5354;
+    }
+
+    &:hover {
+      background-color: #9fc820;
+    }
+  }
+}

app/assets/stylesheets/admin/variant_overrides.css.sass

@@ -1,6 +0,0 @@
-.variant-override-unit
-  float: right
-  font-style: italic
-
-button.hide:hover
-  background-color: #DA5354

app/assets/stylesheets/admin/variant_overrides.css.scss

@@ -0,0 +1,8 @@
+.variant-override-unit {
+  float: right;
+  font-style: italic;
+}
+
+button.hide:hover {
+  background-color: #DA5354;
+}

app/assets/stylesheets/admin/welcome.css.sass

@@ -1,16 +0,0 @@
-@import ../darkswarm/mixins
-
-#welcome_page
-  header
-    text-align: center
-    padding: 4em 2em
-    @include fullbg
-    background-image: url('/assets/home/tagline-bg.jpg')
-    background-repeat: no-repeat
-    background-position: center center
-    margin-bottom: 2em
-    p
-      text-transform: uppercase
-      font-weight: 300
-    &, & *
-      color: white

app/assets/stylesheets/admin/welcome.css.scss

@@ -0,0 +1,24 @@
+@import "../darkswarm/mixins";
+
+#welcome_page {
+  header {
+    text-align: center;
+    padding: 4em 2em;
+
+    @include fullbg;
+
+    background-image: url("/assets/home/tagline-bg.jpg");
+    background-repeat: no-repeat;
+    background-position: center center;
+    margin-bottom: 2em;
+
+    p {
+      text-transform: uppercase;
+      font-weight: 300;
+    }
+
+    &, & * {
+      color: white;
+    }
+  }
+}

app/assets/stylesheets/darkswarm/_shop-filters.css.sass

@@ -1,125 +0,0 @@
-@import mixins
-@import branding
-@import big-input
-@import animations
-
-@mixin filter-selector($base-clr, $border-clr, $hover-clr)
-  &.inline-block, ul.inline-block
-    display: inline-block
-
-  li
-    display: inline-block
-    @include border-radius(0)
-    padding: 0
-    margin: 0 0 0.25rem 0.25rem
-    &:hover, &:focus
-      background: transparent
-    &.active
-      box-shadow: none
-
-    a, a.button
-      display: block
-      padding-top: 0.5rem
-      @include border-radius(0.5em)
-      border: 1px solid $border-clr
-      padding: 0.5em 0.625em
-      font-size: 0.875em
-      color: $base-clr
-      font-size: 0.75em
-      background: white
-      margin: 0
-      i
-        padding-left: 0.25rem
-
-      render-svg
-        &, & svg
-          width: 1rem
-          height: 1rem
-          float: left
-          padding-right: 0.25rem
-          path
-            @include csstrans
-            fill: $base-clr
-
-      &:hover, &:focus
-        border-color: $hover-clr
-        color: $hover-clr
-        render-svg
-          svg
-            path
-              fill: $hover-clr
-
-      &.disabled
-        opacity: 0.6
-
-        &:hover, &:focus
-          border-color: $border-clr
-          color:  $base-clr
-          render-svg
-            svg
-              path
-                fill: $base-clr
-
-
-      &.active, &.active:hover, &.active:focus
-        border: 1px solid $base-clr
-        background: $base-clr
-        color: white
-        render-svg
-          svg
-            path
-              fill: white
-
-
-// Alert when search, taxon, filter is triggered
-
-.alert-box.search-alert
-  background-color: $clr-yellow-light
-  border-color: $clr-yellow-light
-  color: #777
-  font-size: 0.75rem
-  padding: 0.5rem 0.75rem
-
-  span.applied-properties
-    color: #333
-
-  span.applied-taxons
-    color: $clr-blue
-
-  span.applied-search
-    color: $clr-brick
-
-  span.filter-label
-    opacity: 0.75
-
-// singleLineSelectors directive provides a drop-down that can overlap
-// content. Ensure that the dropdown appears above the content.
-.filter-row
-  position: relative
-  z-index: 100
-
-.filter-shopfront
-  &.taxon-selectors, &.property-selectors
-    background: transparent
-
-    single-line-selectors
-      overflow-x: hidden
-      white-space: nowrap
-
-      .f-dropdown
-        overflow-x: auto
-        white-space: normal
-
-    ul
-      margin: 0
-      display: inline-block
-    ul, ul li
-      list-style: none
-
-  // Shopfront taxons
-  &.taxon-selectors
-    @include filter-selector($clr-blue, $clr-blue-light, $clr-blue-bright)
-
-  // Shopfront properties
-  &.property-selectors
-    @include filter-selector(#666, #ccc, #777)

app/assets/stylesheets/darkswarm/_shop-filters.css.scss

@@ -0,0 +1,173 @@
+@import "mixins";
+@import "branding";
+@import "big-input";
+@import "animations";
+
+@mixin filter-selector($base-clr, $border-clr, $hover-clr) {
+  &.inline-block, ul.inline-block {
+    display: inline-block;
+  }
+
+  li {
+    display: inline-block;
+
+    @include border-radius(0);
+
+    padding: 0;
+    margin: 0 0 0.25rem 0.25rem;
+
+    &:hover, &:focus {
+      background: transparent;
+    }
+
+    &.active {
+      box-shadow: none;
+    }
+
+    a, a.button {
+      display: block;
+      padding-top: 0.5rem;
+
+      @include border-radius(0.5em);
+
+      border: 1px solid $border-clr;
+      padding: 0.5em 0.625em;
+      font-size: 0.875em;
+      color: $base-clr;
+      font-size: 0.75em;
+      background: white;
+      margin: 0;
+
+      i {
+        padding-left: 0.25rem;
+      }
+
+      render-svg {
+        &, & svg {
+          width: 1rem;
+          height: 1rem;
+          float: left;
+          padding-right: 0.25rem;
+
+          path {
+            @include csstrans;
+
+            fill: $base-clr;
+          }
+        }
+      }
+
+      &:hover, &:focus {
+        border-color: $hover-clr;
+        color: $hover-clr;
+
+        render-svg {
+          svg {
+            path {
+              fill: $hover-clr;
+            }
+          }
+        }
+      }
+
+      &.disabled {
+        opacity: 0.6;
+
+        &:hover, &:focus {
+          border-color: $border-clr;
+          color: $base-clr;
+
+          render-svg {
+            svg {
+              path {
+                fill: $base-clr;
+              }
+            }
+          }
+        }
+      }
+
+      &.active, &.active:hover, &.active:focus {
+        border: 1px solid $base-clr;
+        background: $base-clr;
+        color: white;
+
+        render-svg {
+          svg {
+            path {
+              fill: white;
+            }
+          }
+        }
+      }
+    }
+  }
+}
+
+// Alert when search, taxon, filter is triggered
+
+.alert-box.search-alert {
+  background-color: $clr-yellow-light;
+  border-color: $clr-yellow-light;
+  color: #777;
+  font-size: 0.75rem;
+  padding: 0.5rem 0.75rem;
+
+  span.applied-properties {
+    color: #333;
+  }
+
+  span.applied-taxons {
+    color: $clr-blue;
+  }
+
+  span.applied-search {
+    color: $clr-brick;
+  }
+
+  span.filter-label {
+    opacity: 0.75;
+  }
+}
+
+// singleLineSelectors directive provides a drop-down that can overlap
+// content. Ensure that the dropdown appears above the content.
+.filter-row {
+  position: relative;
+  z-index: 90;
+}
+
+.filter-shopfront {
+  &.taxon-selectors, &.property-selectors {
+    background: transparent;
+
+    single-line-selectors {
+      overflow-x: hidden;
+      white-space: nowrap;
+
+      .f-dropdown {
+        overflow-x: auto;
+        white-space: normal;
+      }
+    }
+
+    ul {
+      margin: 0;
+      display: inline-block;
+    }
+
+    ul, ul li {
+      list-style: none;
+    }
+  }
+
+  // Shopfront taxons
+  &.taxon-selectors {
+    @include filter-selector($clr-blue, $clr-blue-light, $clr-blue-bright);
+  }
+
+  // Shopfront properties
+  &.property-selectors {
+    @include filter-selector(#666, #ccc, #777);
+  }
+}

app/assets/stylesheets/darkswarm/_shop-inputs.css.sass

@@ -1,85 +0,0 @@
-@import mixins
-@import variables
-@import branding
-@import big-input
-
-
-.darkswarm
-  // #search
-  @include placeholder(rgba(0,0,0,0.4), #777)
-  
-  input#search
-    @include medium-input(rgba(0,0,0,0.3), #777, $clr-brick)
-
-  // ordering
-  product
-    
-    input
-      @include border-radius(0) 
-      @include csstrans
-      margin: 0
-      width: 10rem
-      display: inline
-      @include box-shadow(none)
-      border-color: #b3b3b3
-      text-align: right
-      
-      @media all and (max-width: 1024px)
-        width: 8rem
-
-      @media all and (max-width: 768px)
-        width: 7rem
-
-      @media all and (max-width: 640px) 
-        float: left !important
-        font-size: 0.75rem
-        padding-left: 0.25rem
-        padding-right: 0.25rem
-     
-      @media all and (max-width: 480px) 
-        width: 5.8rem
-
-      &:hover
-        @include box-shadow(none)
-        border-color: #888
-        background-color: #fafafa
-
-      &:active, &:focus, &.active
-        @include box-shadow(none)
-        background-color: #f9f4b9
-        border-color: #666
-
-
-    // BULK
-
-    input.bulk
-      width: 5rem
-
-      @media all and (max-width: 1024px)
-        width: 4rem
-
-      @media all and (max-width: 768px)
-        width: 3.5rem
-
-      @media all and (max-width: 480px) 
-        width: 2.8rem
-
-    input.bulk.first
-      border-right: 0
-
-    input.bulk.second
-      border-left: 0
-      
-    .bulk-input-container
-      float: right
-
-      @media all and (max-width: 640px) 
-        float: left !important
-
-      .bulk-input
-        float: left
-
-      
-
-
-

app/assets/stylesheets/darkswarm/_shop-inputs.css.scss

@@ -0,0 +1,102 @@
+@import "mixins";
+@import "variables";
+@import "branding";
+@import "big-input";
+
+.darkswarm {
+  // #search
+  @include placeholder(rgba(0, 0, 0, 0.4), #777);
+
+  input#search {
+    @include medium-input(rgba(0, 0, 0, 0.3), #777, $clr-brick);
+  }
+
+  // ordering
+  product {
+    input {
+      @include border-radius(0);
+
+      @include csstrans;
+
+      margin: 0;
+      width: 10rem;
+      display: inline;
+
+      @include box-shadow(none);
+
+      border-color: #b3b3b3;
+      text-align: right;
+
+      @media all and (max-width: 1024px) {
+        width: 8rem;
+      }
+
+      @media all and (max-width: 768px) {
+        width: 7rem;
+      }
+
+      @media all and (max-width: 640px) {
+        float: left !important;
+        font-size: 0.75rem;
+        padding-left: 0.25rem;
+        padding-right: 0.25rem;
+      }
+
+      @media all and (max-width: 480px) {
+        width: 5.8rem;
+      }
+
+      &:hover {
+        @include box-shadow(none);
+
+        border-color: #888;
+        background-color: #fafafa;
+      }
+
+      &:active, &:focus, &.active {
+        @include box-shadow(none);
+
+        background-color: #f9f4b9;
+        border-color: #666;
+      }
+    }
+
+    // BULK
+
+    input.bulk {
+      width: 5rem;
+
+      @media all and (max-width: 1024px) {
+        width: 4rem;
+      }
+
+      @media all and (max-width: 768px) {
+        width: 3.5rem;
+      }
+
+      @media all and (max-width: 480px) {
+        width: 2.8rem;
+      }
+    }
+
+    input.bulk.first {
+      border-right: 0;
+    }
+
+    input.bulk.second {
+      border-left: 0;
+    }
+
+    .bulk-input-container {
+      float: right;
+
+      @media all and (max-width: 640px) {
+        float: left !important;
+      }
+
+      .bulk-input {
+        float: left;
+      }
+    }
+  }
+}

app/assets/stylesheets/darkswarm/_shop-modals.css.sass

@@ -1,6 +0,0 @@
-
-.product-header
-	h1, h2, h3, h4, h5, h6
-		margin: 0
-	hr
-		margin: 0.5em 0

app/assets/stylesheets/darkswarm/_shop-modals.css.scss

@@ -0,0 +1,9 @@
+.product-header {
+  h1, h2, h3, h4, h5, h6 {
+    margin: 0;
+  }
+
+  hr {
+    margin: 0.5em 0;
+  }
+}

app/assets/stylesheets/darkswarm/_shop-navigation.css.sass

@@ -33,16 +33,18 @@
         
 
       ordercycle
-        p.text-right
+        text-align: right
+        p
           max-width: 400px
         @media all and (max-width: 640px)
           float: left
           clear: left
+          text-align: left
           padding: 12px 10px
           width: 100%
           margin-top: 10px
           background: #e5e5e5
-          p.text-right
+          p
             max-width: 100%
         float: right
         form.custom 

app/assets/stylesheets/darkswarm/_shop-popovers.css.sass

@@ -1,112 +0,0 @@
-@import mixins
-@import branding
-
-// .darkswarm
-//   product
-
-ordercycle
-  .joyride-tip-guide 
-    background-color: $clr-brick
-    .joyride-nub.right
-      border-color: $clr-brick !important
-      border-top-color: transparent !important
-      border-right-color: transparent !important
-      border-bottom-color: transparent !important
-    p
-      margin: 0
-      font-weight: 700
-
-// Pop over
-// Foundation overrides
-.joyride-tip-guide.price_breakdown
-  // JS needs to be tweaked to adjust for left alignment - this is dynamic can't rewrite in CSS
-  background-color: #999
-  color: #1f1f1f
-  margin-left: -8px
-  @include box-shadow(0 1px 2px 0 rgba(0,0,0,0.7))
-
-  .joyride-content-wrapper
-    padding: 1.125rem 1.25rem 1.5rem
-    padding: 1rem
-    margin: 1%
-    width: 98%
-    background-color: white
-
-  h1, h2, h3, h4, h5, h6
-    color: #1f1f1f
-
-  .joyride-nub.right
-    top: 38px
-    border-color: #999 !important
-    border-top-color: transparent !important
-    border-right-color: transparent !important
-    border-bottom-color: transparent !important
-
-  .progress
-    background-color: #13bf85
-    padding: 0
-    border: none
-    color: white
-    font-size: 0.75rem
-    font-style: oblique
-    line-height: 1
-    height: auto
-    .right
-      padding: 0.5rem 0.25rem 0 0 
-    .meter
-      background-color: #0b8c61
-      padding: 0.5rem 0.25rem
-      border-right: 1px solid #539f92
-  
-  .expanded 
-    ul, li
-      list-style: none
-      margin: 0
-      font-size: 0.875rem
-    li
-      background-color: #13bf85
-      padding: 0 0.25rem
-      margin-bottom: 2px
-      color: white
-    li.cost
-      background-color: #0b8c61
-    li:last-child
-      margin-bottom: 0.75rem
-
-
-button.graph-button
-  // z-index: 9999999
-  border: 1px solid transparent
-  padding: 0
-  margin: 0
-  display: inline
-  background-color: rgba(255,255,255,0.5)
-  padding: 4px 
-  @include box-shadow(none)
-  @include border-radius(999rem)
-  &:before
-    @include icon-font
-    content: '\e639'
-    color: #999
-  &:focus
-    border: 1px solid #e0e0e0
-    background-color: rgba(255,255,255,1)
-    &:before
-      color: #666
-  &:hover, &:active
-    background-color: rgba(255,255,255,1)
-    border: 1px solid transparent
-    &:before
-      color: $clr-brick-bright
-  @media all and (max-width: 768px) 
-    // Hide for small
-    display: none
-
-button.graph-button.open
-  border: 1px solid transparent
-  background-color:  $clr-brick-bright
-  &:before
-    content: '\e608'
-    color: white
-
-