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 @@ +
<%= notification.created_at.to_date %>
-<%= notification.body %>
+<%= notification.created_at.to_date %>
+ <%= simple_format text_with_links(notification.body), {}, sanitize: false %> + + + <%= render 'proposal_notifications/actions', notification: notification %> + +