From a0cdf3a8b22a0acc161bf954b6f1f2609f300502 Mon Sep 17 00:00:00 2001 From: Daniel O'Connor Date: Thu, 27 Aug 2015 15:12:05 +0930 Subject: [PATCH 1/3] Fix #818 by removing the .thumbnail around the button. Also rearrange some of the headings (sizing) and controls (add new garden) to be more clearly not a tab. --- app/views/members/_gardens.html.haml | 39 ++++++++++++++++++---------- 1 file changed, 25 insertions(+), 14 deletions(-) diff --git a/app/views/members/_gardens.html.haml b/app/views/members/_gardens.html.haml index ddee17d3a..7733e298d 100644 --- a/app/views/members/_gardens.html.haml +++ b/app/views/members/_gardens.html.haml @@ -7,31 +7,42 @@ - first_garden = false = link_to g.name, "#garden#{g.id}", 'data-toggle' => 'tab' - if current_member == member - %li= link_to 'New Garden', new_garden_path - .tab-content + %li.navbar-right + = link_to new_garden_path, class: 'btn' do + Add New Garden + .tab-content{style: "padding-top: 1em"} - first_garden = true - member.gardens.each do |g| %div{:class => ['tab-pane', first_garden ? 'active' : ''], :id => "garden#{g.id}"} - first_garden = false - %div + .container :growstuff_markdown #{ strip_tags g.description } + - unless g.description + .row + %p No description available yet. + + - if can? :edit, g + %p + Why not + = link_to 'tell us more.', edit_garden_path(g) + - if g.photos.size > 0 or (can? :edit, g and can? :create, Photo) .row - %h2 Photos - - %ul.thumbnails - - g.photos.each do |p| - .col-md-2.six-across - = render :partial => 'photos/thumbnail', :locals => { :photo => p } - - if can? :create, Photo and can? :edit, g - .col-md-2 - .thumbnail(style='height: 220px') - %p{:style => 'text-align: center; padding-top: 50px'} - = link_to "Add photo", new_photo_path(:type => "garden", :id => g.id), :class => 'btn btn-primary' + %h3 Photos + %p= pluralize(g.photos.length, "photo") + .row + %ul.thumbnails + - g.photos.each do |p| + .col-md-2.six-across + = render :partial => 'photos/thumbnail', :locals => { :photo => p } + .row + - if can? :create, Photo and can? :edit, g + %p + = link_to "Add photo", new_photo_path(:type => "garden", :id => g.id), :class => 'btn btn-primary' %h3 What's planted here? .row From ff00b2c985a2ec9b00e71df95e242e3c509592a0 Mon Sep 17 00:00:00 2001 From: Daniel O'Connor Date: Thu, 27 Aug 2015 15:25:16 +0930 Subject: [PATCH 2/3] Fix #818 and layout of show garden page --- app/views/gardens/show.html.haml | 49 ++++++++++++++++++-------------- 1 file changed, 28 insertions(+), 21 deletions(-) diff --git a/app/views/gardens/show.html.haml b/app/views/gardens/show.html.haml index 526074e4a..4e666f8d5 100644 --- a/app/views/gardens/show.html.haml +++ b/app/views/gardens/show.html.haml @@ -2,7 +2,6 @@ .row .col-md-9 - - if can? :edit, @garden or can? :delete, @garden %p.btn-group - if can? :edit, @garden @@ -28,33 +27,41 @@ %div :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 @garden.photos.size > 0 or (can? :edit, @garden and can? :create, Photo) - .row - %h2 Photos - - %ul.thumbnails - - @garden.photos.each do |p| - .col-md-2.six-across - = render :partial => 'photos/thumbnail', :locals => { :photo => p } + .row-fluid + %h3 Photos + %p= pluralize(@garden.photos.length, "photo") + .row-fluid + %ul.thumbnails + - @garden.photos.each do |p| + .col-md-2.six-across + = render :partial => 'photos/thumbnail', :locals => { :photo => p } + .row-fluid - if can? :create, Photo and can? :edit, @garden - .col-md-2 - .thumbnail(style='height: 220px') - %p{:style => 'text-align: center; padding-top: 50px'} - = link_to "Add photo", new_photo_path(:type => "garden", :id => @garden.id), :class => 'btn btn-primary' + %p + = link_to "Add photo", new_photo_path(:type => "garden", :id => @garden.id), :class => 'btn btn-primary' - %h3 What's planted here? - - if @garden.plantings.current.size > 0 - .row + .row-fluid + %h3 What's planted here? + - if @garden.plantings.current.size > 0 - @garden.plantings.current.each.with_index do |planting_current, index_current| = render partial: "plantings/thumbnail", locals: {:planting => planting_current} - - else - %p - Nothing is currently planted here. + - else + %p + Nothing is currently planted here. - %h3 Previously planted in this garden - - if @garden.plantings.finished.size > 0 - .row + .row-fluid + %h3 Previously planted in this garden + - if @garden.plantings.finished.size > 0 - @garden.plantings.finished.each.with_index do |planting_finished| = render partial: "plantings/thumbnail", locals: {:planting => planting_finished} From 631747e9191ae1fe9317017752189d7f205e3857 Mon Sep 17 00:00:00 2001 From: Daniel O'Connor Date: Thu, 27 Aug 2015 15:26:40 +0930 Subject: [PATCH 3/3] Add a trailing sentence. --- app/views/gardens/show.html.haml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/views/gardens/show.html.haml b/app/views/gardens/show.html.haml index 4e666f8d5..0900eac40 100644 --- a/app/views/gardens/show.html.haml +++ b/app/views/gardens/show.html.haml @@ -64,7 +64,9 @@ - if @garden.plantings.finished.size > 0 - @garden.plantings.finished.each.with_index do |planting_finished| = render partial: "plantings/thumbnail", locals: {:planting => planting_finished} - + - else + %p + Nothing has been planted here. .col-md-3 %h4 About this garden %p