Merge pull request #938 from Growstuff/dev

Release 11

.codeclimate.yml

@@ -0,0 +1,36 @@
+engines:
+  rubocop:
+    enabled: true
+  scss-lint:
+    enabled: true
+  shellcheck:
+    enabled: true
+  eslint:
+    enabled: true
+  coffeelint:
+    enabled: true 
+  brakeman:
+    enabled: true
+  bundler-audit:
+    enabled: true
+  duplication:
+    enabled: true
+    config:
+      languages:
+      - ruby
+      - javascript
+  fixme:
+    enabled: true
+ratings:
+  paths:
+  - "**.rb"
+  - "**.js"
+  - "**.coffee" 
+  - "**.sass"
+  - "**.haml"
+  - Gemfile.lock
+exclude_paths:
+- config/
+- db/
+- spec/
+- public/

.gitignore

@@ -8,10 +8,10 @@ coverage
 *~
 *.DS_Store
 config/application.yml
+config/database.yml
 credentials*.sh
 Pathogen:
 custom_plan.rb
 zeus.json
 .bundle
-config/application.yml
 .idea/**

.ruby-version

@@ -1 +1 @@
-2.1.8
+2.2.4

.travis.yml

@@ -7,9 +7,8 @@ env:
     - GROWSTUFF_SITE_NAME="Growstuff (travis)" RAILS_SECRET_TOKEN='xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx' GROWSTUFF_ELASTICSEARCH='false'
   global:
     secure: "Z5TpM2jEX4UCvNePnk/LwltQX48U2u9BRc+Iypr1x9QW2o228QJhPIOH39a8RMUrepGnkQIq9q3ZRUn98RfrJz1yThtlNFL3NmzdQ57gKgjGwfpa0e4Dwj/ZJqV2D84tDGjvdVYLP7zzaYZxQcwk/cgNpzKf/jq97HLNP7CYuf4="
-bundler_args: "--without development production staging"
 rvm:
-- 2.1.8
+- 2.2.4
 before_script:
 - psql -c 'create database growstuff_test;' -U postgres
 script:

CONTRIBUTORS.md

@@ -66,3 +66,5 @@ submit the change with your pull request.
 - Anthony Atkinson / [sha1sum](https://github.com/sha1sum)
 - Terence Conquest / [twconquest](https://github.com/twconquest)
 - Daniel O'Connor / [CloCkWeRX](https://github.com/CloCkWeRX)
+- DV Dasari / [dv2](https://github.com/dv2)
+- Eric Tillberg / [Thrillberg](https://github.com/Thrillberg)

Gemfile

@@ -1,20 +1,18 @@
 source 'https://rubygems.org'
 
-ruby '2.1.8'
+ruby '2.2.4'
 
 gem 'rails', '~> 4.1.11'
 
 gem 'bundler', '>=1.1.5'
 
-gem 'sass-rails',   '~> 4.0.4'
+gem 'sass-rails',   '~> 5.0.4'
 gem 'coffee-rails', '~> 4.1.0'
 gem 'haml'
 
-# Another CSS preprocessor, used for Bootstrap overrides
-gem 'less', '~>2.5.0'
-gem 'less-rails', '~> 2.5.0'
 # CSS framework
-gem 'less-rails-bootstrap', '~> 3.2.0'
+gem 'bootstrap-sass', '~> 3.3.6'
+gem 'font-awesome-sass'
 
 gem 'uglifier', '~> 2.7.2'         # JavaScript compressor
 
@@ -29,7 +27,7 @@ gem 'unicorn'                      # http server
 gem 'pg'
 gem 'figaro'                       # for handling config via ENV variables
 gem 'cancancan', '~> 1.9'          # for checking member privileges
-gem 'gibbon'                       # for Mailchimp newsletter subscriptions
+gem 'gibbon', '~>1.2.0'            # for Mailchimp newsletter subscriptions
 gem 'csv_shaper'                   # CSV export
 gem 'ruby-units'                   # for unit conversion
 
@@ -46,14 +44,6 @@ gem 'activemerchant', '1.33.0',
 gem 'active_utils', '1.0.5',
   :path    => 'vendor/gems/active_utils-1.0.5'
 
-# less-rails depends on a JavaScript engine; we use therubyracer.
-# See https://github.com/sstephenson/execjs#readme for more supported runtimes
-# long term, we'll probably want node.js for performance, but this will do
-# for now as it's easier for new people to install
-gem 'therubyracer', '~> 0.12', :platforms => :ruby
-# libv8 is needed by therubyracer and is a bit finicky
-gem 'libv8', '3.16.14.7'
-
 # Markdown formatting for updates etc
 gem 'bluecloth'
 
@@ -122,9 +112,11 @@ group :development, :test do
   gem 'coveralls', require: false       # coverage analysis
   gem 'capybara'                        # integration tests
   gem 'capybara-email'                  # integration tests for email
+  gem 'capybara-screenshot'             # for test debugging
   gem 'poltergeist', '~> 1.6'           # for headless JS testing
   gem 'i18n-tasks'                      # adds tests for finding missing and unused translations
   gem 'selenium-webdriver'
+  gem "codeclimate-test-reporter", group: :test, require: nil
 end
 
 group :travis do

Gemfile.lock

@@ -33,7 +33,7 @@ GEM
       activesupport (= 4.1.15)
       builder (~> 3.1)
       erubis (~> 2.7.0)
-    active_link_to (1.0.2)
+    active_link_to (1.0.3)
       actionpack
     activemodel (4.1.15)
       activesupport (= 4.1.15)
@@ -48,13 +48,13 @@ GEM
       minitest (~> 5.1)
       thread_safe (~> 0.1)
       tzinfo (~> 1.1)
-    addressable (2.3.6)
+    addressable (2.4.0)
     arel (5.0.1.20140414130214)
-    autoprefixer-rails (5.1.1)
+    ast (2.2.0)
+    autoprefixer-rails (6.3.6.1)
       execjs
-      json
     bcrypt (3.1.11)
-    better_errors (2.0.0)
+    better_errors (2.1.1)
       coderay (>= 1.0.0)
       erubis (>= 2.6.6)
       rack (>= 0.9.0)
@@ -62,49 +62,51 @@ GEM
       debug_inspector (>= 0.0.1)
     bluecloth (2.2.0)
     bonsai-elasticsearch-rails (0.0.4)
-    bootstrap-datepicker-rails (1.3.0.2)
+    bootstrap-datepicker-rails (1.6.1.1)
       railties (>= 3.0)
     bootstrap-kaminari-views (0.0.5)
       kaminari (>= 0.13)
       rails (>= 3.1)
-    bootstrap-sass (3.3.3)
-      autoprefixer-rails (>= 5.0.0.1)
-      sass (>= 3.2.19)
-    bootstrap_form (2.2.0)
+    bootstrap-sass (3.3.6)
+      autoprefixer-rails (>= 5.2.1)
+      sass (>= 3.3.4)
+    bootstrap_form (2.3.0)
     builder (3.2.2)
-    byebug (3.5.1)
-      columnize (~> 0.8)
-      debugger-linecache (~> 1.2)
-      slop (~> 3.6)
-    cancancan (1.9.2)
-    capybara (2.4.4)
+    byebug (9.0.4)
+    cancancan (1.14.0)
+    capybara (2.7.1)
+      addressable
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    capybara-email (2.4.0)
+    capybara-email (2.5.0)
       capybara (~> 2.4)
       mail
-    childprocess (0.5.6)
+    capybara-screenshot (1.0.13)
+      capybara (>= 1.0, < 3)
+      launchy
+    childprocess (0.5.9)
       ffi (~> 1.0, >= 1.0.11)
     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)
-    codemirror-rails (4.8)
+    codeclimate-test-reporter (0.5.0)
+      simplecov (>= 0.7.1, < 1.0.0)
+    codemirror-rails (5.11)
       railties (>= 3.0, < 5)
-    coderay (1.1.0)
-    coffee-rails (4.1.0)
+    coderay (1.1.1)
+    coffee-rails (4.1.1)
       coffee-script (>= 2.2.0)
-      railties (>= 4.0.0, < 5.0)
-    coffee-script (2.3.0)
+      railties (>= 4.0.0, < 5.1.x)
+    coffee-script (2.4.1)
       coffee-script-source
       execjs
-    coffee-script-source (1.8.0)
-    columnize (0.9.0)
-    comfortable_mexican_sofa (1.12.7)
+    coffee-script-source (1.10.0)
+    comfortable_mexican_sofa (1.12.9)
       active_link_to (>= 1.0.0)
       bootstrap-sass (>= 3.2.0)
       bootstrap_form (>= 2.2.0)
@@ -119,20 +121,19 @@ GEM
       rails (>= 4.0.0, < 5)
       rails-i18n (>= 4.0.0)
       sass-rails (>= 4.0.3)
-    commonjs (0.2.7)
-    coveralls (0.7.1)
-      multi_json (~> 1.3)
-      rest-client
-      simplecov (>= 0.7)
-      term-ansicolor
-      thor
-    csv_shaper (1.1.1)
+    concurrent-ruby (1.0.2)
+    coveralls (0.8.13)
+      json (~> 1.8)
+      simplecov (~> 0.11.0)
+      term-ansicolor (~> 1.3)
+      thor (~> 0.19.1)
+      tins (~> 1.6.0)
+    csv_shaper (1.2.0)
       activesupport (>= 3.0.0)
-    dalli (2.7.2)
-    database_cleaner (1.5.0)
+    dalli (2.7.6)
+    database_cleaner (1.5.3)
     debug_inspector (0.0.2)
-    debugger-linecache (1.2.0)
-    devise (3.5.6)
+    devise (3.5.10)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 3.2.6, < 5)
@@ -141,51 +142,51 @@ GEM
       warden (~> 1.2.3)
     diff-lcs (1.2.5)
     docile (1.1.5)
-    domain_name (0.5.24)
-      unf (>= 0.0.5, < 1.0.0)
     easy_translate (0.5.0)
       json
       thread
       thread_safe
-    elasticsearch (1.0.6)
-      elasticsearch-api (= 1.0.6)
-      elasticsearch-transport (= 1.0.6)
-    elasticsearch-api (1.0.6)
+    elasticsearch (1.0.17)
+      elasticsearch-api (= 1.0.17)
+      elasticsearch-transport (= 1.0.17)
+    elasticsearch-api (1.0.17)
       multi_json
-    elasticsearch-model (0.1.6)
+    elasticsearch-model (0.1.9)
       activesupport (> 3)
       elasticsearch (> 0.4)
       hashie
-    elasticsearch-rails (0.1.6)
-    elasticsearch-transport (1.0.6)
+    elasticsearch-rails (0.1.9)
+    elasticsearch-transport (1.0.17)
       faraday
       multi_json
     erubis (2.7.0)
-    excon (0.43.0)
-    execjs (2.6.0)
+    excon (0.49.0)
+    execjs (2.7.0)
     factory_girl (4.5.0)
       activesupport (>= 3.0.0)
     factory_girl_rails (4.5.0)
       factory_girl (~> 4.5.0)
       railties (>= 3.0.0)
-    faraday (0.9.1)
+    faraday (0.9.2)
       multipart-post (>= 1.2, < 3)
     ffi (1.9.10)
-    figaro (1.0.0)
+    figaro (1.1.1)
       thor (~> 0.14)
     flickraw (0.9.8)
+    font-awesome-sass (4.6.2)
+      sass (>= 3.2)
     formatador (0.2.5)
-    friendly_id (5.0.4)
+    friendly_id (5.0.5)
       activerecord (>= 4.0.0)
-    gibbon (1.1.4)
+    gibbon (1.2.0)
       httparty
-      multi_json (>= 1.3.4)
+      multi_json (>= 1.9.0)
     gravatar-ultimate (2.0.0)
       activesupport (>= 2.3.14)
       rack
-    guard (2.12.8)
+    guard (2.14.0)
       formatador (>= 0.2.4)
-      listen (>= 2.7, <= 4.0)
+      listen (>= 2.7, < 4.0)
       lumberjack (~> 1.0)
       nenv (~> 0.1)
       notiffany (~> 0.0)
@@ -193,125 +194,119 @@ GEM
       shellany (~> 0.0)
       thor (>= 0.18.1)
     guard-compat (1.2.1)
-    guard-rspec (4.6.2)
+    guard-rspec (4.6.5)
       guard (~> 2.1)
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
-    haml (4.1.0.beta.1)
+    haml (4.0.7)
       tilt
-    haml-rails (0.6.0)
+    haml-rails (0.9.0)
       actionpack (>= 4.0.1)
       activesupport (>= 4.0.1)
-      haml (>= 3.1, < 5.0)
+      haml (>= 4.0.6, < 5.0)
       html2haml (>= 1.0.1)
       railties (>= 4.0.1)
-    hashie (3.3.2)
-    heroku-api (0.3.22)
-      excon (~> 0.38)
+    hashie (3.4.4)
+    heroku-api (0.4.2)
+      excon (~> 0.45)
       multi_json (~> 1.8)
-    highline (1.6.21)
-    hike (1.2.3)
-    hpricot (0.8.6)
-    html2haml (1.0.1)
+    highline (1.7.8)
+    html2haml (2.0.0)
       erubis (~> 2.7.0)
-      haml (>= 4.0.0.rc.1)
-      hpricot (~> 0.8.6)
-      ruby_parser (~> 3.1.1)
-    http-cookie (1.0.2)
-      domain_name (~> 0.5)
+      haml (~> 4.0.0)
+      nokogiri (~> 1.6.0)
+      ruby_parser (~> 3.5)
     httparty (0.13.3)
       json (~> 1.8)
       multi_xml (>= 0.5.2)
     i18n (0.7.0)
-    i18n-tasks (0.7.8)
-      activesupport
+    i18n-tasks (0.9.5)
+      activesupport (>= 4.0.2)
+      ast (>= 2.1.0)
       easy_translate (>= 0.5.0)
       erubis
-      highline
+      highline (>= 1.7.3)
       i18n
-      slop (>= 3.5.0)
-      term-ansicolor
-      terminal-table
-    jquery-rails (3.1.3)
+      parser (>= 2.2.3.0)
+      term-ansicolor (>= 1.3.2)
+      terminal-table (>= 1.5.1)
+    jquery-rails (3.1.4)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    jquery-ui-rails (5.0.3)
+    jquery-ui-rails (5.0.5)
       railties (>= 3.2.16)
-    js-routes (0.9.9)
+    js-routes (1.2.5)
       railties (>= 3.2)
       sprockets-rails
     json (1.8.3)
     kaminari (0.16.3)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
-    kgio (2.9.2)
-    kramdown (1.5.0)
+    kgio (2.10.0)
+    kramdown (1.11.1)
     launchy (2.4.3)
       addressable (~> 2.3)
     leaflet-markercluster-rails (0.7.0)
       railties (>= 3.1)
-    leaflet-rails (0.7.4)
-    less (2.5.1)
-      commonjs (~> 0.2.7)
-    less-rails (2.5.0)
-      actionpack (>= 3.1)
-      less (~> 2.5.0)
-    less-rails-bootstrap (3.2.0)
-      less-rails (~> 2.5.0)
-    letter_opener (1.3.0)
+    leaflet-rails (0.7.7)
+    letter_opener (1.4.1)
       launchy (~> 2.2)
-    libv8 (3.16.14.7)
-    listen (3.0.2)
-      rb-fsevent (>= 0.9.3)
-      rb-inotify (>= 0.9)
-    lumberjack (1.0.9)
+    listen (3.1.5)
+      rb-fsevent (~> 0.9, >= 0.9.4)
+      rb-inotify (~> 0.9, >= 0.9.7)
+      ruby_dep (~> 1.2)
+    lumberjack (1.0.10)
     mail (2.6.4)
       mime-types (>= 1.16, < 4)
     memcachier (0.0.2)
     method_source (0.8.2)
-    mime-types (2.99.1)
+    mime-types (3.0)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0221)
     mimemagic (0.3.0)
     mini_portile2 (2.0.0)
-    minitest (5.8.4)
-    multi_json (1.11.2)
+    minitest (5.9.0)
+    multi_json (1.11.3)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
-    nenv (0.2.0)
-    netrc (0.10.3)
-    newrelic_rpm (3.9.8.273)
+    nenv (0.3.0)
+    newrelic_rpm (3.15.2.317)
     nokogiri (1.6.7.2)
       mini_portile2 (~> 2.0.0.rc2)
-    notiffany (0.0.6)
+    notiffany (0.1.0)
       nenv (~> 0.1)
       shellany (~> 0.0)
-    oauth (0.4.7)
-    omniauth (1.2.2)
+    oauth (0.5.1)
+    omniauth (1.3.1)
       hashie (>= 1.2, < 4)
-      rack (~> 1.0)
-    omniauth-flickr (0.0.15)
+      rack (>= 1.0, < 3)
+    omniauth-flickr (0.0.19)
+      multi_json (~> 1.11.0)
       omniauth-oauth (~> 1.0)
-    omniauth-oauth (1.0.1)
+    omniauth-oauth (1.1.0)
       oauth
       omniauth (~> 1.0)
-    omniauth-twitter (1.1.0)
-      multi_json (~> 1.3)
-      omniauth-oauth (~> 1.0)
+    omniauth-twitter (1.2.1)
+      json (~> 1.3)
+      omniauth-oauth (~> 1.1)
     orm_adapter (0.5.0)
-    paperclip (4.3.0)
+    paperclip (4.3.6)
       activemodel (>= 3.2.0)
       activesupport (>= 3.2.0)
       cocaine (~> 0.5.5)
       mime-types
       mimemagic (= 0.3.0)
-    pg (0.17.1)
+    parser (2.3.1.0)
+      ast (~> 2.2)
+    pg (0.18.4)
     plupload-rails (1.2.1)
       rails (>= 3.1)
-    poltergeist (1.6.0)
+    poltergeist (1.9.0)
       capybara (~> 2.1)
       cliver (~> 0.3.1)
       multi_json (~> 1.0)
       websocket-driver (>= 0.2.0)
-    pry (0.10.1)
+    pry (0.10.3)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
@@ -330,36 +325,31 @@ GEM
       bundler (>= 1.3.0, < 2.0)
       railties (= 4.1.15)
       sprockets-rails (~> 2.0)
-    rails-i18n (4.0.3)
-      i18n (~> 0.6)
+    rails-i18n (4.0.8)
+      i18n (~> 0.7)
       railties (~> 4.0)
     rails_12factor (0.0.3)
       rails_serve_static_assets
       rails_stdout_logging
-    rails_serve_static_assets (0.0.2)
-    rails_stdout_logging (0.0.3)
+    rails_serve_static_assets (0.0.5)
+    rails_stdout_logging (0.0.5)
     railties (4.1.15)
       actionpack (= 4.1.15)
       activesupport (= 4.1.15)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    raindrops (0.13.0)
+    raindrops (0.16.0)
     rake (11.1.2)
-    rb-fsevent (0.9.5)
-    rb-inotify (0.9.5)
+    rb-fsevent (0.9.7)
+    rb-inotify (0.9.7)
       ffi (>= 0.5.0)
-    ref (1.0.5)
     responders (1.1.2)
       railties (>= 3.2, < 4.2)
-    rest-client (1.8.0)
-      http-cookie (>= 1.0.2, < 2.0)
-      mime-types (>= 1.16, < 3.0)
-      netrc (~> 0.7)
     rspec (3.4.0)
       rspec-core (~> 3.4.0)
       rspec-expectations (~> 3.4.0)
       rspec-mocks (~> 3.4.0)
-    rspec-activemodel-mocks (1.0.1)
+    rspec-activemodel-mocks (1.0.3)
       activemodel (>= 3.0)
       activesupport (>= 3.0)
       rspec-mocks (>= 2.99, < 4.0)
@@ -380,60 +370,52 @@ GEM
       rspec-mocks (~> 3.4.0)
       rspec-support (~> 3.4.0)
     rspec-support (3.4.1)
-    ruby-units (1.4.5)
-    ruby_parser (3.1.3)
+    ruby-units (2.0.0)
+    ruby_dep (1.3.1)
+    ruby_parser (3.8.2)
       sexp_processor (~> 4.1)
-    rubyzip (1.1.7)
-    sass (3.2.19)
-    sass-rails (4.0.5)
+    rubyzip (1.2.0)
+    sass (3.4.22)
+    sass-rails (5.0.4)
       railties (>= 4.0.0, < 5.0)
-      sass (~> 3.2.2)
-      sprockets (~> 2.8, < 3.0)
-      sprockets-rails (~> 2.0)
-    selenium-webdriver (2.47.1)
+      sass (~> 3.1)
+      sprockets (>= 2.8, < 4.0)
+      sprockets-rails (>= 2.0, < 4.0)
+      tilt (>= 1.1, < 3)
+    selenium-webdriver (2.53.0)
       childprocess (~> 0.5)
-      multi_json (~> 1.0)
       rubyzip (~> 1.0)
       websocket (~> 1.0)
-    sexp_processor (4.4.4)
+    sexp_processor (4.7.0)
     shellany (0.0.1)
-    simplecov (0.9.1)
+    simplecov (0.11.2)
       docile (~> 1.1.0)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.8.0)
-    simplecov-html (0.8.0)
+      json (~> 1.8)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.0)
     slop (3.6.0)
-    sprockets (2.12.4)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
-      rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
+    sprockets (3.6.0)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
     sprockets-rails (2.3.3)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
-    term-ansicolor (1.3.0)
+    term-ansicolor (1.3.2)
       tins (~> 1.0)
-    terminal-table (1.4.5)
-    therubyracer (0.12.1)
-      libv8 (~> 3.16.14.0)
-      ref
+    terminal-table (1.5.2)
     thor (0.19.1)
-    thread (0.1.4)
+    thread (0.2.2)
     thread_safe (0.3.5)
-    tilt (1.4.1)
-    tins (1.3.3)
+    tilt (2.0.4)
+    tins (1.6.0)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
     uglifier (2.7.2)
       execjs (>= 0.3.0)
       json (>= 1.8.0)
-    unf (0.1.4)
-      unf_ext
-    unf_ext (0.0.7.1)
-    unicorn (4.8.3)
+    unicorn (5.1.0)
       kgio (~> 2.6)
-      rack
       raindrops (~> 0.7)
     warden (1.2.6)
       rack (>= 1.0)
@@ -441,11 +423,11 @@ GEM
       nokogiri (>= 1.2.0)
       rack (>= 1.0)
       rack-test (>= 0.5.3)
-    websocket (1.2.2)
-    websocket-driver (0.5.4)
+    websocket (1.2.3)
+    websocket-driver (0.6.4)
       websocket-extensions (>= 0.1.0)
     websocket-extensions (0.1.2)
-    will_paginate (3.0.7)
+    will_paginate (3.1.0)
     xpath (2.0.0)
       nokogiri (~> 1.3)
 
@@ -461,11 +443,14 @@ DEPENDENCIES
   bonsai-elasticsearch-rails
   bootstrap-datepicker-rails
   bootstrap-kaminari-views
+  bootstrap-sass (~> 3.3.6)
   bundler (>= 1.1.5)
   byebug
   cancancan (~> 1.9)
   capybara
   capybara-email
+  capybara-screenshot
+  codeclimate-test-reporter
   coffee-rails (~> 4.1.0)
   comfortable_mexican_sofa (~> 1.12.0)
   coveralls
@@ -478,9 +463,10 @@ DEPENDENCIES
   factory_girl_rails (~> 4.5.0)
   figaro
   flickraw
+  font-awesome-sass
   friendly_id (~> 5.0.4)
   geocoder!
-  gibbon
+  gibbon (~> 1.2.0)
   gravatar-ultimate
   guard
   guard-rspec
@@ -494,11 +480,7 @@ DEPENDENCIES
   kaminari
   leaflet-markercluster-rails
   leaflet-rails
-  less (~> 2.5.0)
-  less-rails (~> 2.5.0)
-  less-rails-bootstrap (~> 3.2.0)
   letter_opener
-  libv8 (= 3.16.14.7)
   memcachier
   newrelic_rpm
   omniauth
@@ -514,13 +496,15 @@ DEPENDENCIES
   rspec-activemodel-mocks
   rspec-rails (~> 3.4.0)
   ruby-units
-  sass-rails (~> 4.0.4)
+  sass-rails (~> 5.0.4)
   selenium-webdriver
-  therubyracer (~> 0.12)
   uglifier (~> 2.7.2)
   unicorn
   webrat
   will_paginate (~> 3.0)
 
+RUBY VERSION
+   ruby 2.1.8p440
+
 BUNDLED WITH
-   1.11.2
+   1.12.4

README.md

@@ -2,6 +2,7 @@
 
 [![Build Status](https://travis-ci.org/Growstuff/growstuff.png)](https://travis-ci.org/Growstuff/growstuff)
 [![Coverage Status](https://coveralls.io/repos/Growstuff/growstuff/badge.png)](https://coveralls.io/r/Growstuff/growstuff)
+[![Code Climate](https://codeclimate.com/github/Growstuff/growstuff/badges/gpa.svg)](https://codeclimate.com/github/Growstuff/growstuff)
 
 Welcome to the Growstuff project.
 
@@ -32,6 +33,14 @@ frontend features. We welcome contributions -- see
 * Drop in to one of our [discussion forums](http://wiki.growstuff.org/index.php/Discussion_forums) to chat to other developers, get help, etc.
 * You may also be interested in our [API](http://wiki.growstuff.org/index.php/API).
 
+The wiki is down right now, so here's what you need to do on Mac OS X to get set up.
+
+```
+gem install bundle
+gem install pg -v '0.18.4' -- --with-pg-config=/Applications/Postgres.app/Contents/Versions/latest/bin/pg_config
+bundle install
+```
+
 ## For designers, writers, researchers, data wranglers, and other contributors
 
 There are heaps of ways to get involved and contribute no matter what

app/assets/javascripts/append_date.js.coffee

@@ -10,12 +10,11 @@ jQuery ->
 
   href = el.attr('href')
 
-  originalText = el.text()
-
   el.click (e) ->
     e.stopPropagation()
     e.preventDefault()
 
+    originalText = $(this).text()
     $(this).text('Confirm without date')
 
     $(this).bind('click.confirm', (e) ->

app/assets/javascripts/application.js

@@ -16,7 +16,6 @@
 //= require jquery
 //= require jquery_ujs
 //= require jquery-ui/autocomplete
-//= require twitter/bootstrap
-//= require_tree .
+//= require bootstrap-sprockets
 //= require bootstrap-datepicker
-
+//= require_tree .

app/assets/stylesheets/application.css

@@ -1,14 +0,0 @@
-/*
- * This is a manifest file that'll automatically include all the stylesheets available in this directory
- * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
- * the top of the compiled file, but it's generally better to create a new file per style scope.
- *= require_self
- *= require jquery-ui/autocomplete
- *= require bootstrap-datepicker
- *= require leaflet
- *= require leaflet.markercluster
- *= require leaflet.markercluster.default
- *= require custom_bootstrap/custom_bootstrap
- *= require overrides.css
- *= require_tree .
-*/

app/assets/stylesheets/application.sass

@@ -0,0 +1,7 @@
+@import 'jquery-ui/autocomplete'
+@import 'bootstrap-datepicker'
+@import 'leaflet'
+@import 'leaflet.markercluster'
+@import 'leaflet.markercluster.default'
+@import 'custom_bootstrap/custom_bootstrap'
+@import 'overrides'

app/assets/stylesheets/bootstrap-accessibility.css

@@ -0,0 +1 @@
+.btn:focus{outline:dotted 2px #000}div.active:focus{outline:dotted 1px #000}a:focus{outline:dotted 1px #000}.close:hover,.close:focus{outline:dotted 1px #000}.nav>li>a:hover,.nav>li>a:focus{outline:dotted 1px #000}.carousel-inner>.item{position:absolute;top:-999999em;display:block;-moz-transition:ease-in-out 0.6s left;-o-transition:ease-in-out 0.6s left;-webkit-transition:ease-in-out 0.6s left;transition:ease-in-out 0.6s left}.carousel-inner>.active{top:0}.carousel-inner>.active,.carousel-inner>.next,.carousel-inner>.prev{position:relative}.carousel-inner>.next,.carousel-inner>.prev{position:absolute;top:0;width:100%}.alert-success{color:#2d4821}.alert-info{color:#214c62}.alert-warning{color:#6c4a00;background-color:#f9f1c6}.alert-danger{color:#d2322d}.alert-danger:hover{color:#a82824}

app/assets/stylesheets/custom_bootstrap/custom_bootstrap.less

@@ -1,56 +0,0 @@
-// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-// !!! AUTOMATICALLY GENERATED FILE. DO NOT MODIFY !!!
-// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-// Core variables and mixins
-@import "twitter/bootstrap/variables.less";
-@import "custom_bootstrap/variables.less"; // Modify this for custom colors, font-sizes, etc
-@import "twitter/bootstrap/mixins.less";
-@import "custom_bootstrap/mixins.less"; // Modify this for custom mixins
-
-// Reset and dependencies
-@import "twitter/bootstrap/normalize.less";
-@import "twitter/bootstrap/print.less";
-@import "twitter/bootstrap/glyphicons.less";
-
-// Core CSS
-@import "twitter/bootstrap/scaffolding.less";
-@import "twitter/bootstrap/type.less";
-@import "twitter/bootstrap/code.less";
-@import "twitter/bootstrap/grid.less";
-@import "twitter/bootstrap/tables.less";
-@import "twitter/bootstrap/forms.less";
-@import "twitter/bootstrap/buttons.less";
-
-// Components
-@import "twitter/bootstrap/component-animations.less";
-@import "twitter/bootstrap/dropdowns.less";
-@import "twitter/bootstrap/button-groups.less";
-@import "twitter/bootstrap/input-groups.less";
-@import "twitter/bootstrap/navs.less";
-@import "twitter/bootstrap/navbar.less";
-@import "twitter/bootstrap/breadcrumbs.less";
-@import "twitter/bootstrap/pagination.less";
-@import "twitter/bootstrap/pager.less";
-@import "twitter/bootstrap/labels.less";
-@import "twitter/bootstrap/badges.less";
-@import "twitter/bootstrap/jumbotron.less";
-@import "twitter/bootstrap/thumbnails.less";
-@import "twitter/bootstrap/alerts.less";
-@import "twitter/bootstrap/progress-bars.less";
-@import "twitter/bootstrap/media.less";
-@import "twitter/bootstrap/list-group.less";
-@import "twitter/bootstrap/panels.less";
-@import "twitter/bootstrap/responsive-embed.less";
-@import "twitter/bootstrap/wells.less";
-@import "twitter/bootstrap/close.less";
-
-// Components w/ JavaScript
-@import "twitter/bootstrap/modals.less";
-@import "twitter/bootstrap/tooltip.less";
-@import "twitter/bootstrap/popovers.less";
-@import "twitter/bootstrap/carousel.less";
-
-// Utility classes
-@import "twitter/bootstrap/utilities.less";
-@import "twitter/bootstrap/responsive-utilities.less";

app/assets/stylesheets/custom_bootstrap/custom_bootstrap.sass

@@ -0,0 +1,59 @@
+// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+// !!! AUTOMATICALLY GENERATED FILE. DO NOT MODIFY !!!
+// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+// Core variables and mixins
+@import "bootstrap-sprockets"
+@import "bootstrap/variables"
+// Modify this for custom colors, font-sizes, etc
+@import "custom_bootstrap/variables"
+@import "bootstrap/mixins"
+// Modify this for custom mixins
+@import "custom_bootstrap/mixins"
+
+// Reset and dependencies
+@import "bootstrap/normalize"
+@import "bootstrap/print"
+@import "bootstrap/glyphicons"
+
+// Core CSS
+@import "bootstrap/scaffolding"
+@import "bootstrap/type"
+@import "bootstrap/code"
+@import "bootstrap/grid"
+@import "bootstrap/tables"
+@import "bootstrap/forms"
+@import "bootstrap/buttons"
+
+// Components
+@import "bootstrap/component-animations"
+@import "bootstrap/dropdowns"
+@import "bootstrap/button-groups"
+@import "bootstrap/input-groups"
+@import "bootstrap/navs"
+@import "bootstrap/navbar"
+@import "bootstrap/breadcrumbs"
+@import "bootstrap/pagination"
+@import "bootstrap/pager"
+@import "bootstrap/labels"
+@import "bootstrap/badges"
+@import "bootstrap/jumbotron"
+@import "bootstrap/thumbnails"
+@import "bootstrap/alerts"
+@import "bootstrap/progress-bars"
+@import "bootstrap/media"
+@import "bootstrap/list-group"
+@import "bootstrap/panels"
+@import "bootstrap/responsive-embed"
+@import "bootstrap/wells"
+@import "bootstrap/close"
+
+// Components w/ JavaScript
+@import "bootstrap/modals"
+@import "bootstrap/tooltip"
+@import "bootstrap/popovers"
+@import "bootstrap/carousel"
+
+// Utility classes
+@import "bootstrap/utilities"
+@import "bootstrap/responsive-utilities"

app/assets/stylesheets/custom_bootstrap/variables.less

@@ -1,54 +0,0 @@
-// Use this file to override Twitter Bootstrap variables or define own variables.
-
-// Import original variables so they can be used in overrides
-@import "twitter/bootstrap/variables.less";
-
-// Base colours
-
-@beige: #f3f1ee;
-@brown: #413f3b;
-
-@green:  #5f8e43;
-@blue:   #2f4365;
-@red:    #8e4d43;
-@orange: #b2685c;
-@yellow: #b2935c;
-
-@body-bg: @beige;
-@text-color: @brown;
-@link-color: @green;
-
-@brand-primary: @green;
-
-@font-family-sans-serif:        "Helvetica Neue", Helvetica, Arial, sans-serif;
-@font-family-serif:       Georgia, "Times New Roman", Times, serif;
-@font-family-mono:        Monaco, Menlo, Consolas, "Courier New", monospace;
-
-@font-size-base:          14px;
-@font-family-base:        @font-family-sans-serif;
-@line-height-base:        1.5;
-@alt-font-family:         @font-family-serif;
-
-@headings-font-family:    @font-family-sans-serif;
-@headings-font-weight:    bold;    // instead of browser default, bold
-@headings-color:         inherit; // empty to use BS default, @textColor
-
-// Hero unit
-@jumbotron-bg: darken(@body-bg, 10%);
-
-// Nav bar
-@navbar-default-bg: @brown;
-@navbar-default-bg-highlight: @brown;
-@navbar-default-color: @beige;
-@navbar-default-link-color: darken(@beige, 20%);
-@navbar-default-link-hover-color: @beige;
-@navbar-default-link-active-color: @beige;
-@navbar-default-brand-color: lighten(@green, 20%);
-
-// Top nav collapse threshold
-@grid-float-breakpoint: @screen-md-min;
-
-@dropdown-bg: lighten(@beige, 10%);
-@dropdown-link-color: @brown;
-@dropdown-link-hover-color: @brown;
-@dropdown-link-hover-bg: lighten(@green, 50%);

app/assets/stylesheets/custom_bootstrap/variables.sass

@@ -0,0 +1,54 @@
+// Use this file to override Twitter Bootstrap variables or define own variables.
+
+// Import original variables so they can be used in overrides
+//@import 'bootstrap/variables.scss'
+
+// Base colours
+
+$beige: #f3f1ee
+$brown: #413f3b
+
+$green:  #5f8e43
+$blue:   #2f4365
+$red:    #8e4d43
+$orange: #b2685c
+$yellow: #b2935c
+
+$body-bg: $beige
+$text-color: $brown
+$link-color: $green
+
+$brand-primary: $green
+
+$font-family-sans-serif:        "Helvetica Neue", Helvetica, Arial, sans-serif
+$font-family-serif:       Georgia, "Times New Roman", Times, serif
+$font-family-mono:        Monaco, Menlo, Consolas, "Courier New", monospace
+
+$font-size-base:          14px
+$font-family-base:        $font-family-sans-serif
+$line-height-base:        1.5
+$alt-font-family:         $font-family-serif
+
+$headings-font-family:    $font-family-sans-serif
+$headings-font-weight:    bold    // instead of browser default, bold
+$headings-color:         inherit // empty to use BS default, $textColor
+
+// Hero unit
+$jumbotron-bg: darken($body-bg, 10%)
+
+// Nav bar
+$navbar-default-bg: $brown
+$navbar-default-bg-highlight: $brown
+$navbar-default-color: $beige
+$navbar-default-link-color: darken($beige, 20%)
+$navbar-default-link-hover-color: $beige
+$navbar-default-link-active-color: darken($beige,80%)
+$navbar-default-brand-color: lighten($green, 20%)
+
+// Top nav collapse threshold
+$grid-float-breakpoint: $screen-md-min
+
+$dropdown-bg: lighten($beige, 10%)
+$dropdown-link-color: $brown
+$dropdown-link-hover-color: $brown
+$dropdown-link-hover-bg: lighten($green, 50%)

app/assets/stylesheets/leaflet_overrides.css.less

@@ -1,10 +0,0 @@
-.leaflet-popup-content-wrapper, .leaflet-popup-tip {
-  border: none;
-}
-.thumbnail{
-	background: #fff !important; 
-	border: solid 1px whitesmoke;
-}
-.thumbnail .crop-thumbnail .cropinfo{
-	padding-top: 14px;
-}

app/assets/stylesheets/leaflet_overrides.sass

@@ -0,0 +1,10 @@
+.leaflet-popup-content-wrapper,
+.leaflet-popup-tip
+  border: none
+
+.thumbnail
+  background: #fff !important
+  border: solid 1px whitesmoke
+
+.thumbnail .crop-thumbnail .cropinfo
+  padding-top: 14px

app/assets/stylesheets/overrides.css.less

@@ -1,360 +0,0 @@
-@import "twitter/bootstrap/bootstrap";
-@import "custom_bootstrap/variables";
-// this padding needs to be done before the responsive stuff is imported
-body {
-  // modifying this for our promotional banner. can be replaced after if
-  // needed.
-  // padding-top: @navbar-height + 15px;
-  padding-top: @navbar-height;
-}
-
-//@import "twitter/bootstrap/responsive";
-
-// Set the correct sprite paths
-@iconSpritePath: asset-path("twitter/bootstrap/glyphicons-halflings");
-@iconWhiteSpritePath: asset-path("twitter/bootstrap/glyphicons-halflings-white");
-
-// Set the Font Awesome (Font Awesome is default. You can disable by commenting below lines)
-@fontAwesomeEotPath: asset-url("fontawesome-webfont.eot");
-@fontAwesomeEotPath_iefix: asset-url("fontawesome-webfont.eot#iefix");
-@fontAwesomeWoffPath: asset-url("fontawesome-webfont.woff");
-@fontAwesomeTtfPath: asset-url("fontawesome-webfont.ttf");
-@fontAwesomeSvgPath: asset-url("fontawesome-webfont.svg#fontawesomeregular");
-
-// Font Awesome
-//@import "fontawesome/font-awesome";
-
-// Glyphicons
-//@import "twitter/bootstrap/sprites.less";
-
-
-.list-inline > li.first {
-  padding-left: 0px;
-}
-
-h2 {
-  font-size: 150%;
-}
-
-/*
-#subtitle {
-  color: lighten(@brown, 30%);
-  margin-top: 0px;
-  padding-top: 0px;
-  padding-left: 1em;
-  font-style: italic;
-  font-weight: normal;
-}
-*/
-
-h3 {
-  font-size: 120%;
-}
-
-.main {
-  padding-right: 1em;
-}
-
-.sidebar {
-  margin-left: -1px;
-  border-left: 1px solid darken(@beige, 10%);
-  padding-left: 1em;
-}
-
-// this is used for eg. crops and members index pages
-.six-across:nth-child(6n+1) {
-  margin-left: 0px
-}
-
-.three-across:nth-child(3n+1) {
-  margin-left: 0px;
-  clear: both;
-}
-
-// let's condense the hero unit a little
-.jumbotron {
-  padding-top: 30px;
-  padding-bottom: 30px;
-}
-
-// info under the main heading on homepage
-.jumbotron .info {
-  padding-top: 15px;
-}
-
-// signup widget on homepage
-.jumbotron .signup {
-  background-color: lighten(@green, 40%);
-  border: 1px solid lighten(@green, 20%);
-  border-radius: 6px;
-  padding: 15px;
-  text-align: center;
-  line-height: 200%;
-}
-
-// stats shown on homepage. eg. "999 members..."
-p.stats {
-  font-weight: bold;
-}
-
-.member-cards {
-  display: flex;
-  flex: none;
-  flex-wrap: wrap;
-  justify-content: space-between;
-}
-.member-thumbnail {
-  padding: .25em;
-
-  div {
-    width: 5em;
-    display: inline-block;
-	vertical-align: top;
-  }
-
-  div ~ div {
-    width: 15em;
-	padding-left: 1em;
-  }
-}
-
-#placesmap, #cropmap {
-  height: 500px;
-}
-
-#membermap {
-  height: 250px;
-}
-
-.member-location {
-  font-size: small;
-  font-style: italic;
-}
-
-.member-location a {
-  color: @brown;
-}
-
-.photo-thumbnail {
-  position:relative;
-  padding:0;
-  img {
-    width:100%;
-  }
-  .text {
-    display:none;
-    color:#000;
-    position:absolute;
-    bottom:0;
-    background:rgba(0, 0, 0, 0.8);
-    width:100%;
-    margin:0;
-  }
-  p {
-    padding:5px;
-    margin:0;
-    color:#fff;
-  }
-  &:hover {
-    .text {
-      display:block;
-    }
-  }
-}
-
-
-.thumbnail {
-  border: none;
-  text-align: center;
-  margin-bottom: 1.5em;
-
-  .member-thumbnail {
-    text-align: left;
-    img {
-      height: 85px;
-      width: 85px;
-      max-width: 85px
-    }
-  }
-
-  .crop-thumbnail {
-    height: 220px;
-    .cropinfo {
-      display: inline-block;
-      max-width: 100%;
-      white-space: nowrap;
-      line-height: 1em;
-      padding-bottom: 2px;
-
-      .cropname {
-        overflow: hidden;
-        text-overflow: ellipsis;
-      }
-
-      .scientificname {
-        font-size: small;
-        font-style: italic;
-        overflow: hidden;
-        text-overflow: ellipsis;
-      }
-
-      .plantingcount {
-        font-size: small;
-      }
-    }
-
-
-    .crop-name a {
-      padding-top: 2px;
-    }
-
-    .scientific-name small {
-      margin-bottom: -2px;
-    }
-  }
-}
-
-li.crop-hierarchy {
-  list-style-type: disc;
-}
-
-.navbar-brand {
-  margin: 0px;
-  padding: 0px;
-}
-
-.navbar-bottom {
-  margin: 40px 0px 0px 0px !important;
-}
-
-// footer
-
-footer {
-  #footer1, #footer2, #footer3 {
-    text-align: left;
-    padding-top: 1em;
-    padding-bottom: 2em;
-    ul {
-      list-style-type: none;
-      list-style-position: outside;
-      padding-left: 0px;
-      margin-left: 0px;
-    }
-    a {
-      color: @navbar-default-link-color;
-      text-decoration: none;
-    }
-    a:hover {
-      color: @navbar-default-link-hover-color;
-    }
-    a:active {
-      color: @navbar-default-link-active-color;
-    }
-  }
-
-  .navbar-bottom.navbar {
-    border-radius: 0;
-  }
-}
-
-// ensure footer is pushed to bottom of browser window
-
-#maincontainer {
-  min-height: 80%;
-}
-
-html, body {
-  height: 100%;
-}
-
-//
-
-.crop-image, .member-image {
-  width: 100%;
-  height: 100%;
-}
-
-// Autosuggest
-
-.ui-autocomplete {
-  z-index: @zindex-tooltip;
-}
-
-// Crowdfunding campaign, Sep-Oct 2014
-
-.crowdfunding-banner {
-  text-align: center;
-  font-weight: bold;
-  background-color: lighten(@green, 30%);
-  margin-top: 0px;
-  margin-bottom: 5px;
-  padding: 15px;
-}
-
-.crowdfunding-banner a {
-  color: @brown;
-  text-decoration: underline;
-}
-
-.alert {
-  a {
-    font-weight: 800;
-  }
-}
-
-// Overrides applying only to mobile view. This must be at the end of the overrides file.
-
-@media only screen and (max-width: 767px) {
-  .sidebar {
-    margin-left: 0;
-    border-left: none;
-    padding-left: 0;
-  }
-
-  #map {
-    height: 300px;
-  }
-
-  .navbar .nav > li {
-    display: block;
-  }
-}
-
-/* override "info" alert boxes to be green, not blue, on Growstuff */
-@state-info-text: darken(@green, 10%);
-@state-info-bg: lighten(@green, 50%);
-
-/* and set "success" to be the same, as it was just very slightly
- * different because the default bootstrap green is slightly different
- * from ours */
-@state-success-text: darken(@green, 10%);
-@state-success-bg: lighten(@green, 50%);
-
-.hide {
-  display: none;
-}
-
-#add-sci_name-row, #remove-sci_name-row, #add-alt_name-row, #remove-alt_name-row{
-  display: none;
-}
-
-.panel-footer{
-  height: 6em;
-}
-
-#gardens_panel_body{
-  height: 20em;
-}
-
-.form-group.required .control-label:before {
-  content: "* ";
-  color: red;
-}
-
-.margin-bottom {
-  margin-bottom: 1em;
-}
-
-.red {
-  color: red;
-}

app/assets/stylesheets/overrides.sass

@@ -0,0 +1,316 @@
+@import "bootstrap-sprockets"
+@import "bootstrap"
+@import "custom_bootstrap/variables"
+// this padding needs to be done before the responsive stuff is imported
+body 
+  // modifying this for our promotional banner. can be replaced after if
+  // needed.
+  // padding-top: $navbar-height + 15px
+  padding-top: $navbar-height
+
+
+//@import "bootstrap/responsive"
+
+// Font Awesome
+@import "font-awesome-sprockets"
+@import "font-awesome"
+
+// Glyphicons
+//@import "bootstrap/glyphicons"
+
+
+.list-inline > li.first 
+  padding-left: 0px
+
+h2 
+  font-size: 150%
+
+
+//#subtitle 
+//  color: lighten($brown, 30%)
+//  font-style: italic
+//  font-weight: normal
+//  margin-top: 0px
+//  padding-left: 1em
+//  padding-top: 0px
+
+h3 
+  font-size: 120%
+
+.main 
+  padding-right: 1em
+
+.sidebar
+  border-left: 1px solid darken($beige, 10%)
+  margin-left: -1px
+  padding-left: 1em
+
+// this is used for eg. crops and members index pages
+.six-across:nth-child(6n+1) 
+  margin-left: 0px
+
+.three-across:nth-child(3n+1) 
+  margin-left: 0px
+  clear: both
+
+// let's condense the hero unit a little
+.jumbotron 
+  padding-top: 30px
+  padding-bottom: 30px
+
+// info under the main heading on homepage
+.jumbotron .info 
+  padding-top: 15px
+
+// signup widget on homepage
+.jumbotron .signup 
+  background-color: lighten($green, 40%)
+  border: 1px solid lighten($green, 20%)
+  border-radius: 6px
+  line-height: 200%
+  padding: 15px
+  text-align: center
+
+// stats shown on homepage. eg. "999 members..."
+p.stats 
+  font-weight: bold
+
+.member-cards 
+  display: flex
+  flex: none
+  flex-wrap: wrap
+  justify-content: space-between
+
+.member-thumbnail 
+  padding: .25em
+
+  div 
+    width: 5em
+    display: inline-block
+    vertical-align: top
+
+.member-thumbnail div~div
+  padding-left: 1em
+  width: 15em
+
+.planting
+  dl.planting-attributes
+    font-size: 85%
+
+    dt
+      text-align: left
+    dd
+      margin-left: auto
+
+@media (min-width: $screen-md-min)
+  .planting-thumbnail 
+    dl.planting-attributes
+      font-size: 85%
+      width: 100%
+
+      dt
+        text-align: left
+        width: 80px
+      dd
+        padding-left: 80px
+        margin-left: auto
+
+#placesmap, #cropmap 
+  height: 500px
+
+#membermap 
+  height: 250px
+
+.location-not-set
+  height: 250px
+  width: 100%
+  background-image: image-url('location-not-set.en.png')
+  background-repeat: no-repeat
+  background-position: center
+
+.member-location 
+  font-size: small
+  font-style: italic
+
+
+.member-location a 
+  color: $brown
+
+
+.photo-thumbnail 
+  padding: 0
+  position: relative
+
+  img
+    width: 100%
+  
+  .text 
+    display: none
+    color: #000
+    position: absolute
+    bottom: 0
+    background: rgba(0, 0, 0, 0.8)
+    width: 100%
+    margin: 0
+  
+  p 
+    padding: 5px
+    margin: 0
+    color: #fff
+  
+  &:hover 
+    .text 
+      display: block
+
+.thumbnail 
+  border: none
+  text-align: center
+  margin-bottom: 1.5em
+
+  .member-thumbnail 
+    text-align: left
+    img 
+      height: 85px
+      width: 85px
+      max-width: 85px
+
+  .crop-thumbnail 
+    height: 220px
+    .cropinfo 
+      display: inline-block
+      max-width: 100%
+      white-space: nowrap
+      line-height: 1em
+      padding-bottom: 2px
+
+      .cropname 
+        overflow: hidden
+        text-overflow: ellipsis
+
+      .scientificname 
+        font-size: small
+        font-style: italic
+        overflow: hidden
+        text-overflow: ellipsis
+
+      .plantingcount 
+        font-size: small
+
+    .crop-name a 
+      padding-top: 2px
+
+    .scientific-name small 
+      margin-bottom: -2px
+
+li.crop-hierarchy 
+  list-style-type: disc
+
+.navbar-brand 
+  margin: 0px
+  padding: 0px
+
+.navbar-bottom 
+  margin: 40px 0px 0px 0px !important
+
+// footer
+footer 
+  #footer1, #footer2, #footer3 
+    text-align: left
+    padding-top: 1em
+    padding-bottom: 2em
+    ul 
+      list-style-type: none
+      list-style-position: outside
+      padding-left: 0px
+      margin-left: 0px
+    
+    a 
+      color: $navbar-default-link-color
+      text-decoration: none
+    
+    a:hover 
+      color: $navbar-default-link-hover-color
+    
+    a:active 
+      color: $navbar-default-link-active-color
+
+  .navbar-bottom.navbar 
+    border-radius: 0
+
+// ensure footer is pushed to bottom of browser window
+
+#maincontainer 
+  min-height: 80%
+
+html, body 
+  height: 100%
+
+.crop-image, .member-image 
+  width: 100%
+  height: 100%
+
+// Autosuggest
+
+.ui-autocomplete
+  background: white
+  z-index: $zindex-tooltip
+
+.alert 
+  a 
+    font-weight: 800
+
+// Overrides applying only to mobile view. This must be at the end of the overrides file.
+
+@media only screen and (max-width: 767px) 
+  .sidebar 
+    margin-left: 0
+    border-left: none
+    padding-left: 0
+
+  #map 
+    height: 300px
+
+  .navbar .nav > li 
+    display: block
+
+/* override "info" alert boxes to be green, not blue, on Growstuff */
+$state-info-text: darken($green, 10%)
+$state-info-bg: lighten($green, 50%)
+
+/* and set "success" to be the same, as it was just very slightly
+ * different because the default bootstrap green is slightly different
+ * from ours */
+$state-success-text: darken($green, 10%)
+$state-success-bg: lighten($green, 50%)
+
+.hide 
+  display: none
+
+#add-sci_name-row, #remove-sci_name-row, #add-alt_name-row, #remove-alt_name-row
+  display: none
+
+.panel-footer
+  height: 6em
+
+.panel
+  .dl-horizontal
+    text-overflow: ellipsis
+    overflow: hidden
+
+#gardens_panel_body
+  height: 20em
+
+.form-group.required .control-label:before 
+  content: "* "
+  color: red
+
+.margin-bottom 
+  margin-bottom: 1em
+
+.red 
+  color: red
+
+.truncate
+  overflow: hidden
+  text-overflow: ellipsis
+  white-space: nowrap

app/controllers/about_controller.rb

@@ -1,2 +0,0 @@
-class AboutController < ApplicationController
-end

app/controllers/admin/orders_controller.rb

@@ -8,7 +8,7 @@ class Admin::OrdersController < ApplicationController
 
   def search
     authorize! :manage, :all
-    @orders = Order.search({:by => params[:search_by], :for => params[:search_text]})
+    @orders = Order.search({by: params[:search_by], for: params[:search_text]})
 
     if @orders.empty?
       flash[:alert] = "Couldn't find order with #{params[:search_by]} = #{params[:search_text]}"

app/controllers/alternate_names_controller.rb

@@ -1,5 +1,5 @@
 class AlternateNamesController < ApplicationController
-  before_filter :authenticate_member!, :except => [:index, :show]
+  before_filter :authenticate_member!, except: [:index, :show]
   load_and_authorize_resource
 
   # GET /alternate_names

app/controllers/application_controller.rb

@@ -35,7 +35,7 @@ class ApplicationController < ActionController::Base
 
   # CanCan error handling
   rescue_from CanCan::AccessDenied do |exception|
-    redirect_to request.referer || root_url, :alert => exception.message
+    redirect_to request.referer || root_url, alert: exception.message
   end
 
   def set_locale

app/controllers/authentications_controller.rb

@@ -20,14 +20,14 @@ class AuthenticationsController < ApplicationController
 
       @authentication = current_member.authentications
       .create_with(
-        :name => name,
-        :token => auth['credentials']['token'],
-        :secret => auth['credentials']['secret']
+        name: name,
+        token: auth['credentials']['token'],
+        secret: auth['credentials']['secret']
       )
       .find_or_create_by(
-        :provider => auth['provider'],
-        :uid => auth['uid'],
-        :name => name)
+        provider: auth['provider'],
+        uid: auth['uid'],
+        name: name)
 
       flash[:notice] = "Authentication successful."
     else

app/controllers/comments_controller.rb

@@ -1,16 +1,16 @@
 class CommentsController < ApplicationController
-  before_filter :authenticate_member!, :except => [:index, :show]
+  before_filter :authenticate_member!, except: [:index, :show]
   load_and_authorize_resource
 
   # GET /comments
   # GET /comments.json
   def index
-    @comments = Comment.paginate(:page => params[:page])
+    @comments = Comment.paginate(page: params[:page])
 
     respond_to do |format|
       format.html # index.html.erb
       format.json { render json: @comments }
-      format.rss { render :layout => false }
+      format.rss { render layout: false }
     end
   end
 
@@ -39,7 +39,7 @@ class CommentsController < ApplicationController
       end
     else
       redirect_to request.referer || root_url,
-        :alert => "Can't post a comment on a non-existent post"
+        alert: "Can't post a comment on a non-existent post"
     end
   end
 

app/controllers/crops_controller.rb

@@ -1,9 +1,9 @@
 require 'will_paginate/array'
 
 class CropsController < ApplicationController
-  before_filter :authenticate_member!, :except => [:index, :hierarchy, :search, :show]
+  before_filter :authenticate_member!, except: [:index, :hierarchy, :search, :show]
   load_and_authorize_resource
-  skip_authorize_resource :only => [:hierarchy, :search]
+  skip_authorize_resource only: [:hierarchy, :search]
 
   # GET /crops
   # GET /crops.json
@@ -11,25 +11,25 @@ class CropsController < ApplicationController
     @sort = params[:sort]
     if @sort == 'alpha'
       # alphabetical order
-      @crops = Crop.includes(:scientific_names, {:plantings => :photos})
-      @paginated_crops = @crops.approved.paginate(:page => params[:page])
+      @crops = Crop.includes(:scientific_names, {plantings: :photos})
+      @paginated_crops = @crops.approved.paginate(page: params[:page])
     else
       # default to sorting by popularity
-      @crops = Crop.popular.includes(:scientific_names, {:plantings => :photos})
-      @paginated_crops = @crops.approved.paginate(:page => params[:page])
+      @crops = Crop.popular.includes(:scientific_names, {plantings: :photos})
+      @paginated_crops = @crops.approved.paginate(page: params[:page])
     end
 
     respond_to do |format|
       format.html
-      format.json { render :json => @crops }
+      format.json { render json: @crops }
       format.rss do
         @crops = Crop.recent.includes(:scientific_names, :creator)
-        render :rss => @crops
+        render rss: @crops
       end
       format.csv do
         @filename = "Growstuff-Crops-#{Time.zone.now.to_s(:number)}.csv"
         @crops = Crop.includes(:scientific_names, :plantings, :seeds, :creator)
-        render :csv => @crops
+        render csv: @crops
       end
     end
   end
@@ -46,7 +46,7 @@ class CropsController < ApplicationController
       @crops = Crop.recent
     end
 
-    @crops = @crops.paginate(:page => params[:page])
+    @crops = @crops.paginate(page: params[:page])
 
     @crop_wranglers = Role.crop_wranglers
     respond_to do |format|
@@ -66,25 +66,25 @@ class CropsController < ApplicationController
   def search
     @term = params[:term]
     @matches = Crop.search(@term)
-    @paginated_matches = @matches.paginate(:page => params[:page])
+    @paginated_matches = @matches.paginate(page: params[:page])
 
     respond_to do |format|
       format.html
-      format.json { render :json => @matches }
+      format.json { render json: @matches }
     end
   end
 
   # GET /crops/1
   # GET /crops/1.json
   def show
-    @crop = Crop.includes(:scientific_names, {:plantings => :photos}).find(params[:id])
-    @posts = @crop.posts.paginate(:page => params[:page])
+    @crop = Crop.includes(:scientific_names, {plantings: :photos}).find(params[:id])
+    @posts = @crop.posts.paginate(page: params[:page])
 
     respond_to do |format|
       format.html # show.html.haml
       format.json do
-        render :json => @crop.to_json(:include => {
-          :plantings => { :include => { :owner => { :only => [:id, :login_name, :location, :latitude, :longitude] }}}
+        render json: @crop.to_json(include: {
+          plantings: { include: { owner: { only: [:id, :login_name, :location, :latitude, :longitude] }}}
         })
       end
     end
@@ -207,6 +207,6 @@ class CropsController < ApplicationController
   private
 
   def crop_params
-    params.require(:crop).permit(:en_wikipedia_url, :name, :parent_id, :creator_id, :approval_status, :request_notes, :reason_for_rejection, :rejection_notes, :scientific_names_attributes => [:scientific_name, :_destroy, :id])
+    params.require(:crop).permit(:en_wikipedia_url, :name, :parent_id, :creator_id, :approval_status, :request_notes, :reason_for_rejection, :rejection_notes, scientific_names_attributes: [:scientific_name, :_destroy, :id])
   end
 end

app/controllers/follows_controller.rb

@@ -1,12 +1,12 @@
 class FollowsController < ApplicationController
   before_filter :authenticate_member!
   load_and_authorize_resource
-  skip_load_resource :only => :create
+  skip_load_resource only: :create
 
   # POST /follows
   def create
 
-    @follow = current_member.follows.build(:followed_id => follow_params[:followed_id])
+    @follow = current_member.follows.build(followed_id: follow_params[:followed_id])
 
     if @follow.save
       flash[:notice] = "Followed #{ @follow.followed.login_name }"

app/controllers/gardens_controller.rb

@@ -1,15 +1,15 @@
 class GardensController < ApplicationController
-  before_filter :authenticate_member!, :except => [:index, :show]
+  before_filter :authenticate_member!, except: [:index, :show]
   load_and_authorize_resource
 
 
   # GET /gardens
   # GET /gardens.json
   def index
-    @gardens = Garden.paginate(:page => params[:page])
+    @gardens = Garden.paginate(page: params[:page])
     @owner = Member.find_by_slug(params[:owner])
     if @owner
-      @gardens = @owner.gardens.paginate(:page => params[:page])
+      @gardens = @owner.gardens.paginate(page: params[:page])
     end
 
     respond_to do |format|
@@ -87,7 +87,7 @@ class GardensController < ApplicationController
     expire_fragment("homepage_stats")
 
     respond_to do |format|
-      format.html { redirect_to gardens_by_owner_path(:owner => @garden.owner), notice: 'Garden was successfully deleted.' }
+      format.html { redirect_to gardens_by_owner_path(owner: @garden.owner), notice: 'Garden was successfully deleted.' }
       format.json { head :no_content }
     end
   end

app/controllers/harvests_controller.rb

@@ -1,5 +1,5 @@
 class HarvestsController < ApplicationController
-  before_filter :authenticate_member!, :except => [:index, :show]
+  before_filter :authenticate_member!, except: [:index, :show]
   load_and_authorize_resource
   
 
@@ -17,12 +17,12 @@ class HarvestsController < ApplicationController
     end
 
     respond_to do |format|
-      format.html { @harvests = @harvests.paginate(:page => params[:page]) }
+      format.html { @harvests = @harvests.paginate(page: params[:page]) }
       format.json { render json: @harvests }
       format.csv do
         specifics = (@owner ? "#{@owner.login_name}-" : @crop ? "#{@crop.name}-" : nil)
         @filename = "Growstuff-#{specifics}Harvests-#{Time.zone.now.to_s(:number)}.csv"
-        render :csv => @harvests
+        render csv: @harvests
       end
     end
   end

app/controllers/members_controller.rb

@@ -1,21 +1,21 @@
 class MembersController < ApplicationController
   load_and_authorize_resource
 
-  skip_authorize_resource :only => [:nearby, :unsubscribe]
+  skip_authorize_resource only: [:nearby, :unsubscribe]
 
-  after_action :expire_cache_fragments, :only => :create
+  after_action :expire_cache_fragments, only: :create
 
   def index
     @sort = params[:sort]
     if @sort == 'recently_joined'
-      @members = Member.confirmed.recently_joined.paginate(:page => params[:page])
+      @members = Member.confirmed.recently_joined.paginate(page: params[:page])
     else
-      @members = Member.confirmed.paginate(:page => params[:page])
+      @members = Member.confirmed.paginate(page: params[:page])
     end
 
     respond_to do |format|
       format.html # index.html.haml
-      format.json { render :json => @members.to_json(:only => [:id, :login_name, :slug, :bio, :created_at, :location, :latitude, :longitude]) }
+      format.json { render json: @members.to_json(only: [:id, :login_name, :slug, :bio, :created_at, :location, :latitude, :longitude]) }
     end
   end
 
@@ -31,22 +31,22 @@ class MembersController < ApplicationController
     
     respond_to do |format|
       format.html # show.html.haml
-      format.json { render :json => @member.to_json(:only => [:id, :login_name, :bio, :created_at, :slug, :location, :latitude, :longitude]) }
+      format.json { render json: @member.to_json(only: [:id, :login_name, :bio, :created_at, :slug, :location, :latitude, :longitude]) }
       format.rss { render(
-        :layout => false,
-        :locals => { :member => @member }
+        layout: false,
+        locals: { member: @member }
       )}
     end
   end
 
   def view_follows
     @member = Member.confirmed.find(params[:login_name])
-    @follows = @member.followed.paginate(:page => params[:page])
+    @follows = @member.followed.paginate(page: params[:page])
   end
 
   def view_followers
     @member = Member.confirmed.find(params[:login_name])
-    @followers = @member.followers.paginate(:page => params[:page])
+    @followers = @member.followers.paginate(page: params[:page])
   end
 
   EMAIL_TYPE_STRING = {

app/controllers/notifications_controller.rb

@@ -40,6 +40,8 @@ class NotificationsController < ApplicationController
   def reply
     @notification = Notification.new
     @sender_notification = Notification.find(params[:id])
+    @sender_notification.read = true
+    @sender_notification.save
     @recipient = @sender_notification.sender
     @subject   = @sender_notification.subject =~ /^Re: / ?
       @sender_notification.subject :

app/controllers/order_items_controller.rb

@@ -8,7 +8,7 @@ class OrderItemsController < ApplicationController
       params[:order_item][:price] = params[:order_item][:price].to_f * 100 # convert to cents
     end
     @order_item = OrderItem.new(order_item_params)
-    @order_item.order = current_member.current_order || Order.create(:member_id => current_member.id)
+    @order_item.order = current_member.current_order || Order.create(member_id: current_member.id)
 
     respond_to do |format|
       if @order_item.save

app/controllers/orders_controller.rb

@@ -34,15 +34,15 @@ class OrdersController < ApplicationController
     @order = Order.find(params[:id])
 
     respond_to do |format|
-      if @order.update_attributes(:referral_code => params[:referral_code])
+      if @order.update_attributes(referral_code: params[:referral_code])
         response = EXPRESS_GATEWAY.setup_purchase(
           @order.total,
-          :items             => @order.activemerchant_items,
-          :currency          => Growstuff::Application.config.currency,
-          :no_shipping       => true,
-          :ip                => request.remote_ip,
-          :return_url        => complete_order_url,
-          :cancel_return_url => shop_url
+          items: @order.activemerchant_items,
+          currency: Growstuff::Application.config.currency,
+          no_shipping: true,
+          ip: request.remote_ip,
+          return_url: complete_order_url,
+          cancel_return_url: shop_url
         )
         format.html { redirect_to EXPRESS_GATEWAY.redirect_url_for(response.token) }
       else
@@ -58,10 +58,10 @@ class OrdersController < ApplicationController
     if (params[:token] && params['PayerID'])
       purchase = EXPRESS_GATEWAY.purchase(
         @order.total,
-        :currency          => Growstuff::Application.config.currency,
-        :ip       => request.remote_ip,
-        :payer_id => params['PayerID'],
-        :token    => params[:token]
+        currency: Growstuff::Application.config.currency,
+        ip: request.remote_ip,
+        payer_id: params['PayerID'],
+        token: params[:token]
       )
       if purchase.success?
         @order.completed_at = Time.zone.now

app/controllers/photos_controller.rb

@@ -1,11 +1,11 @@
 class PhotosController < ApplicationController
-  before_filter :authenticate_member!, :except => [:index, :show]
+  before_filter :authenticate_member!, except: [:index, :show]
   load_and_authorize_resource
 
   # GET /photos
   # GET /photos.json
   def index
-    @photos = Photo.paginate(:page => params[:page])
+    @photos = Photo.paginate(page: params[:page])
 
     respond_to do |format|
       format.html # index.html.erb
@@ -63,35 +63,29 @@ class PhotosController < ApplicationController
     @photo.owner_id = current_member.id
     @photo.set_flickr_metadata
 
-    # several models can have photos. we need to know what model and the id
-    # for the entry to attach the photo to
-    valid_models = ["planting", "harvest", "garden"]
-    if params[:type]
-      if valid_models.include?(params[:type])
-        if params[:id]
-          item = params[:type].camelcase.constantize.find_by_id(params[:id])
-          if item
-            if item.owner.id == current_member.id
-              #  This syntax is weird, so just know that it means this:
-              #  @photo.harvests << item unless @photo.harvests.include?(item)
-              #  but with the correct many-to-many relationship automatically referenced
-              (@photo.send "#{params[:type]}s") << item unless (@photo.send "#{params[:type]}s").include?(item)
-            else
-              flash[:alert] = "You must own both the #{params[:type]} and the photo."
-            end
-          else
-            flash[:alert] = "Couldn't find #{params[:type]} to connect to photo."
-          end
-        else
-          flash[:alert] = "Missing id parameter"
-        end
+
+    collection = case params[:type]
+                   when 'garden'
+                     @photo.gardens
+                   when 'planting'
+                     @photo.plantings
+                   when 'harvest'
+                     @photo.harvests
+                   else
+                     nil
+                 end
+
+    if collection && has_item_id
+      item = params[:type].camelcase.constantize.find_by_id(params[:id])
+      if item && member_owns_item(item)
+        collection << item unless collection.include?(item)
       else
-        flash[:alert] = "Cannot attach photos to #{params[:type]}"
+        flash[:alert] = "Could not find this item owned by you"
       end
-    else    
-      flash[:alert] = "Missing type parameter"
+    else
+      flash[:alert] = "Missing or invalid type or id parameter"
     end
-  
+
     respond_to do |format|
       if @photo.save
         format.html { redirect_to @photo, notice: 'Photo was successfully added.' }
@@ -134,6 +128,14 @@ class PhotosController < ApplicationController
 
   private
 
+  def has_item_id
+    params.key? :id
+  end
+
+  def member_owns_item(item)
+    item.owner.id == current_member.id
+  end
+
   def photo_params
     params.require(:photo).permit(:flickr_photo_id, :owner_id, :title, :license_name,
     :license_url, :thumbnail_url, :fullsize_url, :link_url)

app/controllers/places_controller.rb

@@ -5,7 +5,7 @@ class PlacesController < ApplicationController
     respond_to do |format|
       format.html
       # json response is whatever we want to map here
-      format.json { render :json => Member.located.to_json(:only => [:id, :login_name, :slug, :location, :latitude, :longitude]) }
+      format.json { render json: Member.located.to_json(only: [:id, :login_name, :slug, :location, :latitude, :longitude]) }
     end
   end
 
@@ -16,7 +16,7 @@ class PlacesController < ApplicationController
     @nearby_members = Member.nearest_to(params[:place])
     respond_to do |format|
       format.html # show.html.haml
-      format.json { render :json => @nearby_members.to_json(:only => [:id, :login_name, :slug, :location, :latitude, :longitude]) }
+      format.json { render json: @nearby_members.to_json(only: [:id, :login_name, :slug, :location, :latitude, :longitude]) }
     end
   end
 

app/controllers/plantings_controller.rb

@@ -1,5 +1,5 @@
 class PlantingsController < ApplicationController
-  before_filter :authenticate_member!, :except => [:index, :show]
+  before_filter :authenticate_member!, except: [:index, :show]
   load_and_authorize_resource
 
   # GET /plantings
@@ -8,21 +8,21 @@ class PlantingsController < ApplicationController
     @owner = Member.find_by_slug(params[:owner])
     @crop = Crop.find_by_slug(params[:crop])
     if @owner
-      @plantings = @owner.plantings.includes(:owner, :crop, :garden).paginate(:page => params[:page])
+      @plantings = @owner.plantings.includes(:owner, :crop, :garden).paginate(page: params[:page])
     elsif @crop
-      @plantings = @crop.plantings.includes(:owner, :crop, :garden).paginate(:page => params[:page])
+      @plantings = @crop.plantings.includes(:owner, :crop, :garden).paginate(page: params[:page])
     else
-      @plantings = Planting.includes(:owner, :crop, :garden).paginate(:page => params[:page])
+      @plantings = Planting.includes(:owner, :crop, :garden).paginate(page: params[:page])
     end
 
     respond_to do |format|
-      format.html { @plantings = @plantings.paginate(:page => params[:page]) }
+      format.html { @plantings = @plantings.paginate(page: params[:page]) }
       format.json { render json: @plantings }
-      format.rss { render :layout => false } #index.rss.builder
+      format.rss { render layout: false } #index.rss.builder
       format.csv do
         specifics = (@owner ? "#{@owner.login_name}-" : @crop ? "#{@crop.name}-" : nil)
         @filename = "Growstuff-#{specifics}Plantings-#{Time.zone.now.to_s(:number)}.csv"
-        render :csv => @plantings
+        render csv: @plantings
       end
     end
   end

app/controllers/policy_controller.rb

@@ -1,2 +0,0 @@
-class PolicyController < ApplicationController
-end

app/controllers/posts_controller.rb

@@ -1,5 +1,5 @@
 class PostsController < ApplicationController
-  before_filter :authenticate_member!, :except => [:index, :show]
+  before_filter :authenticate_member!, except: [:index, :show]
   load_and_authorize_resource
 
   # GET /posts
@@ -8,29 +8,29 @@ class PostsController < ApplicationController
   def index
     @author = Member.find_by_slug(params[:author])
     if @author
-      @posts = @author.posts.includes(:author, { :comments => :author }).paginate(:page => params[:page])
+      @posts = @author.posts.includes(:author, { comments: :author }).paginate(page: params[:page])
     else
-      @posts = Post.includes(:author, { :comments => :author }).paginate(:page => params[:page])
+      @posts = Post.includes(:author, { comments: :author }).paginate(page: params[:page])
     end
 
     respond_to do |format|
       format.html # index.html.haml
       format.json { render json: @posts }
-      format.rss { render :layout => false } #index.rss.builder
+      format.rss { render layout: false } #index.rss.builder
     end
   end
 
   # GET /posts/1
   # GET /posts/1.json
   def show
-    @post = Post.includes(:author, { :comments => :author }).find(params[:id])
+    @post = Post.includes(:author, { comments: :author }).find(params[:id])
 
     respond_to do |format|
       format.html # show.html.haml
       format.json { render json: @post }
       format.rss { render(
-        :layout => false,
-        :locals => { :post => @post }
+        layout: false,
+        locals: { post: @post }
       )}
     end
   end

app/controllers/registrations_controller.rb

@@ -28,7 +28,7 @@ class RegistrationsController < Devise::RegistrationsController
     if successfully_updated
       set_flash_message :notice, :updated
       # Sign in the member bypassing validation in case their password changed
-      sign_in @member, :bypass => true
+      sign_in @member, bypass: true
       redirect_to edit_member_registration_path
     else
       render "edit"

app/controllers/scientific_names_controller.rb

@@ -1,5 +1,5 @@
 class ScientificNamesController < ApplicationController
-  before_filter :authenticate_member!, :except => [:index, :show]
+  before_filter :authenticate_member!, except: [:index, :show]
   load_and_authorize_resource
 
   # GET /scientific_names

app/controllers/seeds_controller.rb

@@ -1,5 +1,5 @@
 class SeedsController < ApplicationController
-  before_filter :authenticate_member!, :except => [:index, :show]
+  before_filter :authenticate_member!, except: [:index, :show]
   load_and_authorize_resource
 
   # GET /seeds
@@ -8,17 +8,17 @@ class SeedsController < ApplicationController
     @owner = Member.find_by_slug(params[:owner])
     @crop = Crop.find_by_slug(params[:crop])
     if @owner
-      @seeds = @owner.seeds.includes(:owner, :crop).paginate(:page => params[:page])
+      @seeds = @owner.seeds.includes(:owner, :crop).paginate(page: params[:page])
     elsif @crop
-      @seeds = @crop.seeds.includes(:owner, :crop).paginate(:page => params[:page])
+      @seeds = @crop.seeds.includes(:owner, :crop).paginate(page: params[:page])
     else
-      @seeds = Seed.includes(:owner, :crop).paginate(:page => params[:page])
+      @seeds = Seed.includes(:owner, :crop).paginate(page: params[:page])
     end
 
     respond_to do |format|
       format.html # index.html.erb
       format.json { render json: @seeds }
-      format.rss { render :layout => false } #index.rss.builder
+      format.rss { render layout: false } #index.rss.builder
       format.csv do
         if @owner
           @filename = "Growstuff-#{@owner}-Seeds-#{Time.zone.now.to_s(:number)}.csv"
@@ -27,7 +27,7 @@ class SeedsController < ApplicationController
           @filename = "Growstuff-Seeds-#{Time.zone.now.to_s(:number)}.csv"
           @seeds = Seed.includes(:owner, :crop)
         end
-        render :csv => @seeds
+        render csv: @seeds
       end
     end
   end

app/controllers/sessions_controller.rb

@@ -0,0 +1,9 @@
+class SessionsController < Devise::SessionsController
+  def create
+    super do |resource|
+      if Crop.pending_approval.present? && current_member.has_role?(:crop_wrangler)
+        flash[:alert] = "There are crops waiting to be wrangled."
+      end
+    end
+  end
+end

app/controllers/support_controller.rb

@@ -1,2 +0,0 @@
-class SupportController < ApplicationController
-end

app/helpers/application_helper.rb

@@ -21,7 +21,7 @@ module ApplicationHelper
     link = "http://www.wolframalpha.com/input/?i=#{pid}+#{currency}"
     return link_to "(convert)",
       link,
-      :target => "_blank"
+      target: "_blank"
   end 
 
   # Produces a cache key for uniquely identifying cached fragments.
@@ -46,8 +46,8 @@ module ApplicationHelper
     return member.preferred_avatar_uri if member.preferred_avatar_uri.present?
 
     Gravatar.new(member.email).image_url({
-      :size => size,
-      :default => :identicon
+      size: size,
+      default: :identicon
     })
   end
 end

app/helpers/harvests_helper.rb

@@ -18,11 +18,11 @@ module HarvestsHelper
   def display_human_quantity(harvest)
     if ! harvest.quantity.blank? && harvest.quantity > 0
       if harvest.unit == 'individual' # just the number
-        number_to_human(harvest.quantity, :strip_insignificant_zeros => true)
+        number_to_human(harvest.quantity, strip_insignificant_zeros: true)
       elsif ! harvest.unit.blank? # pluralize anything else
-        return pluralize(number_to_human(harvest.quantity, :strip_insignificant_zeros => true), harvest.unit)
+        return pluralize(number_to_human(harvest.quantity, strip_insignificant_zeros: true), harvest.unit)
       else
-        return "#{number_to_human(harvest.quantity, :strip_insignificant_zeros => true)} #{harvest.unit}"
+        return "#{number_to_human(harvest.quantity, strip_insignificant_zeros: true)} #{harvest.unit}"
       end
     else
       return nil
@@ -31,7 +31,7 @@ module HarvestsHelper
 
   def display_weight(harvest)
     if ! harvest.weight_quantity.blank? && harvest.weight_quantity > 0
-      return "#{number_to_human(harvest.weight_quantity, :strip_insignificant_zeros => true)} #{harvest.weight_unit}"
+      return "#{number_to_human(harvest.weight_quantity, strip_insignificant_zeros: true)} #{harvest.weight_unit}"
     else
       return nil
     end
@@ -41,7 +41,7 @@ module HarvestsHelper
     if harvest.description.empty?
       "No description provided."
     else
-      truncate(harvest.description, length: 130, separator: ' ', omission: '... ') { link_to "Read more", harvest_path(harvest) }
+      harvest.description
     end
   end
 

app/helpers/notifications_helper.rb

@@ -2,7 +2,7 @@ module NotificationsHelper
   def reply_link(notification)
     if notification.post
       # comment on the post in question
-      new_comment_url(:post_id => notification.post.id)
+      new_comment_url(post_id: notification.post.id)
     else
       # by default, reply link sends a PM in return
       reply_notification_url(notification)

app/mailers/notifier.rb

@@ -17,8 +17,8 @@ class Notifier < ActionMailer::Base
     # Encrypting 
     @signed_message = verifier.generate ({ member_id: @notification.recipient.id, type: :send_notification_email })
 
-    mail(:to => @notification.recipient.email,
-         :subject => @notification.subject)
+    mail(to: @notification.recipient.email,
+         subject: @notification.subject)
   end
 
   def planting_reminder(member)
@@ -31,24 +31,24 @@ class Notifier < ActionMailer::Base
     @signed_message = verifier.generate ({ member_id: @member.id, type: :send_planting_reminder })
 
     if @member.send_planting_reminder
-      mail(:to => @member.email,
-          :subject => "What have you planted lately?")
+      mail(to: @member.email,
+          subject: "What have you planted lately?")
     end
   end
 
   def new_crop_request(member, request)
     @member, @request = member, request
-    mail(:to => @member.email, :subject => "#{@request.requester.login_name} has requested #{@request.name} as a new crop")    
+    mail(to: @member.email, subject: "#{@request.requester.login_name} has requested #{@request.name} as a new crop")    
   end
 
   def crop_request_approved(member, crop)
     @member, @crop = member, crop
-    mail(:to => @member.email, :subject => "#{crop.name.capitalize} has been approved")
+    mail(to: @member.email, subject: "#{crop.name.capitalize} has been approved")
   end
 
   def crop_request_rejected(member, crop)
     @member, @crop = member, crop
-    mail(:to => @member.email, :subject => "#{crop.name.capitalize} has been rejected")
+    mail(to: @member.email, subject: "#{crop.name.capitalize} has been rejected")
   end
 
 end

app/models/ability.rb

@@ -24,7 +24,7 @@ class Ability
     # nobody should be able to view unapproved crops unless they
     # are wranglers or admins 
     cannot :read, Crop
-    can :read, Crop, :approval_status => "approved"
+    can :read, Crop, approval_status: "approved"
     # scientific names should only be viewable if associated crop is approved
     cannot :read, ScientificName
     can :read, ScientificName do |sn|
@@ -38,15 +38,15 @@ class Ability
 
     if member
       # members can see even rejected or pending crops if they requested it
-      can :read, Crop, :requester_id => member.id
+      can :read, Crop, requester_id: member.id
 
       # managing your own user settings
-      can :update, Member, :id => member.id
+      can :update, Member, id: member.id
 
       # can read/delete notifications that were sent to them
-      can :read, Notification, :recipient_id => member.id
-      can :destroy, Notification, :recipient_id => member.id
-      can :reply, Notification, :recipient_id => member.id
+      can :read, Notification, recipient_id: member.id
+      can :destroy, Notification, recipient_id: member.id
+      can :reply, Notification, recipient_id: member.id
       # can send a private message to anyone but themselves
       # note: sadly, we can't test for this from the view, but it works
       # for the model/controller
@@ -68,58 +68,58 @@ class Ability
 
       # can create & destroy their own authentications against other sites.
       can :create, Authentication
-      can :destroy, Authentication, :member_id => member.id
+      can :destroy, Authentication, member_id: member.id
 
       # anyone can create a post, or comment on a post,
       # but only the author can edit/destroy it.
       can :create,  Post
-      can :update,  Post, :author_id => member.id
-      can :destroy, Post, :author_id => member.id
+      can :update,  Post, author_id: member.id
+      can :destroy, Post, author_id: member.id
       can :create,  Comment
-      can :update,  Comment, :author_id => member.id
-      can :destroy, Comment, :author_id => member.id
+      can :update,  Comment, author_id: member.id
+      can :destroy, Comment, author_id: member.id
 
       # same deal for gardens and plantings
       can :create,  Garden
-      can :update,  Garden, :owner_id => member.id
-      can :destroy, Garden, :owner_id => member.id
+      can :update,  Garden, owner_id: member.id
+      can :destroy, Garden, owner_id: member.id
 
       can :create,  Planting
-      can :update,  Planting, :garden => { :owner_id => member.id }
-      can :destroy, Planting, :garden => { :owner_id => member.id }
+      can :update,  Planting, garden: { owner_id: member.id }
+      can :destroy, Planting, garden: { owner_id: member.id }
 
       can :create,  Harvest
-      can :update,  Harvest, :owner_id => member.id
-      can :destroy, Harvest, :owner_id => member.id
+      can :update,  Harvest, owner_id: member.id
+      can :destroy, Harvest, owner_id: member.id
 
       can :create, Photo
-      can :update, Photo, :owner_id => member.id
-      can :destroy, Photo, :owner_id => member.id
+      can :update, Photo, owner_id: member.id
+      can :destroy, Photo, owner_id: member.id
 
       can :create, Seed
-      can :update, Seed, :owner_id => member.id
-      can :destroy, Seed, :owner_id => member.id
+      can :update, Seed, owner_id: member.id
+      can :destroy, Seed, owner_id: member.id
 
       # orders/shop/etc
       can :create,   Order
-      can :read,     Order, :member_id => member.id
-      can :complete, Order, :member_id => member.id, :completed_at => nil
-      can :checkout, Order, :member_id => member.id, :completed_at => nil
-      can :cancel,   Order, :member_id => member.id, :completed_at => nil
-      can :destroy,  Order, :member_id => member.id, :completed_at => nil
+      can :read,     Order, member_id: member.id
+      can :complete, Order, member_id: member.id, completed_at: nil
+      can :checkout, Order, member_id: member.id, completed_at: nil
+      can :cancel,   Order, member_id: member.id, completed_at: nil
+      can :destroy,  Order, member_id: member.id, completed_at: nil
 
       can :create,  OrderItem
       # for now, let's not let people mess with individual order items
-      cannot :read,    OrderItem, :order => { :member_id => member.id }
-      cannot :update,  OrderItem, :order => { :member_id => member.id, :completed_at => nil }
-      cannot :destroy, OrderItem, :order => { :member_id => member.id, :completed_at => nil }
+      cannot :read,    OrderItem, order: { member_id: member.id }
+      cannot :update,  OrderItem, order: { member_id: member.id, completed_at: nil }
+      cannot :destroy, OrderItem, order: { member_id: member.id, completed_at: nil }
 
       # following/unfollowing permissions
       can :create, Follow
-      cannot :create, Follow, :followed_id => member.id # can't follow yourself
+      cannot :create, Follow, followed_id: member.id # can't follow yourself
 
       can :destroy, Follow
-      cannot :destroy, Follow, :followed_id => member.id # can't unfollow yourself
+      cannot :destroy, Follow, followed_id: member.id # can't unfollow yourself
 
       if member.has_role? :admin
 

app/models/account.rb

@@ -2,8 +2,8 @@ class Account < ActiveRecord::Base
   belongs_to :member
   belongs_to :account_type
 
-  validates :member_id, :uniqueness => {
-    :message => 'already has account details associated with it'
+  validates :member_id, uniqueness: {
+    message: 'already has account details associated with it'
   }
 
   before_create do |account|

app/models/alternate_name.rb

@@ -1,5 +1,5 @@
 class AlternateName < ActiveRecord::Base
   after_commit { |an| an.crop.__elasticsearch__.index_document if an.crop && ENV['GROWSTUFF_ELASTICSEARCH'] == "true" }
   belongs_to :crop
-  belongs_to :creator, :class_name => 'Member'
+  belongs_to :creator, class_name: 'Member'
 end

app/models/comment.rb

@@ -1,5 +1,5 @@
 class Comment < ActiveRecord::Base
-  belongs_to :author, :class_name => 'Member'
+  belongs_to :author, class_name: 'Member'
   belongs_to :post
 
   default_scope { order("created_at DESC") }
@@ -11,11 +11,11 @@ class Comment < ActiveRecord::Base
     # don't send notifications to yourself
     if recipient != sender
       Notification.create(
-        :recipient_id => recipient,
-        :sender_id => sender,
-        :subject => "#{self.author} commented on #{self.post.subject}",
-        :body => self.body,
-        :post_id => self.post.id
+        recipient_id: recipient,
+        sender_id: sender,
+        subject: "#{self.author} commented on #{self.post.subject}",
+        body: self.body,
+        post_id: self.post.id
       )
     end
   end

app/models/crop.rb

@@ -4,42 +4,42 @@ class Crop < ActiveRecord::Base
 
   has_many :scientific_names, after_add: :update_index, after_remove: :update_index
   accepts_nested_attributes_for :scientific_names,
-    :allow_destroy => true,
-    :reject_if     => :all_blank
+    allow_destroy: true,
+    reject_if: :all_blank
 
   has_many :alternate_names, after_add: :update_index, after_remove: :update_index, dependent: :destroy
   has_many :plantings
-  has_many :photos, :through => :plantings
+  has_many :photos, through: :plantings
   has_many :seeds
   has_many :harvests
-  has_many :plant_parts, -> { uniq }, :through => :harvests
-  belongs_to :creator, :class_name => 'Member'
-  belongs_to :requester, :class_name => 'Member'
+  has_many :plant_parts, -> { uniq }, through: :harvests
+  belongs_to :creator, class_name: 'Member'
+  belongs_to :requester, class_name: 'Member'
 
-  belongs_to :parent, :class_name => 'Crop'
-  has_many :varieties, :class_name => 'Crop', :foreign_key => 'parent_id'
+  belongs_to :parent, class_name: 'Crop'
+  has_many :varieties, class_name: 'Crop', foreign_key: 'parent_id'
   has_and_belongs_to_many :posts
   before_destroy {|crop| crop.posts.clear}
 
   default_scope { order("lower(name) asc") }
-  scope :recent, -> { where(:approval_status => "approved").reorder("created_at desc") }
-  scope :toplevel, -> { where(:approval_status => "approved", :parent_id => nil) }
-  scope :popular, -> { where(:approval_status => "approved").reorder("plantings_count desc, lower(name) asc") }
-  scope :randomized, -> { where(:approval_status => "approved").reorder('random()') } # ok on sqlite and psql, but not on mysql
-  scope :pending_approval, -> { where(:approval_status => "pending") }
-  scope :approved, -> { where(:approval_status => "approved") }
-  scope :rejected, -> { where(:approval_status => "rejected") }
+  scope :recent, -> { where(approval_status: "approved").reorder("created_at desc") }
+  scope :toplevel, -> { where(approval_status: "approved", parent_id: nil) }
+  scope :popular, -> { where(approval_status: "approved").reorder("plantings_count desc, lower(name) asc") }
+  scope :randomized, -> { where(approval_status: "approved").reorder('random()') } # ok on sqlite and psql, but not on mysql
+  scope :pending_approval, -> { where(approval_status: "pending") }
+  scope :approved, -> { where(approval_status: "approved") }
+  scope :rejected, -> { where(approval_status: "rejected") }
 
   ## Wikipedia urls are only necessary when approving a crop
   validates :en_wikipedia_url,
-    :format => {
-      :with => /\Ahttps?:\/\/en\.wikipedia\.org\/wiki/,
-      :message => 'is not a valid English Wikipedia URL'
+    format: {
+      with: /\Ahttps?:\/\/en\.wikipedia\.org\/wiki/,
+      message: 'is not a valid English Wikipedia URL'
     },
-    :if => :approved?
+    if: :approved?
 
   ## Reasons are only necessary when rejecting
-  validates :reason_for_rejection, :presence => true, :if => :rejected?
+  validates :reason_for_rejection, presence: true, if: :rejected?
 
   ## This validation addresses a race condition
   validate :approval_status_cannot_be_changed_again
@@ -231,14 +231,14 @@ class Crop < ActiveRecord::Base
 
     crop = Crop.find_or_create_by(name: name)
     crop.update_attributes(
-      :en_wikipedia_url => en_wikipedia_url,
-      :creator_id => cropbot.id
+      en_wikipedia_url: en_wikipedia_url,
+      creator_id: cropbot.id
     )
 
     if parent
       parent = Crop.find_by_name(parent)
       if parent
-        crop.update_attributes(:parent_id => parent.id)
+        crop.update_attributes(parent_id: parent.id)
       else
         logger.warn("Warning: parent crop #{parent} not found")
       end
@@ -264,13 +264,13 @@ class Crop < ActiveRecord::Base
       raise "cropbot account not found: run rake db:seed" unless cropbot
 
       names_to_add.each do |n|
-        if self.scientific_names.exists?(:scientific_name => n)
+        if self.scientific_names.exists?(scientific_name: n)
           logger.warn("Warning: skipping duplicate scientific name #{n} for #{self}")
         else
 
           self.scientific_names.create(
-            :scientific_name => n,
-            :creator_id => cropbot.id
+            scientific_name: n,
+            creator_id: cropbot.id
           )
         end
       end
@@ -286,12 +286,12 @@ class Crop < ActiveRecord::Base
       names_to_add = alternate_names.split(%r{,\s*})
 
       names_to_add.each do |n|
-        if self.alternate_names.exists?(:name => n)
+        if self.alternate_names.exists?(name: n)
           logger.warn("Warning: skipping duplicate alternate name #{n} for #{self}")
         else
           self.alternate_names.create(
-            :name => n,
-            :creator_id => cropbot.id
+            name: n,
+            creator_id: cropbot.id
           )
         end
       end

app/models/follow.rb

@@ -1,14 +1,14 @@
 class Follow < ActiveRecord::Base
   belongs_to :follower, class_name: "Member"
   belongs_to :followed, class_name: "Member"
-  validates :follower_id, uniqueness: { :scope => :followed_id }
+  validates :follower_id, uniqueness: { scope: :followed_id }
 
   after_create do
     Notification.create(
-      :recipient_id => self.followed_id,
-      :sender_id => self.follower_id,
-      :subject => "#{self.follower.login_name} is now following you",
-      :body => "#{self.follower.login_name} just followed you on #{ENV["GROWSTUFF_SITE_NAME"]}. "
+      recipient_id: self.followed_id,
+      sender_id: self.follower_id,
+      subject: "#{self.follower.login_name} is now following you",
+      body: "#{self.follower.login_name} just followed you on #{ENV["GROWSTUFF_SITE_NAME"]}. "
     )
   end
 

app/models/forum.rb

@@ -3,7 +3,7 @@ class Forum < ActiveRecord::Base
   friendly_id :name, use: [:slugged, :finders]
 
   has_many :posts
-  belongs_to :owner, :class_name => "Member"
+  belongs_to :owner, class_name: "Member"
 
   def to_s
     return name

app/models/garden.rb

@@ -3,9 +3,9 @@ class Garden < ActiveRecord::Base
   extend FriendlyId
   friendly_id :garden_slug, use: [:slugged, :finders]
 
-  belongs_to :owner, :class_name => 'Member', :foreign_key => 'owner_id'
-  has_many :plantings, -> { order(created_at: :desc) }, :dependent => :destroy
-  has_many :crops, :through => :plantings
+  belongs_to :owner, class_name: 'Member', foreign_key: 'owner_id'
+  has_many :plantings, -> { order(created_at: :desc) }, dependent: :destroy
+  has_many :crops, through: :plantings
 
   has_and_belongs_to_many :photos
 
@@ -25,23 +25,23 @@ class Garden < ActiveRecord::Base
   after_save :mark_inactive_garden_plantings_as_finished
 
   default_scope { order("lower(name) asc") }
-  scope :active, -> { where(:active => true) }
-  scope :inactive, -> { where(:active => false) }
+  scope :active, -> { where(active: true) }
+  scope :inactive, -> { where(active: false) }
 
   validates :location,
-    :length => { :maximum => 255 }
+    length: { maximum: 255 }
 
   validates :name,
-    :format => {
-      :with => /\S/
+    format: {
+      with: /\S/
     },
-    :length => { :maximum => 255 }
+    length: { maximum: 255 }
 
   validates :area,
-    :numericality => {
-      :only_integer => false,
-      :greater_than_or_equal_to => 0 },
-    :allow_nil => true
+    numericality: {
+      only_integer: false,
+      greater_than_or_equal_to: 0 },
+    allow_nil: true
 
   AREA_UNITS_VALUES = {
     "square metres" => "square metre",
@@ -49,10 +49,10 @@ class Garden < ActiveRecord::Base
     "hectares" => "hectare",
     "acres" => "acre"
   }
-  validates :area_unit, :inclusion => { :in => AREA_UNITS_VALUES.values,
-        :message => "%{value} is not a valid area unit" },
-        :allow_nil => true,
-        :allow_blank => true
+  validates :area_unit, inclusion: { in: AREA_UNITS_VALUES.values,
+        message: "%{value} is not a valid area unit" },
+        allow_nil: true,
+        allow_blank: true
 
   after_validation :cleanup_area
 

app/models/harvest.rb

@@ -4,7 +4,7 @@ class Harvest < ActiveRecord::Base
   friendly_id :harvest_slug, use: [:slugged, :finders]
 
   belongs_to :crop
-  belongs_to :owner, :class_name => 'Member'
+  belongs_to :owner, class_name: 'Member'
   belongs_to :plant_part
 
   has_and_belongs_to_many :photos
@@ -20,17 +20,17 @@ class Harvest < ActiveRecord::Base
 
   default_scope { order('created_at DESC') }
 
-  validates :crop, :approved => true
+  validates :crop, approved: true
 
-  validates :crop, :presence => {:message => "must be present and exist in our database"}
+  validates :crop, presence: {message: "must be present and exist in our database"}
 
-  validates :plant_part, :presence => {:message => "must be present and exist in our database"}
+  validates :plant_part, presence: {message: "must be present and exist in our database"}
 
   validates :quantity,
-    :numericality => {
-      :only_integer => false,
-      :greater_than_or_equal_to => 0 },
-    :allow_nil => true
+    numericality: {
+      only_integer: false,
+      greater_than_or_equal_to: 0 },
+    allow_nil: true
 
   UNITS_VALUES = {
     "individual" => "individual",
@@ -44,24 +44,24 @@ class Harvest < ActiveRecord::Base
     "baskets" => "basket",
     "bushels" => "bushel"
   }
-  validates :unit, :inclusion => { :in => UNITS_VALUES.values,
-    :message => "%{value} is not a valid unit" },
-    :allow_nil => true,
-    :allow_blank => true
+  validates :unit, inclusion: { in: UNITS_VALUES.values,
+    message: "%{value} is not a valid unit" },
+    allow_nil: true,
+    allow_blank: true
 
   validates :weight_quantity,
-    :numericality => { :only_integer => false },
-    :allow_nil => true
+    numericality: { only_integer: false },
+    allow_nil: true
 
   WEIGHT_UNITS_VALUES = {
     "kg" => "kg",
     "lb" => "lb",
     "oz" => "oz"
   }
-  validates :weight_unit, :inclusion => { :in => WEIGHT_UNITS_VALUES.values,
-    :message => "%{value} is not a valid unit" },
-    :allow_nil => true,
-    :allow_blank => true
+  validates :weight_unit, inclusion: { in: WEIGHT_UNITS_VALUES.values,
+    message: "%{value} is not a valid unit" },
+    allow_nil: true,
+    allow_blank: true
 
   after_validation :cleanup_quantities
 
@@ -72,7 +72,7 @@ class Harvest < ActiveRecord::Base
   def set_si_weight
     if self.weight_unit != nil
       weight_string = "#{self.weight_quantity} #{self.weight_unit}"
-      self.si_weight = Unit(weight_string).convert_to("kg").to_s("%0.3f").delete(" kg").to_f
+      self.si_weight = Unit.new(weight_string).convert_to("kg").to_s("%0.3f").delete(" kg").to_f
     end
   end
 
@@ -104,7 +104,7 @@ class Harvest < ActiveRecord::Base
     # 2 buckets of apricots, weighing 10kg
     string = ''
     if self.quantity
-      string += "#{number_to_human(self.quantity.to_s, :strip_insignificant_zeros => true)} "
+      string += "#{number_to_human(self.quantity.to_s, strip_insignificant_zeros: true)} "
       if self.unit == 'individual'
         string += 'individual '
       else
@@ -125,7 +125,7 @@ class Harvest < ActiveRecord::Base
     end
 
     if self.weight_quantity
-      string += " weighing #{number_to_human(self.weight_quantity, :strip_insignificant_zeros => true)} #{self.weight_unit}"
+      string += " weighing #{number_to_human(self.weight_quantity, strip_insignificant_zeros: true)} #{self.weight_unit}"
     end
 
     return string

app/models/member.rb

@@ -4,26 +4,26 @@ class Member < ActiveRecord::Base
 
   friendly_id :login_name, use: [:slugged, :finders]
 
-  has_many :posts,   :foreign_key => 'author_id'
-  has_many :comments, :foreign_key => 'author_id'
-  has_many :forums, :foreign_key => 'owner_id'
+  has_many :posts,   foreign_key: 'author_id'
+  has_many :comments, foreign_key: 'author_id'
+  has_many :forums, foreign_key: 'owner_id'
 
-  has_many :gardens, :foreign_key => 'owner_id'
-  has_many :plantings, :foreign_key => 'owner_id'
+  has_many :gardens, foreign_key: 'owner_id'
+  has_many :plantings, foreign_key: 'owner_id'
 
-  has_many :seeds, :foreign_key => 'owner_id'
-  has_many :harvests, :foreign_key => 'owner_id'
+  has_many :seeds, foreign_key: 'owner_id'
+  has_many :harvests, foreign_key: 'owner_id'
 
   has_and_belongs_to_many :roles
 
-  has_many :notifications, :foreign_key => 'recipient_id'
-  has_many :sent_notifications, :foreign_key => 'sender_id'
+  has_many :notifications, foreign_key: 'recipient_id'
+  has_many :sent_notifications, foreign_key: 'sender_id'
 
   has_many :authentications
 
   has_many :orders
   has_one  :account
-  has_one  :account_type, :through => :account
+  has_one  :account_type, through: :account
 
   has_many :photos
 
@@ -33,13 +33,13 @@ class Member < ActiveRecord::Base
   scope :located, -> { where("location <> '' and latitude IS NOT NULL and longitude IS NOT NULL") }
   scope :recently_signed_in, -> { reorder('updated_at DESC') }
   scope :recently_joined, -> { reorder("confirmed_at desc") }
-  scope :wants_newsletter, -> { where(:newsletter => true) }
+  scope :wants_newsletter, -> { where(newsletter: true) }
 
-  has_many :follows, :class_name => "Follow", :foreign_key => "follower_id"
-  has_many :followed, :through => :follows
+  has_many :follows, class_name: "Follow", foreign_key: "follower_id"
+  has_many :followed, through: :follows
 
-  has_many :inverse_follows, :class_name => "Follow", :foreign_key => "followed_id"
-  has_many :followers, :through => :inverse_follows, :source => :follower
+  has_many :inverse_follows, class_name: "Follow", foreign_key: "followed_id"
+  has_many :followers, through: :inverse_follows, source: :follower
 
   # Include default devise modules. Others available are:
   # :token_authenticatable, :confirmable,
@@ -58,34 +58,34 @@ class Member < ActiveRecord::Base
   attr_accessor :login
 
   # Requires acceptance of the Terms of Service
-  validates_acceptance_of :tos_agreement, :allow_nil => false,
-    :accept => true
+  validates_acceptance_of :tos_agreement, allow_nil: false,
+    accept: true
 
   validates :login_name,
-    :length => {
-      :minimum => 2,
-      :maximum => 25,
-      :message => "should be between 2 and 25 characters long"
+    length: {
+      minimum: 2,
+      maximum: 25,
+      message: "should be between 2 and 25 characters long"
     },
-    :exclusion => {
-      :in => %w(growstuff admin moderator staff nearby),
-      :message => "name is reserved"
+    exclusion: {
+      in: %w(growstuff admin moderator staff nearby),
+      message: "name is reserved"
     },
-    :format => {
-      :with => /\A\w+\z/,
-      :message => "may only include letters, numbers, or underscores"
+    format: {
+      with: /\A\w+\z/,
+      message: "may only include letters, numbers, or underscores"
     },
-    :uniqueness => {
-      :case_sensitive => false
+    uniqueness: {
+      case_sensitive: false
     }
 
   # Give each new member a default garden
-  after_create {|member| Garden.create(:name => "Garden", :owner_id => member.id) }
+  after_create {|member| Garden.create(name: "Garden", owner_id: member.id) }
 
   # and an account record (for paid accounts etc)
   # we use find_or_create to avoid accidentally creating a second one,
   # which can happen sometimes especially with FactoryGirl associations
-  after_create {|member| Account.find_or_create_by(:member_id => member.id) }
+  after_create {|member| Account.find_or_create_by(member_id: member.id) }
 
   after_save :update_newsletter_subscription
 
@@ -93,7 +93,7 @@ class Member < ActiveRecord::Base
   def self.find_first_by_auth_conditions(warden_conditions)
     conditions = warden_conditions.dup
     if login = conditions.delete(:login)
-      where(conditions).where(["lower(login_name) = :value OR lower(email) = :value", { :value => login.downcase }]).first
+      where(conditions).where(["lower(login_name) = :value OR lower(email) = :value", { value: login.downcase }]).first
     else
       where(conditions).first
     end
@@ -108,7 +108,7 @@ class Member < ActiveRecord::Base
   end
 
   def current_order
-    orders.where(:completed_at => nil).first
+    orders.where(completed_at: nil).first
   end
 
   # when purchasing a product that gives you a paid account, this method
@@ -163,15 +163,15 @@ class Member < ActiveRecord::Base
     result = false
     if set
       result = flickr.photosets.getPhotos(
-        :photoset_id => set,
-        :page => page_num,
-        :per_page => 30
+        photoset_id: set,
+        page: page_num,
+        per_page: 30
       )
     else
       result = flickr.people.getPhotos(
-        :user_id => 'me',
-        :page => page_num,
-        :per_page => 30
+        user_id: 'me',
+        page: page_num,
+        per_page: 30
       )
     end
     if result
@@ -239,10 +239,10 @@ class Member < ActiveRecord::Base
     return true if (Rails.env.test? && !testing)
     gb = Gibbon::API.new
     res = gb.lists.subscribe({
-      :id => Gibbon::API.api_key,
-      :email => { :email => email },
-      :merge_vars => { :login_name => login_name },
-      :double_optin => false # they already confirmed their email with us
+      id: Growstuff::Application.config.newsletter_list_id,
+      email: { email: email },
+      merge_vars: { login_name: login_name },
+      double_optin: false # they already confirmed their email with us
     })
   end
 
@@ -250,17 +250,17 @@ class Member < ActiveRecord::Base
     return true if (Rails.env.test? && !testing)
     gb = Gibbon::API.new
     res = gb.lists.unsubscribe({
-      :id => ENV['GROWSTUFF_MAILCHIMP_NEWSLETTER_ID'],
-      :email => { :email => email }
+      id: Growstuff::Application.config.newsletter_list_id,
+      email: { email: email }
     })
   end
 
   def already_following?(member)
-    self.follows.exists?(:followed_id => member.id)
+    self.follows.exists?(followed_id: member.id)
   end
 
   def get_follow(member)
-    self.follows.where(:followed_id => member.id).first if already_following?(member)
+    self.follows.where(followed_id: member.id).first if already_following?(member)
   end
 
 end

app/models/notification.rb

@@ -1,12 +1,12 @@
 class Notification < ActiveRecord::Base
-  belongs_to :sender, :class_name => 'Member'
-  belongs_to :recipient, :class_name => 'Member'
+  belongs_to :sender, class_name: 'Member'
+  belongs_to :recipient, class_name: 'Member'
   belongs_to :post
 
-  validates :subject, :length => { :maximum => 255 }
+  validates :subject, length: { maximum: 255 }
 
   default_scope { order('created_at DESC') }
-  scope :unread, -> { where(:read => false) }
+  scope :unread, -> { where(read: false) }
 
   before_create :replace_blank_subject
   after_create :send_email

app/models/order.rb

@@ -1,13 +1,13 @@
 class Order < ActiveRecord::Base
   belongs_to :member
 
-  has_many :order_items, :dependent => :destroy
+  has_many :order_items, dependent: :destroy
 
   default_scope { order('created_at DESC') }
 
-  validates :referral_code, :format => {
-    :with => /\A[a-zA-Z0-9 ]*\z/,
-    :message => "may only include letters and numbers"
+  validates :referral_code, format: {
+    with: /\A[a-zA-Z0-9 ]*\z/,
+    message: "may only include letters and numbers"
   }
 
   before_save :standardize_referral_code
@@ -27,9 +27,9 @@ class Order < ActiveRecord::Base
     items = []
     order_items.each do |i|
       items.push({
-        :name => i.product.name,
-        :quantity => i.quantity,
-        :amount => i.price
+        name: i.product.name,
+        quantity: i.quantity,
+        amount: i.price
       })
     end
     return items
@@ -87,7 +87,7 @@ class Order < ActiveRecord::Base
           end
         when "referral_code"
           # coerce to uppercase
-          return Order.where(:referral_code => args[:for].upcase)
+          return Order.where(referral_code: args[:for].upcase)
       end
     end
     return []

app/models/order_item.rb

@@ -4,7 +4,7 @@ class OrderItem < ActiveRecord::Base
 
   validate :price_must_be_greater_than_minimum
 
-  validates_uniqueness_of :order_id, :message => "may only have one item."
+  validates_uniqueness_of :order_id, message: "may only have one item."
 
   def price_must_be_greater_than_minimum
     @product = Product.find(product_id)

app/models/photo.rb

@@ -1,5 +1,5 @@
 class Photo < ActiveRecord::Base
-  belongs_to :owner, :class_name => 'Member'
+  belongs_to :owner, class_name: 'Member'
 
   has_and_belongs_to_many :plantings
   has_and_belongs_to_many :harvests
@@ -23,16 +23,16 @@ class Photo < ActiveRecord::Base
   # for easier stubbing and testing.
   def flickr_metadata
     flickr = owner.flickr
-    info = flickr.photos.getInfo(:photo_id => flickr_photo_id)
+    info = flickr.photos.getInfo(photo_id: flickr_photo_id)
     licenses = flickr.photos.licenses.getInfo()
     license = licenses.find { |l| l.id == info.license }
     return {
-      :title => info.title || "Untitled",
-      :license_name => license.name,
-      :license_url => license.url,
-      :thumbnail_url => FlickRaw.url_q(info),
-      :fullsize_url => FlickRaw.url_z(info),
-      :link_url => FlickRaw.url_photopage(info)
+      title: info.title || "Untitled",
+      license_name: license.name,
+      license_url: license.url,
+      thumbnail_url: FlickRaw.url_q(info),
+      fullsize_url: FlickRaw.url_z(info),
+      link_url: FlickRaw.url_photopage(info)
     }
 
   end

app/models/plant_part.rb

@@ -1,9 +1,9 @@
 class PlantPart < ActiveRecord::Base
   extend FriendlyId
-  friendly_id :name, :use => [:slugged, :finders]
+  friendly_id :name, use: [:slugged, :finders]
 
   has_many :harvests
-  has_many :crops, -> { uniq }, :through => :harvests
+  has_many :crops, -> { uniq }, through: :harvests
 
   def to_s
     return name

app/models/planting.rb

@@ -3,8 +3,8 @@ class Planting < ActiveRecord::Base
   friendly_id :planting_slug, use: [:slugged, :finders]
 
   belongs_to :garden
-  belongs_to :owner, :class_name => 'Member', :counter_cache => true
-  belongs_to :crop, :counter_cache => true
+  belongs_to :owner, class_name: 'Member', counter_cache: true
+  belongs_to :crop, counter_cache: true
 
   has_and_belongs_to_many :photos
 
@@ -18,33 +18,33 @@ class Planting < ActiveRecord::Base
   end
 
   default_scope { order("created_at desc") }
-  scope :finished, -> { where(:finished => true) }
-  scope :current, -> { where(:finished => false) }
+  scope :finished, -> { where(finished: true) }
+  scope :current, -> { where(finished: false) }
 
   delegate :name,
     :en_wikipedia_url,
     :default_scientific_name,
     :plantings_count,
-    :to => :crop,
-    :prefix => true
+    to: :crop,
+    prefix: true
 
   default_scope { order("created_at desc") }
 
-  validates :crop, :approved => true
+  validates :crop, approved: true
 
-  validates :crop, :presence => {:message => "must be present and exist in our database"}
+  validates :crop, presence: {message: "must be present and exist in our database"}
 
   validates :quantity,
-    :numericality => {
-      :only_integer => true,
-      :greater_than_or_equal_to => 0 },
-    :allow_nil => true
+    numericality: {
+      only_integer: true,
+      greater_than_or_equal_to: 0 },
+    allow_nil: true
 
   SUNNINESS_VALUES = %w(sun semi-shade shade)
-  validates :sunniness, :inclusion => { :in => SUNNINESS_VALUES,
-        :message => "%{value} is not a valid sunniness value" },
-        :allow_nil => true,
-        :allow_blank => true
+  validates :sunniness, inclusion: { in: SUNNINESS_VALUES,
+        message: "%{value} is not a valid sunniness value" },
+        allow_nil: true,
+        allow_blank: true
 
   PLANTED_FROM_VALUES = [
     'seed',
@@ -59,10 +59,10 @@ class Planting < ActiveRecord::Base
     'graft',
     'layering'
   ]
-  validates :planted_from, :inclusion => { :in => PLANTED_FROM_VALUES,
-        :message => "%{value} is not a valid planting method" },
-        :allow_nil => true,
-        :allow_blank => true
+  validates :planted_from, inclusion: { in: PLANTED_FROM_VALUES,
+        message: "%{value} is not a valid planting method" },
+        allow_nil: true,
+        allow_blank: true
 
   validate :finished_must_be_after_planted
 
@@ -95,7 +95,7 @@ class Planting < ActiveRecord::Base
   end
 
   def calculate_days_before_maturity(planting, crop)
-    p_crop = Planting.where(:crop_id => crop).where.not(:id => planting)
+    p_crop = Planting.where(crop_id: crop).where.not(id: planting)
     differences = p_crop.collect do |p|
       if p.finished and !p.finished_at.nil?
         (p.finished_at - p.planted_at).to_i
@@ -109,11 +109,11 @@ class Planting < ActiveRecord::Base
     end
   end
 
-  def planted?(current_date = Date.today)
+  def planted?(current_date = Date.current)
     planted_at.present? && current_date.to_date >= planted_at
   end
 
-  def percentage_grown(current_date = Date.today)
+  def percentage_grown(current_date = Date.current)
     return nil unless days_before_maturity && planted?(current_date)
 
     days = (current_date.to_date - planted_at.to_date).to_i

app/models/post.rb

@@ -1,9 +1,9 @@
 class Post < ActiveRecord::Base
   extend FriendlyId
   friendly_id :author_date_subject, use: [:slugged, :finders]
-  belongs_to :author, :class_name => 'Member'
+  belongs_to :author, class_name: 'Member'
   belongs_to :forum
-  has_many :comments, :dependent => :destroy
+  has_many :comments, dependent: :destroy
   has_and_belongs_to_many :crops
   before_destroy {|post| post.crops.clear}
   after_save :update_crops_posts_association
@@ -27,10 +27,10 @@ class Post < ActiveRecord::Base
     recipients.map{ |r| r.id }.each do |recipient|
       if recipient != sender
         Notification.create(
-          :recipient_id => recipient,
-          :sender_id => sender,
-          :subject => "#{self.author} mentioned you in their post #{self.subject}",
-          :body => self.body,
+          recipient_id: recipient,
+          sender_id: sender,
+          subject: "#{self.author} mentioned you in their post #{self.subject}",
+          body: self.body,
         )
       end
     end
@@ -39,10 +39,10 @@ class Post < ActiveRecord::Base
   default_scope { order("created_at desc") }
 
   validates :subject,
-    :format => {
-      :with => /\S/
+    format: {
+      with: /\S/
     },
-    :length => { :maximum => 255 }
+    length: { maximum: 255 }
 
 
   def author_date_subject

app/models/product.rb

@@ -3,10 +3,10 @@ class Product < ActiveRecord::Base
   belongs_to :account_type
 
   validates :paid_months,
-    :numericality => {
-      :only_integer => true,
-      :greater_than_or_equal_to => 0 },
-    :allow_nil => true
+    numericality: {
+      only_integer: true,
+      greater_than_or_equal_to: 0 },
+    allow_nil: true
 
   def to_s
     name

app/models/scientific_name.rb

@@ -1,5 +1,5 @@
 class ScientificName < ActiveRecord::Base
   after_commit { |sn| sn.crop.__elasticsearch__.index_document if sn.crop && ENV['GROWSTUFF_ELASTICSEARCH'] == "true" }
   belongs_to :crop
-  belongs_to :creator, :class_name => 'Member'
+  belongs_to :creator, class_name: 'Member'
 end

app/models/seed.rb

@@ -3,62 +3,62 @@ class Seed < ActiveRecord::Base
   friendly_id :seed_slug, use: [:slugged, :finders]
 
   belongs_to :crop
-  belongs_to :owner, :class_name => 'Member', :foreign_key => 'owner_id'
+  belongs_to :owner, class_name: 'Member', foreign_key: 'owner_id'
 
   default_scope { order("created_at desc") }
 
-  validates :crop, :approved => true
+  validates :crop, approved: true
 
-  validates :crop, :presence => {:message => "must be present and exist in our database"}
+  validates :crop, presence: {message: "must be present and exist in our database"}
   validates :quantity,
-    :numericality => {
-      :only_integer => true,
-      :greater_than_or_equal_to => 0 },
-    :allow_nil => true
+    numericality: {
+      only_integer: true,
+      greater_than_or_equal_to: 0 },
+    allow_nil: true
   validates :days_until_maturity_min,
-    :numericality => {
-      :only_integer => true,
-      :greater_than_or_equal_to => 0 },
-    :allow_nil => true
+    numericality: {
+      only_integer: true,
+      greater_than_or_equal_to: 0 },
+    allow_nil: true
   validates :days_until_maturity_max,
-    :numericality => {
-      :only_integer => true,
-      :greater_than_or_equal_to => 0 },
-    :allow_nil => true
+    numericality: {
+      only_integer: true,
+      greater_than_or_equal_to: 0 },
+    allow_nil: true
 
   scope :tradable, -> { where("tradable_to != 'nowhere'") }
 
   TRADABLE_TO_VALUES = %w(nowhere locally nationally internationally)
-  validates :tradable_to, :inclusion => { :in => TRADABLE_TO_VALUES,
-        :message => "You may only trade seed nowhere, locally, nationally, or internationally" },
-        :allow_nil => false,
-        :allow_blank => false
+  validates :tradable_to, inclusion: { in: TRADABLE_TO_VALUES,
+        message: "You may only trade seed nowhere, locally, nationally, or internationally" },
+        allow_nil: false,
+        allow_blank: false
 
   ORGANIC_VALUES = [
     'certified organic',
     'non-certified organic',
     'conventional/non-organic',
     'unknown']
-  validates :organic, :inclusion => { :in => ORGANIC_VALUES,
-        :message => "You must say whether the seeds are organic or not, or that you don't know" },
-        :allow_nil => false,
-        :allow_blank => false
+  validates :organic, inclusion: { in: ORGANIC_VALUES,
+        message: "You must say whether the seeds are organic or not, or that you don't know" },
+        allow_nil: false,
+        allow_blank: false
 
   GMO_VALUES = [
     'certified GMO-free',
     'non-certified GMO-free',
     'GMO',
     'unknown']
-  validates :gmo, :inclusion => { :in => GMO_VALUES,
-        :message => "You must say whether the seeds are genetically modified or not, or that you don't know" },
-        :allow_nil => false,
-        :allow_blank => false
+  validates :gmo, inclusion: { in: GMO_VALUES,
+        message: "You must say whether the seeds are genetically modified or not, or that you don't know" },
+        allow_nil: false,
+        allow_blank: false
 
   HEIRLOOM_VALUES = %w(heirloom hybrid unknown)
-  validates :heirloom, :inclusion => { :in => HEIRLOOM_VALUES,
-        :message => "You must say whether the seeds are heirloom, hybrid, or unknown" },
-        :allow_nil => false,
-        :allow_blank => false
+  validates :heirloom, inclusion: { in: HEIRLOOM_VALUES,
+        message: "You must say whether the seeds are heirloom, hybrid, or unknown" },
+        allow_nil: false,
+        allow_blank: false
 
   def tradable?
     if self.tradable_to == 'nowhere'

app/views/about/contact.html.haml

@@ -1,17 +0,0 @@
--content_for :title, 'Contact'
-
-%dl
-  %dt General contact email
-  %dd= link_to 'info@growstuff.org', 'mailto:info@growstuff.org'
-%dl
-  %dt
-    Support and accounts enquiries (not covered by the
-    =succeed ")" do
-      =link_to 'FAQ', url_for(:controller => '/support')
-  %dd= link_to 'support@growstuff.org', 'mailto:support@growstuff.org'
-%dl
-  %dt Media/Press enquiries
-  %dd= link_to 'media@growstuff.org', 'mailto:media@growstuff.org'
-%dl
-  %dt Twitter
-  %dd= link_to '@growstufforg', 'http://twitter.com/growstufforg'

app/views/comments/index.html.haml

@@ -1,7 +1,7 @@
 = content_for :title, "Recent comments"
 
 %div.pagination
-  = page_entries_info @comments, :model => "comments"
+  = page_entries_info @comments
   = will_paginate @comments
 
 - @comments.each do |comment|
@@ -11,7 +11,7 @@
   = render :partial => "single", :locals => { :comment => comment }
 
 %div.pagination
-  = page_entries_info @comments, :model => "comments"
+  = page_entries_info @comments
   = will_paginate @comments
 
 %p

app/views/crops/show.html.haml

@@ -54,13 +54,13 @@
           = render :partial => "shared/signin_signup", :locals => { :to => "post your tips and experiences growing #{ @crop.name.pluralize }" }
     - else
       %div.pagination
-        = page_entries_info @posts, :model => "posts"
+        = page_entries_info @posts
         = will_paginate @posts, :params => {:anchor => "posts"}
       - @posts.each do |post|
         = render :partial => "posts/single", :locals => { :post => post, :subject => true }
 
       %div.pagination
-        = page_entries_info @posts, :model => "posts"
+        = page_entries_info @posts
         = will_paginate @posts, :params => {:anchor => "posts"}
 
   .col-md-3

app/views/crops/wrangle.html.haml

@@ -34,7 +34,7 @@
 
 
 %div.pagination
-  = page_entries_info @crops, :model => "crops"
+  = page_entries_info @crops
   = will_paginate @crops
 
 %table{:class => "table table-striped", :id => @approval_status.blank? ? 'recently-added-crops' : "#{@approval_status}-crops"}
@@ -64,7 +64,7 @@
         ago.
 
 %div.pagination
-  = page_entries_info @crops, :model => "crops"
+  = page_entries_info @crops
   = will_paginate @crops
 
 

app/views/devise/confirmations/new.html.haml

@@ -13,4 +13,6 @@
     .form-actions.col-md-offset-2.col-md-8
       = f.submit "Resend confirmation instructions", :class => 'btn btn-primary'
 
-= render "devise/shared/links"
+  .form-group
+    .col-md-offset-2.col-md-8
+      = render "devise/shared/links"

app/views/devise/mailer/confirmation_instructions.html.haml

@@ -25,7 +25,7 @@
 %p
   We'd also appreciate it if you'd read our
   = succeed "," do
-    = link_to 'Community Guidelines', url_for(:controller => '/policy', :action => 'community', :only_path => false)
+    = link_to 'Community Guidelines', "#{root_url}/policy/community"
   and make sure you follow them. We want #{site_name} to be a
   friendly, welcoming environment for everyone, and we hope you'll
   help us keep it that way.

app/views/devise/passwords/new.html.haml

@@ -11,4 +11,6 @@
     .form-actions.col-md-offset-2.col-md-8
       = f.submit "Send me reset password instructions", :class => 'btn btn-primary'
 
-= render "devise/shared/links"
+  .form-group
+    .col-md-offset-2.col-md-8
+      = render "devise/shared/links"

app/views/devise/registrations/new.html.haml

@@ -31,7 +31,7 @@
         = f.check_box :tos_agreement
         I agree to the
         = succeed "." do
-          = link_to 'Terms of Service', url_for(:action => 'tos', :controller => '/policy')
+          = link_to 'Terms of Service', "#{root_url}/policy/tos"
   .form-group
     .col-md-offset-2.col-md-8.checkbox
       %label

app/views/devise/unlocks/new.html.haml

@@ -11,4 +11,6 @@
     .form-actions.col-md-offset-2.col-md-8
       = f.submit "Resend unlock instructions", :class => 'btn btn-primary'
 
-= render "devise/shared/links"
+  .form-group
+    .col-md-offset-2.col-md-8
+      = render "devise/shared/links"

app/views/gardens/_form.html.haml

@@ -16,15 +16,16 @@
   .form-group
     = f.label :description, :class => 'control-label col-md-2'
     .col-md-8
-      = f.text_area :description, :rows => 6, :class => 'form-control', :placeholder => 'optional'
+      = f.text_area :description, :rows => 6, :class => 'form-control'
+      = render :partial => 'shared/form_optional'
 
   .form-group
     = f.label :location, :class => 'control-label col-md-2'
     .col-md-8
-      = f.text_field :location, :value => @garden.location || current_member.location, :class => 'form-control', :placeholder => 'optional', :maxlength => 255
+      = f.text_field :location, :value => @garden.location || current_member.location, :class => 'form-control', :maxlength => 255
+      = render :partial => 'shared/form_optional'
       %span.help-block
-        If you have a location set in your profile, it will be used when
-        you create a new garden.
+        = t('.location_helper')
         - if current_member.location.blank?
           =link_to "Set your location now.", edit_member_registration_path
         - else
@@ -33,7 +34,8 @@
   .form-group
     = f.label :area, :class => 'control-label col-md-2'
     .col-md-2
-      = f.number_field :area, :class => 'input-small form-control', :placeholder => 'optional'
+      = f.number_field :area, :class => 'input-small form-control'
+      = render :partial => 'shared/form_optional'
     .col-md-2
       = f.select(:area_unit, Garden::AREA_UNITS_VALUES, {:include_blank => false}, :class => 'form-control')
 

app/views/gardens/_thumbnail.html.haml

@@ -18,7 +18,7 @@
             - if garden.location.blank?
               not specified
             - else
-              = link_to garden.location, place_path(garden.location)
+              = link_to garden.location, place_path(garden.location, anchor: "gardens")
           %dt Area : 
           %dd= garden.area.nil? ? "not specified" : pluralize(garden.area, garden.area_unit)
           %dt Active? :       

app/views/gardens/index.html.haml

@@ -15,7 +15,7 @@
     = render :partial => 'shared/signin_signup', :locals => { :to => 'add a new garden' }
 
 %div.pagination
-  = page_entries_info @gardens, :model => "gardens"
+  = page_entries_info @gardens
   = will_paginate @gardens
 
 .row
@@ -27,6 +27,6 @@
     %p There are no gardens to display.
 
 %div.pagination
-  = page_entries_info @gardens, :model => "gardens"
+  = page_entries_info @gardens
   = will_paginate @gardens
 

app/views/harvests/_form.html.haml

@@ -19,9 +19,10 @@
       = link_to "Request new crops.", new_crop_path
 
   .form-group
-    = f.label :harvested_at, 'When?', :class => 'control-label col-md-2', :placeholder => 'optional'
+    = f.label :harvested_at, 'When?', :class => 'control-label col-md-2'
     .col-md-2
       = f.text_field :harvested_at, :value => @harvest.harvested_at ? @harvest.harvested_at.to_s(:ymd) : '', :class => 'add-datepicker form-control'
+      = render :partial => 'shared/form_optional'
 
   .form-group
     = f.label :quantity, 'How many?', :class => 'control-label col-md-2'
@@ -29,20 +30,23 @@
       -# Some browsers (eg Firefox for Android) assume "number" means
       -# "integer" unless you specify step="any":
       -# http://blog.isotoma.com/2012/03/html5-input-typenumber-and-decimalsfloats-in-chrome/
-      = f.number_field :quantity, :class => 'input-small', :step => 'any', :class => 'form-control', :placeholder => 'optional'
+      = f.number_field :quantity, :class => 'input-small form-control', :step => 'any'
+      = render :partial => 'shared/form_optional'
     .col-md-2
       = f.select(:unit, Harvest::UNITS_VALUES, {:include_blank => false}, :class => 'input-medium form-control')
 
   .form-group
     = f.label :weight_quantity, 'Weighing (in total):', :class => 'control-label col-md-2'
     .col-md-2
-      = f.number_field :weight_quantity, :class => 'input-small', :step => 'any', :class => 'form-control', :placeholder => 'optional'
+      = f.number_field :weight_quantity, :class => 'input-small form-control', :step => 'any'
+      = render :partial => 'shared/form_optional'
     .col-md-2
       = f.select(:weight_unit, Harvest::WEIGHT_UNITS_VALUES, {:include_blank => false}, :class => 'form-control')
   .form-group
     = f.label :description, 'Notes', :class => 'control-label col-md-2'
     .col-md-8
-      = f.text_area :description, :rows => 6, :class => 'form-control', :placeholder => 'optional'
+      = f.text_area :description, :rows => 6, :class => 'form-control'
+      = render :partial => 'shared/form_optional'
 
   .form-group
     .form-actions.col-md-offset-2.col-md-8

app/views/harvests/_thumbnail.html.haml

@@ -21,5 +21,7 @@
           %dd= harvest.harvested_at
   .panel-footer
     %dt Description
-    %dd
+    %dd.truncate
       = display_harvest_description(harvest)
+    = if not harvest.description.empty?
+      - link_to "Read more", harvest_path(harvest)

app/views/harvests/index.html.haml

@@ -21,7 +21,7 @@
     = render :partial => 'shared/signin_signup', :locals => { :to => 'track your harvests' }
 
 %div.pagination
-  = page_entries_info @harvests, :model => "harvests"
+  = page_entries_info @harvests
   = will_paginate @harvests
 .row
   - if @harvests.size > 0
@@ -30,7 +30,7 @@
         =render :partial => 'harvests/thumbnail', :locals => {:harvest => harvest}
 
 %div.pagination
-  = page_entries_info @harvests, :model => "harvests"
+  = page_entries_info @harvests
   = will_paginate @harvests
 
   %ul.list-inline

app/views/layouts/_crowdfunding.html.haml

@@ -1,7 +0,0 @@
-- daysleft = Date.new(2014, 10, 22) - Date.today # end of campaign is the 21st, this gives a number that matches what IGG uses
-- if daysleft > 0
-  .crowdfunding-banner
-    Help us share free growing information with the world.
-    = link_to "Support our crowdfunding campaign.", "https://www.indiegogo.com/projects/growstuff/x/6079859"
-    There are only #{daysleft.to_i} days left.
-

app/views/layouts/application.html.haml

@@ -3,7 +3,6 @@
   = render :partial => "layouts/meta"
   %body
     = render :partial => "layouts/header"
-    = render :partial => "layouts/crowdfunding"
 
     #maincontainer.container
       .row

app/views/members/_gardens.html.haml

@@ -44,12 +44,12 @@
                 %p
                   = link_to "Add photo", new_photo_path(:type => "garden", :id => g.id), :class => 'btn btn-primary'
 
-        %h3 What's planted here?
-        .row
-          - if g.featured_plantings.size > 0
-            - g.featured_plantings.each.with_index do |planting|
-              .col-xs-12.col-lg-6
-                = render partial: "plantings/thumbnail", locals: {:planting => planting}
+          %h3 What's planted here?
+          .row
+            - if g.featured_plantings.size > 0
+              - g.featured_plantings.each.with_index do |planting|
+                .col-xs-12.col-lg-6
+                  = render partial: "plantings/thumbnail", locals: {:planting => planting}
 
-        %p
-          = link_to "More about this garden...", url_for(g)
+          %p
+            = link_to "More about this garden...", url_for(g)

app/views/members/_location.html.haml

@@ -2,4 +2,4 @@
   - if member.location.blank?
     unknown location
   - else
-    = link_to member.location, place_path(:place => member.location)
+    = link_to member.location, place_path(:place => member.location, anchor: "members")

app/views/members/_map.html.haml

@@ -1,5 +1,9 @@
 - if member.latitude and member.longitude
   %div#membermap
   %p
-    See other members near
-    = link_to member.location, place_path(member.location)
+    See other members, plantings, seeds and more near
+    = link_to member.location, place_path(member.location, anchor: "members")
+- else
+  %div.location-not-set
+    %div.sr-only Location not known
+    %div.sr-only We can't show you what's nearby

app/views/members/_stats.html.haml

@@ -1,6 +1,6 @@
 %h3 Activity
 
-%ul
+%ul.list-inline
   %li
     - if member.plantings.size > 0
       = link_to pluralize(member.plantings.size, "planting"), plantings_by_owner_path(:owner => member)

app/views/members/index.html.haml

@@ -7,7 +7,7 @@
   = submit_tag "Show", :class => 'btn btn-primary'
 
 %div.pagination
-  = page_entries_info @members, :model => "members"
+  = page_entries_info @members
   = will_paginate @members
 
 .member-cards
@@ -15,5 +15,5 @@
     = render :partial => "members/thumbnail", :locals => { :member => m }
 
 %div.pagination
-  = page_entries_info @members, :model => "members"
+  = page_entries_info @members
   = will_paginate @members

app/views/members/view_followers.html.haml

@@ -1,7 +1,7 @@
 - content_for :title, "#{@member.login_name}'s followers"
 
 %div.pagination
-  = page_entries_info @followers, :model => "members"
+  = page_entries_info @followers
   = will_paginate @followers
 
 .row
@@ -12,5 +12,5 @@
           = render :partial => "members/thumbnail", :locals => { :member => f }
           
 %div.pagination
-  = page_entries_info @followers, :model => "members"
-  = will_paginate @followers
+  = page_entries_info @followers
+  = will_paginate @followers

app/views/members/view_follows.html.haml

@@ -1,7 +1,7 @@
 - content_for :title, "#{@member.login_name}'s follows"
 
 %div.pagination
-  = page_entries_info @follows, :model => "members"
+  = page_entries_info @follows
   = will_paginate @follows
 
 .row
@@ -12,5 +12,5 @@
           = render :partial => "members/thumbnail", :locals => { :member => f }
 
 %div.pagination
-  = page_entries_info @follows, :model => "members"
-  = will_paginate @follows
+  = page_entries_info @follows
+  = will_paginate @follows

app/views/photos/index.html.haml

@@ -3,7 +3,7 @@
 %p Most recent photos added to #{ENV['GROWSTUFF_SITE_NAME']}.
 
 %div.pagination
-  = page_entries_info @photos, :model => "photos"
+  = page_entries_info @photos
   = will_paginate @photos
 
 .row
@@ -17,7 +17,7 @@
           = link_to p.owner, p.owner
 
 %div.pagination
-  = page_entries_info @photos, :model => "photos"
+  = page_entries_info @photos
   = will_paginate @photos
 
 

app/views/photos/new.html.haml

@@ -20,7 +20,7 @@
         = submit_tag "Search", :class => 'btn btn-primary'
 
   %div.pagination
-    = page_entries_info @photos, :model => "photos"
+    = page_entries_info @photos
     = will_paginate @photos
 
   .row

app/views/photos/show.html.haml

@@ -24,13 +24,13 @@
       %ul
         - if @photo.plantings.size > 0
           - @photo.plantings.each do |p|
-            %li= link_to p, p
+            %li= link_to t('.thing_by', thing: Planting.model_name.singular, owner: p.owner), p
         - if @photo.harvests.size > 0
           - @photo.harvests.each do |h|
-            %li= link_to h, h
+            %li= link_to t('.thing_by', thing: Harvest.model_name.singular, owner: h.owner), h
         - if @photo.gardens.size > 0
           - @photo.gardens.each do |g|
-            %li= link_to g, g
+            %li= link_to t('.thing_by', thing: Garden.model_name.singular, owner: g.owner), g
 
 
 .row

app/views/places/show.html.haml

@@ -1,10 +1,10 @@
--content_for :title, "#{ENV['GROWSTUFF_SITE_NAME']} members near #{@place}"
+-content_for :title, "#{ENV['GROWSTUFF_SITE_NAME']} community near #{@place}"
 
 = render partial: 'search_form'
 
 %div#placesmap{ :style => "height:300px"}
 
-%h3= "Nearby members"
+%h3#members= "Nearby members"
 
 - if !@nearby_members.empty?
   .row
@@ -13,7 +13,7 @@
         = render :partial => "members/thumbnail", :locals => { :member => member }
   = link_to "View all members >>", members_path
 
-  %h3= "Seeds available for trade near #{@place}"
+  %h3#seeds= "Seeds available for trade near #{@place}"
   - crop_id = []
   - @nearby_members.first(10).each do |member|
     - member.seeds.first(5).each do |seed|
@@ -27,19 +27,23 @@
   - else
     %p No nearby seeds found
 
+  #plantings
   %h3= "Recent plantings near #{@place}"
   
-  .row
-    - plantings = []
-    - @nearby_members.first(10).each do |member|
-      - member.plantings.first(5).each do |planting|
-        - plantings << planting
-    - if !plantings.blank?
+
+  - plantings = []
+  - @nearby_members.first(10).each do |member|
+    - member.plantings.first(5).each do |planting|
+      - plantings << planting
+  - if !plantings.blank?
+    .row
       - plantings.first(10).each.with_index do |planting, index|
         .col-xs-12.col-lg-6
           = render partial: "plantings/thumbnail", locals: {:planting => planting, :index => index}
+    .row
       = link_to "View all plantings >>", plantings_path
-    - else
+  - else
+    .row
       %p No nearby plantings found
 - else
   %p No results found