Merge branch 'dev' of https://github.com/appirio-tech/connect-app into dev

Author: gondzo

src/config/projectWizard/index.js

@@ -45,6 +45,7 @@ const products = {
         brief: 'Watson Chatbot',
         details: 'Build Chatbot using IBM Watson',
         formTitle: 'Chatbot powered by IBM Watson®',
+        formDesclaimer: 'IBM is receiving compensation from Topcoder for referring customers to IBM Watson Conversation Service.',
         icon: 'product-chatbot-watson',
         id: 'watson_chatbot',
         aliases: ['watson_chatbot'],

src/projects/create/components/FillProjectDetails.js

@@ -51,15 +51,20 @@ class FillProjectDetails extends Component  {
           <section className="two-col-content content">
             <div className="container">
               <div className="left-area">
-                <ProjectBasicDetailsForm
-                  project={project}
-                  sections={sections}
-                  isEdittable
-                  submitHandler={this.props.onCreateProject}
-                  saving={processing}
-                  onProjectChange={this.props.onProjectChange}
-                  submitBtnText={ submitBtnText }
-                />
+                <div className="left-area-content">
+                  <ProjectBasicDetailsForm
+                    project={project}
+                    sections={sections}
+                    isEdittable
+                    submitHandler={this.props.onCreateProject}
+                    saving={processing}
+                    onProjectChange={this.props.onProjectChange}
+                    submitBtnText={ submitBtnText }
+                  />
+                </div>
+                <div className="left-area-footer">
+                  <span>{ _.get(product, 'formDesclaimer') }</span>
+                </div>
               </div>
               <div className="right-area">
                 <Sticky top={20}>

src/projects/create/components/FillProjectDetails.scss

@@ -34,21 +34,35 @@
         flex: auto;
         width: auto;
         position: relative;
-        border-radius: 4px;
-        background: $tc-white;
-        box-shadow: 0px 1px 3px 0px $tc-gray-30;
-        padding: 50px;
-
-        .title {
-          color: $tc-gray-80;
-          @include roboto-bold;
+
+        .left-area-content {
+          border-radius: 4px;
+          background: $tc-white;
+          box-shadow: 0px 1px 3px 0px $tc-gray-30;
+          padding: 50px;
+
+          .title {
+            color: $tc-gray-80;
+            @include roboto-bold;
+          }
+
+          .section-footer {
+            margin-top: $base_unit * 4;
+            margin-bottom: 0;
+            background: none;
+            height: 40px;
+          }
         }
 
-        .section-footer {
-          margin-top: $base_unit * 4;
-          margin-bottom: 0;
-          background: none;
-          height: 40px;
+        .left-area-footer {
+          @include tc-label-sm;
+          color: $tc-gray-50;
+          margin-top: 4 * $base_unit;
+
+          span {
+            clear: both;
+            float: none;
+          }
         }
       }
 
@@ -78,7 +92,7 @@
 
 .ProjectWizard {
   .FillProjectDetails {
-    .left-area .title span,
+    .left-area-content .title span,
     .section-header .section-number {
       display: none;
     }

src/projects/detail/containers/Specification.scss

@@ -302,6 +302,12 @@ $sideBarMaxWidth: 360px;
           resize: vertical;
         }
       }
+
+      .right-area-footer {
+        @include tc-label-sm;
+        color: $tc-gray-50;
+        margin-top: 4 * $base_unit;
+      }
     }
 
     .contents-list {

src/projects/detail/containers/SpecificationContainer.jsx

@@ -8,6 +8,7 @@ import Sticky from 'react-stickynode'
 import ProjectSpecSidebar from '../components/ProjectSpecSidebar'
 import FooterV2 from '../../../components/FooterV2/FooterV2'
 import EditProjectForm from '../components/EditProjectForm'
+import { findProduct } from '../../../config/projectWizard'
 import { updateProject, fireProjectDirty, fireProjectDirtyUndo } from '../../actions/project'
 import spinnerWhileLoading from '../../../components/LoadingSpinner'
 // import { Icons } from 'appirio-tech-react-components'
@@ -49,6 +50,8 @@ class SpecificationContainer extends Component {
 
   render() {
     const { project, currentMemberRole, processing } = this.props
+    const productId = _.get(project, 'details.products[0]')
+    const product = findProduct(productId)
 
     let specification = 'topcoder.v1'
     if (project.details && project.details.products && project.details.products[0])
@@ -76,6 +79,9 @@ class SpecificationContainer extends Component {
               fireProjectDirty={ this.props.fireProjectDirty }
               fireProjectDirtyUndo= { this.props.fireProjectDirtyUndo }
             />
+            <div className="right-area-footer">
+              { _.get(product, 'formDesclaimer') }
+            </div>
           </div>
 
         </div>