diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js index 1c97069b0..a9e44d249 100644 --- a/app/assets/javascripts/application.js +++ b/app/assets/javascripts/application.js @@ -33,6 +33,7 @@ //= require moderator_comment //= require moderator_debates //= require moderator_proposals +//= require moderator_proposal_notifications //= require prevent_double_submission //= require gettext //= require annotator diff --git a/app/assets/javascripts/moderator_proposal_notifications.js.coffee b/app/assets/javascripts/moderator_proposal_notifications.js.coffee new file mode 100644 index 000000000..b2e8fbf44 --- /dev/null +++ b/app/assets/javascripts/moderator_proposal_notifications.js.coffee @@ -0,0 +1,7 @@ +App.ModeratorProposalNotifications = + + add_class_faded: (id) -> + $("##{id}").addClass("faded") + + hide_moderator_actions: (id) -> + $("##{id} .js-moderator-proposal-notifications-actions:first").hide() diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss index 94ef4a7a9..3914f0fa7 100644 --- a/app/assets/stylesheets/layout.scss +++ b/app/assets/stylesheets/layout.scss @@ -1963,7 +1963,8 @@ table { } } -.comment-body { +.comment-body, +.notification-body { img { margin-right: $line-height / 2; diff --git a/app/views/proposal_notifications/_actions.html.erb b/app/views/proposal_notifications/_actions.html.erb new file mode 100644 index 000000000..bcac9cb4f --- /dev/null +++ b/app/views/proposal_notifications/_actions.html.erb @@ -0,0 +1,14 @@ +
+ + <% if can? :hide, notification %> + <%= link_to t("admin.actions.hide").capitalize, hide_moderation_proposal_notification_path(notification), + method: :put, remote: true, data: { confirm: t('admin.actions.confirm') } %> + <% end %> + + <% if can? :hide, notification.author %> +  •  + <%= link_to t("admin.actions.hide_author").capitalize, hide_moderation_user_path(notification.author_id), + method: :put, data: { confirm: t('admin.actions.confirm') } %> + <% end %> + +
diff --git a/app/views/proposals/_notifications.html.erb b/app/views/proposals/_notifications.html.erb index 6a693c601..fe96ba741 100644 --- a/app/views/proposals/_notifications.html.erb +++ b/app/views/proposals/_notifications.html.erb @@ -1,6 +1,6 @@