From e2c73511bc4e0c55857cceaeb83891f4acaa8d65 Mon Sep 17 00:00:00 2001 From: Christoph Haas Date: Fri, 15 Jul 2016 20:10:19 +0200 Subject: [PATCH] Removed user dropdown - adding description field and delete button directly into details view --- app/views/packages/_user_dropdown.slim | 6 ------ app/views/packages/details.slim | 18 +++++++++++++++++- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/app/views/packages/_user_dropdown.slim b/app/views/packages/_user_dropdown.slim index 0c33a2e..289e733 100644 --- a/app/views/packages/_user_dropdown.slim +++ b/app/views/packages/_user_dropdown.slim @@ -7,11 +7,5 @@ href=delete_screenshot_path(screenshot.id) onclick="return confirm('Really delete the screenshot?');" ] Delete screenshot - p Write a description for this screenshot: - = form_tag(update_screenshot_description_path(screenshot.package.name, screenshot.id)) - .input-group - = text_field_tag 'description', nil, class: 'input-group-field', maxlength: 40 - .input-group-button - =submit_tag 'OK', class: 'button success' p i =screenshot.status diff --git a/app/views/packages/details.slim b/app/views/packages/details.slim index f1db764..45ed3e8 100644 --- a/app/views/packages/details.slim +++ b/app/views/packages/details.slim @@ -27,7 +27,23 @@ = render(partial: 'admin_dropdown', locals: {screenshot: screenshot}) // or does the screenshot belong to the user (determined by session cookie) - elsif screenshot.uploaderhash == session[:token] - = render(partial: 'user_dropdown', locals: {screenshot: screenshot}) + / = render(partial: 'user_dropdown', locals: {screenshot: screenshot}) + / Ask the user to add a description if not yet done + - if screenshot.description.blank? + .imgcaption + p Please add a brief a description of this screenshot: + = form_tag(update_screenshot_description_path(screenshot.package.name, screenshot.id)) + .input-group + = text_field_tag 'description', nil, class: 'input-group-field', maxlength: 80 + .input-group-button + =submit_tag 'Save', class: 'button success' + / Offer to delete the screenshot + a.button.small.alert[ + href=delete_screenshot_path(screenshot.id) + onclick="return confirm('Really delete your screenshot again?');" + ] Delete your screenshot + + // or is the user not related to the screenshot and the screenshot is public? - elsif screenshot.approved = render(partial: 'report_dropdown', locals: {screenshot: screenshot})