From 9eaaa8856fe54998fba0b3c50ecc0f47b9dd154a Mon Sep 17 00:00:00 2001 From: AELOGICA Date: Fri, 10 Jul 2015 15:27:34 +0800 Subject: [PATCH] Added row divs for members/_gardens, gardens/show, planting/index page. --- app/views/gardens/show.html.haml | 14 ++++++++------ app/views/members/_gardens.html.haml | 8 +++++--- app/views/plantings/index.html.haml | 21 +++++++++++---------- 3 files changed, 24 insertions(+), 19 deletions(-) diff --git a/app/views/gardens/show.html.haml b/app/views/gardens/show.html.haml index c0feee7eb..59a16db52 100644 --- a/app/views/gardens/show.html.haml +++ b/app/views/gardens/show.html.haml @@ -44,17 +44,19 @@ = 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 - - @garden.plantings.current.each.with_index do |planting_current, index_current| - = render partial: "plantings/thumbnail", locals: {:planting => planting_current} + .row + - 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. %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} + .row + - if @garden.plantings.finished.size > 0 + - @garden.plantings.finished.each.with_index do |planting_finished| + = render partial: "plantings/thumbnail", locals: {:planting => planting_finished} .col-md-3 %h4 About this garden diff --git a/app/views/members/_gardens.html.haml b/app/views/members/_gardens.html.haml index f5b0deb6e..ddee17d3a 100644 --- a/app/views/members/_gardens.html.haml +++ b/app/views/members/_gardens.html.haml @@ -34,9 +34,11 @@ = link_to "Add photo", new_photo_path(:type => "garden", :id => g.id), :class => 'btn btn-primary' %h3 What's planted here? - - if g.featured_plantings.size > 0 - - g.featured_plantings.each.with_index do |planting| - = render partial: "plantings/thumbnail", locals: {:planting => planting} + .row + - if g.featured_plantings.size > 0 + - g.featured_plantings.each.with_index do |planting| + .col-xs-12.col-lg-6 + = render partial: "plantings/thumbnail", locals: {:planting => planting} %p = link_to "More about this garden...", url_for(g) diff --git a/app/views/plantings/index.html.haml b/app/views/plantings/index.html.haml index cb2796c44..27fed56b3 100644 --- a/app/views/plantings/index.html.haml +++ b/app/views/plantings/index.html.haml @@ -14,18 +14,19 @@ - else = render :partial => 'shared/signin_signup', :locals => { :to => "track what you've planted" } - %div.pagination - = page_entries_info @plantings, :model => "plantings" - = will_paginate @plantings +%div.pagination + = page_entries_info @plantings, :model => "plantings" + = will_paginate @plantings -- if @plantings.size > 0 - - @plantings.each.with_index do |planting| - .col-xs-12.col-lg-6 - = render partial: "plantings/thumbnail", locals: {:planting => planting} +.row + - if @plantings.size > 0 + - @plantings.each.with_index do |planting| + .col-xs-12.col-lg-6 + = render partial: "plantings/thumbnail", locals: {:planting => planting} - %div.pagination - = page_entries_info @plantings, :model => "plantings" - = will_paginate @plantings +%div.pagination + = page_entries_info @plantings, :model => "plantings" + = will_paginate @plantings %ul.list-inline %li The data on this page is available in the following formats: