From ba9bbfaed5b5fe4523fb1df1ec50e9c17938f707 Mon Sep 17 00:00:00 2001
From: Robbie Averill <robbie@silverstripe.com>
Date: Wed, 15 Aug 2018 16:39:44 +1200
Subject: [PATCH] FIX Remove divider line and add margin underneath Submissions
 GridField

---
 code/Model/Submission/SubmittedForm.php | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/code/Model/Submission/SubmittedForm.php b/code/Model/Submission/SubmittedForm.php
index 922d94c..ace4ed0 100755
--- a/code/Model/Submission/SubmittedForm.php
+++ b/code/Model/Submission/SubmittedForm.php
@@ -2,17 +2,18 @@
 
 namespace SilverStripe\UserForms\Model\Submission;
 
+use SilverStripe\Forms\FieldList;
 use SilverStripe\Forms\GridField\GridField;
+use SilverStripe\Forms\GridField\GridFieldButtonRow;
 use SilverStripe\Forms\GridField\GridFieldConfig;
 use SilverStripe\Forms\GridField\GridFieldDataColumns;
 use SilverStripe\Forms\GridField\GridFieldExportButton;
 use SilverStripe\Forms\GridField\GridFieldPrintButton;
+use SilverStripe\Forms\GridField\GridFieldToolbarHeader;
 use SilverStripe\Forms\ReadonlyField;
 use SilverStripe\ORM\DataObject;
 use SilverStripe\ORM\DB;
 use SilverStripe\Security\Member;
-use SilverStripe\UserForms\Model\UserDefinedForm;
-use SilverStripe\UserForms\Model\Submission\SubmittedFormField;
 
 class SubmittedForm extends DataObject
 {
@@ -75,7 +76,7 @@ class SubmittedForm extends DataObject
      */
     public function getCMSFields()
     {
-        $this->beforeUpdateCMSFields(function ($fields) {
+        $this->beforeUpdateCMSFields(function (FieldList $fields) {
             $fields->removeByName('Values');
 
             //check to ensure there is a Member to extract an Email from else null value
@@ -88,11 +89,8 @@ class SubmittedForm extends DataObject
             //replace scaffolded field with readonly submitter
             $fields->replaceField(
                 'SubmittedByID',
-                ReadonlyField::create(
-                    'Submitter',
-                    'Submitter',
-                    $submitter
-                )
+                ReadonlyField::create('Submitter', 'Submitter', $submitter)
+                    ->addExtraClass('form-field--no-divider')
             );
 
             $values = GridField::create(
@@ -106,10 +104,11 @@ class SubmittedForm extends DataObject
                 'ExportValue' => 'Value'
             );
 
-            $config = new GridFieldConfig();
+            $config = GridFieldConfig::create();
             $config->addComponent(new GridFieldDataColumns());
-            $config->addComponent(new GridFieldExportButton('after', $exportColumns));
-            $config->addComponent(new GridFieldPrintButton());
+            $config->addComponent(new GridFieldButtonRow('after'));
+            $config->addComponent(new GridFieldExportButton('buttons-after-left', $exportColumns));
+            $config->addComponent(new GridFieldPrintButton('buttons-after-left'));
             $values->setConfig($config);
 
             $fields->addFieldToTab('Root.Main', $values);