diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 3d7d936..cc36654 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -57,7 +57,8 @@ class ApplicationController < ActionController::Base # Define where the user is redirected to after a successful login. def after_sign_in_path_for(resource) - my_welcome_path + my_profile_path + #my_welcome_path end # Overwriting the sign_out redirect path method diff --git a/app/views/packages/_admin_dropdown.slim b/app/views/packages/_admin_dropdown.slim index 6a966e5..9a287d9 100644 --- a/app/views/packages/_admin_dropdown.slim +++ b/app/views/packages/_admin_dropdown.slim @@ -1,22 +1,32 @@ // Button that reveals a dropdown/modal for moderation/reporting -button-group - - if user_signed_in? - a.button.small.alert[ - href=delete_screenshot_path(screenshot.id) - onclick="return confirm('Really delete the screenshot?');" - ] Delete screenshot +.button-group.small.align-center + a.button.secondary.hollow =screenshot.adminstatus + + a.button.small.bordered.radius.alert[ + href=delete_screenshot_path(screenshot.id) + onclick="return confirm('Really delete the screenshot?');" + ] #{fa_icon 'trash'} Delete + + / a.button.small.bordered.radius.secondary[ + / href='#' + / ] #{fa_icon 'edit'} Edit caption + + / a.button.small.bordered.radius.secondary[ + / href='#' + / ] #{fa_icon 'star'} Make primary - if not screenshot.approved a.button.small.success[ href=approve_screenshot_path(screenshot.id) method='post' - ] Approve screenshot + ] Approve + - elsif screenshot.markedfordelete a.button.small.success[ href=approve_screenshot_path(screenshot.id) method='post' - ] Keep screenshot + ] Keep / Display additional information to admins