Merge branch 'master' into docs-plug

client/coral-admin/src/components/Forbidden.css

@@ -0,0 +1,8 @@
+.container {
+  max-width: 1280px;
+  margin: 0 auto;
+}
+
+.copy {
+  padding: 20px 0;
+}

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

@@ -0,0 +1,13 @@
+import React from 'react';
+import styles from './Forbidden.css';
+
+const Forbidden = () => (
+  <div className={styles.container}>
+    <p className={styles.copy}>
+      This page is for team use only. Please contact an administrator if you
+      want to join this team.
+    </p>
+  </div>
+);
+
+export default Forbidden;

client/coral-admin/src/components/Layout.css

@@ -1,4 +1,6 @@
 .layout {
   margin: 0 auto;
   background-color: #FAFAFA;
-}
+  height: inherit;
+  min-height: calc(100vh - 58px);
+}

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

@@ -11,6 +11,7 @@ import { logout } from 'coral-framework/actions/auth';
 import { can } from 'coral-framework/services/perms';
 import UserDetail from 'coral-admin/src/containers/UserDetail';
 import PropTypes from 'prop-types';
+import Forbidden from '../components/Forbidden';
 
 class LayoutContainer extends React.Component {
   render() {
@@ -47,10 +48,7 @@ class LayoutContainer extends React.Component {
       } else {
         return (
           <Layout {...this.props} handleLogout={logout}>
-            <p>
-              This page is for team use only. Please contact an administrator if
-              you want to join this team.
-            </p>
+            <Forbidden />
           </Layout>
         );
       }

client/coral-admin/src/routes/Moderation/components/ModerationQueue.css

@@ -6,10 +6,6 @@
   margin-top: 16px;
 }
 
-:global(html) {
-  height: inherit;
-}
-
 .list {
   outline: none;
 }

client/coral-embed-stream/src/tabs/stream/components/Stream.js

@@ -15,14 +15,13 @@ import QuestionBox from '../../../components/QuestionBox';
 import { Tab, TabCount, TabPane } from 'coral-ui';
 import cn from 'classnames';
 import get from 'lodash/get';
-
 import { reverseCommentParentTree } from '../../../graphql/utils';
 import AllCommentsPane from './AllCommentsPane';
 import ExtendableTabPanel from '../../../containers/ExtendableTabPanel';
+import ChangedUsername from './ChangedUsername';
+import CommentNotFound from '../containers/CommentNotFound';
 
 import styles from './Stream.css';
-import ChangedUsername from './ChangedUsername';
-
 class Stream extends React.Component {
   constructor(props) {
     super(props);
@@ -238,7 +237,11 @@ class Stream extends React.Component {
         keepCommentBox);
 
     if (highlightedComment === null) {
-      return <StreamError>{t('stream.comment_not_found')}</StreamError>;
+      return (
+        <StreamError>
+          <CommentNotFound />
+        </StreamError>
+      );
     }
 
     const slotPassthrough = { root, asset };

client/coral-embed-stream/src/tabs/stream/containers/CommentNotFound.js

@@ -0,0 +1,36 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Button } from 'coral-ui';
+import { setActiveTab } from '../../../actions/embed';
+import { bindActionCreators } from 'redux';
+import { connect } from 'react-redux';
+import t from 'coral-framework/services/i18n';
+
+class CommentNotFound extends React.Component {
+  showAllTab = () => {
+    this.props.setActiveTab('all');
+  };
+
+  render() {
+    return (
+      <div>
+        <p>{t('stream.comment_not_found')}</p>
+        <Button onClick={this.showAllTab}>Show all comments</Button>
+      </div>
+    );
+  }
+}
+
+CommentNotFound.propTypes = {
+  setActiveTab: PropTypes.func,
+};
+
+const mapDispatchToProps = dispatch =>
+  bindActionCreators(
+    {
+      setActiveTab,
+    },
+    dispatch
+  );
+
+export default connect(null, mapDispatchToProps)(CommentNotFound);

docs/source/api/server.md

@@ -377,7 +377,11 @@ en:
 
 Which overrides the copy for the `embedlink.copy` template. You can
 also provide other languages as well by using the correct language
-prefix.
+prefix. 
+
+When creating a plugin using this `translations` hook to override copy 
+from another plugin, be sure to list it after the plugin it's overriding
+in the `plugins.json` file. 
 
 ### websockets
 

views/admin.ejs

@@ -4,17 +4,8 @@
     <meta name="viewport" content="initial-scale=1, maximum-scale=1">
     <title>Talk - Coral Admin</title>
     <style media="screen">
-      body, #root {
-        width: 100%;
-        height: 100%;
-        margin: 0;
-        background-color: #FAFAFA;
-        font-family: 'Roboto', sans-serif;
-      }
-
-      #root > div {
-        height: 100%;
-      }
+      html, body, #root, #root > div { min-height: 100%; }
+      body { margin: 0; background-color: #FAFAFA; font-family: 'Roboto', sans-serif; }
     </style>
     <link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500" rel="stylesheet">
     <link rel="stylesheet" href="https://code.getmdl.io/1.2.1/material.min.css">