Merge branch 'dev' into feature/ownable

app/assets/stylesheets/overrides.sass

@@ -146,6 +146,7 @@ p.stats
   border: none
   text-align: center
   margin-bottom: 1.5em
+  max-width: 160px
 
   .member-thumbnail
     text-align: left
@@ -221,6 +222,7 @@ footer
 
 #maincontainer
   min-height: 80%
+  padding: 50px
 
 html, body
   height: 100%
@@ -334,3 +336,6 @@ ul.thumbnail-buttons
       height: 180px
     .seed-thumbnail
       height: 220px
+
+  #maincontainer
+    padding: 10px

app/models/crop.rb

@@ -26,13 +26,11 @@ class Crop < ActiveRecord::Base
   ## 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 }) }
 
   ##

app/views/harvests/_list.html.haml

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

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,5 +1,6 @@
 - cache cache_key_for(Crop, 'interesting'), expires_in: 1.day do
   .row
     %h2= t('.our_crops')
-    - Crop.interesting.includes(:scientific_names, :photos).limit(8).each do |c|
-      .col-md-4.col-sm-3.col-xs-6= render 'crops/thumbnail', crop: c
+    - 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/_harvests.html.haml

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

app/views/home/_plantings.html.haml

@@ -1,3 +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(5)
+  = render 'plantings/list', plantings: Planting.includes(:crop, garden: :owner).has_photos.recent.limit(6)

app/views/home/_seeds.html.haml

@@ -1,7 +1,7 @@
 - cache cache_key_for(Seed, 'interesting'), expires_in: 1.day do
   %h2= t('.title')
   .row
-    - Seed.current.tradable.order(created_at: :desc).limit(6).each do |seed|
+    - 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

app/views/home/index.html.haml

@@ -19,11 +19,11 @@
         = render 'blurb'
 
     .row
-      .col-md-6.col-sm-12
+      .col-lg-8.col-md-6.col-sm-12
         = render 'crops'
-      .col-md-3.col-sm-6
+      .col-lg-2.col-md-3.col-sm-6
         = render 'plantings'
-      .col-md-3.col-sm-6
+      .col-lg-2.col-md-3.col-sm-6
         = render 'harvests'
       .col-md-12
         - cache cache_key_for(Crop, 'recent') do

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)

app/views/plantings/_image_with_popover.html.haml

@@ -5,6 +5,6 @@
             planting,
             rel: "popover",
             'data-trigger': 'hover',
-            'data-title': planting.to_s,
+            '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.col-xs-4.homepage-listing
+      .col-lg-6.col-md-3.col-xs-4.homepage-listing
         = render 'plantings/image_with_popover', planting: p
-      .col-md-9.col-xs-4
+      .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.location
+          %i= p.location

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