From 1734655bc628d866ef81a5f51e7385791d7373f2 Mon Sep 17 00:00:00 2001 From: Christoph Haas Date: Sat, 24 Oct 2020 17:45:27 +0200 Subject: [PATCH] De-duplicate code into medium_image partial template --- app/views/packages/details.slim | 34 ++------------------------------- 1 file changed, 2 insertions(+), 32 deletions(-) diff --git a/app/views/packages/details.slim b/app/views/packages/details.slim index 596b4e2..83a7444 100644 --- a/app/views/packages/details.slim +++ b/app/views/packages/details.slim @@ -17,37 +17,13 @@ - if idx==0 .small-12.medium-12.cell .margin-bottom-3 - - / TODO: de-duplicate - a href =url_for(screenshot.large_image_watermarked) rel='fancybox-thumb' title=screenshot.caption data-fancybox='gallery' data-caption=screenshot_caption(screenshot) - .image-with-zoom-icon - = image_tag(url_for(screenshot.medium_image), alt: screenshot.caption, class: 'thumbnail') - - .magnifying-glass-icon - i.fa.fa-search - - /.imgcaption =screenshot_caption(screenshot) - - .imgcaption - = screenshot.description - + = render(partial:'medium_image', locals: {screenshot: screenshot}) / Display further screenshots as smaller images - else .small-12.medium-6.cell .margin-bottom-3 - - a href =url_for(screenshot.large_image_watermarked) rel='fancybox-thumb' title=screenshot.caption data-fancybox='gallery' data-caption=screenshot_caption(screenshot) - .image-with-zoom-icon - = image_tag(url_for(screenshot.medium_image), alt: screenshot.caption, class: 'thumbnail') - - .magnifying-glass-icon - i.fa.fa-search - - /.imgcaption =screenshot_caption(screenshot) - - .imgcaption - = screenshot.description + = render(partial:'medium_image', locals: {screenshot: screenshot}) // Has the unmoderated screenshot been uploaded by the current user? - if screenshot_uploaded_by_current_user?(screenshot) @@ -56,9 +32,6 @@ - unless screenshot.approved | (but not public yet) - - if user_signed_in? and current_user.is_admin? - .imgcaption - span.label.secondary #{screenshot.adminstatus} // Show detailed information about the screenshot object when in dev mode @@ -67,11 +40,8 @@ / tt / = screenshot.inspect - // Is the user an admin? // TODO: fix dropdowns – do not enforce javascript - / - if user_signed_in? and current_user.is_admin? - / = render(partial: 'admin_dropdown', locals: {screenshot: screenshot}) // or does the screenshot belong to the user (determined by session cookie) / - elsif user_signed_in? and screenshot.user == current_user / = render(partial: 'user_dropdown', locals: {screenshot: screenshot})