From f1afe1ca792a2a741aa62012931a7dc6351c0874 Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Sun, 1 Apr 2018 12:44:59 +1200 Subject: [PATCH 1/2] Expanding layout to use full screen --- app/assets/stylesheets/overrides.sass | 5 ++++ app/models/crop.rb | 6 ++-- app/models/planting.rb | 2 +- app/views/harvests/_list.html.haml | 7 ++--- app/views/home/_blurb.html.haml | 29 +++++++++---------- app/views/home/_crops.html.haml | 5 ++-- app/views/home/_harvests.html.haml | 2 +- app/views/home/_plantings.html.haml | 2 +- app/views/home/_seeds.html.haml | 2 +- app/views/home/index.html.haml | 6 ++-- app/views/layouts/application.html.haml | 2 +- .../plantings/_image_with_popover.html.haml | 2 +- app/views/plantings/_list.html.haml | 11 ++----- app/views/plantings/_popover.html.haml | 18 +++++++----- 14 files changed, 49 insertions(+), 50 deletions(-) diff --git a/app/assets/stylesheets/overrides.sass b/app/assets/stylesheets/overrides.sass index 338a2dbc5..25ade49a6 100644 --- a/app/assets/stylesheets/overrides.sass +++ b/app/assets/stylesheets/overrides.sass @@ -146,6 +146,7 @@ p.stats border: none text-align: center margin-bottom: 1.5em + max-width: 160px .member-thumbnail text-align: left @@ -221,6 +222,7 @@ footer #maincontainer min-height: 80% + padding: 50px 50px 50px 50px html, body height: 100% @@ -334,3 +336,6 @@ ul.thumbnail-buttons height: 180px .seed-thumbnail height: 220px + + #maincontainer + padding: 10px \ No newline at end of file diff --git a/app/models/crop.rb b/app/models/crop.rb index 682610436..490a35d71 100644 --- a/app/models/crop.rb +++ b/app/models/crop.rb @@ -26,13 +26,11 @@ class Crop < ActiveRecord::Base ## Scopes scope :recent, -> { approved.order(created_at: :desc) } scope :toplevel, -> { approved.where(parent_id: nil) } - scope :popular, -> { approved.reorder("plantings_count desc, lower(name) asc") } - # ok on sqlite and psql, but not on mysql - scope :randomized, -> { approved.reorder('random()') } + scope :popular, -> { approved.order("plantings_count desc, lower(name) asc") } scope :pending_approval, -> { where(approval_status: "pending") } scope :approved, -> { where(approval_status: "approved") } scope :rejected, -> { where(approval_status: "rejected") } - scope :interesting, -> { approved.has_photos.randomized } + scope :interesting, -> { approved.has_photos } scope :has_photos, -> { includes(:photos).where.not(photos: { id: nil }) } ## diff --git a/app/models/planting.rb b/app/models/planting.rb index e358a6bb4..715a494f7 100644 --- a/app/models/planting.rb +++ b/app/models/planting.rb @@ -17,7 +17,7 @@ class Planting < ActiveRecord::Base before_save :calculate_lifespan belongs_to :garden - belongs_to :owner, class_name: 'Member', counter_cache: true + belongs_to :owner, class_name: 'Member', foreign_key: 'owner_id', counter_cache: true belongs_to :crop, counter_cache: true has_many :harvests, dependent: :destroy diff --git a/app/views/harvests/_list.html.haml b/app/views/harvests/_list.html.haml index bb0178238..8e4e1a7a1 100644 --- a/app/views/harvests/_list.html.haml +++ b/app/views/harvests/_list.html.haml @@ -1,11 +1,10 @@ - harvests.each do |h| - cache h do .row - .col-md-3.col-xs-4{ style: 'padding-bottom: 6px' } + .col-lg-6.col-md-3.col-xs-4.homepage-listing = render 'harvests/image_with_popover', harvest: h - .col-md-9.col-xs-4 + .col-lg-3.col-md-9.col-xs-4 = link_to h.crop, crop_path(h.crop) %br/ %small - %i - = h.owner.location + %i= h.owner.location diff --git a/app/views/home/_blurb.html.haml b/app/views/home/_blurb.html.haml index 0459d1095..81e65510f 100644 --- a/app/views/home/_blurb.html.haml +++ b/app/views/home/_blurb.html.haml @@ -1,16 +1,13 @@ -.col-md-12 - -%h1= ENV['GROWSTUFF_SITE_NAME'] - -.row - .col-md-8.info - %p= t('.intro', site_name: ENV['GROWSTUFF_SITE_NAME']) - - = render partial: 'stats' - .col-md-4.signup - %p= t('.perks') - %p= link_to(t('.sign_up'), new_member_registration_path, class: 'btn btn-primary btn-lg') - %p - %small - = t('.already_html', sign_in: link_to(t('.sign_in_linktext'), new_member_session_path)) - +.container + .row + .col-md-12 + %h1= ENV['GROWSTUFF_SITE_NAME'] + .col-md-8.info + %p= t('.intro', site_name: ENV['GROWSTUFF_SITE_NAME']) + = render partial: 'stats' + .col-md-4.signup + %p= t('.perks') + %p= link_to(t('.sign_up'), new_member_registration_path, class: 'btn btn-primary btn-lg') + %p + %small + = t('.already_html', sign_in: link_to(t('.sign_in_linktext'), new_member_session_path)) diff --git a/app/views/home/_crops.html.haml b/app/views/home/_crops.html.haml index bfcbc9a71..8cffe4b78 100644 --- a/app/views/home/_crops.html.haml +++ b/app/views/home/_crops.html.haml @@ -1,5 +1,6 @@ - cache cache_key_for(Crop, 'interesting'), expires_in: 1.day do .row %h2= t('.our_crops') - - Crop.interesting.includes(:scientific_names, :photos).limit(8).each do |c| - .col-md-4.col-sm-3.col-xs-6= render 'crops/thumbnail', crop: c + - Crop.interesting.includes(:scientific_names, :photos).shuffle.first(12).each do |c| + .col-lg-2.col-md-4.col-sm-3.col-xs-6 + = render 'crops/thumbnail', crop: c diff --git a/app/views/home/_harvests.html.haml b/app/views/home/_harvests.html.haml index d4c2a1117..2229eae63 100644 --- a/app/views/home/_harvests.html.haml +++ b/app/views/home/_harvests.html.haml @@ -1,3 +1,3 @@ - cache cache_key_for(Harvest) do %h2 Recently Harvested - = render 'harvests/list', harvests: Harvest.includes(:crop, :owner, :photos).has_photos.recent.first(5) + = render 'harvests/list', harvests: Harvest.includes(:crop, :owner, :photos).has_photos.recent.first(6) diff --git a/app/views/home/_plantings.html.haml b/app/views/home/_plantings.html.haml index 595ad4586..dd631d2ff 100644 --- a/app/views/home/_plantings.html.haml +++ b/app/views/home/_plantings.html.haml @@ -1,3 +1,3 @@ - cache cache_key_for(Planting, 'home'), expires_in: 1.day do %h2= t('.recently_planted') - = render 'plantings/list', plantings: Planting.includes(:crop, garden: :owner).has_photos.recent.limit(5) + = render 'plantings/list', plantings: Planting.includes(:crop, garden: :owner).has_photos.recent.limit(6) diff --git a/app/views/home/_seeds.html.haml b/app/views/home/_seeds.html.haml index d53759738..4a28f9590 100644 --- a/app/views/home/_seeds.html.haml +++ b/app/views/home/_seeds.html.haml @@ -1,7 +1,7 @@ - cache cache_key_for(Seed, 'interesting'), expires_in: 1.day do %h2= t('.title') .row - - Seed.current.tradable.order(created_at: :desc).limit(6).each do |seed| + - Seed.current.tradable.includes(:owner, :crop).order(created_at: :desc).limit(6).each do |seed| .col-md-2.col-sm-2.col-xs-6 .thumbnail.seed-thumbnail - cache cache_key_for(Crop, seed.id) do diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml index c28a8985b..d05d6a37a 100644 --- a/app/views/home/index.html.haml +++ b/app/views/home/index.html.haml @@ -19,11 +19,11 @@ = render 'blurb' .row - .col-md-6.col-sm-12 + .col-lg-8.col-md-6.col-sm-12 = render 'crops' - .col-md-3.col-sm-6 + .col-lg-2.col-md-3.col-sm-6 = render 'plantings' - .col-md-3.col-sm-6 + .col-lg-2.col-md-3.col-sm-6 = render 'harvests' .col-md-12 - cache cache_key_for(Crop, 'recent') do diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 2c0f6b9bb..6b9cfd40f 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -5,7 +5,7 @@ %body = render partial: "layouts/header" - .container#maincontainer + #maincontainer .row .col-md-12 - if content_for?(:title) diff --git a/app/views/plantings/_image_with_popover.html.haml b/app/views/plantings/_image_with_popover.html.haml index 70bfc1836..740562fda 100644 --- a/app/views/plantings/_image_with_popover.html.haml +++ b/app/views/plantings/_image_with_popover.html.haml @@ -5,6 +5,6 @@ planting, rel: "popover", 'data-trigger': 'hover', - 'data-title': planting.to_s, + 'data-title': planting.crop.name, 'data-content': render('plantings/popover', planting: planting), 'data-html': true diff --git a/app/views/plantings/_list.html.haml b/app/views/plantings/_list.html.haml index aa7dcf9fa..21be75416 100644 --- a/app/views/plantings/_list.html.haml +++ b/app/views/plantings/_list.html.haml @@ -1,15 +1,10 @@ - plantings.each do |p| - cache p do .row - .col-md-3.col-xs-4.homepage-listing + .col-lg-6.col-md-3.col-xs-4.homepage-listing = render 'plantings/image_with_popover', planting: p - .col-md-9.col-xs-4 + .col-lg-3.col-md-9.col-xs-4 = link_to p.crop, p.crop - in - = succeed "'s" do - = link_to p.garden.owner, p.garden.owner - = link_to display_garden_name(p.garden), p.garden %br/ %small - %i - = p.location + %i= p.location diff --git a/app/views/plantings/_popover.html.haml b/app/views/plantings/_popover.html.haml index d7a83f616..44fd1744f 100644 --- a/app/views/plantings/_popover.html.haml +++ b/app/views/plantings/_popover.html.haml @@ -1,7 +1,11 @@ -%p - %small - Quantity: - = planting.quantity ? planting.quantity : 'unknown' - %br/ - Planted on: - = planting.planted_at.to_s +- if planting.quantity.present? + %p + %small + Quantity: + = planting.quantity + +- if planting.planted_at.present? + %p + %small + Planted: + = planting.planted_at.to_s From b64a2942455fe4920cb615493a283ab919727aef Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Sun, 1 Apr 2018 18:45:35 +1200 Subject: [PATCH 2/2] Removed duplicate margins in css --- app/assets/stylesheets/overrides.sass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/stylesheets/overrides.sass b/app/assets/stylesheets/overrides.sass index 25ade49a6..6a97975fb 100644 --- a/app/assets/stylesheets/overrides.sass +++ b/app/assets/stylesheets/overrides.sass @@ -222,7 +222,7 @@ footer #maincontainer min-height: 80% - padding: 50px 50px 50px 50px + padding: 50px html, body height: 100% @@ -338,4 +338,4 @@ ul.thumbnail-buttons height: 220px #maincontainer - padding: 10px \ No newline at end of file + padding: 10px