From 84cdb15a5f24d1944ac631e0cf709d6f2acf1880 Mon Sep 17 00:00:00 2001
From: Ingo Schommer <ingo@silverstripe.com>
Date: Thu, 18 Aug 2016 15:43:35 +1200
Subject: [PATCH] Simplify "add to campaign" dialog

Talked to @clarkepaul and simplified to avoid title duplication
---
 .../components/AddToCampaignModal/AddToCampaignModal.js  | 9 ++++-----
 admin/code/AddToCampaignHandler.php                      | 6 +++---
 admin/code/AddToCampaignHandler_FormAction.php           | 3 ++-
 lang/en.yml                                              | 3 ++-
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/admin/client/src/components/AddToCampaignModal/AddToCampaignModal.js b/admin/client/src/components/AddToCampaignModal/AddToCampaignModal.js
index 9917bc010..b21b6fdb8 100644
--- a/admin/client/src/components/AddToCampaignModal/AddToCampaignModal.js
+++ b/admin/client/src/components/AddToCampaignModal/AddToCampaignModal.js
@@ -2,7 +2,6 @@ import React from 'react';
 import { Modal } from 'react-bootstrap-4';
 import SilverStripeComponent from 'lib/SilverStripeComponent';
 import FormBuilder from 'components/FormBuilder/FormBuilder';
-import i18n from 'i18n';
 
 class AddToCampaignModal extends SilverStripeComponent {
   constructor(props) {
@@ -96,9 +95,9 @@ class AddToCampaignModal extends SilverStripeComponent {
         show={this.props.show}
         onHide={this.props.handleHide}
       >
-        <Modal.Header closeButton>
-          <Modal.Title>{this.props.title}</Modal.Title>
-        </Modal.Header>
+        {this.props.title !== false &&
+          <Modal.Header closeButton><Modal.Title>{this.props.title}</Modal.Title></Modal.Header>
+        }
         <Modal.Body>
           {body}
           {response}
@@ -118,7 +117,7 @@ AddToCampaignModal.propTypes = {
 
 AddToCampaignModal.defaultProps = {
   show: false,
-  title: i18n._t('Campaigns.AddToCampaign', 'Add to campaign'),
+  title: null,
 };
 
 export default AddToCampaignModal;
diff --git a/admin/code/AddToCampaignHandler.php b/admin/code/AddToCampaignHandler.php
index e5b03e80a..c8ba97d10 100644
--- a/admin/code/AddToCampaignHandler.php
+++ b/admin/code/AddToCampaignHandler.php
@@ -176,8 +176,8 @@ class AddToCampaignHandler {
 		$inChangeSets = array_unique(ChangeSetItem::get_for_object($object)->column('ChangeSetID'));
 		$changeSets = $this->getAvailableChangeSets()->map();
 
-		$campaignDropdown = DropdownField::create('Campaign', _t('Campaigns.CampaignTitle', 'Campaigns'), $changeSets);
-		$campaignDropdown->setEmptyString(_t('Campaigns.AddToCampaign', 'Select a Campaign'));
+		$campaignDropdown = DropdownField::create('Campaign', '', $changeSets);
+		$campaignDropdown->setEmptyString(_t('Campaigns.AddToCampaignFormFieldLabel', 'Select a Campaign'));
 		$campaignDropdown->addExtraClass('noborder');
 		$campaignDropdown->setDisabledItems($inChangeSets);
 
@@ -216,7 +216,7 @@ class AddToCampaignHandler {
 
 		$form->unsetValidator();
 		$form->loadDataFrom($this->data);
-		$form->addExtraClass('add-to-campaign__form');
+		$form->addExtraClass('form--no-dividers add-to-campaign__form');
 
 		return $form;
 	}
diff --git a/admin/code/AddToCampaignHandler_FormAction.php b/admin/code/AddToCampaignHandler_FormAction.php
index 702d1ac0f..8f6e39841 100644
--- a/admin/code/AddToCampaignHandler_FormAction.php
+++ b/admin/code/AddToCampaignHandler_FormAction.php
@@ -20,7 +20,8 @@ class AddToCampaignHandler_FormAction extends FormAction
 
 	function __construct()
 	{
-		parent::__construct('addtocampaign', _t('CAMPAIGNS.ADDTOCAMPAIGN', 'Add to campaign'));
+		parent::__construct('addtocampaign', _t('CAMPAIGNS.ADDTOCAMPAIGN', 'Add to Campaign'));
+
 		$this->setUseButtonTag(false);
 		$this->addExtraClass('add-to-campaign-action');
 		$this->setValidationExempt(true);
diff --git a/lang/en.yml b/lang/en.yml
index d3ab2c696..d008d5091 100644
--- a/lang/en.yml
+++ b/lang/en.yml
@@ -75,7 +75,7 @@ en:
     NOANSWER: 'No'
     YESANSWER: 'Yes'
   CAMPAIGNS:
-    ADDTOCAMPAIGN: 'Add to campaign'
+    ADDTOCAMPAIGN: 'Add to Campaign'
   CMSLoadingScreen_ss:
     LOADING: Loading...
     REQUIREJS: 'The CMS requires that you have JavaScript enabled.'
@@ -106,6 +106,7 @@ en:
     MENUTITLE: Campaigns
   Campaigns:
     AddToCampaign: 'Add To Campaign'
+    AddToCampaignFormFieldLabel: 'Select a Campaign'
     CampaignTitle: 'Campaign'
   ChangePasswordEmail_ss:
     CHANGEPASSWORDFOREMAIL: 'The password for account with email address {email} has been changed. If you didn\''t change your password please change your password using the link below'