From c168bb4a2b0d7cf513f0fc1f6473182d9e85bbda Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Sat, 6 May 2017 08:35:17 +1200 Subject: [PATCH] More fix up to alignment and thumbnail row counts gardens#show --- app/views/gardens/show.html.haml | 42 +++++++++++---------- app/views/places/show.html.haml | 2 +- app/views/plantings/_thumbnail.html.haml | 48 +++++++++++------------- 3 files changed, 44 insertions(+), 48 deletions(-) diff --git a/app/views/gardens/show.html.haml b/app/views/gardens/show.html.haml index f6c9a4326..15470066e 100644 --- a/app/views/gardens/show.html.haml +++ b/app/views/gardens/show.html.haml @@ -50,32 +50,34 @@ = link_to 'tell us more.', edit_garden_path(@garden) - if @garden.photos.size.positive? + %h3= localize_plural(@garden.photos, Photo) .row - %h3 Photos - %p= localize_plural(@garden.photos, Photo) - %ul.thumbnails - - @garden.photos.includes(:owner).each do |p| - .col-xs-3.col-md-2.six-across - = render partial: 'photos/thumbnail', locals: { photo: p } - - if (can?(:edit, @garden) && can?(:create, Photo)) - .row - %p= link_to "Add photo", new_photo_path(type: "garden", id: @garden.id), class: 'btn btn-primary' + - @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 "Add photo", new_photo_path(type: "garden", id: @garden.id), class: 'btn btn-primary' + %h3 What's planted here? .row - %h3 What's planted here? - if @garden.plantings.size.positive? - %p Nothing is currently planted here. + - @garden.plantings.current.includes(:crop, :owner, :harvests, :garden).each do |planting| + .col-xs-12.col-md-6 + = render partial: "plantings/thumbnail", locals: { planting: planting } - else - - @garden.plantings.current.includes(:crop, :owner, :harvests, :garden).each do |planting_current| - = render partial: "plantings/thumbnail", locals: { planting: planting_current } - - .row-fluid - %h3 Previously planted in this garden - - if @garden.plantings.finished.empty? - %p Nothing has been planted here. + .col-md-12 + %p Nothing is currently planted here. + %h3 Previously planted in this garden + .row + - if @garden.plantings.finished.size.positive? + - @garden.plantings.finished.includes(:crop, :owner, :harvests, :garden).each do |planting| + .col-xs-12.col-md-6 + = render partial: "plantings/thumbnail", locals: { planting: planting } - else - - @garden.plantings.finished.includes(:crop, :owner, :harvests, :garden).each do |planting_finished| - = render partial: "plantings/thumbnail", locals: { planting: planting_finished } + .col-md-12 + %p Nothing has been planted here. .col-md-3 %h4 About this garden %p diff --git a/app/views/places/show.html.haml b/app/views/places/show.html.haml index ed91bdb5c..7d73d4fb1 100644 --- a/app/views/places/show.html.haml +++ b/app/views/places/show.html.haml @@ -44,7 +44,7 @@ .row - plantings.first(10).each.with_index do |planting, index| .col-xs-12.col-lg-6 - = render partial: "plantings/thumbnail", locals: { planting: planting, index: index } + = render partial: "plantings/card", locals: { planting: planting, index: index } .row = link_to "View all plantings >>", plantings_path - else diff --git a/app/views/plantings/_thumbnail.html.haml b/app/views/plantings/_thumbnail.html.haml index ddb830e4e..296e89acf 100644 --- a/app/views/plantings/_thumbnail.html.haml +++ b/app/views/plantings/_thumbnail.html.haml @@ -3,11 +3,11 @@ %h3.panel-title= link_to planting.crop.name, planting.crop .panel-body .row - .col-xs-12.col-md-4 + .col-xs-12.col-md-5 = link_to image_tag((planting.default_photo ? planting.default_photo.thumbnail_url : 'placeholder_150.png'), - alt: planting.crop_id, class: 'img'), + alt: planting.crop_id, class: 'img img-responsive'), planting - .col-xs-7.col-md-6 + .col-xs-12.col-md-7 %dl.dl-horizontal.planting-attributes %dt Owner: %dd= link_to planting.owner.login_name, planting.owner @@ -29,33 +29,27 @@ %dt Planted from: %dd= display_planted_from(planting) - - .row - .col-xs-12.col-md-4 - %dl %dt Mature in: %dd = display_days_before_maturity(planting) days - .col-xs-12.col-md-8 - = link_to 'Details', planting, class: 'btn btn-default btn-xs' - - if can? :edit, planting - = 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' - - 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?' }, - class: 'btn btn-default btn-xs' do - %span.glyphicon.glyphicon-trash{ title: "Delete" } + %p= render partial: 'plantings/planting_progress', locals: { planting: planting } + + = link_to 'Details', planting, class: 'btn btn-default btn-xs' + - if can? :edit, planting + = 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' + - 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?' }, + class: 'btn btn-default btn-xs' do + %span.glyphicon.glyphicon-trash{ title: "Delete" } - .row - .col-xs-12.col-md-12 - %p= render partial: 'plantings/planting_progress', locals: { planting: planting }