diff --git a/app/helpers/buttons_helper.rb b/app/helpers/buttons_helper.rb index cfc824791..310c8f334 100644 --- a/app/helpers/buttons_helper.rb +++ b/app/helpers/buttons_helper.rb @@ -4,14 +4,6 @@ module ButtonsHelper include IconsHelper include PhotosHelper - def garden_plant_something_button(garden, classes: "btn btn-outline-secondary") - return unless can? :edit, garden - - link_to new_planting_path(garden_id: garden.id), class: classes do - planting_icon + ' ' + t('buttons.plant_something_here') - end - end - def garden_plan_something_button(garden, classes: "btn btn-outline-secondary") return unless can? :edit, garden diff --git a/app/views/gardens/show.html.haml b/app/views/gardens/show.html.haml index 78f4e86cb..93b6a6d8b 100644 --- a/app/views/gardens/show.html.haml +++ b/app/views/gardens/show.html.haml @@ -39,6 +39,10 @@ - if can? :edit, @garden = link_to 'Set it to active', edit_garden_path(@garden) to plant something in this garden. + - if @suggestion_count&.positive? + .mb-3 + = render 'jobs/ideas_banner', href: suggestions_path, open: false, + text: t('.suggested_plantings', count: @suggestion_count), go: t('.suggested_plantings_go') - if @garden.active -# Points people at the layout page, showing either the current bed map or a teaser to create one. = link_to layout_member_garden_path(@garden.owner, @garden), class: 'garden-layout-teaser' do @@ -102,7 +106,12 @@ = render 'plantings/progress_list', plantings: @garden.plantings.active.limit(10) %section - %h2 Current plantings in garden + .section-header + %h2 Current plantings in garden + - if can?(:edit, @garden) + = link_to new_planting_path(garden_id: @garden.id), class: 'btn btn-sm section-add' do + = icon 'fas', 'plus' + add .index-cards - if @current_plantings.size.positive? - @current_plantings.each do |planting| @@ -110,13 +119,6 @@ - else .col-md-12 %p Nothing is currently planted here. - - if can?(:edit, @garden) - .col-md-12 - = garden_plant_something_button(@garden) - - if @suggestion_count&.positive? - .col-md-12 - = render 'jobs/ideas_banner', href: suggestions_path, open: false, - text: t('.suggested_plantings', count: @suggestion_count), go: t('.suggested_plantings_go') - if @notepad %section