mirror of
https://github.com/Growstuff/growstuff.git
synced 2026-03-28 19:51:57 -04:00
Layout tidy to cope with neighbours on page
This commit is contained in:
@@ -14,6 +14,15 @@
|
||||
%li.breadcrumb-item= link_to @planting.owner, member_plantings_path(@planting.owner)
|
||||
%li.breadcrumb-item.active= link_to @planting.crop.name, @planting
|
||||
|
||||
|
||||
- if @planting.parent_seed.nil? && @matching_seeds && @matching_seeds.any? && @planting.owner == current_member
|
||||
.alert.alert-info{role: "alert"}
|
||||
= bootstrap_form_for(@planting) do |f|
|
||||
Is this from one of these plantings?
|
||||
- @matching_seeds.each do |seed|
|
||||
= f.radio_button :parent_seed_id, seed.id, label: seed
|
||||
= f.submit "save", class: 'btn btn-sm'
|
||||
|
||||
.planting
|
||||
.row
|
||||
.col-md-8.col-xs-12
|
||||
@@ -30,13 +39,6 @@
|
||||
|
||||
= render 'timeline', planting: @planting
|
||||
|
||||
- if @planting.parent_seed.nil? && @matching_seeds && @matching_seeds.any? && @planting.owner == current_member
|
||||
.alert.alert-info{role: "alert"}
|
||||
= bootstrap_form_for(@planting) do |f|
|
||||
Is this from one of these plantings?
|
||||
- @matching_seeds.each do |seed|
|
||||
= f.radio_button :parent_seed_id, seed.id, label: seed
|
||||
= f.submit "save", class: 'btn btn-sm'
|
||||
|
||||
.col-md-4.col-xs-12
|
||||
= render 'plantings/owner', planting: @planting
|
||||
@@ -52,6 +54,15 @@
|
||||
:growstuff_markdown
|
||||
#{strip_tags(@planting.description)}
|
||||
%section= render 'plantings/photos', photos: @photos, planting: @planting
|
||||
|
||||
%section.harvests
|
||||
%a{name: 'harvests'}
|
||||
= render 'plantings/harvests', planting: @planting
|
||||
|
||||
%section.descendants
|
||||
%a{name: 'seeds'}
|
||||
= render 'plantings/descendants', planting: @planting
|
||||
|
||||
.col-md-4.col-xs-12
|
||||
= render 'plantings/actions', planting: @planting
|
||||
%hr/
|
||||
@@ -73,12 +84,3 @@
|
||||
planted by #{planting.owner}
|
||||
in #{planting.garden.location}
|
||||
%p Other #{@planting.crop.name} plantings at the same latitude
|
||||
.row
|
||||
.col-md-6
|
||||
%section.harvests
|
||||
%a{name: 'harvests'}
|
||||
= render 'plantings/harvests', planting: @planting
|
||||
.col-md-6
|
||||
%section.descendants
|
||||
%a{name: 'seeds'}
|
||||
= render 'plantings/descendants', planting: @planting
|
||||
|
||||
Reference in New Issue
Block a user