From c0b4242342d3c73b4366d1c3d334f6f65d2c9ba0 Mon Sep 17 00:00:00 2001
From: Robbie Averill <robbie@silverstripe.com>
Date: Mon, 30 Jan 2017 13:21:16 +1300
Subject: [PATCH] FIX Move nested form template to FQCN location. Port CMS
 save/publish styles from core.

---
 src/Buttons/BetterButton_Publish.php                      | 4 ++--
 src/Buttons/BetterButton_SaveDraft.php                    | 4 ++--
 src/FormFields/DropdownFormAction.php                     | 8 ++++----
 .../BetterButtons/Actions}/BetterButtonNestedForm.ss      | 0
 4 files changed, 8 insertions(+), 8 deletions(-)
 rename templates/{Includes => UncleCheese/BetterButtons/Actions}/BetterButtonNestedForm.ss (100%)

diff --git a/src/Buttons/BetterButton_Publish.php b/src/Buttons/BetterButton_Publish.php
index c4bf9bf..9476ac4 100755
--- a/src/Buttons/BetterButton_Publish.php
+++ b/src/Buttons/BetterButton_Publish.php
@@ -40,8 +40,8 @@ public function baseTransform()
     {
         parent::baseTransform();
         return $this
-            ->setAttribute('data-icon', 'accept')
-            ->setAttribute('data-icon-alternate', 'disk')
+            ->addExtraClass('btn-secondary-outline font-icon-check-mark')
+            ->setAttribute('data-btn-alternate', 'btn action btn-primary font-icon-rocket')
             ->setAttribute('data-text-alternate', _t('SiteTree.BUTTONSAVEPUBLISH', 'Save & publish'));
     }
 
diff --git a/src/Buttons/BetterButton_SaveDraft.php b/src/Buttons/BetterButton_SaveDraft.php
index 20db6df..eef3ca5 100755
--- a/src/Buttons/BetterButton_SaveDraft.php
+++ b/src/Buttons/BetterButton_SaveDraft.php
@@ -41,8 +41,8 @@ public function baseTransform()
         parent::baseTransform();
 
         return $this
-            ->setAttribute('data-icon', 'accept')
-            ->setAttribute('data-icon-alternate', 'addpage')
+            ->addExtraClass('btn-secondary-outline font-icon-check-mark')
+            ->setAttribute('data-btn-alternate', 'btn action btn-primary font-icon-save')
             ->setAttribute('data-text-alternate', _t('CMSMain.SAVEDRAFT', 'Save draft'));
     }
 
diff --git a/src/FormFields/DropdownFormAction.php b/src/FormFields/DropdownFormAction.php
index acb64da..bb1379d 100755
--- a/src/FormFields/DropdownFormAction.php
+++ b/src/FormFields/DropdownFormAction.php
@@ -61,9 +61,9 @@ public function __construct($title = null, $children = array ())
      */
     public function Field($properties = array ())
     {
-        Requirements::css(BETTER_BUTTONS_DIR.'/css/dropdown_form_action.css');
-        Requirements::javascript(BETTER_BUTTONS_DIR.'/javascript/dropdown_form_action.js');
-        $this->setAttribute('data-form-action-dropdown', '#'.$this->DropdownID());
+        Requirements::css(BETTER_BUTTONS_DIR . '/css/dropdown_form_action.css');
+        Requirements::javascript(BETTER_BUTTONS_DIR . '/javascript/dropdown_form_action.js');
+        $this->setAttribute('data-form-action-dropdown', '#' . $this->DropdownID());
 
         return parent::Field();
     }
@@ -75,7 +75,7 @@ public function Field($properties = array ())
      */
     public function DropdownID()
     {
-        return 'form-action-dropdown-'.$this->identifier;
+        return 'form-action-dropdown-' . $this->identifier;
     }
 
     /**
diff --git a/templates/Includes/BetterButtonNestedForm.ss b/templates/UncleCheese/BetterButtons/Actions/BetterButtonNestedForm.ss
similarity index 100%
rename from templates/Includes/BetterButtonNestedForm.ss
rename to templates/UncleCheese/BetterButtons/Actions/BetterButtonNestedForm.ss