PI-1033 more under stable message to users

lang/en.js

@@ -230,7 +230,7 @@
     "constants.plans.pro": "Pro plan",
     "constants.plans.biz": "Business plan",
     "constants.plans.ent": "Enterprise plan",
-    "errors.noActiveZoneSelected": "Please select a domain that is provisioned with Cloudflare.",
+    "errors.noActiveZoneSelected": "It looks like your domain {domain} is not provisioned with Cloudflare. Please continue to {link} to secure and speed up your website.",
     "warning.usingSubdomain": "You are using a subdomain for your site, but any Cloudflare settings applied via this plugin will be applied to your original domain as well.",
     "warning.developmentmode": "Development mode enabled, all traffic will bypass the Cloudflare cache.",
     "utils.utils.lastmodifieddate": "This settings was last changed {date}"

src/constants/UrlPaths.js

@@ -13,3 +13,4 @@ export const SUPPORT_PAGE = 'https://support.cloudflare.com/hc/en-us/';
 export const TERMS_AND_CONDITIONS_PAGE = 'https://www.cloudflare.com/terms';
 export const PRIVACY_POLICY_PAGE = 'https://www.cloudflare.com/security-policy';
 export const CLOUDFLARE_ACCOUNT_PAGE = 'https://www.cloudflare.com/a/account/my-account';
+export const CLOUDFLARE_ADD_SITE_PAGE = 'https://www.cloudflare.com/a/add-site';

src/containers/WaitForSettings/WaitForSettings.js

@@ -7,16 +7,32 @@ import { getPluginSettingsForZoneId } from '../../selectors/pluginSettings';
 import { FormattedMessage, injectIntl } from 'react-intl';
 import { getZoneAnalyticsForZoneId } from '../../selectors/zoneAnalytics';
 import { getAllZoneSettingsForZoneId } from '../../selectors/zoneSettings';
+import { isDNSPageEnabled } from '../../selectors/config';
+import { push } from 'react-router-redux';
+import { Link } from 'react-router';
+import {
+  CLOUDFLARE_ADD_SITE_PAGE,
+  DOMAINS_OVERVIEW_PAGE
+} from '../../constants/UrlPaths.js';
 
 class WaitForSettings extends Component {
+  handleClick(path) {
+    let { dispatch } = this.props;
+    dispatch(push(path));
+  }
+
   render() {
     let {
       activeZone,
       zoneSettings,
       zonePluginSettings,
-      zoneAnalytics
+      zoneAnalytics,
+      settings,
+      pluginSettings,
+      analytics,
+      config
     } = this.props;
-    let { settings, pluginSettings, analytics } = this.props;
+    const { formatMessage } = this.props.intl;
 
     let isSettingsLoaded = true;
     let isPluginSettingsLoaded = true;
@@ -49,6 +65,17 @@ class WaitForSettings extends Component {
       isPluginSettingsLoaded &&
       isAnalyticsLoaded;
 
+    var link = (
+      <Link href={CLOUDFLARE_ADD_SITE_PAGE} target="_blank">Cloudflare</Link>
+    );
+    if (isDNSPageEnabled(config)) {
+      link = (
+        <Link onClick={() => this.handleClick(DOMAINS_OVERVIEW_PAGE)}>
+          <FormattedMessage id="container.dnsManagementPage.title" />
+        </Link>
+      );
+    }
+
     return (
       <div>
         {!isEverythingLoaded &&
@@ -57,7 +84,10 @@ class WaitForSettings extends Component {
         {!isEverythingLoaded &&
           !isZoneOnCloudflare &&
           <Text align="center">
-            <FormattedMessage id="errors.noActiveZoneSelected" />
+            <FormattedMessage
+              id="errors.noActiveZoneSelected"
+              values={{ link: link, domain: activeZone.name }}
+            />
           </Text>}
         {isEverythingLoaded && isZoneOnCloudflare && this.props.children}
       </div>
@@ -76,7 +106,8 @@ function mapStateToProps(state) {
     activeZone: state.activeZone,
     zoneSettings: state.zoneSettings,
     zonePluginSettings: state.pluginSettings,
-    zoneAnalytics: state.zoneAnalytics
+    zoneAnalytics: state.zoneAnalytics,
+    config: state.config
   };
 }
 export default injectIntl(connect(mapStateToProps)(WaitForSettings));