Merge pull request #37 from open-sausages/pulls/1.0/create-success-msg

FIX Create campaign success message

.eslintrc

@@ -5,5 +5,10 @@
   },
   "rules": {
     "init-declarations": 1
+  },
+  "parserOptions": {
+    "ecmaFeatures": {
+      "experimentalObjectRestSpread": true
+    }
   }
 }

client/lang/en.js

@@ -6,7 +6,7 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
   }
 } else {
   ss.i18n.addDictionary('en', {
-    "CampaignAdmin.ADDCAMPAIGN": "Add campaign",
+    "CampaignAdmin.ADDCAMPAIGN": "Add new",
     "CampaignAdmin.DELETECAMPAIGN": "Are you sure you want to delete this record?",
     "CampaignAdmin.DRAFT": "Draft",
     "CampaignAdmin.ITEM_SUMMARY_PLURAL": "%s items",
@@ -15,6 +15,9 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
     "CampaignAdmin.NO_CHANGES": "No changes",
     "CampaignAdmin.PUBLISHCAMPAIGN": "Publish campaign",
     "CampaignAdmin.REMOVED": "Removed",
-    "CampaignAdmin.REVERTCAMPAIGN": "Revert"
+    "CampaignAdmin.REVERTCAMPAIGN": "Revert",
+    "CampaignAdmin.NEWCAMPAIGNSUCCESS": "Nice one! You have successfully created a campaign.",
+    "CampaignAdmin.SELECTFROMSECTIONS": "Select \"Add to Campaign\" from pages, files, and other admin sections with content types",
+    "CampaignAdmin.LOADING": "Loading..."
 });
-}
+}

client/lang/src/en.json

@@ -1,5 +1,5 @@
 {
-    "CampaignAdmin.ADDCAMPAIGN": "Add campaign",
+    "CampaignAdmin.ADDCAMPAIGN": "Add new",
     "CampaignAdmin.DELETECAMPAIGN": "Are you sure you want to delete this record?",
     "CampaignAdmin.DRAFT": "Draft",
     "CampaignAdmin.ITEM_SUMMARY_PLURAL": "%s items",
@@ -8,5 +8,8 @@
     "CampaignAdmin.NO_CHANGES": "No changes",
     "CampaignAdmin.PUBLISHCAMPAIGN": "Publish campaign",
     "CampaignAdmin.REMOVED": "Removed",
-    "CampaignAdmin.REVERTCAMPAIGN": "Revert"
-}
+    "CampaignAdmin.REVERTCAMPAIGN": "Revert",
+    "CampaignAdmin.NEWCAMPAIGNSUCCESS": "Nice one! You have successfully created a campaign.",
+    "CampaignAdmin.SELECTFROMSECTIONS": "Select \"Add to Campaign\" from pages, files, and other admin sections with content types",
+    "CampaignAdmin.LOADING": "Loading..."
+}

client/src/containers/CampaignAdmin/CampaignAdmin.js

@@ -5,6 +5,7 @@ import { bindActionCreators } from 'redux';
 import { withRouter } from 'react-router';
 import getFormState from 'lib/getFormState';
 import backend from 'lib/Backend';
+import * as campaignActions from 'state/campaign/CampaignActions';
 import * as breadcrumbsActions from 'state/breadcrumbs/BreadcrumbsActions';
 import Breadcrumb from 'components/Breadcrumb/Breadcrumb';
 import SilverStripeComponent from 'lib/SilverStripeComponent';
@@ -119,7 +120,8 @@ class CampaignAdmin extends SilverStripeComponent {
           // open the new campaign in edit mode after save completes
           const sectionUrl = this.props.sectionConfig.url;
           const id = response.record.id;
-          this.props.router.push(`${sectionUrl}/set/${id}/edit`);
+          this.props.campaignActions.setNewItem(id);
+          this.props.router.push(`${sectionUrl}/set/${id}/show`);
         }
 
         return response;
@@ -166,6 +168,7 @@ class CampaignAdmin extends SilverStripeComponent {
     const formActionProps = {
       title: i18n._t('CampaignAdmin.ADDCAMPAIGN'),
       icon: 'plus',
+      extraClass: 'btn-primary',
       handleClick: this.addCampaign.bind(this),
     };
     const formBuilderProps = {
@@ -410,6 +413,7 @@ function mapStateToProps(state, ownProps) {
 function mapDispatchToProps(dispatch) {
   return {
     breadcrumbsActions: bindActionCreators(breadcrumbsActions, dispatch),
+    campaignActions: bindActionCreators(campaignActions, dispatch),
   };
 }
 

client/src/containers/CampaignAdmin/CampaignAdmin.scss

@@ -25,6 +25,24 @@
       }
     }
   }
+
+  .campaign-admin__campaign-preview--empty {
+    align-items: center;
+    justify-content: center;
+  }
+
+  .campaign-admin__empty-heading {
+    font-size: $font-size-h1;
+    margin-bottom: 1em;
+  }
+
+  .campaign-admin__empty-info {
+    padding-top: calc(270px + 0.5em);
+    background-image: url('empty-campaign-preview.png');
+    background-repeat: no-repeat;
+    background-position: 50% 0;
+    font-size: $font-size-lg;
+  }
 }
 
 .campaign-admin__campaign-items {
@@ -77,6 +95,27 @@
   }
 }
 
+.list-group-wrapper--empty {
+  .list-group {
+    border-bottom: 0;
+  }
+
+  .list-group-item {
+    background: transparent;
+    font-style: italic;
+    border-bottom: 0;
+    cursor: default;
+  }
+
+  .accordion__title {
+    cursor: default;
+
+    &:before {
+      display: none;
+    }
+  }
+}
+
 .campaign-admin__item-links--is-linked {
   opacity: 1;