From 6fed41351b1bb0e7a5b6aa701ad2dca312eb066f Mon Sep 17 00:00:00 2001
From: Miles Gould <miles@assyrian.org.uk>
Date: Tue, 4 Jun 2013 12:24:03 +0100
Subject: [PATCH 1/2] Show community features on logged-in homepage.

Don't show interesting members if there are none
---
 app/views/home/index.html.haml | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml
index 7b33f1506..e0dc9c150 100644
--- a/app/views/home/index.html.haml
+++ b/app/views/home/index.html.haml
@@ -54,17 +54,17 @@
   .visible-phone
     = render :partial => 'blurb'
 
-  - if @interesting_members
-    %h2 Some of our members
-    %ul.thumbnails
-      - @interesting_members.each do |m|
-        %li.span2
-          = render :partial => "members/thumbnail", :locals => { :member => m }
+- if !@interesting_members.blank?
+  %h2 Some of our members
+  %ul.thumbnails
+    - @interesting_members.each do |m|
+      %li.span2
+        = render :partial => "members/thumbnail", :locals => { :member => m }
 
-  .row
-    .span6
-      %h2 Recent plantings
-      = render :partial => 'shared/recent_plantings'
-    .span6
-      %h2 Recent posts
-      = render :partial => 'shared/recent_posts'
+.row
+  .span6
+    %h2 Recent plantings
+    = render :partial => 'shared/recent_plantings'
+  .span6
+    %h2 Recent posts
+    = render :partial => 'shared/recent_posts'

From a0c91ee8849e56ee54d7dcdbb587067b187134ca Mon Sep 17 00:00:00 2001
From: Miles Gould <miles@assyrian.org.uk>
Date: Tue, 4 Jun 2013 12:59:37 +0100
Subject: [PATCH 2/2] Changes to homepage

 - only show interesting members if logged out
 - don't show your recent posts/plantings
 - change limits on posts/plantings for better visual balance.
---
 app/controllers/home_controller.rb |  8 ++------
 app/views/home/index.html.haml     | 21 ++++++---------------
 spec/views/home/index_spec.rb      | 10 ----------
 3 files changed, 8 insertions(+), 31 deletions(-)

diff --git a/app/controllers/home_controller.rb b/app/controllers/home_controller.rb
index c96b99f3a..389c7dfa2 100644
--- a/app/controllers/home_controller.rb
+++ b/app/controllers/home_controller.rb
@@ -12,12 +12,8 @@ class HomeController < ApplicationController
     # customise what we show on the homepage based on whether you're
     # logged in or not.
     @member = current_member
-    @plantings  = current_member ?
-      current_member.plantings.limit(10) :
-      Planting.limit(10)
-    @posts = current_member ?
-      current_member.posts.limit(10) :
-      Post.limit(10)
+    @plantings = Planting.limit(15)
+    @posts = Post.limit(10)
 
     respond_to do |format|
       format.html # index.html.haml
diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml
index e0dc9c150..85b53a253 100644
--- a/app/views/home/index.html.haml
+++ b/app/views/home/index.html.haml
@@ -38,15 +38,6 @@
           - current_member.forums.each do |f|
             %li= link_to f.name, f
 
-  .row
-    .span6
-      %h2 Your recent plantings
-      = render :partial => 'shared/recent_plantings'
-
-    .span6
-      %h2 Your recent posts
-      = render :partial => 'shared/recent_posts'
-
 - else
   .visible-desktop.visible-tablet
     .hero-unit
@@ -54,12 +45,12 @@
   .visible-phone
     = render :partial => 'blurb'
 
-- if !@interesting_members.blank?
-  %h2 Some of our members
-  %ul.thumbnails
-    - @interesting_members.each do |m|
-      %li.span2
-        = render :partial => "members/thumbnail", :locals => { :member => m }
+  - if @interesting_members.present?
+    %h2 Some of our members
+    %ul.thumbnails
+      - @interesting_members.each do |m|
+        %li.span2
+          = render :partial => "members/thumbnail", :locals => { :member => m }
 
 .row
   .span6
diff --git a/spec/views/home/index_spec.rb b/spec/views/home/index_spec.rb
index e123927f5..558420a7c 100644
--- a/spec/views/home/index_spec.rb
+++ b/spec/views/home/index_spec.rb
@@ -64,16 +64,6 @@ describe 'home/index.html.haml', :type => "view" do
       assert_select "a[href=#{url_for(@member.gardens.first)}]", "Garden"
     end
 
-    it 'lists plantings' do
-      rendered.should contain "Your recent plantings"
-      assert_select "a[href=#{url_for(@planting)}]"
-    end
-
-    it 'lists posts' do
-      rendered.should contain "Your recent posts"
-      assert_select "a[href=#{url_for(@post)}]"
-    end
-
     it 'shows admin status' do
       rendered.should contain "You are an ADMIN USER"
     end