diff --git a/client/coral-admin/src/routes/Moderation/components/Moderation.js b/client/coral-admin/src/routes/Moderation/components/Moderation.js index 7582d10d1..511d3f089 100644 --- a/client/coral-admin/src/routes/Moderation/components/Moderation.js +++ b/client/coral-admin/src/routes/Moderation/components/Moderation.js @@ -210,7 +210,7 @@ export default class Moderation extends Component { acceptComment={props.acceptComment} rejectComment={props.rejectComment} /> )} - + ); } diff --git a/client/coral-admin/src/routes/Moderation/components/ModerationHeader.js b/client/coral-admin/src/routes/Moderation/components/ModerationHeader.js index 9aa9788fb..0ab2eb762 100644 --- a/client/coral-admin/src/routes/Moderation/components/ModerationHeader.js +++ b/client/coral-admin/src/routes/Moderation/components/ModerationHeader.js @@ -14,8 +14,8 @@ const ModerationHeader = ({asset, searchVisible, openSearch, closeSearch}) => { : ; const title = asset - ? {asset.title} {searchTriggerIcon} - : {t('modqueue.all_streams')} {searchTriggerIcon}; + ? {asset.title} {searchTriggerIcon} + : {t('modqueue.all_streams')} {searchTriggerIcon}; return (
diff --git a/client/coral-admin/src/routes/Moderation/components/Story.js b/client/coral-admin/src/routes/Moderation/components/Story.js index ee9d462d3..59f6d6fa1 100644 --- a/client/coral-admin/src/routes/Moderation/components/Story.js +++ b/client/coral-admin/src/routes/Moderation/components/Story.js @@ -1,18 +1,20 @@ import React, {PropTypes} from 'react'; +import {Link} from 'react-router'; import styles from './StorySearch.css'; -const Story = ({author, title, createdAt, open}) => { +const Story = ({author, title, createdAt, open, id}) => { return ( -
  • +

    {title}

    By {author}{createdAt}{open ? 'Open' : 'Closed'}

    -
  • + ); }; Story.propTypes = { + id: PropTypes.string.isRequired, author: PropTypes.string.isRequired, title: PropTypes.string.isRequired, createdAt: PropTypes.string.isRequired, diff --git a/client/coral-admin/src/routes/Moderation/components/StorySearch.css b/client/coral-admin/src/routes/Moderation/components/StorySearch.css index e5b6e4a93..ccccd210b 100644 --- a/client/coral-admin/src/routes/Moderation/components/StorySearch.css +++ b/client/coral-admin/src/routes/Moderation/components/StorySearch.css @@ -38,32 +38,39 @@ .storyList { padding: 10px; - margin: 0; - list-style: none; border-top: 1px solid #ddd; } .story { padding: 10px; border-bottom: 1px solid #ddd; + cursor: pointer; + display: block; + text-decoration: none; + + &:hover { + background-color: #efefef; + } } .title, .meta { margin: 0; + color: black; } .author, .createdAt, .status { display: inline-block; font-size: .8em; - color: #aaa; } .author { display: inline-block; width: 200px; + color: #aaa; } .createdAt { display: inline-block; width: 200px; + color: #aaa; } diff --git a/client/coral-admin/src/routes/Moderation/components/StorySearch.js b/client/coral-admin/src/routes/Moderation/components/StorySearch.js index ce16e5b15..a841fd96d 100644 --- a/client/coral-admin/src/routes/Moderation/components/StorySearch.js +++ b/client/coral-admin/src/routes/Moderation/components/StorySearch.js @@ -10,6 +10,10 @@ const StorySearch = (props) => { data: {loading} } = props; + if (!props.visible) { + return null; + } + return (
    @@ -19,7 +23,7 @@ const StorySearch = (props) => {

    Moderate comments on All Stories

    -
      +
      { loading ? @@ -27,13 +31,14 @@ const StorySearch = (props) => { const storyOpen = story.closedAt === null || new Date(story.closedAt) > new Date(); return ; }) } -
    +
    diff --git a/client/coral-admin/src/routes/Moderation/components/styles.css b/client/coral-admin/src/routes/Moderation/components/styles.css index a6bf7e89e..b0c2cc5ac 100644 --- a/client/coral-admin/src/routes/Moderation/components/styles.css +++ b/client/coral-admin/src/routes/Moderation/components/styles.css @@ -471,5 +471,4 @@ span { .searchTrigger { position: relative; top: .3em; - background-color: blue; }