From 5f9240f201d2ff298cfb7fa44466df2cdb68d393 Mon Sep 17 00:00:00 2001 From: Riley Davis Date: Thu, 4 May 2017 16:32:07 -0600 Subject: [PATCH 1/4] open the comment in context when clicked --- .../src/containers/ModerationQueue/components/Comment.js | 5 +++-- .../src/containers/ModerationQueue/components/styles.css | 8 ++++++++ .../coral-admin/src/graphql/fragments/commentView.graphql | 1 + 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/client/coral-admin/src/containers/ModerationQueue/components/Comment.js b/client/coral-admin/src/containers/ModerationQueue/components/Comment.js index e5afd9726..ac16082d2 100644 --- a/client/coral-admin/src/containers/ModerationQueue/components/Comment.js +++ b/client/coral-admin/src/containers/ModerationQueue/components/Comment.js @@ -57,7 +57,7 @@ const Comment = ({actions = [], comment, ...props}) => { Moderate → )} -
+

{ })}

- + { flagActions && flagActions.length @@ -106,6 +106,7 @@ Comment.propTypes = { }), asset: PropTypes.shape({ title: PropTypes.string, + url: PropTypes.string, id: PropTypes.string }) }) diff --git a/client/coral-admin/src/containers/ModerationQueue/components/styles.css b/client/coral-admin/src/containers/ModerationQueue/components/styles.css index a22fbbc64..074bc34f1 100644 --- a/client/coral-admin/src/containers/ModerationQueue/components/styles.css +++ b/client/coral-admin/src/containers/ModerationQueue/components/styles.css @@ -231,6 +231,14 @@ span { font-size: 14px; line-height: 1.5; font-weight: 300; + cursor: pointer; + text-decoration: none; + background-color: white; + transition: background-color .3s; + + &:hover { + background-color: #eee; + } } .avatar { diff --git a/client/coral-admin/src/graphql/fragments/commentView.graphql b/client/coral-admin/src/graphql/fragments/commentView.graphql index 51b0a3f44..1f3b8b1d3 100644 --- a/client/coral-admin/src/graphql/fragments/commentView.graphql +++ b/client/coral-admin/src/graphql/fragments/commentView.graphql @@ -11,6 +11,7 @@ fragment commentView on Comment { asset { id title + url } action_summaries { count From 5db48e8c0f96ba2b73fde2c111e132ae47e1efa3 Mon Sep 17 00:00:00 2001 From: Riley Davis Date: Fri, 5 May 2017 11:35:18 -0600 Subject: [PATCH 2/4] make it a blue link instead of the whole thing --- .../ModerationQueue/components/Comment.js | 6 +++--- .../ModerationQueue/components/styles.css | 21 +++++++++++++++++++ 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/client/coral-admin/src/containers/ModerationQueue/components/Comment.js b/client/coral-admin/src/containers/ModerationQueue/components/Comment.js index ac16082d2..b3813bbc8 100644 --- a/client/coral-admin/src/containers/ModerationQueue/components/Comment.js +++ b/client/coral-admin/src/containers/ModerationQueue/components/Comment.js @@ -57,11 +57,11 @@ const Comment = ({actions = [], comment, ...props}) => { Moderate → )} - +

+ textToHighlight={comment.body} /> View context

{links ? Contains Link : null} @@ -79,7 +79,7 @@ const Comment = ({actions = [], comment, ...props}) => { })}
- + { flagActions && flagActions.length diff --git a/client/coral-admin/src/containers/ModerationQueue/components/styles.css b/client/coral-admin/src/containers/ModerationQueue/components/styles.css index 074bc34f1..6d09b2d36 100644 --- a/client/coral-admin/src/containers/ModerationQueue/components/styles.css +++ b/client/coral-admin/src/containers/ModerationQueue/components/styles.css @@ -431,3 +431,24 @@ span { position: relative; top: 7px; } + +.external { + font-size: .7em; + text-decoration: none; + color: #063b9a; + cursor: pointer; + font-weight: normal; + margin-left: 10px; + white-space: nowrap; + + &:hover { + text-decoration: underline; + opacity: .9; + } + + i { + font-size: 12px; + top: 2px; + position: relative; + } +} From 519ca7beb51fa6f66b3ab59b3db58e1ee76e354a Mon Sep 17 00:00:00 2001 From: Riley Davis Date: Fri, 5 May 2017 11:55:28 -0600 Subject: [PATCH 3/4] =?UTF-8?q?en=20espa=C3=B1ol?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/containers/ModerationQueue/components/Comment.js | 2 +- client/coral-admin/src/translations.json | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/client/coral-admin/src/containers/ModerationQueue/components/Comment.js b/client/coral-admin/src/containers/ModerationQueue/components/Comment.js index b3813bbc8..afe0c967f 100644 --- a/client/coral-admin/src/containers/ModerationQueue/components/Comment.js +++ b/client/coral-admin/src/containers/ModerationQueue/components/Comment.js @@ -61,7 +61,7 @@ const Comment = ({actions = [], comment, ...props}) => {

View context + textToHighlight={comment.body} /> {lang.t('comment.view_context')}

{links ? Contains Link : null} diff --git a/client/coral-admin/src/translations.json b/client/coral-admin/src/translations.json index 3f9392656..68a3b93d5 100644 --- a/client/coral-admin/src/translations.json +++ b/client/coral-admin/src/translations.json @@ -72,6 +72,7 @@ "flagged": "flagged", "anon": "Anonymous", "ban_user": "Ban User", + "view_context": "View context", "banned_user": "Banned User" }, "user": { @@ -259,6 +260,7 @@ "comment": { "flagged": "marcado", "anon": "Anónimo", + "view_context": "Ver contexto", "ban_user": "Suspender Usuario", "banned_user": "Usuario Suspendido" }, From 4ff42385e330db5a242b11c69336a1c24162ad13 Mon Sep 17 00:00:00 2001 From: Riley Davis Date: Fri, 5 May 2017 14:41:19 -0600 Subject: [PATCH 4/4] remove dead code --- .../src/containers/ModerationQueue/components/styles.css | 8 -------- 1 file changed, 8 deletions(-) diff --git a/client/coral-admin/src/containers/ModerationQueue/components/styles.css b/client/coral-admin/src/containers/ModerationQueue/components/styles.css index 6d09b2d36..966a37526 100644 --- a/client/coral-admin/src/containers/ModerationQueue/components/styles.css +++ b/client/coral-admin/src/containers/ModerationQueue/components/styles.css @@ -231,14 +231,6 @@ span { font-size: 14px; line-height: 1.5; font-weight: 300; - cursor: pointer; - text-decoration: none; - background-color: white; - transition: background-color .3s; - - &:hover { - background-color: #eee; - } } .avatar {