From 88a8aaa0836639a8be329d977e632bc5234eea2a Mon Sep 17 00:00:00 2001
From: iagirre <itziar.agirre@m2c.es>
Date: Fri, 18 May 2018 11:41:29 +0200
Subject: [PATCH] Add hide button in the user interface

The little menu with the hide notification link and block user link
has been added to each proposal notification.

JS for adding the fade efect has also been added.
---
 app/assets/javascripts/application.js              |  1 +
 .../moderator_proposal_notifications.js.coffee     |  7 +++++++
 app/assets/stylesheets/layout.scss                 |  3 ++-
 app/views/proposal_notifications/_actions.html.erb | 14 ++++++++++++++
 app/views/proposals/_notifications.html.erb        | 14 ++++++++++----
 config/locales/en/activerecord.yml                 |  3 +++
 config/locales/es/activerecord.yml                 |  3 +++
 7 files changed, 40 insertions(+), 5 deletions(-)
 create mode 100644 app/assets/javascripts/moderator_proposal_notifications.js.coffee
 create mode 100644 app/views/proposal_notifications/_actions.html.erb

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 @@
+<div class="reply">
+  <span class='js-moderation-actions'>
+    <% 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 %>
+      <span class="divider">&nbsp;&bull;&nbsp;</span>
+      <%= link_to t("admin.actions.hide_author").capitalize, hide_moderation_user_path(notification.author_id),
+                  method: :put, data: { confirm: t('admin.actions.confirm') } %>
+    <% end %>
+  </span>
+</div>
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 @@
 <div class="tabs-panel" id="tab-notifications" role="tab">
   <div class="row">
-    <div class="small-12 column">
+    <div id="proposal_notifications" class="small-12 column notification-body">
       <% if @notifications.blank? %>
         <div class="callout primary text-center">
           <%= t('proposals.show.no_notifications') %>
@@ -8,9 +8,15 @@
       <% end %>
 
       <% @notifications.each do |notification| %>
-        <h3><%= notification.title %></h3>
-        <p class="more-info"><%= notification.created_at.to_date %></p>
-        <p><%= notification.body %></p>
+        <div id="<%= dom_id(notification) %>">
+          <h3><%= notification.title %></h3>
+          <p class="more-info"><%= notification.created_at.to_date %></p>
+          <%= simple_format text_with_links(notification.body), {}, sanitize: false %>
+
+          <span class="js-flag-actions">
+            <%= render 'proposal_notifications/actions', notification: notification %>
+          </span>
+        </div>
       <% end %>
     </div>
   </div>
diff --git a/config/locales/en/activerecord.yml b/config/locales/en/activerecord.yml
index 7ea038a92..8e44f6ea9 100644
--- a/config/locales/en/activerecord.yml
+++ b/config/locales/en/activerecord.yml
@@ -103,6 +103,9 @@ en:
       poll:
         one: "Poll"
         other: "Polls"
+      proposal_notification:
+        one: "Proposal notification"
+        other: "Proposal notifications"
     attributes:
       budget:
         name: "Name"
diff --git a/config/locales/es/activerecord.yml b/config/locales/es/activerecord.yml
index 3b137d67b..2da027031 100644
--- a/config/locales/es/activerecord.yml
+++ b/config/locales/es/activerecord.yml
@@ -103,6 +103,9 @@ es:
       poll:
         one: "Votación"
         other: "Votaciones"
+      proposal_notification:
+        one: "Notificación de propuesta"
+        other: "Notificaciones de propuestas"
     attributes:
       budget:
         name: "Nombre"