From f7ca32d88845a1f7921f31e5bb3b69a61db3bdb3 Mon Sep 17 00:00:00 2001
From: Brenda Wallace <brenda@wallace.net.nz>
Date: Sat, 6 May 2017 13:30:57 +1200
Subject: [PATCH] Moved garden photos to right/bottom

---
 app/views/gardens/show.html.haml         | 34 ++++++++++++------------
 app/views/places/show.html.haml          |  6 ++---
 app/views/plantings/_thumbnail.html.haml | 13 ++++++---
 3 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/app/views/gardens/show.html.haml b/app/views/gardens/show.html.haml
index ef58b34d4..05139fe8f 100644
--- a/app/views/gardens/show.html.haml
+++ b/app/views/gardens/show.html.haml
@@ -53,21 +53,6 @@
               Why not
               = link_to 'tell us more.', edit_garden_path(@garden)
 
-    - if @garden.photos.size.positive?
-      %h3= localize_plural(@garden.photos, Photo)
-      .row
-        - @garden.photos.includes(:owner).each do |photo|
-          .col-xs-4.col-md-2
-            = render partial: 'photos/thumbnail', locals: { photo: photo }
-
-    - if can?(:edit, @garden) && can?(:create, Photo)
-      .row
-        .col-md-12
-          %p
-            = link_to new_photo_path(type: "garden", id: @garden.id),
-            class: 'btn btn-primary' do
-              %span.glyphicon.glyphicon-camera{ title: "Add Photo" }
-              Add Photo
     %h3 What's planted here?
     .row
       - if @garden.plantings.size.positive?
@@ -114,9 +99,24 @@
         - @garden.owner.gardens.inactive.each do |othergarden|
           %li
             - if @garden == othergarden
-              = @garden
+              = @garden.name
             - else
               = link_to othergarden, garden_path(othergarden)
 
     - if @garden.owner == current_member
-      = link_to 'Add New Garden', new_garden_path, class: 'btn btn-default btn-xs'
+      %p
+        = link_to new_garden_path, class: 'btn btn-default btn-xs' do
+          Add New Garden
+
+    - if can?(:edit, @garden) && can?(:create, Photo)
+      %p
+        = link_to new_photo_path(type: "garden", id: @garden.id),
+        class: 'btn btn-primary' do
+          %span.glyphicon.glyphicon-camera{ title: "Add Photo" }
+          Add Photo
+    - if @garden.photos.size.positive?
+      %h3= localize_plural(@garden.photos, Photo)
+      .row
+        - @garden.photos.includes(:owner).each do |photo|
+          .col-xs-6
+            = render partial: 'photos/thumbnail', locals: { photo: photo }
\ No newline at end of file
diff --git a/app/views/places/show.html.haml b/app/views/places/show.html.haml
index ed91bdb5c..099da27d5 100644
--- a/app/views/places/show.html.haml
+++ b/app/views/places/show.html.haml
@@ -45,10 +45,8 @@
       - plantings.first(10).each.with_index do |planting, index|
         .col-xs-12.col-lg-6
           = render partial: "plantings/thumbnail", locals: { planting: planting, index: index }
-    .row
-      = link_to "View all plantings >>", plantings_path
+    = link_to "View all plantings >>", plantings_path
   - else
-    .row
-      %p No nearby plantings found
+    %p No nearby plantings found
 - else
   %p No results found
diff --git a/app/views/plantings/_thumbnail.html.haml b/app/views/plantings/_thumbnail.html.haml
index 08458f4b7..528950b91 100644
--- a/app/views/plantings/_thumbnail.html.haml
+++ b/app/views/plantings/_thumbnail.html.haml
@@ -36,17 +36,24 @@
 
     %p= render partial: 'plantings/planting_progress', locals: { planting: planting }
 
-    = link_to 'Details', planting_path(planting), class: 'btn btn-default btn-xs'
+    = link_to 'Details', planting_path(planting),
+      class: 'btn btn-default btn-xs'
+
     - if can? :edit, planting
-      = link_to edit_planting_path(planting), class: 'btn btn-default btn-xs' do
+      = link_to edit_planting_path(planting),
+        class: 'btn btn-default btn-xs' do
         %span.glyphicon.glyphicon-pencil{ title: "Edit" }
+
     - if can?(:edit, planting) && can?(:create, Harvest)
-      = link_to 'Harvest', new_planting_harvest_path(planting), class: 'btn btn-default btn-xs'
+      = 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?' },