From 0fbc247aff44dd87633a2ec393cb5c7597fcdb4f Mon Sep 17 00:00:00 2001 From: Christoph Haas Date: Fri, 11 Aug 2017 21:06:33 +0200 Subject: [PATCH] Reporting of spam screenshots disabled Will be re-enabled later with a proper seperate page. --- app/views/packages/_admin_dropdown.slim | 53 ++++++++++++++++--------- app/views/packages/details.slim | 5 ++- config/routes.rb | 2 +- 3 files changed, 38 insertions(+), 22 deletions(-) diff --git a/app/views/packages/_admin_dropdown.slim b/app/views/packages/_admin_dropdown.slim index a55b381..cc98e5b 100644 --- a/app/views/packages/_admin_dropdown.slim +++ b/app/views/packages/_admin_dropdown.slim @@ -1,20 +1,35 @@ -// Button that reveals a dropdown/modal for admins -.text-right - button.small.dropdown.warning.button type="button" data-toggle="admin-info-#{screenshot.id}" - 'Admin -.dropdown-pane data-dropdown=true id="admin-info-#{screenshot.id}" - - if not screenshot.approved or screenshot.markedfordelete - a.button.small.success[ - href=approve_screenshot_path(screenshot.id) - method='post' - ] Keep/approve screenshot - a.button.small.alert[ - href=delete_screenshot_path(screenshot.id) - onclick="return confirm('Really delete the screenshot?');" - ] Delete screenshot +// Button that reveals a dropdown/modal for moderation/reporting +.button-bar + ul.button-group + - if not screenshot.approved + li + a.button.small.success[ + href=approve_screenshot_path(screenshot.id) + method='post' + ] Approve screenshot + - elsif screenshot.markedfordelete + li + a.button.small.success[ + href=approve_screenshot_path(screenshot.id) + method='post' + ] Keep screenshot - p Status: #{screenshot.adminstatus} - / p Uploader IP=#{screenshot.uploaderip} - / p Uploader Token=#{session[:token]} - / p Uploaded #{screenshot.age_days} (#{screenshot.created_at}) - p Uploaded #{screenshot.age_days} + - if user_signed_in? + li + a.button.small.alert[ + href=delete_screenshot_path(screenshot.id) + onclick="return confirm('Really delete the screenshot?');" + ] Delete screenshot + + / Display additional information to admins + p Status: #{screenshot.adminstatus} + p Uploader IP=#{screenshot.uploaderip} + p Uploader Token=#{session[:token]} + p Uploaded #{screenshot.age_days} (#{screenshot.created_at}) + + / TODO: Move reporting screenshots to an extra page with a form and captcha + / - else + / / Allow anonymous users to report inappropriate screenshots + / = form_tag(report_screenshot_path(screenshot.id)) + / = text_area_tag 'delete_reason', nil, class: 'input-group-field', maxlength: 100, rows: 3, cols: 50 + / = submit_tag 'Request removal', class: 'button alert' diff --git a/app/views/packages/details.slim b/app/views/packages/details.slim index 6166aec..0b1a19c 100644 --- a/app/views/packages/details.slim +++ b/app/views/packages/details.slim @@ -44,8 +44,9 @@ ] 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}) + // TODO: Move to a seperate page with a form + //- elsif screenshot.approved + // = render(partial: 'report_dropdown', locals: {screenshot: screenshot}) - else .row.listview diff --git a/config/routes.rb b/config/routes.rb index 40fd28b..34ae0ef 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -28,7 +28,7 @@ Rails.application.routes.draw do # TODO: "get" is probably the wrong method to delete a screenshot get 'delete_screenshot/:id' => 'packages#delete_screenshot', as: :delete_screenshot post 'update_screenshot_description/:name/:id' => 'packages#update_screenshot_description', as: :update_screenshot_description - post 'report_screenshot/:id' => 'packages#report_screenshot', as: :report_screenshot + #post 'report_screenshot/:id' => 'packages#report_screenshot', as: :report_screenshot # TODO: "get" is probably the wrong method to delete a screenshot get 'approve_screenshot/:id' => 'packages#approve_screenshot', as: :approve_screenshot get 'about' => 'welcome#about'