diff --git a/client/coral-admin/src/routes/Moderation/components/Comment.js b/client/coral-admin/src/routes/Moderation/components/Comment.js index 71642e3c2..2ca18d928 100644 --- a/client/coral-admin/src/routes/Moderation/components/Comment.js +++ b/client/coral-admin/src/routes/Moderation/components/Comment.js @@ -15,6 +15,7 @@ import CommentBodyHighlighter from 'coral-admin/src/components/CommentBodyHighli import IfHasLink from 'coral-admin/src/components/IfHasLink'; import cn from 'classnames'; import {getCommentType} from 'coral-admin/src/utils/comment'; +import ReplyBadge from './ReplyBadge'; import t, {timeago} from 'coral-framework/services/i18n'; @@ -69,7 +70,7 @@ class Comment extends React.Component { let selectionStateCSS = selected ? 'mdl-shadow--16dp' : 'mdl-shadow--2dp'; const queryData = {root, comment, asset: comment.asset}; - console.log(comment); + return (
  • }
    + hasParent ? + + {t('modqueue.reply')} + + : null; + +export default ReplyBadge; diff --git a/client/coral-admin/src/routes/Moderation/containers/Comment.js b/client/coral-admin/src/routes/Moderation/containers/Comment.js index 11b648a0b..cc127ef4b 100644 --- a/client/coral-admin/src/routes/Moderation/containers/Comment.js +++ b/client/coral-admin/src/routes/Moderation/containers/Comment.js @@ -37,6 +37,7 @@ export default withFragments({ count ... on FlagActionSummary { reason + __typename } } actions { @@ -48,7 +49,9 @@ export default withFragments({ id username } + __typename } + __typename } editing { edited diff --git a/client/coral-ui/components/Badge.css b/client/coral-ui/components/Badge.css new file mode 100644 index 000000000..fd725cf14 --- /dev/null +++ b/client/coral-ui/components/Badge.css @@ -0,0 +1,19 @@ +.badge { + display: inline-block; + color: white; + background-color: #3D73D5; + box-sizing: border-box; + padding: 0px 5px; + font-size: 12px; + height: 24px; + letter-spacing: 0.4px; + margin-bottom: 1px; + margin-right: 2px; +} + +.icon { + font-size: 14px; + vertical-align: text-top; + margin: 0; + margin-right: 4px; +} \ No newline at end of file diff --git a/client/coral-ui/components/Badge.js b/client/coral-ui/components/Badge.js new file mode 100644 index 000000000..c1ba8100b --- /dev/null +++ b/client/coral-ui/components/Badge.js @@ -0,0 +1,13 @@ +import React from 'react'; +import styles from './Badge.css'; +import Icon from './Icon'; +import cn from 'classnames'; + +const Badge = ({className, children, icon, props}) => ( + + {icon && } + {children} + +); + +export default Badge; diff --git a/client/coral-ui/index.js b/client/coral-ui/index.js index 8a538d120..8f261bcca 100644 --- a/client/coral-ui/index.js +++ b/client/coral-ui/index.js @@ -26,3 +26,4 @@ export {default as Option} from './components/Option'; export {default as SnackBar} from './components/SnackBar'; export {default as TextArea} from './components/TextArea'; export {default as Drawer} from './components/Drawer'; +export {default as Badge} from './components/Badge'; diff --git a/locales/en.yml b/locales/en.yml index 54d5315d5..2ec0c816c 100644 --- a/locales/en.yml +++ b/locales/en.yml @@ -281,6 +281,7 @@ en: prev_comment: "Go to the previous comment" reject: "Reject" rejected: "Rejected" + reply: "Reply" select_stream: "Select Stream" shift_key: "⇧" shortcuts: "Shortcuts" diff --git a/locales/es.yml b/locales/es.yml index 8c3e7927b..877a42841 100644 --- a/locales/es.yml +++ b/locales/es.yml @@ -272,6 +272,7 @@ es: prev_comment: "Ir al comentario anterior" reject: "Rechazar" rejected: "rechazado" + reply: "Respuesta" select_stream: "Seleccionar hilo de comentarios" shift_key: ⇧ shortcuts: Atajos