From fc6183eb5239f2add7becff0838857a8e8b3a308 Mon Sep 17 00:00:00 2001 From: Brenda Wallace Date: Thu, 24 Jan 2019 13:46:35 +1300 Subject: [PATCH] DRY actions more --- app/views/layouts/application.html.haml | 3 +-- app/views/photos/_actions.html.haml | 4 ++-- app/views/photos/_photo_association_delete.haml | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index d36f217b8..c1f2c2e33 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -6,8 +6,6 @@ = render partial: "layouts/header" #maincontainer - .row - .col-md-12= render partial: "shared/flash_messages", flash: flash .row .col-md-6 - if content_for?(:title) @@ -25,6 +23,7 @@ .row .col-md-12 + = render partial: "shared/flash_messages", flash: flash = yield %footer diff --git a/app/views/photos/_actions.html.haml b/app/views/photos/_actions.html.haml index 06fc37f0e..95d9de0d1 100644 --- a/app/views/photos/_actions.html.haml +++ b/app/views/photos/_actions.html.haml @@ -2,6 +2,6 @@ - if can?(:edit, @photo) && can?(:destroy, @photo) %p - if can?(:edit, @photo) - = render 'shared/buttons/edit', path: edit_photo_path(@photo) + = edit_button(@photo) - if can?(:destroy, @photo) - = render 'shared/buttons/delete', path: photo_path(@photo) + = delete_button(@photo) diff --git a/app/views/photos/_photo_association_delete.haml b/app/views/photos/_photo_association_delete.haml index d505b47ad..fd950821c 100644 --- a/app/views/photos/_photo_association_delete.haml +++ b/app/views/photos/_photo_association_delete.haml @@ -1,4 +1,4 @@ - if can? :edit, photo = link_to photo_associations_path(photo_id: photo.id, type: type, id: thing.id), method: 'delete', class: 'btn btn-default btn-xs' do - %span.glyphicon.glyphicon-remove{ title: "Remove link" } + = delete_icon