-
-
- {this.state.copied && 'Copied!'}
-
+
+ {t('configure.copy_and_paste')}
+
);
}
}
diff --git a/client/coral-admin/src/routes/Configure/components/ModerationSettings.js b/client/coral-admin/src/routes/Configure/components/ModerationSettings.js
index 41b0e1528..21757100d 100644
--- a/client/coral-admin/src/routes/Configure/components/ModerationSettings.js
+++ b/client/coral-admin/src/routes/Configure/components/ModerationSettings.js
@@ -1,12 +1,10 @@
import React from 'react';
import PropTypes from 'prop-types';
-import styles from './ModerationSettings.css';
-import {Card} from 'coral-ui';
-import {Checkbox} from 'react-mdl';
import Wordlist from './Wordlist';
import Slot from 'coral-framework/components/Slot';
import t from 'coral-framework/services/i18n';
-import cn from 'classnames';
+import ConfigurePage from './ConfigurePage';
+import ConfigureCard from './ConfigureCard';
class ModerationSettings extends React.Component {
@@ -43,52 +41,31 @@ class ModerationSettings extends React.Component {
render() {
const {settings, data, root} = this.props;
- // just putting this here for shorthand below
- const on = styles.enabledSetting;
- const off = styles.disabledSetting;
-
return (
-
-
{t('configure.moderation_settings')}
-
-
-
-
-
-
{t('configure.require_email_verification')}
-
- {t('configure.require_email_verification_text')}
-
-
-
-
-
-
-
-
-
{t('configure.enable_pre_moderation')}
-
- {t('configure.enable_pre_moderation_text')}
-
-
-
-
-
-
-
-
-
{t('configure.enable_premod_links')}
-
- {t('configure.enable_premod_links_text')}
-
-
-
+
+
+ {t('configure.require_email_verification_text')}
+
+
+ {t('configure.enable_pre_moderation_text')}
+
+
+ {t('configure.enable_premod_links_text')}
+
-
+
);
}
}
diff --git a/client/coral-admin/src/routes/Configure/components/StreamSettings.css b/client/coral-admin/src/routes/Configure/components/StreamSettings.css
index c7cd71bbb..5ddd46bd2 100644
--- a/client/coral-admin/src/routes/Configure/components/StreamSettings.css
+++ b/client/coral-admin/src/routes/Configure/components/StreamSettings.css
@@ -1,56 +1,3 @@
-.title {
- color: black;
- font-size: 1.26em;
- font-weight: 500;
-}
-
-.card {
- margin-bottom: 20px;
- align-items: flex-start;
- min-height: 100px;
- max-width: 600px;
-}
-
-.header {
- margin-top: 3px;
- margin-bottom: 7px;
- font-size: 18px;
- font-weight: 500;
-}
-
-.wrapper {
- width: 100%;
-}
-
-.action {
- display: inline-block;
- position: absolute;
- top: 0;
- left: 0;
- padding: 20px;
-}
-
-.content {
- display: inline-block;
- padding: 0px 30px;
- box-sizing: border-box;
- width: 100%;
-}
-
-.enabledSetting {
- border-left-color: #00796b;
- border-left-style: solid;
- border-left-width: 7px;
-}
-
-.disabledSetting {
- padding-left: 22px;
-}
-
-.disabledSettingText {
- color: #ccc;
-}
-
.configSettingInfoBox {
min-height: 100px;
margin-bottom: 20px;
@@ -78,8 +25,6 @@
}
}
-
-
.hidden {
display: none;
}
diff --git a/client/coral-admin/src/routes/Configure/components/StreamSettings.js b/client/coral-admin/src/routes/Configure/components/StreamSettings.js
index b43f5d940..bce2918bb 100644
--- a/client/coral-admin/src/routes/Configure/components/StreamSettings.js
+++ b/client/coral-admin/src/routes/Configure/components/StreamSettings.js
@@ -2,12 +2,14 @@ import React from 'react';
import {SelectField, Option} from 'react-mdl-selectfield';
import t from 'coral-framework/services/i18n';
import styles from './StreamSettings.css';
-import {Checkbox, Textfield} from 'react-mdl';
-import {Card, Icon, TextArea} from 'coral-ui';
+import {Textfield} from 'react-mdl';
+import {Icon, TextArea} from 'coral-ui';
import PropTypes from 'prop-types';
import Slot from 'coral-framework/components/Slot';
import MarkdownEditor from 'coral-framework/components/MarkdownEditor';
import cn from 'classnames';
+import ConfigurePage from './ConfigurePage';
+import ConfigureCard from './ConfigureCard';
const TIMESTAMPS = {
weeks: 60 * 60 * 24 * 7,
@@ -100,130 +102,109 @@ class StreamSettings extends React.Component {
render() {
const {settings, data, root, errors} = this.props;
- // just putting this here for shorthand below
- const on = styles.enabledSetting;
- const off = styles.disabledSetting;
-
return (
-
-
{t('configure.stream_settings')}
-
-
-
-
-
-
{t('configure.comment_count_header')}
-
- {t('configure.comment_count_text_pre')}
-
- {t('configure.comment_count_text_post')}
- {
- errors.charCount &&
-
-
-
- {t('configure.comment_count_error')}
-
- }
-
-
-
-
-
-
-
-
-
- {t('configure.include_comment_stream')}
-
-
- {t('configure.include_comment_stream_desc')}
-
-
-
-
-
-
-
-
-
{t('configure.closed_stream_settings')}
-
{t('configure.closed_comments_desc')}
-
-
-
-
-
- {/* Edit Comment Timeframe */}
-
- {t('configure.edit_comment_timeframe_heading')}
+
+
+ {t('configure.comment_count_text_pre')}
+
+ {t('configure.comment_count_text_post')}
+ {
+ errors.charCount &&
+
+
+
+ {t('configure.comment_count_error')}
+
+ }
+
+
- {t('configure.edit_comment_timeframe_text_pre')}
-
-
-
- {t('configure.edit_comment_timeframe_text_post')}
+ {t('configure.include_comment_stream_desc')}
-
-
-
-
+
+
-
-
{t('configure.close_after')}
-
-
-
-
-
-
-
-
-
+
+
+ {t('configure.closed_comments_desc')}
+
+
-
+
+
+ {t('configure.edit_comment_timeframe_text_pre')}
+
+
+
+ {t('configure.edit_comment_timeframe_text_post')}
+
+
+
+
+
+
+
+
+
+
+
{/* the above card should be the last one if at all possible because of z-index issues with the selects */}
-
+
);
}
}
diff --git a/client/coral-admin/src/routes/Configure/components/TechSettings.css b/client/coral-admin/src/routes/Configure/components/TechSettings.css
index 6511359a0..e3d6a071c 100644
--- a/client/coral-admin/src/routes/Configure/components/TechSettings.css
+++ b/client/coral-admin/src/routes/Configure/components/TechSettings.css
@@ -1,27 +1,3 @@
-.title {
- color: black;
- font-size: 1.26em;
- font-weight: 500;
-}
-
-.card {
- margin-bottom: 20px;
- align-items: flex-start;
- min-height: 100px;
- max-width: 600px;
-}
-
-.header {
- margin-top: 3px;
- margin-bottom: 7px;
- font-size: 18px;
- font-weight: 500;
-}
-
-.wrapper {
- width: 100%;
-}
-
.customCSSInput {
width: 100%;
font-size: 14px;
diff --git a/client/coral-admin/src/routes/Configure/components/TechSettings.js b/client/coral-admin/src/routes/Configure/components/TechSettings.js
index e841db898..36c1ecc12 100644
--- a/client/coral-admin/src/routes/Configure/components/TechSettings.js
+++ b/client/coral-admin/src/routes/Configure/components/TechSettings.js
@@ -1,11 +1,12 @@
import React from 'react';
import PropTypes from 'prop-types';
-import {Card} from 'coral-ui';
import Domainlist from './Domainlist';
import EmbedLink from './EmbedLink';
import styles from './TechSettings.css';
import Slot from 'coral-framework/components/Slot';
import t from 'coral-framework/services/i18n';
+import ConfigurePage from './ConfigurePage';
+import ConfigureCard from './ConfigureCard';
class TechSettings extends React.Component {
@@ -32,28 +33,26 @@ class TechSettings extends React.Component {
render() {
const {settings, data, root} = this.props;
return (
-
-
{t('configure.tech_settings')}
+
-
-
-
{t('configure.custom_css_url')}
-
{t('configure.custom_css_url_desc')}
-
-
-
+
+ {t('configure.custom_css_url_desc')}
+
+
-
+
);
}
}
diff --git a/client/coral-admin/src/routes/Configure/components/Wordlist.css b/client/coral-admin/src/routes/Configure/components/Wordlist.css
deleted file mode 100644
index a1667e5ce..000000000
--- a/client/coral-admin/src/routes/Configure/components/Wordlist.css
+++ /dev/null
@@ -1,17 +0,0 @@
-.card {
- margin-bottom: 20px;
- align-items: flex-start;
- min-height: 100px;
- max-width: 600px;
-}
-
-.header {
- margin-top: 3px;
- margin-bottom: 7px;
- font-size: 18px;
- font-weight: 500;
-}
-
-.wrapper {
- width: 100%;
-}
diff --git a/client/coral-admin/src/routes/Configure/components/Wordlist.js b/client/coral-admin/src/routes/Configure/components/Wordlist.js
index 9522d9c3e..c02cf8fe5 100644
--- a/client/coral-admin/src/routes/Configure/components/Wordlist.js
+++ b/client/coral-admin/src/routes/Configure/components/Wordlist.js
@@ -1,33 +1,26 @@
import React from 'react';
import t from 'coral-framework/services/i18n';
import TagsInput from 'coral-admin/src/components/TagsInput';
-import styles from './Wordlist.css';
import PropTypes from 'prop-types';
-import {Card} from 'coral-ui';
+import ConfigureCard from './ConfigureCard';
const Wordlist = ({suspectWords, bannedWords, onChangeWordlist}) => (
-
- {t('configure.banned_words_title')}
+
{t('configure.banned_word_text')}
-
- onChangeWordlist('banned', tags)}
- />
-
-
-
- {t('configure.suspect_word_title')}
+ onChangeWordlist('banned', tags)}
+ />
+
+
{t('configure.suspect_word_text')}
-
- onChangeWordlist('suspect', tags)} />
-
-
+
onChangeWordlist('suspect', tags)} />
+
);