From 7574eb554ef1cbc1146a51d23d09ef49d7537cf0 Mon Sep 17 00:00:00 2001 From: Logan Gingerich Date: Wed, 15 Nov 2017 09:24:14 -0700 Subject: [PATCH] Adds a more prominent add photo button to garden and planting show views --- app/views/gardens/show.html.haml | 6 ++++++ app/views/plantings/show.html.haml | 3 +++ 2 files changed, 9 insertions(+) diff --git a/app/views/gardens/show.html.haml b/app/views/gardens/show.html.haml index ef5b41cfb..cdfedeb13 100644 --- a/app/views/gardens/show.html.haml +++ b/app/views/gardens/show.html.haml @@ -12,6 +12,12 @@ .row .col-md-9 %p.btn-group= render 'gardens/actions', garden: @garden + - if can?(:edit, @garden) && can?(:create, Photo) + %p + = link_to new_photo_path(type: "garden", id: @garden.id), + class: 'btn btn-primary' do + %span.glyphicon.glyphicon-camera{ title: "Add Photo" } + Add Photo - unless @garden.active .alert.alert-warning diff --git a/app/views/plantings/show.html.haml b/app/views/plantings/show.html.haml index 099571218..b0208f34a 100644 --- a/app/views/plantings/show.html.haml +++ b/app/views/plantings/show.html.haml @@ -67,6 +67,9 @@ %p= render 'plantings/progress', planting: @planting, show_explanation: true = render 'plantings/actions', planting: @planting + - if !@planting.photos.empty? || (can?(:edit, @planting) && can?(:create, Photo)) + - if can?(:create, Photo) && can?(:edit, @planting) + = link_to "Add photo", new_photo_path(type: "planting", id: @planting.id), class: 'btn btn-primary btn-xs' .col-md-6 = render partial: "crops/index_card", locals: { crop: @planting.crop }