Auto corrected by following Ruby Layout/LeadingBlankLines

Auto corrected by following Ruby FactoryBot/AttributeDefinedStatically

.overcommit.yml

@@ -51,9 +51,6 @@ PreCommit:
     command: ['bundle', 'exec', 'haml-lint']
   JsonSyntax:
     enabled: true
-  BundleOutdated:
-    enabled: true
-    on_warn: warn
   BundleAudit:
     enabled: true
     on_warn: warn

.travis.yml

@@ -7,47 +7,41 @@ cache:
     - tmp/cache/assets/test/sprockets
 env:
   matrix:
-    - GROWSTUFF_ELASTICSEARCH='true' RSPEC_TAG=elasticsearch STATIC_CHECKS=false
-    - GROWSTUFF_ELASTICSEARCH='false' RSPEC_TAG=~elasticsearch STATIC_CHECKS=false
+    - GROWSTUFF_ELASTICSEARCH=true RSPEC_TAG=elasticsearch COVERAGE=true
+    - GROWSTUFF_ELASTICSEARCH=false RSPEC_TAG=~elasticsearch COVERAGE=false
     - STATIC_CHECKS=true
   global:
+    - secure: "Z5TpM2jEX4UCvNePnk/LwltQX48U2u9BRc+Iypr1x9QW2o228QJhPIOH39a8RMUrepGnkQIq9q3ZRUn98RfrJz1yThtlNFL3NmzdQ57gKgjGwfpa0e4Dwj/ZJqV2D84tDGjvdVYLP7zzaYZxQcwk/cgNpzKf/jq97HLNP7CYuf4="
     - GROWSTUFF_SITE_NAME="Growstuff (travis)"
     - RAILS_SECRET_TOKEN='xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx'
-    - secure: "Z5TpM2jEX4UCvNePnk/LwltQX48U2u9BRc+Iypr1x9QW2o228QJhPIOH39a8RMUrepGnkQIq9q3ZRUn98RfrJz1yThtlNFL3NmzdQ57gKgjGwfpa0e4Dwj/ZJqV2D84tDGjvdVYLP7zzaYZxQcwk/cgNpzKf/jq97HLNP7CYuf4="
 before_install:
-  - ./script/install_phantomjs;
+  - ./script/install_phantomjs.sh
   - export PATH=$PWD/travis_phantomjs/phantomjs-2.1.1-linux-x86_64/bin:$PATH
-  # Force Travis to use Elastic Search 2.4.0
-  - >
-    if [ "${GROWSTUFF_ELASTICSEARCH}" = "true" ]; then
-      sudo dpkg -r elasticsearch;
-      curl -O https://download.elastic.co/elasticsearch/release/org/elasticsearch/distribution/deb/elasticsearch/2.4.0/elasticsearch-2.4.0.deb;
-      sudo dpkg -i --force-confnew elasticsearch-2.4.0.deb;
-      sudo service elasticsearch start;
-      sleep 10;
-      curl localhost:9200;
-    fi
+  - ./script/install_codeclimate.sh
+  - ./script/install_linters.sh
+  - VERSION="6.2.3" ./script/install_elasticsearch.sh
 before_script:
-  - set -e
   - >
-    if [ "${STATIC_CHECKS}" = "true" ]; then
-      ./script/install_linters;
-    else
-      RAILS_ENV=test bundle exec rake db:create db:migrate;
-      bundle exec rake assets:precompile;
+    if [ "${COVERAGE}" = "true" ]; then
+      ./cc-test-reporter before-build
     fi
-  - set +e
 script:
   - set -e
   - >
     if [ "${STATIC_CHECKS}" = "true" ]; then
       ./script/check_static.rb
     else
-      bundle exec rake db:migrate --trace;
+      set +e;
+      RAILS_ENV=test bundle exec rake db:create db:migrate search:create;
+      bundle exec rake assets:precompile;
       bundle exec rspec --tag $RSPEC_TAG spec/;
-      bundle exec rake jasmine:ci;
     fi;
   - set +e
+after_script:
+  - >
+    if [ "${COVERAGE}" = "true" ]; then
+      ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT;
+    fi
 before_deploy:
   - bundle exec script/heroku_maintenance.rb on
 deploy:
@@ -70,4 +64,5 @@ after_deploy:
   - bundle exec script/heroku_maintenance.rb off
 addons:
   code_climate:
-    repo_token: 462e015bbdaabfb20910fc07f2fea253410ecb131444e00f97dbf32dc6789ca6
+    repo_token:
+      secure: "PfhLGBKRgNqhKuYCJsK+VPhdAzcgWFGeeOyxC/eS8gtlvIISVdgyZE+r30uIei0DFI6zEiN62eW4d+xtT4j7/e2ZcAcx7U52mza/SnQNuu3nCGQDJB8VOvV5NbnwXfi8vfr4e889Mt7k3ocd2c4gqB4UtRqrzhygj7HN+B/GfEk="

CONTRIBUTORS.md

@@ -83,7 +83,12 @@ submit the change with your pull request.
 - Jeff Kingswood / [ancyentmariner](https://github.com/ancyentmariner)
 - Logan Gingerich / [logangingerich](https://github.com/logangingerich)
 - Mark Taffman / [mftaff](https://github.com/mftaff)
+- Jennifer Kruse / [jenkr55](https://github.com/jenkr55)
+- Christopher Bazin / [RobotScissors](https://github.com/robotscissors)
 
 ## Bots
 
-- Security and Dependency Updates / [deppbot](https://github.com/deppbot)
+### Security and Dependency Updates
+- DeppBot / [deppbot](https://github.com/deppbot)
+- dependabot[bot] / [dependabot-bot](https://github.com/dependabot-bot)
+- dependabot / [dependabot](https://github.com/dependabot)

Gemfile

@@ -86,9 +86,9 @@ gem "chartkick"
 # Project does not use semver, so we want to be in sync with the version of
 # elasticsearch we use
 # See https://github.com/elastic/elasticsearch-ruby#compatibility
-gem "elasticsearch-api", "~> 2.0.0"
-gem "elasticsearch-model"
-gem "elasticsearch-rails"
+gem "elasticsearch-api", ">= 6.0.0"
+gem "elasticsearch-model", ">= 6.0.0"
+gem "elasticsearch-rails", ">= 6.0.0"
 gem "hashie", ">= 3.5.3"
 
 gem 'rake', '>= 10.0.0'
@@ -137,7 +137,6 @@ group :development, :test do
   gem 'haml-rails'                      # HTML templating language
   gem 'haml_lint'                       # Checks haml files for goodness
   gem 'i18n-tasks'                      # adds tests for finding missing and unused translations
-  gem 'jasmine'                         # javascript unit testing
   gem 'poltergeist'                     # for headless JS testing
   gem 'rainbow', '< 2.2.0' # See https://github.com/sickill/rainbow/issues/44
   gem 'rspec-activemodel-mocks'
@@ -155,3 +154,5 @@ end
 group :travis do
   gem 'platform-api'
 end
+gem 'loofah', '>= 2.2.1'
+gem 'rack-protection', '>= 2.0.1'

Gemfile.lock

@@ -26,8 +26,8 @@ GEM
       addressable
     active_median (0.1.4)
       activerecord
-    active_utils (3.3.9)
-      activesupport (>= 3.2, < 5.2.0)
+    active_utils (3.3.12)
+      activesupport (>= 3.2, < 6.0)
       i18n
     activejob (4.2.10)
       activesupport (= 4.2.10)
@@ -51,7 +51,7 @@ GEM
       public_suffix (>= 2.0.2, < 4.0)
     arel (6.0.4)
     ast (2.4.0)
-    autoprefixer-rails (7.2.5)
+    autoprefixer-rails (8.6.4)
       execjs
     bcrypt (3.1.11)
     better_errors (2.2.0)
@@ -61,10 +61,8 @@ GEM
     binding_of_caller (0.8.0)
       debug_inspector (>= 0.0.1)
     bluecloth (2.2.0)
-    bonsai-elasticsearch-rails (0.2.0)
-      elasticsearch-model (~> 0)
-      elasticsearch-rails (~> 0)
-    bootstrap-datepicker-rails (1.7.1.1)
+    bonsai-elasticsearch-rails (0.0.4)
+    bootstrap-datepicker-rails (1.8.0.1)
       railties (>= 3.0)
     bootstrap-kaminari-views (0.0.5)
       kaminari (>= 0.13)
@@ -74,31 +72,29 @@ GEM
       sass (>= 3.3.4)
     bootstrap_form (2.7.0)
     builder (3.2.3)
-    bullet (5.7.2)
+    bullet (5.7.5)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11.0)
-    byebug (10.0.0)
-    cancancan (2.1.3)
-    capybara (2.17.0)
+    byebug (10.0.2)
+    cancancan (2.2.0)
+    capybara (2.18.0)
       addressable
       mini_mime (>= 0.1.3)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (>= 2.0, < 4.0)
-    capybara-email (2.5.0)
-      capybara (~> 2.4)
+    capybara-email (3.0.1)
+      capybara (>= 2.4, < 4.0)
       mail
-    capybara-screenshot (1.0.18)
-      capybara (>= 1.0, < 3)
+    capybara-screenshot (1.0.21)
+      capybara (>= 1.0, < 4)
       launchy
-    chartkick (2.2.5)
-    childprocess (0.8.0)
+    chartkick (2.3.5)
+    childprocess (0.9.0)
       ffi (~> 1.0, >= 1.0.11)
     climate_control (0.2.0)
     cliver (0.3.2)
-    cocaine (0.5.8)
-      climate_control (>= 0.0.3, < 1.0)
     codeclimate-test-reporter (1.0.8)
       simplecov (<= 0.13)
     codemirror-rails (5.16.0)
@@ -111,7 +107,7 @@ GEM
       coffee-script-source
       execjs
     coffee-script-source (1.12.2)
-    comfortable_mexican_sofa (1.12.10)
+    comfortable_mexican_sofa (1.12.11)
       active_link_to (>= 1.0.0)
       bootstrap-sass (>= 3.2.0)
       bootstrap_form (>= 2.2.0)
@@ -134,16 +130,16 @@ GEM
       term-ansicolor (~> 1.3)
       thor (~> 0.19.1)
       tins (~> 1.6)
-    crass (1.0.3)
+    crass (1.0.4)
     csv_shaper (1.3.0)
       activesupport (>= 3.0.0)
-    dalli (2.7.6)
-    database_cleaner (1.6.2)
+    dalli (2.7.8)
+    database_cleaner (1.7.0)
     debug_inspector (0.0.3)
-    devise (4.4.1)
+    devise (4.4.3)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
-      railties (>= 4.1.0, < 5.2)
+      railties (>= 4.1.0, < 6.0)
       responders
       warden (~> 1.2.3)
     diff-lcs (1.3)
@@ -151,41 +147,41 @@ GEM
     easy_translate (0.5.1)
       thread
       thread_safe
-    elasticsearch (2.0.2)
-      elasticsearch-api (= 2.0.2)
-      elasticsearch-transport (= 2.0.2)
-    elasticsearch-api (2.0.2)
+    elasticsearch (6.1.0)
+      elasticsearch-api (= 6.1.0)
+      elasticsearch-transport (= 6.1.0)
+    elasticsearch-api (6.1.0)
       multi_json
-    elasticsearch-model (0.1.9)
+    elasticsearch-model (6.0.0)
       activesupport (> 3)
-      elasticsearch (> 0.4)
+      elasticsearch (> 1)
       hashie
-    elasticsearch-rails (0.1.9)
-    elasticsearch-transport (2.0.2)
+    elasticsearch-rails (6.0.0)
+    elasticsearch-transport (6.1.0)
       faraday
       multi_json
     erubis (2.7.0)
-    excon (0.60.0)
+    excon (0.62.0)
     execjs (2.7.0)
-    factory_bot (4.8.2)
+    factory_bot (4.10.0)
       activesupport (>= 3.0.0)
-    factory_bot_rails (4.8.2)
-      factory_bot (~> 4.8.2)
+    factory_bot_rails (4.10.0)
+      factory_bot (~> 4.10.0)
       railties (>= 3.0.0)
-    faker (1.8.7)
+    faker (1.9.1)
       i18n (>= 0.7)
     faraday (0.12.2)
       multipart-post (>= 1.2, < 3)
-    ffi (1.9.21)
+    ffi (1.9.25)
     figaro (1.1.1)
       thor (~> 0.14)
     flickraw (0.9.9)
-    font-awesome-sass (4.7.0)
-      sass (>= 3.2)
+    font-awesome-sass (5.0.13)
+      sassc (>= 1.11)
     formatador (0.2.5)
-    friendly_id (5.2.3)
+    friendly_id (5.2.4)
       activerecord (>= 4.0.0)
-    geocoder (1.4.5)
+    geocoder (1.4.9)
     gibbon (1.2.1)
       httparty
       multi_json (>= 1.9.0)
@@ -241,9 +237,9 @@ GEM
       haml (>= 4.0, < 6)
       nokogiri (>= 1.6.0)
       ruby_parser (~> 3.5)
-    httparty (0.15.6)
+    httparty (0.16.2)
       multi_xml (>= 0.5.2)
-    i18n (0.9.3)
+    i18n (0.9.5)
       concurrent-ruby (~> 1.0)
     i18n-tasks (0.9.12)
       activesupport (>= 4.0.2)
@@ -255,13 +251,7 @@ GEM
       parser (>= 2.2.3.0)
       term-ansicolor (>= 1.3.2)
       terminal-table (>= 1.5.1)
-    jasmine (2.9.0)
-      jasmine-core (>= 2.9.0, < 3.0.0)
-      phantomjs
-      rack (>= 1.2.1)
-      rake
-    jasmine-core (2.99.0)
-    jquery-rails (4.3.1)
+    jquery-rails (4.3.3)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
@@ -289,7 +279,7 @@ GEM
       kaminari-core (= 1.1.1)
     kaminari-core (1.1.1)
     kgio (2.11.2)
-    kramdown (1.16.2)
+    kramdown (1.17.0)
     launchy (2.4.3)
       addressable (~> 2.3)
     leaflet-rails (1.3.1)
@@ -300,10 +290,10 @@ GEM
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
       ruby_dep (~> 1.2)
-    loofah (2.1.1)
+    loofah (2.2.2)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    lumberjack (1.0.12)
+    lumberjack (1.0.13)
     mail (2.7.0)
       mini_mime (>= 0.1.1)
     memcachier (0.0.2)
@@ -320,8 +310,8 @@ GEM
     multi_xml (0.6.0)
     multipart-post (2.0.0)
     nenv (0.3.0)
-    newrelic_rpm (4.8.0.341)
-    nokogiri (1.8.2)
+    newrelic_rpm (5.2.0.345)
+    nokogiri (1.8.4)
       mini_portile2 (~> 2.3.0)
     notiffany (0.1.1)
       nenv (~> 0.1)
@@ -336,7 +326,7 @@ GEM
     omniauth (1.8.1)
       hashie (>= 3.4.6, < 3.6.0)
       rack (>= 1.6.2, < 3)
-    omniauth-facebook (4.0.0)
+    omniauth-facebook (5.0.0)
       omniauth-oauth2 (~> 1.2)
     omniauth-flickr (0.0.19)
       multi_json (~> 1.11.0)
@@ -351,17 +341,16 @@ GEM
       omniauth-oauth (~> 1.1)
       rack
     orm_adapter (0.5.0)
-    paperclip (5.2.1)
+    paperclip (6.1.0)
       activemodel (>= 4.2.0)
       activesupport (>= 4.2.0)
-      cocaine (~> 0.5.5)
       mime-types
       mimemagic (~> 0.3.0)
+      terrapin (~> 0.6.0)
     parallel (1.12.1)
-    parser (2.4.0.2)
-      ast (~> 2.3)
+    parser (2.5.1.0)
+      ast (~> 2.4.0)
     pg (0.21.0)
-    phantomjs (2.1.1.0)
     platform-api (2.1.0)
       heroics (~> 0.0.23)
       moneta (~> 0.8.1)
@@ -375,11 +364,11 @@ GEM
     pry (0.11.3)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
-    public_suffix (3.0.1)
+    public_suffix (3.0.2)
     quiet_assets (1.1.0)
       railties (>= 3.1, < 5.0)
-    rack (1.6.8)
-    rack-protection (2.0.0)
+    rack (1.6.10)
+    rack-protection (2.0.3)
       rack
     rack-test (0.6.3)
       rack (>= 1.0)
@@ -403,8 +392,8 @@ GEM
       activesupport (>= 4.2.0, < 5.0)
       nokogiri (~> 1.6)
       rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.3)
-      loofah (~> 2.0)
+    rails-html-sanitizer (1.0.4)
+      loofah (~> 2.2, >= 2.2.2)
     rails-i18n (4.0.9)
       i18n (~> 0.7)
       railties (~> 4.0)
@@ -420,39 +409,39 @@ GEM
       thor (>= 0.18.1, < 2.0)
     rainbow (2.1.0)
     raindrops (0.19.0)
-    rake (12.3.0)
-    rb-fsevent (0.10.2)
+    rake (12.3.1)
+    rb-fsevent (0.10.3)
     rb-inotify (0.9.10)
       ffi (>= 0.5.0, < 2)
     redis (4.0.1)
     responders (2.4.0)
       actionpack (>= 4.2.0, < 5.3)
       railties (>= 4.2.0, < 5.3)
-    rspec (3.7.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
+    rspec (3.8.0)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
     rspec-activemodel-mocks (1.0.3)
       activemodel (>= 3.0)
       activesupport (>= 3.0)
       rspec-mocks (>= 2.99, < 4.0)
-    rspec-core (3.7.1)
-      rspec-support (~> 3.7.0)
-    rspec-expectations (3.7.0)
+    rspec-core (3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-expectations (3.8.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-mocks (3.7.0)
+      rspec-support (~> 3.8.0)
+    rspec-mocks (3.8.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-rails (3.7.2)
+      rspec-support (~> 3.8.0)
+    rspec-rails (3.8.0)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 3.7.0)
-      rspec-expectations (~> 3.7.0)
-      rspec-mocks (~> 3.7.0)
-      rspec-support (~> 3.7.0)
-    rspec-support (3.7.1)
+      rspec-core (~> 3.8.0)
+      rspec-expectations (~> 3.8.0)
+      rspec-mocks (~> 3.8.0)
+      rspec-support (~> 3.8.0)
+    rspec-support (3.8.0)
     rubocop (0.49.1)
       parallel (~> 1.10)
       parser (>= 2.3.3.1, < 3.0)
@@ -461,12 +450,12 @@ GEM
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
     ruby-progressbar (1.9.0)
-    ruby-units (2.2.1)
+    ruby-units (2.3.0)
     ruby_dep (1.5.0)
-    ruby_parser (3.10.1)
+    ruby_parser (3.11.0)
       sexp_processor (~> 4.9)
     rubyzip (1.2.1)
-    sass (3.5.5)
+    sass (3.5.6)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
@@ -477,24 +466,27 @@ GEM
       sprockets (>= 2.8, < 4.0)
       sprockets-rails (>= 2.0, < 4.0)
       tilt (>= 1.1, < 3)
-    selenium-webdriver (3.9.0)
+    sassc (1.12.0)
+      ffi (~> 1.9.6)
+      sass (>= 3.3.0)
+    selenium-webdriver (3.14.0)
       childprocess (~> 0.5)
       rubyzip (~> 1.2)
-    sexp_processor (4.10.0)
+    sexp_processor (4.11.0)
     shellany (0.0.1)
-    sidekiq (5.1.0)
+    sidekiq (5.1.3)
       concurrent-ruby (~> 1.0)
       connection_pool (~> 2.2, >= 2.2.0)
       rack-protection (>= 1.5.0)
-      redis (>= 3.3.4, < 5)
+      redis (>= 3.3.5, < 5)
     simplecov (0.12.0)
       docile (~> 1.1.0)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
-    sparkpost_rails (1.5.0)
-      rails (>= 4.0, < 5.2)
-    sprockets (3.7.1)
+    sparkpost_rails (1.5.1)
+      rails (>= 4.0, < 5.3)
+    sprockets (3.7.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
     sprockets-rails (3.2.1)
@@ -507,6 +499,8 @@ GEM
       tins (~> 1.0)
     terminal-table (1.8.0)
       unicode-display_width (~> 1.1, >= 1.1.1)
+    terrapin (0.6.0)
+      climate_control (>= 0.0.3, < 1.0)
     thor (0.19.4)
     thread (0.2.2)
     thread_safe (0.3.6)
@@ -516,10 +510,10 @@ GEM
     trollop (1.16.2)
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    uglifier (4.1.5)
+    uglifier (4.1.15)
       execjs (>= 0.3.0, < 3)
-    unicode-display_width (1.3.0)
-    unicorn (5.4.0)
+    unicode-display_width (1.3.2)
+    unicorn (5.4.1)
       kgio (~> 2.6)
       raindrops (~> 0.7)
     uniform_notifier (1.11.0)
@@ -534,7 +528,7 @@ GEM
     websocket-extensions (0.1.3)
     will_paginate (3.1.6)
     xmlrpc (0.3.0)
-    xpath (3.0.0)
+    xpath (3.1.0)
       nokogiri (~> 1.8)
 
 PLATFORMS
@@ -567,9 +561,9 @@ DEPENDENCIES
   dalli
   database_cleaner
   devise
-  elasticsearch-api (~> 2.0.0)
-  elasticsearch-model
-  elasticsearch-rails
+  elasticsearch-api (>= 6.0.0)
+  elasticsearch-model (>= 6.0.0)
+  elasticsearch-rails (>= 6.0.0)
   factory_bot_rails
   faker
   figaro
@@ -587,7 +581,6 @@ DEPENDENCIES
   haml_lint
   hashie (>= 3.5.3)
   i18n-tasks
-  jasmine
   jquery-rails
   jquery-ui-rails (~> 5.0.2)
   js-routes
@@ -595,6 +588,7 @@ DEPENDENCIES
   kaminari
   leaflet-rails
   letter_opener
+  loofah (>= 2.2.1)
   memcachier
   newrelic_rpm
   omniauth (~> 1.3)
@@ -606,6 +600,7 @@ DEPENDENCIES
   poltergeist
   pry
   quiet_assets
+  rack-protection (>= 2.0.1)
   rails (~> 4.2.8)
   rails-assets-leaflet.markercluster!
   rails_12factor
@@ -631,4 +626,4 @@ RUBY VERSION
    ruby 2.4.1p111
 
 BUNDLED WITH
-   1.16.1
+   1.16.4

README.md

@@ -1,7 +1,7 @@
 # Growstuff
 
 [![Build Status](https://travis-ci.org/Growstuff/growstuff.svg?branch=dev)](https://travis-ci.org/Growstuff/growstuff)
-[![Coverage Status](https://coveralls.io/repos/Growstuff/growstuff/badge.png)](https://coveralls.io/r/Growstuff/growstuff)
+[![Coverage Status](https://coveralls.io/repos/github/Growstuff/growstuff/badge.svg?branch=dev)](https://coveralls.io/github/Growstuff/growstuff?branch=dev)
 [![Code Climate](https://codeclimate.com/github/Growstuff/growstuff/badges/gpa.svg)](https://codeclimate.com/github/Growstuff/growstuff)
 
 Welcome to the Growstuff project.

app/assets/javascripts/crops.js.coffee

@@ -0,0 +1,39 @@
+jQuery ->
+  $('#add-sci_name-row').css("display", "inline-block")
+  $('#remove-sci_name-row').css("display", "inline-block")
+  $("#add-alt_name-row").css("display", "inline-block")
+  $("#remove-alt_name-row").css("display", "inline-block")
+
+-$ ->
+  sci_template = "<div id='sci_template[INDEX]' class='template col-md-12'><div class='col-md-2'><label>Scientific name INDEX:</label></div><div class='col-md-8'><input name='sci_name[INDEX]' class='form-control', id='sci_name[INDEX]')'></input><span class='help-block'>Scientific name of crop.</span></div><div class='col-md-2'></div></div>"
+
+  sci_index = $('#scientific_names .template').length + 1
+
+  $('#add-sci_name-row').click ->
+    compiled_input = $(sci_template.split("INDEX").join(sci_index))
+    $('#scientific_names').append(compiled_input)
+    sci_index = sci_index + 1
+
+  $('#remove-sci_name-row').click ->
+    if (sci_index > 2)
+      sci_index = sci_index - 1
+      tmp = 'sci_template[' + sci_index + ']'
+      element = document.getElementById(tmp)
+      element.remove()
+
+  alt_template = "<div id='alt_template[INDEX]' class='template col-md-12'><div class='col-md-2'><label>Alternate name INDEX:</label></div><div class='col-md-8'><input name='alt_name[INDEX]' class='form-control', id='alt_name[INDEX]')'></input><span class='help-block'>Alternate name of crop.</span></div><div class='col-md-2'></div></div>"
+
+  alt_index = $('#alternate_names .template').length + 1
+
+  $('#add-alt_name-row').click ->
+    compiled_input = $(alt_template.split("INDEX").join(alt_index))
+    $('#alternate_names').append(compiled_input)
+    alt_index = alt_index + 1
+
+  $('#remove-alt_name-row').click ->
+    if (alt_index > 2)
+      alt_index = alt_index - 1
+      tmp = 'alt_template[' + alt_index + ']'
+      element = document.getElementById(tmp)
+      console.log("%s",tmp)
+      element.remove()

app/assets/javascripts/finish_seed.js.coffee

@@ -0,0 +1,19 @@
+# Clears the finished at date field when
+# a seed is marked unfinished, and
+# repopulates the field with a cached value
+# marking unfinished is undone.
+
+jQuery ->
+  previousValue = ''
+  $('#seed_finished').on('click', ->
+    finished = $('#seed_finished_at')
+    if @checked
+      if previousValue.length
+        date = previousValue
+        finished.val(date)
+      else
+        finished.trigger('focus')
+    else
+      previousValue = finished.val()
+      finished.val('')
+  )

app/assets/javascripts/seeds.js.coffee

@@ -4,41 +4,3 @@
 
 jQuery ->
   $('.add-datepicker').datepicker('format' : 'yyyy-mm-dd')
-  $('#add-sci_name-row').css("display", "inline-block")
-  $('#remove-sci_name-row').css("display", "inline-block")
-  $("#add-alt_name-row").css("display", "inline-block")
-  $("#remove-alt_name-row").css("display", "inline-block")
-
-$ ->
-  sci_template = "<div id='sci_template[INDEX]' class='template col-md-12'><div class='col-md-2'><label>Scientific name INDEX:</label></div><div class='col-md-8'><input name='sci_name[INDEX]' class='form-control', id='sci_name[INDEX]')'></input><span class='help-block'>Scientific name of crop.</span></div><div class='col-md-2'></div></div>"
-
-  sci_index = $('#scientific_names .template').length + 1
-
-  $('#add-sci_name-row').click ->
-    compiled_input = $(sci_template.split("INDEX").join(sci_index))
-    $('#scientific_names').append(compiled_input)
-    sci_index = sci_index + 1
-
-  $('#remove-sci_name-row').click ->
-    if (sci_index > 2)
-      sci_index = sci_index - 1
-      tmp = 'sci_template[' + sci_index + ']'
-      element = document.getElementById(tmp)
-      element.remove()
-
-  alt_template = "<div id='alt_template[INDEX]' class='template col-md-12'><div class='col-md-2'><label>Alternate name INDEX:</label></div><div class='col-md-8'><input name='alt_name[INDEX]' class='form-control', id='alt_name[INDEX]')'></input><span class='help-block'>Alternate name of crop.</span></div><div class='col-md-2'></div></div>"
-
-  alt_index = $('#alternate_names .template').length + 1
-
-  $('#add-alt_name-row').click ->
-    compiled_input = $(alt_template.split("INDEX").join(alt_index))
-    $('#alternate_names').append(compiled_input)
-    alt_index = alt_index + 1
-
-  $('#remove-alt_name-row').click ->
-    if (alt_index > 2)
-      alt_index = alt_index - 1
-      tmp = 'alt_template[' + alt_index + ']'
-      element = document.getElementById(tmp)
-      console.log("%s",tmp)
-      element.remove()

app/assets/stylesheets/custom_bootstrap/variables.sass

@@ -1,7 +1,7 @@
 // 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'
+@import 'bootstrap/variables.scss'
 
 // Base colours
 
@@ -10,7 +10,7 @@ $brown: #413f3b
 
 $green:  #5f8e43
 $blue:   #2f4365
-$red:    #8e4d43
+$red:    #ff4d43
 $orange: #ffa500
 $yellow: #b2935c
 $white:  #ffffff

app/assets/stylesheets/overrides.sass

@@ -12,6 +12,10 @@ body
 .list-inline > li.first
   padding-left: 0px
 
+.activity-list
+  list-style-type: none
+  padding: 0
+
 h2
   font-size: 150%
 
@@ -34,6 +38,21 @@ h3
   max-width: 100%
   height: auto
 
+.profile-sidebar
+  margin-top: -5rem
+  .avatar
+    border-radius: 50%
+    border-radius: 50%
+    z-index: 2
+    position: relative
+
+.profile-activity
+  background: white
+  padding: 2em
+  margin-top: 2em
+  .container
+    width: 100%
+
 .sidebar
   border-left: 1px solid darken($beige, 10%)
   margin-left: -1px
@@ -73,10 +92,16 @@ p.stats
   display: flex
   flex: none
   flex-wrap: wrap
-  justify-content: space-between
+
+.card-row
+  display: grid
+  grid-template-columns: 50% 50%
+  grid-gap: 25px
+  grid-row-gap: 5px
 
 .member-thumbnail
   padding: .25em
+  margin: 1em
 
   div
     width: 5em
@@ -87,34 +112,47 @@ p.stats
   padding-left: 1em
   width: 15em
 
+.progress
+  border-radius: 0
+
+.badge-super-late
+  background-color: $red
+.badge-harvest
+  background-color: $blue
+
+.planting-super-late
+.planting-late
+  background-color: $beige
+
 .planting
+  .planting-badges
+    position: absolute
+
+  .planting-thumbnail
+    padding: 0
+    border: 1px solid darken($beige, 10%)
+    border-radius: 4px
+  .planting-actions
+    top: -8em
+  .planting-name
+    position: relative
+    top: -1em
+
   dl.planting-attributes
     dt
       text-align: left
     dd
       margin-left: auto
 
-@media (min-width: $screen-md-min)
-  .planting-thumbnail
-    dl.planting-attributes
-      width: 100%
-
-      dt
-        text-align: left
-        width: 120px
-      dd
-        padding-left: 120px
-        margin-left: auto
-
-  .navbar .navbar-form
-    width: 250px
-
+.layout-actions
+  width: 100%
 
 #placesmap, #cropmap
   height: 500px
 
 #membermap
   height: 250px
+  z-index: 0
 
 .location-not-set
   height: 250px
@@ -161,6 +199,8 @@ p.stats
   border: none
   text-align: center
   margin-bottom: 1.5em
+  max-width: 160px
+  max-height: 200px
 
   .member-thumbnail
     text-align: left
@@ -207,6 +247,9 @@ li.crop-hierarchy
 .navbar-bottom
   margin: 40px 0px 0px 0px !important
 
+.post-actions
+  margin-bottom: 1rem
+
 // footer
 footer
   #footer1, #footer2, #footer3
@@ -236,6 +279,7 @@ footer
 
 #maincontainer
   min-height: 80%
+  padding: 50px
 
 html, body
   height: 100%
@@ -254,24 +298,6 @@ html, body
   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
-
-  .navbar .navbar-form
-    width: 185px
-    padding-left: 0
-    padding-right: 0
 
 /* override "info" alert boxes to be green, not blue, on Growstuff */
 $state-info-text: darken($green, 10%)
@@ -326,3 +352,47 @@ ul.thumbnail-buttons
 
 .hover-wrapper:hover .text
   visibility: visible
+
+.homepage-listing
+  padding-bottom: 6px
+
+@media (min-width: $screen-md-min)
+  .planting-thumbnail
+    dl.planting-attributes
+      width: 100%
+
+      dt
+        text-align: left
+        width: 120px
+      dd
+        padding-left: 120px
+        margin-left: auto
+
+  .navbar .navbar-form
+    width: 250px
+
+// 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
+
+  .navbar .navbar-form
+    width: 185px
+    padding-left: 0
+    padding-right: 0
+  .homepage
+    .thumbnail
+      height: 180px
+    .seed-thumbnail
+      height: 220px
+
+  #maincontainer
+    padding: 10px

app/controllers/harvests_controller.rb

@@ -3,7 +3,7 @@ class HarvestsController < ApplicationController
   after_action :update_crop_medians, only: %i(create update destroy)
   load_and_authorize_resource
   respond_to :html, :json
-  respond_to :csv, only: :index
+  respond_to :csv, :rss, only: :index
   responders :flash
 
   def index
@@ -92,7 +92,7 @@ class HarvestsController < ApplicationController
     # if this harvest is not linked to a planting, then do nothing
     return if @harvest.planting.nil?
 
-    @harvest.planting.update_harvest_days
+    @harvest.planting.update_harvest_days!
     @harvest.crop.update_harvest_medians
   end
 end

app/controllers/members_controller.rb

@@ -20,6 +20,7 @@ class MembersController < ApplicationController
     @facebook_auth = @member.auth('facebook')
     @posts         = @member.posts
     @gardens       = @member.gardens.active.order(:name)
+    @harvests      = @member.harvests
 
     # The garden form partial is called from the "New Garden" tab;
     # it requires a garden to be passed in @garden.

app/controllers/plantings_controller.rb

@@ -37,6 +37,7 @@ class PlantingsController < ApplicationController
 
   def new
     @planting = Planting.new(planted_at: Time.zone.today)
+    @seed = Seed.find_by(slug: params[:seed_id]) if params[:seed_id]
 
     # using find_by_id here because it returns nil, unlike find
     @crop     = Crop.approved.find_by(id: params[:crop_id]) || Crop.new
@@ -54,6 +55,7 @@ class PlantingsController < ApplicationController
   def create
     @planting = Planting.new(planting_params)
     @planting.owner = current_member
+    @planting.crop = @planting.parent_seed.crop if @planting.parent_seed.present?
     @planting.save!
     respond_with @planting
   end
@@ -75,13 +77,14 @@ class PlantingsController < ApplicationController
   end
 
   def update_planting_medians
-    @planting.update_harvest_days
+    @planting.update_harvest_days!
   end
 
   def planting_params
     params[:planted_at] = parse_date(params[:planted_at]) if params[:planted_at]
     params.require(:planting).permit(
       :crop_id, :description, :garden_id, :planted_at,
+      :parent_seed_id,
       :quantity, :sunniness, :planted_from, :finished,
       :finished_at
     )

app/controllers/seeds_controller.rb

@@ -16,44 +16,37 @@ class SeedsController < ApplicationController
     respond_with(@seeds)
   end
 
-  # GET /seeds/1
-  # GET /seeds/1.json
   def show
     @photos = @seed.photos.includes(:owner).order(created_at: :desc).paginate(page: params[:page])
     respond_with(@seed)
   end
 
-  # GET /seeds/new
-  # GET /seeds/new.json
   def new
     @seed = Seed.new
 
-    # using find_by_id here because it returns nil, unlike find
-    @crop = Crop.find_or_initialize_by(id: params[:crop_id])
+    if params[:planting_id]
+      @planting = Planting.find_by(slug: params[:planting_id])
+    else
+      @crop = Crop.find_or_initialize_by(id: params[:crop_id])
+    end
     respond_with(@seed)
   end
 
-  # GET /seeds/1/edit
   def edit; end
 
-  # POST /seeds
-  # POST /seeds.json
   def create
     @seed = Seed.new(seed_params)
     @seed.owner = current_member
+    @seed.crop = @seed.parent_planting.crop if @seed.parent_planting
     flash[:notice] = "Successfully added #{@seed.crop} seed to your stash." if @seed.save
     respond_with(@seed)
   end
 
-  # PUT /seeds/1
-  # PUT /seeds/1.json
   def update
     flash[:notice] = 'Seed was successfully updated.' if @seed.update(seed_params)
     respond_with(@seed)
   end
 
-  # DELETE /seeds/1
-  # DELETE /seeds/1.json
   def destroy
     @seed.destroy
     respond_with(@seed)
@@ -64,8 +57,11 @@ class SeedsController < ApplicationController
   def seed_params
     params.require(:seed).permit(
       :crop_id, :description, :quantity, :plant_before,
-      :days_until_maturity_min, :days_until_maturity_max, :organic, :gmo,
-      :heirloom, :tradable_to, :slug
+      :parent_planting_id,
+      :days_until_maturity_min, :days_until_maturity_max,
+      :organic, :gmo,
+      :heirloom, :tradable_to, :slug,
+      :finished, :finished_at
     )
   end
 

app/helpers/application_helper.rb

@@ -1,26 +1,9 @@
 module ApplicationHelper
-  def price_in_dollars(price)
-    format('%.2f', price / 100.0)
-  end
-
-  # 999 cents becomes 9.99 AUD -- for products/orders/etc
-  def price_with_currency(price)
-    format('%.2f %s', price / 100.0, Growstuff::Application.config.currency)
-  end
-
   def parse_date(str)
     str ||= '' # Date.parse barfs on nil
     str == '' ? nil : Date.parse(str)
   end
 
-  def forex_link(price)
-    pid = price_in_dollars(price)
-    currency = Growstuff::Application.config.currency
-    link = "http://www.wolframalpha.com/input/?i=#{pid}+#{currency}"
-
-    link_to "(convert)", link, target: "_blank", rel: "noopener noreferrer"
-  end
-
   def build_alert_classes(alert_type = :info)
     classes = 'alert alert-dismissable '
     case alert_type.to_sym
@@ -86,11 +69,15 @@ module ApplicationHelper
   def show_inactive_tickbox_path(type, owner, show_all)
     all = show_all ? '' : 1
     if owner
-      plantings_by_owner_path(owner: owner.slug, all: all) if type == 'plantings'
-      gardens_by_owner_path(owner: owner.slug, all: all) if type == 'gardens'
-    else
-      plantings_path(all: all) if type == 'plantings'
-      gardens_path(all: all) if type == 'gardens'
+      if type == 'plantings'
+        plantings_by_owner_path(owner: owner.slug, all: all)
+      elsif type == 'gardens'
+        gardens_by_owner_path(owner: owner.slug, all: all)
+      end
+    elsif type == 'plantings'
+      plantings_path(all: all)
+    elsif type == 'gardens'
+      gardens_path(all: all)
     end
   end
 

app/helpers/harvests_helper.rb

@@ -28,7 +28,12 @@ module HarvestsHelper
   end
 
   def display_harvest_description(harvest)
-    return "No description provided." if harvest.description.nil?
-    harvest.description
+    if harvest.description.nil?
+      "no description provided."
+    else
+      truncate(harvest.description, length: 50, separator: ' ', omission: '... ') do
+        link_to "Read more", harvest_path(harvest)
+      end
+    end
   end
 end

app/helpers/photos_helper.rb

@@ -0,0 +1,51 @@
+module PhotosHelper
+  def crop_image_path(crop)
+    if crop.default_photo.present?
+      crop.default_photo.thumbnail_url
+    else
+      placeholder_image
+    end
+  end
+
+  def garden_image_path(garden)
+    if garden.default_photo.present?
+      garden.default_photo.thumbnail_url
+    else
+      placeholder_image
+    end
+  end
+
+  def planting_image_path(planting)
+    if planting.photos.present?
+      planting.photos.order(date_taken: :desc).first.thumbnail_url
+    else
+      placeholder_image
+    end
+  end
+
+  def harvest_image_path(harvest)
+    if harvest.photos.present?
+      harvest.photos.order(date_taken: :desc).first.thumbnail_url
+    elsif harvest.planting.present?
+      planting_image_path(harvest.planting)
+    else
+      placeholder_image
+    end
+  end
+
+  def seed_image_path(seed)
+    if seed.default_photo.present?
+      seed.default_photo.thumbnail_url
+    elsif seed.crop.default_photo.present?
+      seed.crop.default_photo.thumbnail_url
+    else
+      placeholder_image
+    end
+  end
+
+  private
+
+  def placeholder_image
+    'placeholder_150.png'
+  end
+end

app/helpers/plantings_helper.rb

@@ -32,4 +32,24 @@ module PlantingsHelper
   def plantings_active_tickbox_path(owner, show_all)
     show_inactive_tickbox_path('plantings', owner, show_all)
   end
+
+  def days_from_now_to_finished(planting)
+    return unless planting.finish_is_predicatable?
+    (planting.finish_predicted_at - Time.zone.today).to_i
+  end
+
+  def days_from_now_to_first_harvest(planting)
+    return unless planting.planted_at.present? && planting.first_harvest_predicted_at.present?
+    (planting.first_harvest_predicted_at - Time.zone.today).to_i
+  end
+
+  def planting_classes(planting)
+    classes = []
+    classes << 'planting-growing' if planting.growing?
+    classes << 'planting-finished' if planting.finished?
+    classes << 'planting-harvest-time' if planting.harvest_time?
+    classes << 'planting-late' if planting.late?
+    classes << 'planting-super-late' if planting.super_late?
+    classes.join(' ')
+  end
 end

app/mailers/notifier.rb

@@ -26,8 +26,8 @@ class Notifier < ActionMailer::Base
   def planting_reminder(member)
     @member = member
 
-    @plantings = @member.plantings.first(5)
-    @harvests = @member.harvests.first(5)
+    @plantings = @member.plantings.order(planted_at: :desc).first(5)
+    @harvests = @member.harvests.order(harvested_at: :desc).first(5)
 
     # Encrypting
     message = { member_id: @member.id, type: :send_planting_reminder }

app/models/ability.rb

@@ -111,9 +111,12 @@ class Ability
     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 :create,  Seed
+    can :update,  Seed, owner_id: member.id
     can :destroy, Seed, owner_id: member.id
+    can :create,  Seed, owner_id: member.id, parent_planting: { owner_id: member.id }
+    can :update,  Seed, owner_id: member.id, parent_planting: { owner_id: member.id }
+    can :destroy, Seed, owner_id: member.id, parent_planting: { owner_id: member.id }
 
     # following/unfollowing permissions
     can :create, Follow

app/models/concerns/finishable.rb

@@ -0,0 +1,12 @@
+module Finishable
+  extend ActiveSupport::Concern
+
+  included do
+    scope :finished, -> { where(finished: true) }
+    scope :current, -> { where.not(finished: true) }
+
+    def active?
+      !finished
+    end
+  end
+end

app/models/concerns/ownable.rb

@@ -0,0 +1,7 @@
+module Ownable
+  extend ActiveSupport::Concern
+
+  included do
+    belongs_to :owner, class_name: 'Member', foreign_key: 'owner_id', counter_cache: true
+  end
+end

app/models/concerns/predict_harvest.rb

@@ -0,0 +1,61 @@
+module PredictHarvest
+  extend ActiveSupport::Concern
+
+  included do # rubocop:disable Metrics/BlockLength
+    # dates
+    def first_harvest_date
+      harvests_with_dates.minimum(:harvested_at)
+    end
+
+    def last_harvest_date
+      harvests_with_dates.maximum(:harvested_at)
+    end
+
+    def first_harvest_predicted_at
+      return unless crop.median_days_to_first_harvest.present? && planted_at.present?
+      planted_at + crop.median_days_to_first_harvest.days
+    end
+
+    def last_harvest_predicted_at
+      return unless crop.median_days_to_last_harvest.present? && planted_at.present?
+      planted_at + crop.median_days_to_last_harvest.days
+    end
+
+    # actions
+    def update_harvest_days!
+      days_to_first_harvest = nil
+      days_to_last_harvest = nil
+      if planted_at.present? && harvests_with_dates.size.positive?
+        days_to_first_harvest = (first_harvest_date - planted_at).to_i
+        days_to_last_harvest = (last_harvest_date - planted_at).to_i if finished?
+      end
+      update(days_to_first_harvest: days_to_first_harvest, days_to_last_harvest: days_to_last_harvest)
+    end
+
+    # status
+    def harvest_time?
+      return false if crop.perennial || finished
+
+      # We have harvests but haven't finished
+      harvests.size.positive? ||
+
+        # or, we don't have harvests, but we predict we should by now
+        (first_harvest_predicted_at.present? &&
+          harvests.empty? &&
+          first_harvest_predicted_at < Time.zone.today)
+    end
+
+    def before_harvest_time?
+      first_harvest_predicted_at.present? &&
+        harvests.empty? &&
+        first_harvest_predicted_at.present? &&
+        first_harvest_predicted_at > Time.zone.today
+    end
+
+    private
+
+    def harvests_with_dates
+      harvests.where.not(harvested_at: nil)
+    end
+  end
+end

app/models/concerns/predict_planting.rb

@@ -0,0 +1,80 @@
+module PredictPlanting
+  extend ActiveSupport::Concern
+
+  included do # rubocop:disable Metrics/BlockLength
+    ## Triggers
+    before_save :calculate_lifespan
+
+    def calculate_lifespan
+      self.lifespan = (planted_at.present? && finished_at.present? ? finished_at - planted_at : nil)
+    end
+
+    # dates
+    def finish_predicted_at
+      if planted_at.blank?
+        nil
+      elsif crop.median_lifespan.present?
+        planted_at + crop.median_lifespan.days
+      elsif crop.parent.present? && crop.parent.median_lifespan.present?
+        planted_at + crop.parent.median_lifespan.days
+      end
+    end
+
+    # days
+    def expected_lifespan
+      if actual_lifespan.present?
+        actual_lifespan
+      elsif crop.median_lifespan.present?
+        crop.median_lifespan
+      elsif crop.parent.present? && crop.parent.median_lifespan.present?
+        crop.parent.median_lifespan
+      end
+    end
+
+    def actual_lifespan
+      return unless planted_at.present? && finished_at.present?
+      (finished_at - planted_at).to_i
+    end
+
+    def days_since_planted
+      (Time.zone.today - planted_at).to_i if planted_at.present?
+    end
+
+    # progress
+    def percentage_grown
+      if finished?
+        100
+      elsif !finish_is_predicatable?
+        nil
+      elsif growing?
+        calculate_percentage_grown
+      elsif planted?
+        0
+      end
+    end
+
+    # states
+    def finish_is_predicatable?
+      crop.annual? && planted_at.present? && finish_predicted_at.present?
+    end
+
+    # Planting has live more then 90 days past predicted finish
+    def super_late?
+      late? && (finish_predicted_at + 90.days) < Time.zone.today
+    end
+
+    def late?
+      crop.annual? && !finished &&
+        planted_at.present? &&
+        finish_predicted_at.present? &&
+        finish_predicted_at <= Time.zone.today
+    end
+
+    private
+
+    def calculate_percentage_grown
+      percent = (days_since_planted / expected_lifespan.to_f) * 100
+      (percent > 100 ? 100 : percent)
+    end
+  end
+end

app/models/crop.rb

@@ -11,28 +11,26 @@ class Crop < ActiveRecord::Base
   has_many :scientific_names, after_add: :update_index, after_remove: :update_index, dependent: :destroy
   accepts_nested_attributes_for :scientific_names, 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 :plantings, dependent: :destroy
+  has_many :seeds, dependent: :destroy
+  has_many :harvests, dependent: :destroy
   has_many :photos, through: :plantings
-  has_many :seeds
-  has_many :harvests
   has_many :plant_parts, -> { uniq.reorder("plant_parts.name") }, 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'
+  has_many :varieties, class_name: 'Crop', foreign_key: 'parent_id', dependent: :nullify
   has_and_belongs_to_many :posts # rubocop:disable Rails/HasAndBelongsToMany
 
   ##
   ## Scopes
   scope :recent, -> { approved.order(created_at: :desc) }
   scope :toplevel, -> { approved.where(parent_id: nil) }
-  scope :popular, -> { approved.reorder("plantings_count desc, lower(name) asc") }
-  # ok on sqlite and psql, but not on mysql
-  scope :randomized, -> { approved.reorder('random()') }
+  scope :popular, -> { approved.order("plantings_count desc, lower(name) asc") }
   scope :pending_approval, -> { where(approval_status: "pending") }
   scope :approved, -> { where(approval_status: "approved") }
   scope :rejected, -> { where(approval_status: "rejected") }
-  scope :interesting, -> { approved.has_photos.randomized }
+  scope :interesting, -> { approved.has_photos }
   scope :has_photos, -> { includes(:photos).where.not(photos: { id: nil }) }
 
   ##
@@ -80,18 +78,18 @@ class Crop < ActiveRecord::Base
              } do
       mappings dynamic: 'false' do
         indexes :id, type: 'long'
-        indexes :name, type: 'string', analyzer: 'gs_edgeNGram_analyzer'
-        indexes :approval_status, type: 'string'
+        indexes :name, type: 'text', analyzer: 'gs_edgeNGram_analyzer'
+        indexes :approval_status, type: 'text'
         indexes :scientific_names do
           indexes :name,
-            type: 'string',
+            type: 'text',
             analyzer: 'gs_edgeNGram_analyzer',
             # Disabling field-length norm (norm). If the norm option is turned on(by default),
             # higher weigh would be given for shorter fields, which in our case is irrelevant.
             norms: { enabled: false }
         end
         indexes :alternate_names do
-          indexes :name, type: 'string', analyzer: 'gs_edgeNGram_analyzer'
+          indexes :name, type: 'text', analyzer: 'gs_edgeNGram_analyzer'
         end
       end
     end
@@ -120,12 +118,7 @@ class Crop < ActiveRecord::Base
   # later we can choose a default photo based on different criteria,
   # eg. popularity
   def default_photo
-    # most recent photo
-    return photos.order(created_at: :desc).first if photos.any?
-
-    # Crop has no photos? Look for the most recent harvest with a photo.
-    harvest_with_photo = Harvest.where(crop_id: id).joins(:photos).order('harvests.id DESC').limit(1).first
-    harvest_with_photo.photos.first if harvest_with_photo
+    first_photo(:plantings) || first_photo(:harvests) || first_photo(:seeds)
   end
 
   # returns hash indicating whether this crop is grown in
@@ -192,7 +185,7 @@ class Crop < ActiveRecord::Base
   end
 
   def update_medians
-    plantings.each(&:update_harvest_days)
+    plantings.each(&:update_harvest_days!)
     update_lifespan_medians
     update_harvest_medians
   end
@@ -242,4 +235,8 @@ class Crop < ActiveRecord::Base
     return unless reason_for_rejection == "other" && rejection_notes.blank?
     errors.add(:rejection_notes, "must be added if the reason for rejection is \"other\"")
   end
+
+  def first_photo(type)
+    Photo.joins(type).where("#{type}": { crop_id: id }).order("photos.created_at DESC").first
+  end
 end

app/models/forum.rb

@@ -1,10 +1,10 @@
 class Forum < ActiveRecord::Base
   extend FriendlyId
+  include Ownable
   validates :name, presence: true
   friendly_id :name, use: %i(slugged finders)
 
   has_many :posts
-  belongs_to :owner, class_name: "Member"
 
   def to_s
     name

app/models/garden.rb

@@ -2,9 +2,9 @@ class Garden < ActiveRecord::Base
   extend FriendlyId
   include Geocodable
   include PhotoCapable
+  include Ownable
   friendly_id :garden_slug, use: %i(slugged finders)
 
-  belongs_to :owner, class_name: 'Member', foreign_key: 'owner_id', counter_cache: true
   has_many :plantings, dependent: :destroy
   has_many :crops, through: :plantings
 

app/models/harvest.rb

@@ -2,6 +2,7 @@ class Harvest < ActiveRecord::Base
   include ActionView::Helpers::NumberHelper
   extend FriendlyId
   include PhotoCapable
+  include Ownable
 
   friendly_id :harvest_slug, use: %i(slugged finders)
 
@@ -33,13 +34,19 @@ class Harvest < ActiveRecord::Base
   ##
   ## Relationships
   belongs_to :crop
-  belongs_to :owner, class_name: 'Member', counter_cache: true
   belongs_to :plant_part
   belongs_to :planting
 
   ##
   ## Scopes
   default_scope { joins(:owner) } # Ensures owner exists
+  scope :interesting, -> { has_photos.one_per_owner }
+  scope :recent, -> { order(created_at: :desc) }
+  scope :one_per_owner, lambda {
+    joins("JOIN members m ON (m.id=harvests.owner_id)
+           LEFT OUTER JOIN harvests h2
+           ON (m.id=h2.owner_id AND harvests.id < h2.id)").where("h2 IS NULL")
+  }
 
   ##
   ## Validations

app/models/photo.rb

@@ -1,5 +1,5 @@
 class Photo < ActiveRecord::Base
-  belongs_to :owner, class_name: 'Member'
+  include Ownable
 
   PHOTO_CAPABLE = %w(Garden Planting Harvest Seed).freeze
 

app/models/plant_part.rb

@@ -5,6 +5,8 @@ class PlantPart < ActiveRecord::Base
   has_many :harvests
   has_many :crops, -> { uniq }, through: :harvests
 
+  validates :name, presence: true, uniqueness: true
+
   def to_s
     name
   end

app/models/planting.rb

@@ -1,6 +1,10 @@
 class Planting < ActiveRecord::Base
   extend FriendlyId
   include PhotoCapable
+  include Finishable
+  include Ownable
+  include PredictPlanting
+  include PredictHarvest
   friendly_id :planting_slug, use: %i(slugged finders)
 
   # Constants
@@ -11,20 +15,19 @@ class Planting < ActiveRecord::Base
     'graft', 'layering'
   ].freeze
 
-  ##
-  ## Triggers
-  before_save :calculate_lifespan
-
   belongs_to :garden
-  belongs_to :owner, class_name: 'Member', counter_cache: true
   belongs_to :crop, counter_cache: true
   has_many :harvests, dependent: :destroy
 
+  #
+  # Ancestry of food
+  belongs_to :parent_seed, class_name: 'Seed', foreign_key: 'parent_seed_id' # parent
+  has_many :child_seeds, class_name: 'Seed',
+                         foreign_key: 'parent_planting_id', dependent: :nullify # children
+
   ##
   ## Scopes
   default_scope { joins(:owner) } # Ensures the owner still exists
-  scope :finished, -> { where(finished: true) }
-  scope :current, -> { where(finished: false) }
   scope :interesting, -> { has_photos.one_per_owner }
   scope :recent, -> { order(created_at: :desc) }
   scope :one_per_owner, lambda {
@@ -54,6 +57,10 @@ class Planting < ActiveRecord::Base
     in: PLANTED_FROM_VALUES, message: "%<value>s is not a valid planting method"
   }
 
+  def age_in_days
+    (Time.zone.today - planted_at).to_i if planted_at.present?
+  end
+
   def planting_slug
     [
       owner.login_name,
@@ -76,61 +83,20 @@ class Planting < ActiveRecord::Base
     photos.order(created_at: :desc).first
   end
 
+  def finished?
+    finished || (finished_at.present? && finished_at <= Time.zone.today)
+  end
+
   def planted?
-    planted_at.present? && planted_at <= Date.current
+    planted_at.present? && planted_at <= Time.zone.today
   end
 
-  def finish_predicted_at
-    planted_at + crop.median_lifespan.days if crop.median_lifespan.present? && planted_at.present?
-  end
-
-  def calculate_lifespan
-    self.lifespan = (planted_at.present? && finished_at.present? ? finished_at - planted_at : nil)
-  end
-
-  def expected_lifespan
-    if planted_at.present? && finished_at.present?
-      return (finished_at - planted_at).to_i
-    end
-    crop.median_lifespan
-  end
-
-  def days_since_planted
-    (Time.zone.today - planted_at).to_i if planted_at.present?
-  end
-
-  def percentage_grown
-    return 100 if finished
-    return if planted_at.blank? || expected_lifespan.blank?
-    p = (days_since_planted / expected_lifespan.to_f) * 100
-    return p if p <= 100
-    100
-  end
-
-  def update_harvest_days
-    days_to_first_harvest = nil
-    days_to_last_harvest = nil
-    if planted_at.present? && harvests_with_dates.size.positive?
-      days_to_first_harvest = (first_harvest_date - planted_at).to_i
-      days_to_last_harvest = (last_harvest_date - planted_at).to_i if finished?
-    end
-    update(days_to_first_harvest: days_to_first_harvest, days_to_last_harvest: days_to_last_harvest)
-  end
-
-  def first_harvest_date
-    harvests_with_dates.minimum(:harvested_at)
-  end
-
-  def last_harvest_date
-    harvests_with_dates.maximum(:harvested_at)
+  def growing?
+    planted? && !finished?
   end
 
   private
 
-  def harvests_with_dates
-    harvests.where.not(harvested_at: nil)
-  end
-
   # check that any finished_at date occurs after planted_at
   def finished_must_be_after_planted
     return unless planted_at && finished_at # only check if we have both

app/models/seed.rb

@@ -1,6 +1,8 @@
 class Seed < ActiveRecord::Base
   extend FriendlyId
   include PhotoCapable
+  include Finishable
+  include Ownable
   friendly_id :seed_slug, use: %i(slugged finders)
 
   TRADABLE_TO_VALUES = %w(nowhere locally nationally internationally).freeze
@@ -11,7 +13,9 @@ class Seed < ActiveRecord::Base
   #
   # Relationships
   belongs_to :crop
-  belongs_to :owner, class_name: 'Member', foreign_key: 'owner_id', counter_cache: true
+  belongs_to :parent_planting, class_name: 'Planting', foreign_key: 'parent_planting_id' # parent
+  has_many :child_plantings, class_name: 'Planting',
+                             foreign_key: 'parent_seed_id', dependent: :nullify # children
 
   #
   # Validations

app/services/crop_search_service.rb

@@ -3,21 +3,19 @@ class CropSearchService
   def self.search(query)
     if ENV['GROWSTUFF_ELASTICSEARCH'] == "true"
       search_str = query.nil? ? "" : query.downcase
-      response = Crop.__elasticsearch__.search( # Finds documents which match any field, but uses the _score from
-        # the best field insead of adding up _score from each field.
+      response = Crop.__elasticsearch__.search(
         query: {
-          multi_match: {
-            query: search_str.to_s,
-            analyzer: "standard",
-            fields: ["name",
-                     "scientific_names.scientific_name",
-                     "alternate_names.name"]
+          bool: {
+            filter: {
+              term: { "approval_status" => "approved" }
+            },
+            must: {
+              query_string: {
+                query: "*#{search_str}*"
+              }
+            }
           }
-        },
-        filter: {
-          term: { approval_status: "approved" }
-        },
-        size: 50
+        }
       )
       response.records.to_a
     else

app/views/admin/members/index.html.haml

@@ -11,5 +11,5 @@
     %th
   - @members.each do |member|
     %tr
-      %td= ember.login_name
+      %td= member.login_name
       %td= member.email

app/views/crops/_actions.html.haml

@@ -0,0 +1,8 @@
+- if can? :create, Planting
+  = link_to "Plant this", new_planting_path(crop_id: crop.id), class: 'btn btn-default'
+
+- if can? :create, Harvest
+  = link_to "Harvest this", new_harvest_path(crop_id: crop.id), class: 'btn btn-default'
+
+- if can? :create, Seed
+  = link_to 'Add seeds to stash', new_seed_path(params: { crop_id: crop.id }), class: 'btn btn-default'

app/views/crops/_image_with_popover.html.haml

@@ -1,5 +1,5 @@
 - cache crop do
-  = link_to image_tag(crop.default_photo.present? ? crop.default_photo.thumbnail_url : 'placeholder_150.png',
+  = link_to image_tag(crop_image_path(crop),
                       alt: crop.name, class: 'image-responsive crop-image'),
             crop.name,
             rel: "popover",

app/views/crops/_index_card.html.haml

@@ -1,7 +1,7 @@
 .well
   .row
     .col-md-4
-      = link_to image_tag((crop.default_photo ? crop.default_photo.thumbnail_url : 'placeholder_150.png'),
+      = link_to image_tag(crop_image_path(crop),
                           alt: '',
                           class: 'img crop-image'),
                           crop

app/views/crops/_photos.html.haml

@@ -8,7 +8,7 @@
 - unless crop.photos.empty?
   %h3 Photos of #{crop.name} plants
   .row
-    - crop.photos.first(6).each do |p|
+    - crop.photos.order(date_taken: :desc).first(6).each do |p|
       .col-xs-6.col-md-2
         = render "photos/thumbnail", photo: p
 .row

app/views/crops/_plantings.html.haml

@@ -4,9 +4,9 @@
     Nobody has planted this crop yet.
 - else
   %ul
-    - crop.plantings.take(3).each do |planting|
+    - crop.plantings.order(planted_at: :desc).limit(3).each do |planting|
       %li
-        = link_to display_planting(planting), planting_path(planting)
+        = link_to planting, planting_path(planting)
         = render partial: 'members/location', locals: { member: planting.owner }
         %small
           = distance_of_time_in_words(planting.created_at, Time.zone.now)
@@ -18,4 +18,3 @@
     %p= link_to "Plant #{crop.name}", new_planting_path(crop_id: crop.id)
   - else
     = render partial: 'shared/signin_signup', locals: { to: "track your #{crop.name} plantings" }
-

app/views/crops/_thumbnail.html.haml

@@ -1,8 +1,8 @@
-.thumbnail
-  .crop-thumbnail
-    - if crop
-      - cache cache_key_for(Crop, crop.id) do
-        = link_to image_tag((crop.default_photo ? crop.default_photo.thumbnail_url : 'placeholder_150.png'),
+- cache cache_key_for(Crop, crop.id) do
+  .thumbnail
+    .crop-thumbnail
+      - if crop
+        = link_to image_tag(crop_image_path(crop),
                             alt: crop.name, class: 'img'),
                             crop
         .cropinfo

app/views/crops/show.html.haml

@@ -15,14 +15,7 @@
 
 - if @crop.approved?
   - content_for :buttonbar do
-    - if can? :create, Planting
-      = link_to "Plant this", new_planting_path(crop_id: @crop.id), class: 'btn btn-default'
-
-    - if can? :create, Harvest
-      = link_to "Harvest this", new_harvest_path(crop_id: @crop.id), class: 'btn btn-default'
-
-    - if can? :create, Seed
-      = link_to 'Add seeds to stash', new_seed_path(params: { crop_id: @crop.id }), class: 'btn btn-default'
+    = render 'crops/actions', crop: @crop
 
 .row
   .col-md-9

app/views/gardens/_actions.html.haml

@@ -1,28 +1,29 @@
-- if can?(:edit, garden) || can?(:delete, garden)
-  - if can? :edit, garden
-    - if garden.active
-      = link_to new_planting_path(garden_id: garden.id), class: 'btn btn-primary' do
-        %span.glyphicon.glyphicon-grain{ title: "Plant" }
-        Plant something
-      = link_to "Mark as inactive", garden_path(garden, garden: { active: 0 }),
-        method: :put, class: 'btn btn-default',
-        data: { confirm: 'All plantings associated with this garden will be marked as finished. Are you sure?' }
-    - else
-      = link_to "Mark as active", garden_path(garden, garden: { active: 1 }),
-                method: :put,
-                class: 'btn btn-default'
-    = link_to edit_garden_path(garden), class: 'btn btn-default', id: 'edit_garden_link' do
-      %span.glyphicon.glyphicon-pencil{ title: "Edit garden" }
-      Edit
+.garden-actions
+  - if can?(:edit, garden)
+    .btn-group
+      - if garden.active
+        = link_to new_planting_path(garden_id: garden.id), class: 'btn btn-default btn-xs' do
+          %span.glyphicon.glyphicon-grain{ title: "Plant" }
+          Plant something
+        = link_to "Mark as inactive", garden_path(garden, garden: { active: 0 }),
+          method: :put, class: 'btn btn-default btn-xs',
+          data: { confirm: 'All plantings associated with this garden will be marked as finished. Are you sure?' }
+      - else
+        = link_to "Mark as active", garden_path(garden, garden: { active: 1 }),
+                  method: :put
+      = render 'shared/buttons/edit', path: edit_garden_path(garden)
+
+      - if can?(:edit, garden) && can?(:create, Photo)
+        = link_to new_photo_path(type: "garden", id: garden.id),
+                  class: 'btn btn-default btn-xs' do
+          %span.glyphicon.glyphicon-camera{ title: "Add photo" }
+          Add photo
+
   - if can?(:destroy, garden)
-    = link_to garden,
-              method: :delete,
-              data: { confirm: 'All plantings associated with this garden will also be deleted. Are you sure?' },
-              class: 'btn btn-default', id: 'delete_garden_link' do
-      %span.glyphicon.glyphicon-trash{ title: "Delete" }
-      Delete
-  - if can?(:edit, garden) && can?(:create, Photo)
-    = link_to new_photo_path(type: "garden", id: garden.id),
-              class: 'btn btn-primary' do
-      %span.glyphicon.glyphicon-camera{ title: "Add Photo" }
-      Add Photo
+    .pull-right
+      = link_to garden_path(garden),
+                method: :delete,
+                data: { confirm: 'All plantings associated with this garden will also be deleted. Are you sure?' },
+                class: 'btn btn-default btn-xs', id: 'delete_garden_link' do
+        %span.glyphicon.glyphicon-trash{ title: "Delete" }
+        Delete

app/views/gardens/_nav.haml

@@ -4,12 +4,7 @@
 
   = link_to "Everyone's gardens", gardens_path, class: 'btn btn-default'
 
-
-  = link_to gardens_active_tickbox_path(@owner, show_all) do
-    = check_box_tag 'active', 'all', show_all
-    include in-active
-
-- if can?(:create, Garden)
-  = link_to 'Add a garden', new_garden_path, class: 'btn btn-primary'
-- unless current_member
-  = render partial: 'shared/signin_signup', locals: { to: 'add a new garden' }
+  - if can?(:create, Garden)
+    = link_to 'Add a garden', new_garden_path, class: 'btn btn-default'
+  - unless current_member
+    = render 'shared/signin_signup', to: 'add a new garden'

app/views/gardens/_overview.html.haml

@@ -1,9 +1,7 @@
-
 .panel.panel-success
   .panel-heading
     %h3.panel-title
       = link_to garden.name, garden_path(garden)
-
   .panel-body
     .row
       .col-md-2.col-xs-12.garden-info
@@ -11,15 +9,14 @@
           .col-md-12.col-xs-6
             = render 'gardens/photo', garden: garden
           .col-md-12.col-xs-6
-            = render 'gardens/actions', garden: garden
+            = display_garden_description(garden)
       .col-md-10
         .row
           - if garden.plantings.current.size.positive?
-            - garden.plantings.current.includes(:crop).each do |planting|
-              .col-md-2.col-sm-6.col-xs-6
-                .hover-wrapper
-                  .text= render 'plantings/actions', planting: planting
-                  = render partial: "plantings/thumbnail", locals: { planting: planting }
+            - garden.plantings.current.order(created_at: :desc).includes(:crop, :photos).each do |planting|
+              .col-md-2.col-sm-4.col-xs-6
+                = render "plantings/thumbnail", planting: planting
           - else
-            no plantings
-  -# .panel-footer
+            .col-md-2.col-sm-6.col-xs-6 no plantings
+  - if can?(:edit, garden)
+    .panel-footer= render 'gardens/actions', garden: garden

app/views/gardens/_photo.html.haml

@@ -1,3 +1,3 @@
-= link_to image_tag((garden.default_photo ? garden.default_photo.thumbnail_url : 'placeholder_150.png'),
+= link_to image_tag(garden_image_path(garden),
                     alt: garden.name, class: 'img-responsive'),
           garden_path(garden)

app/views/gardens/_thumbnail.html.haml

@@ -8,7 +8,7 @@
   .panel-body{ id: "gardens_panel_body" }
     .row
       .col-md-4
-        = link_to image_tag((garden.default_photo ? garden.default_photo.thumbnail_url : 'placeholder_150.png'),
+        = link_to image_tag(garden_image_path(garden),
                             alt: garden.name, class: 'img'),
                   garden_path(garden)
       .col-md-8

app/views/gardens/index.html.haml

@@ -1,6 +1,10 @@
 - content_for :title, @owner ? "#{@owner}'s gardens" : "Everyone's gardens"
 
-= render 'nav', owner: @owner, show_all: @show_all
+= render 'nav'
+
+= link_to gardens_active_tickbox_path(@owner, @show_all) do
+  = check_box_tag 'active', 'all', @show_all
+  include in-active
 
 .pagination
   = page_entries_info @gardens

app/views/gardens/show.html.haml

@@ -16,7 +16,8 @@
 
 .row
   .col-md-9
-    %p.btn-group= render 'gardens/actions', garden: @garden
+    = render 'gardens/actions', garden: @garden
+
 
     - unless @garden.active
       .alert.alert-warning
@@ -26,20 +27,21 @@
           to plant something in this garden.
 
     %div
-      :growstuff_markdown
-        #{strip_tags @garden.description}
-      - unless @garden.description
-        .row-fluid
-          %p No description available yet.
+      %p
+        :growstuff_markdown
+          #{strip_tags @garden.description}
+        - unless @garden.description
+          .row-fluid
+            %p No description available yet.
 
-          - if can? :edit, @garden
-            %p
-              Why not
-              = link_to 'tell us more.', edit_garden_path(@garden)
+            - if can? :edit, @garden
+              %p
+                Why not
+                = link_to 'tell us more.', edit_garden_path(@garden)
 
     %h3 Garden timeline
     .row
-      = timeline garden_timeline_path(@garden), adapter: "google"
+      .col-md-12= timeline garden_timeline_path(@garden), adapter: "google"
 
     %h3 Current plantings in garden
     .row

app/views/harvests/_actions.html.haml

@@ -0,0 +1,6 @@
+- if can?(:edit, harvest) || can?(:destroy, harvest)
+  .btn-group.harvest-actions
+  - if can? :edit, harvest
+    = render 'shared/buttons/edit', path: edit_harvest_path(harvest)
+  - if can? :destroy, harvest
+    .pull-right= render 'shared/buttons/delete', path: harvest_path(harvest)

app/views/harvests/_card.html.haml

@@ -8,7 +8,7 @@
   .panel-body
     .row
       .col-md-4
-        = link_to image_tag((harvest.default_photo ? harvest.default_photo.thumbnail_url : 'placeholder_150.png'),
+        = link_to image_tag(harvest_image_path(harvest),
                             alt: harvest.crop.name, class: 'img'),
                   harvest
       .col-md-8
@@ -21,9 +21,11 @@
           %dd= display_quantity(harvest)
           %dt Harvest date :
           %dd= harvest.harvested_at
-  .panel-footer
-    %dt Description
-    %dd.truncate
-      = display_harvest_description(harvest)
-    = if harvest.description.present?
-      - link_to "Read more", harvest_path(harvest)
+          %dt Notes:
+          %dd= display_harvest_description(harvest)
+          - if harvest.planting.present?
+            %dt Harvested from
+            %dd= link_to(harvest.planting, planting_path(harvest.planting))
+    .row
+      .col-md-12
+        = render 'harvests/actions', harvest: harvest

app/views/harvests/_image_with_popover.haml

@@ -0,0 +1,9 @@
+= link_to image_tag(harvest_image_path(harvest),
+                    alt: harvest.to_s,
+                    class: 'image-responsive crop-image'),
+          harvest,
+          rel: "popover",
+          'data-trigger': 'hover',
+          'data-title': harvest.to_s,
+          'data-content': render('harvests/popover', harvest: harvest),
+          'data-html': true

app/views/harvests/_list.html.haml

@@ -0,0 +1,10 @@
+- harvests.each do |h|
+  - cache h do
+    .row
+      .col-lg-6.col-md-3.col-xs-4.homepage-listing
+        = render 'harvests/image_with_popover', harvest: h
+      .col-lg-3.col-md-9.col-xs-4
+        = link_to h.crop, crop_path(h.crop)
+        %br/
+        %small
+          %i= h.owner.location

app/views/harvests/_planting.haml

@@ -3,7 +3,7 @@
     planting_path(@harvest.planting)
   in
   = link_to @harvest.planting.garden, garden_path(@harvest.planting.garden)
-- elsif @matching_plantings && @harvest.owner == current_member
+- elsif @matching_plantings && @matching_plantings.any? && @harvest.owner == current_member
   Is this from one of these plantings?
   = form_for(@harvest) do |f|
     - @matching_plantings.each do |planting|

app/views/harvests/_popover.html.haml

@@ -0,0 +1,3 @@
+%p
+  %small
+    = harvest.harvested_at

app/views/harvests/_thumbnail.html.haml

@@ -1,9 +1,10 @@
 .thumbnail
   .harvest-thumbnail
     - if harvest
-      = link_to image_tag((harvest.default_photo ? harvest.default_photo.thumbnail_url : 'placeholder_150.png'),
+      = link_to image_tag(harvest_image_path(harvest),
                           alt: harvest.crop.name, class: 'img'),
                           harvest
       .harvestinfo
         .harvest-name
           = link_to harvest, harvest
+  = I18n.l(harvest.harvested_at.to_date)

app/views/harvests/index.html.haml

@@ -24,8 +24,10 @@
   %ul.list-inline
     %li The data on this page is available in the following formats:
     - if @owner
+      %li= link_to "RSS", harvests_by_owner_path(@owner, format: 'rss')
       %li= link_to "CSV", harvests_by_owner_path(@owner, format: 'csv')
       %li= link_to "JSON", harvests_by_owner_path(@owner, format: 'json')
     - else
+      %li= link_to "RSS", harvests_path(format: 'rss')
       %li= link_to "CSV", harvests_path(format: 'csv')
       %li= link_to "JSON", harvests_path(format: 'json')

app/views/harvests/index.rss.haml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+%rss{ version: 2.0 }
+  %channel
+    %title
+      Recent harvests from #{@owner ? @owner : 'all members'} (#{ENV['GROWSTUFF_SITE_NAME']})
+    %link= harvests_url
+    - @harvests.each do |harvest|
+      %item
+        %title #{harvest.owner.login_name}'s #{harvest.crop.name}
+        %pubdate= harvest.harvested_at.to_s(:rfc822)
+        %description
+          :escaped
+            <p>Crop: #{harvest.crop ? harvest.crop : 'unknown' }</p>
+            <p>Quantity: #{harvest.quantity ? harvest.quantity : 'unknown' }</p>
+            <p>Harvested on: #{harvest.harvested_at ? harvest.harvested_at : 'unknown' }</p>
+          :escaped_markdown
+            #{ strip_tags harvest.description }
+        %link= harvest_url(harvest)
+        %guid= harvest_url(harvest)

app/views/harvests/show.html.haml

@@ -32,13 +32,7 @@
       %b Quantity:
       = display_quantity(@harvest)
 
-    - if can?(:edit, @harvest) || can?(:destroy, @harvest)
-      %p
-      - if can? :edit, @harvest
-        = link_to 'Edit', edit_harvest_path(@harvest), class: 'btn btn-default btn-xs'
-      - if can? :destroy, @harvest
-        = link_to 'Delete', @harvest, method: :delete, data: { confirm: 'Are you sure?' },
-                  class: 'btn btn-default btn-xs'
+    = render 'harvests/actions', harvest: @harvest
 
   .col-md-6
     = render partial: "crops/index_card", locals: { crop: @harvest.crop }

app/views/home/_blurb.html.haml

@@ -1,16 +1,13 @@
-.col-md-12
-
-%h1= ENV['GROWSTUFF_SITE_NAME']
-
-.row
-  .col-md-8.info
-    %p= t('.intro', site_name: ENV['GROWSTUFF_SITE_NAME'])
-
-    = render partial: 'stats'
-  .col-md-4.signup
-    %p= t('.perks')
-    %p= link_to(t('.sign_up'), new_member_registration_path, class: 'btn btn-primary btn-lg')
-    %p
-      %small
-        = t('.already_html', sign_in: link_to(t('.sign_in_linktext'), new_member_session_path))
-
+.container
+  .row
+    .col-md-12
+      %h1= ENV['GROWSTUFF_SITE_NAME']
+    .col-md-8.info
+      %p= t('.intro', site_name: ENV['GROWSTUFF_SITE_NAME'])
+      = render partial: 'stats'
+    .col-md-4.signup
+      %p= t('.perks')
+      %p= link_to(t('.sign_up'), new_member_registration_path, class: 'btn btn-primary btn-lg')
+      %p
+        %small
+          = t('.already_html', sign_in: link_to(t('.sign_in_linktext'), new_member_session_path))

app/views/home/_crops.html.haml

@@ -1,28 +1,6 @@
-.row
-  .col-md-8
-    - cache cache_key_for(Crop, 'interesting'), expires_in: 1.day do
-      %h2= t('.our_crops')
-      .hidden-xs
-        - Crop.interesting.includes(:scientific_names, :photos).first(8).each do |c|
-          .col-md-3
-            = render partial: 'crops/thumbnail', locals: { crop: c }
-      .visible-xs
-        - Crop.interesting.includes(:scientific_names, :photos).first(3).each do |c|
-          .col-md-3
-            = render partial: 'crops/thumbnail', locals: { crop: c }
-
-  .col-md-4.hidden-xs
-    - cache cache_key_for(Planting) do
-      %h2= t('.recently_planted')
-      = render 'plantings/list', plantings: Planting.includes(:owner, :photos).interesting.recent.first(6)
-
-.row
-  .col-md-12
-    - cache cache_key_for(Crop, 'recent') do
-      %p{ style: 'margin-top: 11.25px' }
-        %strong
-          #{t('.recently_added')}:
-        != Crop.recent.limit(12).map { |c| link_to(c, c) }.join(", ")
-
-    %p.text-right
-      = link_to "#{t('.view_all')} »", crops_path
+- cache cache_key_for(Crop, 'interesting'), expires_in: 1.day do
+  .row
+    %h2= t('.our_crops')
+    - Crop.interesting.includes(:scientific_names, :photos).shuffle.first(12).each do |c|
+      .col-lg-2.col-md-4.col-sm-3.col-xs-6
+        = render 'crops/thumbnail', crop: c

app/views/home/_discuss.html.haml

@@ -1,6 +1,6 @@
 %h2= t('.discussion')
 
-- posts = Post.limit(6)
+- posts = Post.order(created_at: :desc).limit(6)
 - if posts
   = render "posts/summary", posts: posts, howmany: 6
 

app/views/home/_harvests.html.haml

@@ -0,0 +1,3 @@
+- cache cache_key_for(Harvest) do
+  %h2 Recently Harvested
+  = render 'harvests/list', harvests: Harvest.includes(:crop, :owner, :photos).has_photos.recent.first(6)

app/views/home/_members.html.haml

@@ -1,13 +1,13 @@
 - cache cache_key_for(Member) do
   .hidden-xs
-    - members = Member.interesting.first(6)
+    - members = Member.includes(plantings: :crop).interesting.first(6)
     - if members.present?
       %section
       %h2= t('.title')
 
       .member-cards
         - members.each do |m|
-          = render partial: "members/thumbnail", locals: { member: m }
+          = render "members/thumbnail", member: m
 
       %p.text-right
         = link_to "#{t('.view_all')} »", members_path

app/views/home/_plantings.html.haml

@@ -0,0 +1,3 @@
+- cache cache_key_for(Planting, 'home'), expires_in: 1.day do
+  %h2= t('.recently_planted')
+  = render 'plantings/list', plantings: Planting.includes(:crop, garden: :owner).has_photos.recent.limit(6)

app/views/home/_seeds.html.haml

@@ -1,21 +1,22 @@
 - cache cache_key_for(Seed, 'interesting'), expires_in: 1.day do
   %h2= t('.title')
   .row
-    .col-md-8
-      - Seed.includes(:owner, crop: :photos).order(created_at: :desc).interesting.first(6).each do |seed|
-        .col-md-3
-          .thumbnail
-            - cache cache_key_for(Crop, seed.id) do
-              = link_to image_tag((seed.default_photo ? seed.default_photo.thumbnail_url : 'placeholder_150.png'),
-                                  alt: seed.crop.name, class: 'img'),
-                                  seed
-              .seedinfo
-                = link_to seed.crop.name, seed
-                .trade-to
-                  %p= seed.owner.location
-                  %p
+    - Seed.current.tradable.includes(:owner, :crop).order(created_at: :desc).limit(6).each do |seed|
+      .col-md-2.col-sm-2.col-xs-6
+        .thumbnail.seed-thumbnail
+          - cache cache_key_for(Crop, seed.id) do
+            = link_to image_tag(seed_image_path(seed),
+                                alt: seed.crop.name, class: 'img'),
+                                seed
+            .seedinfo
+              = link_to seed.crop.name, seed
+              .trade-to
+                %p= seed.owner.location
+                %p
+                  %small
                     Will trade to:
                     %br/
-                    #{seed.tradable_to}
+                    %em= seed.tradable_to
+
 %p.text-right
   = link_to "#{t('.view_all')} »", seeds_path

app/views/home/index.html.haml

@@ -1,9 +1,9 @@
-.row
+.homepage.row
   .col-md-12
     - if member_signed_in?
       %h1= t('.welcome', site_name: ENV['GROWSTUFF_SITE_NAME'], member_name: current_member)
 
-      = render partial: 'stats'
+      = render 'stats'
       %p
         .btn-group
           = link_to t('.plant'), new_planting_path, class: 'btn btn-default'
@@ -14,12 +14,30 @@
     - else
       .hidden-xs
         .jumbotron
-          = render partial: 'blurb'
+          = render 'blurb'
       .visible-xs
-        = render partial: 'blurb'
+        = render 'blurb'
 
-    = render partial: 'crops'
-    = render partial: 'seeds'
-    = render partial: 'members'
-    = render partial: 'discuss'
+    .row
+      .col-lg-8.col-md-6.col-sm-12
+        = render 'crops'
+      .col-lg-2.col-md-3.col-sm-6
+        = render 'plantings'
+      .col-lg-2.col-md-3.col-sm-6
+        = render 'harvests'
+      .col-md-12
+        - cache cache_key_for(Crop, 'recent') do
+          %p{ style: 'margin-top: 11.25px' }
+            %strong
+              #{t('.recently_added')}:
+            != Crop.recent.limit(30).map { |c| link_to(c, c) }.join(", ")
 
+    %p.text-right
+      = link_to "#{t('home.crops.view_all')} »", crops_path
+    .row
+      .col-md-12
+        = render 'seeds'
+        = render 'members'
+    .row
+      .col-md-12
+        = render 'discuss'

app/views/layouts/application.html.haml

@@ -5,7 +5,7 @@
   %body
     = render partial: "layouts/header"
 
-    .container#maincontainer
+    #maincontainer
       .row
         .col-md-12
           - if content_for?(:title)
@@ -15,9 +15,7 @@
                 %small= yield(:subtitle)
 
           - if content_for?(:buttonbar)
-            %p
-              .btn-group
-                = yield(:buttonbar)
+            .btn-group.layout-actions= yield(:buttonbar)
           = render partial: "shared/flash_messages", flash: flash
           = yield
 

app/views/members/_gardens.html.haml

@@ -1,4 +1,3 @@
-%h2 #{member.login_name}'s gardens
 .tabbable
   %ul.nav.nav-tabs
     - first_garden = true
@@ -45,10 +44,10 @@
                   = link_to "Add photo", new_photo_path(type: "garden", id: g.id), class: 'btn btn-primary'
 
           %h3 What's planted here?
-          .row
+          .card-row
             - unless g.featured_plantings.empty?
               - g.featured_plantings.each.with_index do |planting|
-                .col-xs-12.col-lg-6
+                .card
                   = render partial: "plantings/card", locals: { planting: planting }
 
           %p

app/views/members/_harvests.html.haml

@@ -0,0 +1,6 @@
+.card-row-short
+  - harvests.each do |harvest|
+    .card
+      = render partial: "harvests/card", locals: { harvest: harvest }
+- if !harvests.any?
+  #{member.login_name} hasn't harvested anything yet.

app/views/members/_map.html.haml

@@ -1,6 +1,6 @@
 - if member.latitude && member.longitude
   #membermap
-  %p
+  %p.pull-right
     See other members, plantings, seeds and more near
     = link_to member.location, place_path(member.location, anchor: "members")
 - else

app/views/members/_stats.html.haml

@@ -7,7 +7,7 @@
 
 %h3 Activity
 
-%ul.list-inline
+%ul.activity-list
   %li
     - if !member.plantings.empty?
       = link_to localize_plural(member.plantings, Planting), plantings_by_owner_path(owner: member)

app/views/members/show.html.haml

@@ -9,31 +9,40 @@
   = tag("meta", property: "og:site_name", content: ENV['GROWSTUFF_SITE_NAME'])
 - content_for :buttonbar do
   - if can? :update, @member
-    = link_to 'Edit profile', edit_member_registration_path, class: 'btn btn-default'
+    = link_to 'Edit profile', edit_member_registration_path, class: 'btn btn-default pull-right'
   - if can?(:create, Notification) && current_member != @member
-    = link_to 'Send message', new_notification_path(recipient_id: @member.id), class: 'btn btn-default'
+    = link_to 'Send message', new_notification_path(recipient_id: @member.id), class: 'btn btn-default pull-right'
 
   - if current_member && current_member != @member # must be logged in, can't follow yourself
     - follow = current_member.get_follow(@member)
     - if !follow && can?(:create, Follow) # not already following
-      = link_to 'Follow', follows_path(followed_id: @member.id), method: :post, class: 'btn btn-default'
+      = link_to 'Follow', follows_path(followed_id: @member.id), method: :post, class: 'btn btn-default pull-right'
     - if follow && can?(:destroy, follow) # already following
-      = link_to 'Unfollow', follow_path(follow), method: :delete, class: 'btn btn-default'
+      = link_to 'Unfollow', follow_path(follow), method: :delete, class: 'btn btn-default pull-right'
 
 - content_for :member_rss_login_name, @member.login_name
 - content_for :member_rss_slug, @member.slug
 
 .row
-
-  .col-md-9
-    = render partial: "map", locals: { member: @member }
-    = render partial: "bio", locals: { member: @member }
-    = render partial: "gardens", locals: { member: @member, gardens: @gardens }
-  .col-md-3
+  = render partial: "map", locals: { member: @member }
+  .col-md-2.profile-sidebar
     = render partial: "avatar", locals: { member: @member }
+    = render partial: "bio", locals: { member: @member }
     = render partial: "roles", locals: { member: @member }
     = render partial: "stats", locals: { member: @member }
     = render partial: "contact", locals: { member: @member,
                                           twitter_auth: @twitter_auth,
                                           flickr_auth: @flickr_auth,
                                           facebook_auth: @facebook_auth }
+
+  .col-md-10
+    %ul.nav.nav-pills.nav-justified
+      %li.active
+        %a{ "data-toggle" => "tab", href: "#gardens" } Gardens
+      %li
+        %a{ "data-toggle" => "tab", href: "#harvests" } Harvests
+    .tab-content.profile-activity
+      .tab-pane.active#gardens
+        = render partial: "gardens", locals: { member: @member, gardens: @gardens }
+      .tab-pane#harvests
+        = render partial: "harvests", locals: { member: @member, harvests: @harvests }

app/views/photos/_actions.html.haml

@@ -0,0 +1,6 @@
+- if can?(:edit, @photo) && can?(:destroy, @photo)
+  %p.photo-actions
+    - if can?(:edit, @photo)
+      = render 'shared/buttons/edit', path: edit_photo_path(@photo)
+    - if can?(:destroy, @photo)
+      = render 'shared/buttons/delete', path: photo_path(@photo)

app/views/photos/_item_photos.haml

@@ -1,16 +1,14 @@
+%h2 Photos
+
 - if photos.size.positive? || (can?(:edit, item) && can?(:create, Photo))
-  %h2 Photos
   - if photos.size.positive?
+    = page_entries_info photos
+    = will_paginate photos
     .row
-      .pagination
-        = page_entries_info photos
-        = will_paginate photos
-  .row
-    - photos.each do |photo|
-      .col-md-2.six-across= render 'photos/thumbnail', photo: photo
-    - if can?(:create, Photo) && can?(:edit, item)
-      .col-md-2
-        .thumbnail
-          = link_to new_photo_path(type: type, id: item.id), class: 'btn btn-primary' do
-            %span.glyphicon.glyphicon-camera{ title: "Add photo" }
-            Add photo
+      - photos.each do |photo|
+        .col-xs-6.col-md-3.six-across= render 'photos/thumbnail', photo: photo
+
+- if can?(:create, Photo) && can?(:edit, item)
+  = link_to new_photo_path(type: type, id: item.id), class: 'btn  btn-primary' do
+    %span.glyphicon.glyphicon-camera{ title: "Add photo" }
+    Add photo

app/views/photos/_thumbnail.html.haml

@@ -1,10 +1,12 @@
-.thumbnail.photo-thumbnail
-  = link_to image_tag(photo.thumbnail_url, alt: photo.title, class: 'img img-responsive'), photo
-  .text
-    %p
-      = link_to photo.title, photo
-      %br/
-      %small
-        %i
-          by
-          = link_to photo.owner, photo.owner
+.thumbnail
+  .photo-thumbnail
+    = link_to image_tag(photo.thumbnail_url, alt: photo.title, class: 'img img-responsive'), photo
+    .text
+      %p
+        = link_to photo.title, photo
+        %br/
+        %small
+          %i
+            by
+            = link_to photo.owner, photo.owner
+  = I18n.l(photo.created_at.to_date)

app/views/photos/show.html.haml

@@ -12,15 +12,7 @@
     %p= image_tag(@photo.fullsize_url, alt: @photo.title, class: 'img img-responsive')
 
   .col-md-4
-    %p
-      - if can? :destroy, @photo
-        = link_to @photo, method: :delete,
-          data: { confirm: 'Are you sure?' }, class: 'btn btn-default btn-xs' do
-          %span.glyphicon.glyphicon-trash{ title: "Delete" }
-
-      - if can? :edit, @photo
-        = link_to edit_photo_path(@photo), class: 'btn btn-default btn-xs' do
-          %span.glyphicon.glyphicon-pencil{ title: "Edit" }
+    = render 'photos/actions', photo: @photo
     %p
       %strong Posted by:
       = link_to @photo.owner, @photo.owner

app/views/plantings/_actions.html.haml

@@ -1,27 +1,12 @@
-- if can?(:edit, planting) || can?(:destroy, planting)
-  - if can? :edit, planting
-    = link_to edit_planting_path(planting), class: 'btn btn-default btn-xs' do
-      %span.glyphicon.glyphicon-pencil{ title: "Edit" }
-      Edit
-  - if can? :destroy, planting
-    = link_to planting, method: :delete,
-              data: { confirm: 'Are you sure?' }, class: 'btn btn-default btn-xs' do
-      %span.glyphicon.glyphicon-trash{ title: "Delete" }
-      Delete
+- if can?(:edit, planting)
+  .btn-group.planting-actions
+    = render 'shared/buttons/edit', path: edit_planting_path(planting)
+    = render 'shared/buttons/add_photo', path: new_photo_path(id: planting.id, type: 'planting')
 
-    - unless planting.finished
-      = link_to planting_path(planting, planting: { finished: 1 }),
-                method: :put, class: 'btn btn-default btn-xs append-date' do
+    - if planting.active?
+      = render 'shared/buttons/finish_planting', planting: planting
+      = render 'shared/buttons/harvest_planting', planting: planting
+      = render 'shared/buttons/save_seeds', planting: planting
 
-        %span.glyphicon.glyphicon-ok{ title: "Finished" }
-        Mark as finished
-
-  - if can? :edit, planting
-    = link_to new_planting_harvest_path(planting), class: 'btn btn-default btn-xs' do
-      %span.glyphicon.glyphicon-leaf{ title: "Harvest" }
-      Harvest
-
-  - if can?(:edit, planting) && can?(:create, Photo)
-    = link_to new_photo_path(id: planting.id, type: 'planting'), class: 'btn btn-default btn-xs' do
-      %span.glyphicon.glyphicon-camera{ title: "Add photo" }
-      Add photo
+    - if can? :destroy, planting
+      = render 'shared/buttons/delete', path: planting

app/views/plantings/_badges.html.haml

@@ -0,0 +1,20 @@
+// Finish times
+- if planting.finish_is_predicatable?
+  - if planting.super_late?
+    %span.badge.badge-super-late= t('.super_late')
+    = render 'shared/buttons/finish_planting', planting: planting
+  - elsif planting.late?
+    %span.badge.badge-late= t('.late_finishing')
+  - else
+    %span.badge
+      = days_from_now_to_finished(planting)
+      = t('.days_until_finished')
+
+// Harvest times
+- unless planting.super_late?
+  - if planting.harvest_time?
+    %span.badge.badge-harvest= t('.harvesting_now')
+  - elsif planting.before_harvest_time?
+    %span.badge
+      = days_from_now_to_first_harvest(planting)
+      = t('.days_until_harvest')

app/views/plantings/_card.html.haml

@@ -8,7 +8,7 @@
   .panel-body
     .row
       .col-xs-12.col-md-5
-        = link_to image_tag((planting.default_photo ? planting.default_photo.thumbnail_url : 'placeholder_150.png'),
+        = link_to image_tag(planting_image_path(planting),
                   alt: planting.crop_id, class: 'img img-responsive'),
                   planting
       .col-xs-12.col-md-7
@@ -35,24 +35,6 @@
 
           %dt Finish expected:
           %dd= planting.finish_predicted_at if planting.finish_predicted_at.present?
-
     %p= render 'plantings/progress', planting: planting, show_explanation: true
-
-    = link_to 'Details', planting_path(planting),
-      class: 'btn btn-default btn-xs'
-
-    - if can?(:edit, planting) && can?(:create, Harvest)
-      = link_to 'Harvest', new_planting_harvest_path(planting),
-        class: 'btn btn-default btn-xs'
-
-    - if can?(:edit, planting) && !planting.finished
-      = link_to "Mark as finished",
-                    planting_path(planting, planting: { finished: 1 }),
-                    method: :put,
-                    class: 'btn btn-default btn-xs append-date'
-
-    - if can? :destroy, planting
-      = link_to planting, method: :delete,
-                  data: { confirm: 'Are you sure?' },
-                  class: 'btn btn-default btn-xs' do
-        %span.glyphicon.glyphicon-trash{ title: "Delete" }
+    .row
+      .col-md-12= render 'plantings/actions', planting: planting

app/views/plantings/_descendants.html.haml

@@ -0,0 +1,14 @@
+%h2 Seeds saved from this planting
+
+- if planting.child_seeds.size.positive?
+  .row
+    - planting.child_seeds.each do |seed|
+      .col-xs-6.col-sm-4.col-md-3
+        = render 'seeds/thumbnail', seed: seed
+- else
+  %p No seeds saved
+
+- if planting.active? && can?(:create, Seed) && can?(:edit, planting)
+  = link_to new_planting_seed_path(planting), class: 'btn btn-primary' do
+    %span.glyphicon.glyphicon-heart{ title: "Add photo" }
+    Save seeds

app/views/plantings/_form.html.haml

@@ -13,10 +13,14 @@
   .form-group.required
     = f.label :crop, 'What did you plant?', class: 'control-label col-md-2'
     .col-md-8
-      = auto_suggest @planting, :crop, class: 'form-control', default: @crop
-      %span.help-inline
-        Can't find what you're looking for?
-        = link_to "Request new crops.", new_crop_path
+      - if @seed.present?
+        = link_to @seed, seed_path(@seed)
+        = f.hidden_field :parent_seed_id, value: @seed.id
+      - else
+        = auto_suggest @planting, :crop, class: 'form-control', default: @crop
+        %span.help-inline
+          Can't find what you're looking for?
+          = link_to "Request new crops.", new_crop_path
   .form-group.required
     = f.label :garden_id, 'Where did you plant it?', class: 'control-label col-md-2'
     .col-md-8

app/views/plantings/_harvests.html.haml

@@ -1,12 +1,13 @@
+%h2 Harvests
 - if planting.harvests.empty?
-  %p no harvests yet
+  %p No harvests
 - else
   .row
     - planting.harvests.order(created_at: :desc).includes(:crop).each do |harvest|
-      .col-xs-6.col-md-2
+      .col-xs-6.col-sm-4.col-md-3
         = render 'harvests/thumbnail', harvest: harvest
-    - if can? :edit, planting
-      .col-xs-6.col-md-2
-        = link_to new_planting_harvest_path(planting), class: 'btn btn-primary' do
-          %span.glyphicon.glyphicon-leaf{ title: "Harvest" }
-          Harvest
+
+- if planting.active? && can?(:edit, planting)
+  = link_to new_planting_harvest_path(planting), class: 'btn btn-primary' do
+    %span.glyphicon.glyphicon-leaf{ title: "Harvest" }
+    Harvest

app/views/plantings/_image_with_popover.html.haml

@@ -1,10 +1,10 @@
 - cache planting do
-  = link_to image_tag(planting.photos.present? ? planting.photos.first.thumbnail_url : 'placeholder_150.png',
+  = link_to image_tag(planting_image_path(planting),
                       alt: planting.to_s,
                       class: 'image-responsive crop-image'),
             planting,
             rel: "popover",
             'data-trigger': 'hover',
-            'data-title': planting.to_s,
-            'data-content': render(partial: 'plantings/popover', locals: { planting: planting }),
+            'data-title': planting.crop.name,
+            'data-content': render('plantings/popover', planting: planting),
             'data-html': true

app/views/plantings/_list.html.haml

@@ -1,15 +1,10 @@
 - plantings.each do |p|
   - cache p do
     .row
-      .col-md-3{ style: 'padding-bottom: 6px' }
-        = render partial: 'plantings/image_with_popover', locals: { planting: p }
-      .col-md-9
+      .col-lg-6.col-md-3.col-xs-4.homepage-listing
+        = render 'plantings/image_with_popover', planting: p
+      .col-lg-3.col-md-9.col-xs-4
         = link_to p.crop, p.crop
-        in
-        = succeed "'s" do
-          = link_to p.garden.owner, p.garden.owner
-        = link_to display_garden_name(p.garden), p.garden
         %br/
         %small
-          %i
-            = p.owner.location
+          %i= p.location

app/views/plantings/_nav.haml

@@ -15,4 +15,3 @@
     = link_to 'Plant something', new_planting_path, class: 'btn btn-primary'
 - else
   = render partial: 'shared/signin_signup', locals: { to: "track what you've planted" }
-

app/views/plantings/_popover.html.haml

@@ -1,7 +1,11 @@
-%p
-  %small
-    Quantity:
-    = planting.quantity ? planting.quantity : 'unknown'
-    %br/
-    Planted on:
-    = planting.planted_at.to_s
+- if planting.quantity.present?
+  %p
+    %small
+      Quantity:
+      = planting.quantity
+
+- if planting.planted_at.present?
+  %p
+    %small
+      Planted:
+      = planting.planted_at.to_s

app/views/plantings/_progress.html.haml

@@ -1,8 +1,8 @@
 - if planting.crop.perennial
-  %p Perennial
+  = render "plantings/progress_bar", status: "perennial", progress: nil
 - elsif !planting.planted?
   - if show_explanation
-    %p Progress: 0% - not planted yet
+    %p= t('.progress_0_not_planted_yet')
   = render "plantings/progress_bar", status: "not planted", progress: 0
 - elsif planting.finished?
   = render "plantings/progress_bar", status: 'finished', progress: 100

app/views/plantings/_thumbnail.html.haml

@@ -1,10 +1,13 @@
-.thumbnail
-  .planting-thumbnail
-    - if planting
-      = link_to image_tag((planting.default_photo ? planting.default_photo.thumbnail_url : 'placeholder_150.png'),
-                          alt: planting.crop.name, class: 'img'),
-                          planting
-      .plantinginfo
+.planting
+  .planting-badges
+    = render 'plantings/badges', planting: planting
+  .hover-wrapper
+    .thumbnail
+      .planting-thumbnail{ class: planting_classes(planting) }
+        = link_to image_tag(planting_image_path(planting),
+          alt: planting.crop.name, class: 'img'), planting_path(planting)
+        = render 'plantings/progress', planting: planting, show_explanation: false
         .planting-name
-          = render 'plantings/progress', planting: planting, show_explanation: false
           = link_to planting.crop.name, planting
+        .text
+          .planting-actions= render 'plantings/actions', planting: planting

app/views/plantings/index.html.haml

@@ -3,16 +3,16 @@
 = render 'nav', owner: @owner, show_all: @show_all
 
 - if @owner
-  = link_to "View #{@owner}'s profile >>", member_path(@owner)
+  = link_to t('.view_owners_profile', owner: @owner), member_path(@owner)
 
 .pagination
   = page_entries_info @plantings
   = will_paginate @plantings
 
-.row
+.card-row
   - unless @plantings.empty?
     - @plantings.each.with_index do |planting|
-      .col-xs-12.col-lg-6
+      .card
         = render partial: "plantings/card", locals: { planting: planting }
 
 .pagination
@@ -20,12 +20,7 @@
   = will_paginate @plantings
 
   %ul.list-inline
-    %li The data on this page is available in the following formats:
-    - if @owner
-      %li= link_to "CSV", plantings_by_owner_path(@owner, format: 'csv')
-      %li= link_to "JSON", plantings_by_owner_path(@owner, format: 'json')
-      %li= link_to "RSS", plantings_by_owner_path(@owner, format: 'rss')
-    - else
-      %li= link_to "CSV", plantings_path(format: 'csv')
-      %li= link_to "JSON", plantings_path(format: 'json')
-      %li= link_to "RSS", plantings_path(format: 'rss')
+    %li= t('.the_data_on_this_page_is_available_in_the_following_formats')
+    - ['csv', 'json', 'rss'].each do |format|
+      %li= link_to format.upcase,
+          (@owner ? plantings_by_owner_path(@owner, format: format) : plantings_path(format: format))

app/views/plantings/show.html.haml

@@ -9,9 +9,11 @@
   = tag("meta", property: "og:url", content: request.original_url)
   = tag("meta", property: "og:site_name", content: ENV['GROWSTUFF_SITE_NAME'])
 
-%p= render 'plantings/actions', planting: @planting
+- content_for :buttonbar do
+  = render 'plantings/actions', planting: @planting
+
 .row.planting
-  .col-md-6
+  .col-xs-12.col-sm-6
     %dl.dl-horizontal.planting-attributes
       %dt Owner:
       %dd
@@ -26,14 +28,17 @@
       %dd
         = link_to "#{@planting.owner}'s", @planting.owner
         = link_to @planting.garden, @planting.garden
-        - unless  @planting.owner.location.blank?
+        - if @planting.owner.location.present?
           (#{@planting.owner.location})
       %dt Quantity:
       %dd= display_planting_quantity(@planting)
 
-      - unless @planting.planted_from.blank?
-        %dt Planted from:
-        %dd= display_planted_from(@planting)
+      %dt Planted from:
+      %dd
+        - if @planting.parent_seed
+          = link_to @planting.parent_seed, seed_path(@planting.parent_seed)
+        - else
+          = display_planted_from(@planting)
 
       %dt Sun or shade?
       %dd
@@ -64,23 +69,23 @@
           %dt Last Harvest:
           %dd #{@planting.days_to_last_harvest} days after planting
 
+      %dt Progress
+      %dd= render 'plantings/progress', planting: @planting, show_explanation: true
 
-    %h2 Progress
-    %p= render 'plantings/progress', planting: @planting, show_explanation: true
-    %h2 Harvests
-    %p= render 'plantings/harvests', planting: @planting
-
-  .col-md-6
+  .col-xs-12.col-sm-6
     = render partial: "crops/index_card", locals: { crop: @planting.crop }
     - if @planting.owner.location
       %p
         %small
           View other plantings, members and more near
           = link_to @planting.owner.location, place_path(@planting.owner.location, anchor: "plantings")
-- if @planting.description
-  %h2 Notes
-
-  :growstuff_markdown
-    #{ @planting.description != "" ? strip_tags(@planting.description) : "No description given." }
-
-= render 'photos/item_photos', item: @planting, type: 'planting', photos: @photos
+.row
+  .col-md-6
+    - if @planting.description
+      %h2 Notes
+      :growstuff_markdown
+        #{ @planting.description != "" ? strip_tags(@planting.description) : "No description given." }
+    = render 'plantings/harvests', planting: @planting
+    = render 'plantings/descendants', planting: @planting
+  .col-md-6
+    = render 'photos/item_photos', item: @planting, type: 'planting', photos: @photos

app/views/posts/show.html.haml

@@ -36,8 +36,12 @@
         = link_to 'Edit Post', edit_post_path(@post), class: 'btn btn-default btn-xs'
       - if can? :destroy, @post
         = link_to 'Delete Post', @post, method: :delete,
-                  data: { confirm: 'Are you sure?' },
-                  class: 'btn btn-default btn-xs'
+                      data: { confirm: 'Are you sure?' },
+                      class: 'btn btn-default btn-xs'
+
+  - if @post.comments.count > 10 && can?(:create, Comment)
+    .post-actions
+      = link_to 'Comment', new_comment_path(post_id: @post.id), class: 'btn btn-primary'
 
   = render partial: "comments", locals: { post: @post }
 

app/views/seeds/_actions.html.haml

@@ -1,11 +1,15 @@
-- if can? :edit, @seed
-  = link_to  edit_seed_path(@seed), class: 'btn btn-default btn-xs' do
-    %span.glyphicon.glyphicon-pencil{ title: "Edit" }
-    Edit
-  = link_to new_photo_path(id: seed.id, type: 'seed'), class: 'btn btn-default btn-xs' do
-    %span.glyphicon.glyphicon-camera{ title: "Add photo" }
-    Add photo
-- if can? :destroy, @seed
-  = link_to @seed, method: :delete, data: { confirm: 'Are you sure?' }, class: 'btn btn-default btn-xs' do
-    %span.glyphicon.glyphicon-trash{ title: "Delete" }
-    Delete
+
+- if can? :edit, seed
+  .btn-group
+    = render 'shared/buttons/edit', path: edit_seed_path(seed)
+    = render 'shared/buttons/add_photo', path: new_photo_path(id: seed.id, type: 'seed')
+
+    - if can?(:create, Planting) && seed.active?
+      = link_to new_planting_path(seed_id: seed), class: 'btn btn-default btn-xs' do
+        %span.glyphicon.glyphicon-grain{ title: "Plant seeds" }
+        Plant seeds
+
+    = render 'shared/buttons/finish_seeds', seed: seed
+
+- if can? :destroy, seed
+  = render 'shared/buttons/delete', path: seed

app/views/seeds/_card.html.haml

@@ -0,0 +1,32 @@
+.panel.panel-success
+  .panel-heading
+    %h3.panel-title
+      = link_to seed, seed
+      - if can? :edit, seed
+        %a.pull-right{ href: edit_seed_path(seed), role: "button", id: "edit_seed_glyphicon" }
+          %span.glyphicon.glyphicon-pencil{ title: "Edit" }
+  .panel-body
+    .row
+      .col-md-4
+        = link_to image_tag(seed_image_path(seed),
+                            alt: seed.crop.name, class: 'img'),
+                  seed.crop
+      .col-md-8
+        %dl.dl-horizontal
+          %dt Crop :
+          %dd= link_to seed.crop.name, seed.crop
+          - if seed.parent_planting.present?
+            %dt Saved from
+            %dd= link_to seed.parent_planting, planting_path(seed.parent_planting)
+          %dt Plant before :
+          %dd= seed.plant_before
+          %dt Quantity :
+          %dd= seed.quantity
+          %dt Will trade to :
+          %dd= seed.tradable_to
+          %dt From location :
+          %dd= seed.owner.location
+          %dt Owner :
+          %dd= link_to seed.owner.login_name, seed.owner
+      .col-md-12
+        %p= render 'seeds/actions', seed: seed

app/views/seeds/_descendants.html.haml

@@ -0,0 +1,13 @@
+%h2 Plants grown from these seeds
+- if @seed.child_plantings
+  .row
+    - seed.child_plantings.each do |planting|
+      .col-md-3
+        = render 'plantings/thumbnail', planting: planting
+- else
+  %p No plants grown yet.
+
+- if can?(:create, Planting) && can?(:edit, seed)
+  = link_to new_seed_planting_path(seed), class: 'btn btn-primary' do
+    %span.glyphicon.glyphicon-grain{ title: "Plant seeds" }
+    Plant seeds

app/views/seeds/_form.html.haml

@@ -9,14 +9,17 @@
       %ul
         - @seed.errors.full_messages.each do |msg|
           %li= msg
-
   .form-group.required
     = f.label :crop, 'Crop:', class: 'control-label col-md-2'
     .col-md-8
-      = auto_suggest @seed, :crop, class: 'form-control', default: @crop
-      %span.help-inline
-        Can't find what you're looking for?
-        = link_to "Request new crops.", new_crop_path
+      - if @planting
+        = link_to @planting, planting_path(@planting)
+        = f.hidden_field :parent_planting_id, value: @planting.id
+      - else
+        = auto_suggest @seed, :crop, class: 'form-control', default: @crop
+        %span.help-inline
+          Can't find what you're looking for?
+          = link_to "Request new crops.", new_crop_path
   .form-group
     = f.label :quantity, 'Quantity:', class: 'control-label col-md-2'
     .col-md-2
@@ -28,6 +31,19 @@
       = f.text_field :plant_before, class: 'add-datepicker form-control',
                       value: @seed.plant_before ? @seed.plant_before.to_s(:ymd) : ''
       = render partial: 'shared/form_optional'
+  .form-group
+    = f.label :finished, 'Mark as finished', class: 'control-label col-md-2'
+    .col-md-8
+      = f.check_box :finished
+      = render partial: 'shared/form_optional'
+      %span.help-block
+        = t('.finish_helper')
+  .form-group
+    = f.label :finished_at, 'Finished at:', class: 'control-label col-md-2'
+    .col-md-2
+      = f.text_field :finished_at, class: 'add-datepicker form-control',
+                      value: @seed.finished_at ? @seed.finished_at.to_s(:ymd) : ''
+      = render partial: 'shared/form_optional'
   .form-group
     = f.label :days_until_maturity_min, 'Days until maturity:', class: 'control-label col-md-2'
     %fieldset

app/views/seeds/_thumbnail.html.haml

@@ -1,31 +1,14 @@
-.panel.panel-success
-  .panel-heading
-    %h3.panel-title
-      = link_to "#{seed.owner.login_name}'s seed", seed
-      - if can? :edit, seed
-        %a.pull-right{ href: edit_seed_path(seed), role: "button", id: "edit_seed_glyphicon" }
-          %span.glyphicon.glyphicon-pencil{ title: "Edit" }
-  .panel-body
-    .row
-      .col-md-4
-        = link_to image_tag((seed.crop.default_photo ? seed.crop.default_photo.thumbnail_url : 'placeholder_150.png'),
-                            alt: seed.crop.name, class: 'img'),
-                  seed.crop
-      .col-md-8
-        %dl.dl-horizontal
-          %dt Crop :
-          %dd= link_to seed.crop.name, seed.crop
-          %dt Plant before :
-          %dd= seed.plant_before
-          %dt Quantity :
-          %dd= seed.quantity
-          %dt Will trade to :
-          %dd= seed.tradable_to
-          %dt From location :
-          %dd= seed.owner.location
-          %dt Owner :
-          %dd= link_to seed.owner.login_name, seed.owner
-  .panel-footer
-    %dt Description
-    %dd
-      = display_seed_description(seed)
+.thumbnail
+  .seed-thumbnail
+    = link_to image_tag(seed_image_path(seed),
+              alt: seed.crop.name, class: 'img'),
+              seed_path(seed)
+    .seedinfo
+      .seed-name
+        = link_to seed, seed_path(seed)
+      .trade-to
+        %p= seed.owner.location
+        %p
+          Will trade to:
+          %br/
+          = seed.tradable_to

app/views/seeds/index.html.haml

@@ -24,11 +24,11 @@
   = page_entries_info @seeds
   = will_paginate @seeds
 
-.row
+.card-row
   - unless @seeds.empty?
     - @seeds.each do |seed|
-      .col-md-6
-        = render partial: 'seeds/thumbnail', locals: { seed: seed }
+      .seedcard
+        = render 'seeds/card', seed: seed
 
 .pagination
   = page_entries_info @seeds

app/views/seeds/show.html.haml

@@ -9,47 +9,56 @@
   = tag("meta", property: "og:url", content: request.original_url)
   = tag("meta", property: "og:site_name", content: ENV['GROWSTUFF_SITE_NAME'])
 
+- content_for :buttonbar do
+  = render 'seeds/actions', seed: @seed
+
 .row
   .col-md-6
-    %p
-      %b Owner:
-      = link_to @seed.owner, @seed.owner
-      —
-      = link_to "view all #{@seed.owner}'s seeds", seeds_by_owner_path(owner: @seed.owner.slug)
-    %p
-      %b Quantity:
-      = @seed.quantity.blank? ? "not specified" : @seed.quantity
-    %p
-      %b Plant before:
-      = @seed.plant_before.to_s
-    %p
-      %b Days until maturity:
-      = render partial: 'days_until_maturity', locals: { seed: @seed }
-    %p
-      %b Organic?
-      = @seed.organic
-    %p
-      %b GMO?
-      = @seed.gmo
-    %p
-      %b Heirloom?
-      = @seed.heirloom
-    %p
-      %b Will trade:
-      = @seed.tradable_to
-      - if @seed.owner.location.blank?
-        (from unspecified location)
-        - if current_member == @seed.owner
-          = link_to "Set Location", edit_registration_path(current_member), class: 'btn btn-default btn-xs'
-      - else
-        (from
-        = succeed ")" do
-          = link_to @seed.owner.location, place_path(@seed.owner.location, anchor: "seeds")
+    %dl.dl-horizontal
+      %dt Owner
+      %dd
+        = link_to @seed.owner, @seed.owner
+        —
+        = link_to "view all #{@seed.owner}'s seeds",
+          seeds_by_owner_path(owner: @seed.owner.slug)
+      %dt Quantity:
+      %dd= @seed.quantity.blank? ? "not specified" : @seed.quantity
+      %dt Plant before:
+      %dd= @seed.plant_before.to_s
+      -if @seed.finished_at
+        %dt Finished at:
+        %dd= @seed.finished_at.to_s
+      %dt Days until maturity:
+      %dd= render partial: 'days_until_maturity', locals: { seed: @seed }
+      %dt Organic?
+      %dd= @seed.organic
+      %dt GMO?
+      %dd= @seed.gmo
+      %dt Heirloom?
+      %dd= @seed.heirloom
+      %dt Will trade:
+      %dd
+        = @seed.tradable_to
+        - if @seed.owner.location.blank?
+          (from unspecified location)
+          - if current_member == @seed.owner
+            = link_to "Set Location", edit_registration_path(current_member), class: 'btn btn-default btn-xs'
+        - else
+          (from
+          = succeed ")" do
+            = link_to @seed.owner.location, place_path(@seed.owner.location, anchor: "seeds")
 
-    %p
-      %b Description:
-      :growstuff_markdown
-        #{ @seed.description != "" ? strip_tags(@seed.description) : "No description given." }
+      %dt When?
+      %dd
+        = @seed.created_at
+      - if @seed.parent_planting
+        %dt Saved from planting:
+        %dd
+          = link_to @seed.parent_planting, planting_path(@seed.parent_planting)
+      %dt Description:
+      %dd
+        :growstuff_markdown
+          #{ @seed.description != "" ? strip_tags(@seed.description) : "No description given." }
 
     - if current_member
       - if @seed.tradable? && current_member != @seed.owner
@@ -60,9 +69,9 @@
     - else
       = render 'shared/signin_signup', to: 'request seeds'
 
-    - if can?(:edit, @seed) || can?(:destroy, @seed)
-      %p
-        = render 'actions', seed: @seed
+    = render 'seeds/descendants', seed: @seed
+    = render 'photos/item_photos', item: @seed, type: 'seed', photos: @photos
+
   .col-md-6
     = render partial: "crops/index_card", locals: { crop: @seed.crop }
     - if @seed.owner.location
@@ -75,5 +84,3 @@
         Or
         = link_to "purchase seeds via Ebay",
         crop_ebay_seeds_url(@seed.crop), target: "_blank", rel: "noopener noreferrer"
-
-= render 'photos/item_photos', item: @seed, type: 'seed', photos: @photos

app/views/shared/buttons/_add_photo.haml

@@ -0,0 +1,4 @@
+- if can?(:create, Photo)
+  = link_to path, class: 'btn btn-default btn-xs' do
+    %span.glyphicon.glyphicon-camera{ title: "Add photo" }
+    Add photo