From 4b181ead282eea13a7c3339be378f6c9314c2d7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mar=C3=ADa=20Checa?= Date: Mon, 18 Dec 2017 21:29:38 +0100 Subject: [PATCH] Added related content report views --- app/assets/stylesheets/layout.scss | 4 ++-- app/views/relationable/_flag_actions.html.erb | 19 +++++++++++++++++++ .../relationable/_refresh_flag_actions.js.erb | 1 + app/views/relationable/_related_list.html.erb | 6 +++--- 4 files changed, 25 insertions(+), 5 deletions(-) create mode 100644 app/views/relationable/_flag_actions.html.erb create mode 100644 app/views/relationable/_refresh_flag_actions.js.erb diff --git a/app/assets/stylesheets/layout.scss b/app/assets/stylesheets/layout.scss index b49c5d17d..62e09e088 100644 --- a/app/assets/stylesheets/layout.scss +++ b/app/assets/stylesheets/layout.scss @@ -2436,7 +2436,7 @@ table { font-weight: normal; } - span { + span:not(.icon-flag) { color: #4f4f4f; font-size: rem-calc(12); text-transform: uppercase; @@ -2452,4 +2452,4 @@ table { .images .button { margin-top: $line-height / 2; -} \ No newline at end of file +} diff --git a/app/views/relationable/_flag_actions.html.erb b/app/views/relationable/_flag_actions.html.erb new file mode 100644 index 000000000..d501b098d --- /dev/null +++ b/app/views/relationable/_flag_actions.html.erb @@ -0,0 +1,19 @@ + + <% if show_flag_action? related %> + + + + + <%= link_to t('shared.flag'), flag_related_content_path(related), method: :put, remote: true, id: "flag-related-#{ related.id }" %> + + <% end %> + + <% if show_unflag_action? related %> + + + + + <%= link_to t('shared.unflag'), unflag_related_content_path(related), method: :put, remote: true, id: "unflag-related-#{ related.id }" %> + + <% end %> + diff --git a/app/views/relationable/_refresh_flag_actions.js.erb b/app/views/relationable/_refresh_flag_actions.js.erb new file mode 100644 index 000000000..d3755c4b1 --- /dev/null +++ b/app/views/relationable/_refresh_flag_actions.js.erb @@ -0,0 +1 @@ +$("#<%= dom_id(@related) %>.js-flag-actions").html('<%= j render("relationable/flag_actions", related: @related) %>'); diff --git a/app/views/relationable/_related_list.html.erb b/app/views/relationable/_related_list.html.erb index 08fc931df..f1d86b748 100644 --- a/app/views/relationable/_related_list.html.erb +++ b/app/views/relationable/_related_list.html.erb @@ -1,9 +1,9 @@