Merge branch 'master' into add-flag-option

client/coral-admin/src/components/Comment.js

@@ -30,7 +30,7 @@ export default props => {
         <div>
           {links ?
           <span className={styles.hasLinks}><Icon name='error_outline'/> Contains Link</span> : null}
-          <div className={styles.actions}>
+          <div className={`actions ${styles.actions}`}>
             {props.actions.map((action, i) => getActionButton(action, i, props))}
           </div>
         </div>
@@ -63,19 +63,21 @@ const getActionButton = (action, i, props) => {
   if (action === 'ban') {
     return (
       <Button
-        disabled={banned ? 'disabled' : ''}
+        className='ban'
         cStyle='black'
+        disabled={banned ? 'disabled' : ''}
         onClick={() => props.onClickShowBanDialog(author.id, author.displayName, comment.id)}
-        key={i} >
+        key={i}
+      >
         {lang.t('comment.ban_user')}
       </Button>
     );
   }
   return (
     <FabButton
-      className={styles.actionButton}
-      icon={props.actionsMap[action].icon}
+      className={`${action} ${styles.actionButton}`}
       cStyle={action}
+      icon={props.actionsMap[action].icon}
       key={i}
       onClick={() => props.onClickAction(props.actionsMap[action].status, comment.id)}
     />

client/coral-admin/src/components/CommentList.js

@@ -126,7 +126,10 @@ export default class CommentList extends React.Component {
     const {active} = this.state;
 
     return (
-      <ul className={`${styles.list} ${singleView ? styles.singleView : ''}`} {...key}>
+      <ul
+        className={`${styles.list} ${singleView ? styles.singleView : ''}`} {...key}
+        id='commentList'
+      >
         {commentIds.map((commentId, index) => {
           const comment = comments[commentId];
           const author = users[comment.author_id];

client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js

@@ -1,6 +1,5 @@
 import React from 'react';
 import {connect} from 'react-redux';
-import {Icon} from 'react-mdl';
 import key from 'keymaster';
 
 import ModerationKeysModal from 'components/ModerationKeysModal';
@@ -48,7 +47,6 @@ class ModerationQueue extends React.Component {
   // Hack for dynamic mdl tabs
   componentDidMount () {
     if (typeof componentHandler !== 'undefined') {
-
       // FIXME: fix this hack
       componentHandler.upgradeAllRegistered(); // eslint-disable-line no-undef
     }
@@ -56,7 +54,6 @@ class ModerationQueue extends React.Component {
 
   // Dispatch the update status action
   onCommentAction (action, id) {
-
     // If not banning then change the status to approved or flagged as action = status
     this.props.dispatch(updateStatus(action, id));
   }
@@ -73,10 +70,6 @@ class ModerationQueue extends React.Component {
     this.props.dispatch(banUser('banned', userId, commentId));
   }
 
-  showShortcuts = () => {
-    this.setState({modalOpen: true});
-  }
-
   onTabClick (activeTab) {
     this.setState({activeTab});
   }
@@ -100,11 +93,6 @@ class ModerationQueue extends React.Component {
               className={`mdl-tabs__tab ${styles.tab}`}>{lang.t('modqueue.rejected')}</a>
             <a href='#flagged' onClick={() => this.onTabClick('flagged')}
               className={`mdl-tabs__tab ${styles.tab}`}>{lang.t('modqueue.flagged')}</a>
-            <a href='#shortcuts' onClick={this.showShortcuts}
-              className={`mdl-tabs__tab ${styles.tab} ${styles.showShortcuts}`}>
-              <Icon name='keyboard' />
-              <span>{lang.t('modqueue.showshortcuts')}</span>
-            </a>
           </div>
           <div className={`mdl-tabs__panel is-active ${styles.listContainer}`} id='pending'>
             <CommentList
@@ -122,7 +110,7 @@ class ModerationQueue extends React.Component {
               handleClose={() => this.hideBanUserDialog()}
               onClickBanUser={(userId, commentId) => this.banUser(userId, commentId)}
               user={comments.banUser}/>
-          </div>
+        </div>
           <div className={`mdl-tabs__panel ${styles.listContainer}`} id='rejected'>
             <CommentList
               isActive={activeTab === 'rejected'}
@@ -136,7 +124,7 @@ class ModerationQueue extends React.Component {
           </div>
           <div className={`mdl-tabs__panel ${styles.listContainer}`} id='flagged'>
             <CommentList
-              isActive={activeTab === 'flagged'}
+              isActive={activeTab === 'rejected'}
               singleView={singleView}
               commentIds={flaggedIds}
               comments={comments.byId}
@@ -145,14 +133,11 @@ class ModerationQueue extends React.Component {
               actions={['reject', 'approve']}
               loading={comments.loading} />
           </div>
-          <div className={`mdl-tabs__panel ${styles.listContainer}`} id='shortcuts'>
-            <ModerationKeysModal open={modalOpen}
-              onClose={() => this.setState({modalOpen: false})} />
-          </div>
+          <ModerationKeysModal open={modalOpen}
+            onClose={() => this.setState({modalOpen: false})} />
         </div>
       </div>
     );
-
   }
 }
 

client/coral-plugin-likes/LikeButton.js

@@ -2,7 +2,7 @@ import React from 'react';
 import {I18n} from '../coral-framework';
 import translations from './translations.json';
 
-const name = 'coral-plugin-flags';
+const name = 'coral-plugin-likes';
 
 const LikeButton = ({like, id, postAction, deleteAction, addItem, showSignInDialog, updateItem, currentUser, banned}) => {
   const liked = like && like.current_user;

client/coral-sign-in/components/SignDialog.js

@@ -9,10 +9,11 @@ import ForgotContent from './ForgotContent';
 const SignDialog = ({open, view, handleClose, offset, ...props}) => (
   <Dialog
     className={styles.dialog}
+    id="signInDialog"
     open={open}
     style={{
       position: 'relative',
-      top: offset !== 0 && offset 
+      top: offset !== 0 && offset
     }}>
     <span className={styles.close} onClick={handleClose}>×</span>
     {view === 'SIGNIN' && <SignInContent {...props} />}

client/coral-sign-in/components/UserBox.js

@@ -9,7 +9,9 @@ const UserBox = ({className, user, logout, ...props}) => (
     className={`${styles.userBox} ${className ? className : ''}`}
     {...props}
   >
-    {lang.t('signIn.loggedInAs')} <a>{user.displayName}</a>. {lang.t('signIn.notYou')} <a onClick={logout}>{lang.t('signIn.logout')}</a>
+    {lang.t('signIn.loggedInAs')}
+    <a>{user.displayName}</a>. {lang.t('signIn.notYou')}
+    <a onClick={logout} id='logout'>{lang.t('signIn.logout')}</a>
   </div>
 );
 

client/coral-sign-in/components/styles.css

@@ -113,6 +113,7 @@ input.error{
     font-weight: bold;
     cursor: pointer;
     margin: 0px;
+    margin-left: 4px;
     padding-bottom: 2px;
     border-bottom: solid 1px black;
 }