From c4e9683fe12981816e356ca3de1e0e970c80bae4 Mon Sep 17 00:00:00 2001
From: Skud <skud@infotrope.net>
Date: Mon, 5 Aug 2013 11:08:17 +1000
Subject: [PATCH] CSS tweaks and some tests

---
 .../bootstrap_and_overrides.css.less          |  4 ++++
 app/views/home/_people.html.haml              |  2 +-
 app/views/layouts/application.html.haml       |  2 +-
 app/views/plantings/_list.html.haml           |  2 +-
 spec/views/crops/_popover.html.haml_spec.rb   | 19 +++++++++++++++++++
 5 files changed, 26 insertions(+), 3 deletions(-)
 create mode 100644 spec/views/crops/_popover.html.haml_spec.rb

diff --git a/app/assets/stylesheets/bootstrap_and_overrides.css.less b/app/assets/stylesheets/bootstrap_and_overrides.css.less
index 76c596249..42c48e243 100644
--- a/app/assets/stylesheets/bootstrap_and_overrides.css.less
+++ b/app/assets/stylesheets/bootstrap_and_overrides.css.less
@@ -98,3 +98,7 @@ h2 {
   border-left: 1px solid darken(@beige, 10%);
   padding-left: 1em;
 }
+
+.homepage-members:nth-child(odd) {
+  margin-left: 0px
+}
diff --git a/app/views/home/_people.html.haml b/app/views/home/_people.html.haml
index c87a56f73..ab17a700d 100644
--- a/app/views/home/_people.html.haml
+++ b/app/views/home/_people.html.haml
@@ -3,7 +3,7 @@
 
   .row-fluid
     - @interesting_members.first(6).each do |m|
-      .span6
+      .span6.homepage-members
         .row-fluid{:style => 'padding-bottom: 1em'}
           .span3
             = render :partial => "members/image_with_popover", :locals => { :member => m }
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
index 9f2a55272..4125582ac 100644
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@@ -5,7 +5,7 @@
     = render :partial => "layouts/header"
 
     .container
-      .row
+      .row-fluid
         .span12
           - if content_for?(:title)
             %h1= yield(:title)
diff --git a/app/views/plantings/_list.html.haml b/app/views/plantings/_list.html.haml
index bbf6323f9..086b1aa5f 100644
--- a/app/views/plantings/_list.html.haml
+++ b/app/views/plantings/_list.html.haml
@@ -1,5 +1,5 @@
 - plantings.each do |p|
-  .row
+  .row-fluid
     .span2{:style => 'padding-bottom: 6px'}
       = render :partial => 'plantings/image_with_popover', :locals => { :planting => p }
     .span10
diff --git a/spec/views/crops/_popover.html.haml_spec.rb b/spec/views/crops/_popover.html.haml_spec.rb
new file mode 100644
index 000000000..4cbe7a677
--- /dev/null
+++ b/spec/views/crops/_popover.html.haml_spec.rb
@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe "crops/_popover" do
+  before(:each) do
+    @tomato = FactoryGirl.create(:tomato)
+    @sn = FactoryGirl.create(:solanum_lycopersicum, :crop => @tomato)
+    @planting = FactoryGirl.create(:planting, :crop => @tomato)
+    render :partial => 'crops/popover', :locals => { :crop => @tomato }
+  end
+
+  it 'has a scientific name' do
+    rendered.should contain 'Solanum lycopersicum'
+  end
+
+  it 'shows count of plantings' do
+    rendered.should contain '1 time'
+  end
+
+end