Feature/ss4 upgrade

_config/config.yml

@@ -28,6 +28,9 @@ UncleCheese\BetterButtons\Extensions\BetterButtons:
       delete: true
       frontendLinks: true
     versioned_edit:
+      save: true
+      publish: true
+#      publishAndClose: true
 #      saveAndAdd: true
 #      saveAndNext: true
 #      saveAndPrev: true
@@ -36,6 +39,8 @@ UncleCheese\BetterButtons\Extensions\BetterButtons:
         label: Versioning...
         buttons:
           rollback: true
+      archive: true
+      unpublish: true
       frontendLinks: true
 ---
 Only:

_config/injector.yml

@@ -4,6 +4,8 @@ Name: betterbuttonsinjector
 SilverStripe\Core\Injector\Injector:
   UncleCheese\BetterButtons\Interfaces\BetterButtonInterface.delete:
     class: UncleCheese\BetterButtons\Buttons\Delete
+  UncleCheese\BetterButtons\Interfaces\BetterButtonInterface.archive:
+    class: UncleCheese\BetterButtons\Buttons\Archive
   UncleCheese\BetterButtons\Interfaces\BetterButtonInterface.create:
     class: UncleCheese\BetterButtons\Buttons\Create
   UncleCheese\BetterButtons\Interfaces\BetterButtonInterface.publishAndAdd:
@@ -14,6 +16,8 @@ SilverStripe\Core\Injector\Injector:
     class: UncleCheese\BetterButtons\Buttons\Rollback
   UncleCheese\BetterButtons\Interfaces\BetterButtonInterface.save:
     class: UncleCheese\BetterButtons\Buttons\Save
+  UncleCheese\BetterButtons\Interfaces\BetterButtonInterface.publish:
+    class: UncleCheese\BetterButtons\Buttons\Publish
   UncleCheese\BetterButtons\Interfaces\BetterButtonInterface.unpublish:
     class: UncleCheese\BetterButtons\Buttons\Unpublish
   UncleCheese\BetterButtons\Interfaces\BetterButtonInterface.saveAndAdd:

composer.json

@@ -1,7 +1,7 @@
 {
     "name": "unclecheese/betterbuttons",
     "description": "Adds new form actions and buttons to GridField detail form for usability enhancements.",
-    "type": "silverstripe-module",
+    "type": "silverstripe-vendormodule",
     "keywords": ["silverstripe", "gridfield", "buttons"],
     "license": "GNU",
     "authors": [

css/gridfield_betterbuttons.css

@@ -7,25 +7,27 @@
 .gridfield-better-buttons-next { margin-right:12px; border-radius: 0 20px 20px 0; }
 .gridfield-better-buttons-prev { margin-right:12px; border-radius: 20px 0 0 20px; }
 
-//.btn.action.gridfield-better-buttons-delete,
-// .ui-widget.gridfield-better-buttons-delete:focus {
-// 	float:right;
-// 	color: #fff;
-// 	text-shadow:none;
-// 	border: solid 1px #980c10;
-// 	background: #d81b21;
-// 	background: -webkit-gradient(linear, left top, left bottom, from(#ed1c24), to(#aa1317));
-// 	background: -moz-linear-gradient(top,  #ed1c24,  #aa1317);
-// 	filter:  progid:DXImageTransform.Microsoft.gradient(startColorstr='#ed1c24', endColorstr='#aa1317');
-// }
+/*
+.btn.action.gridfield-better-buttons-delete,
+ .ui-widget.gridfield-better-buttons-delete:focus {
+ 	float:right;
+ 	color: #fff;
+ 	text-shadow:none;
+ 	border: solid 1px #980c10;
+ 	background: #d81b21;
+ 	background: -webkit-gradient(linear, left top, left bottom, from(#ed1c24), to(#aa1317));
+ 	background: -moz-linear-gradient(top,  #ed1c24,  #aa1317);
+ 	filter:  progid:DXImageTransform.Microsoft.gradient(startColorstr='#ed1c24', endColorstr='#aa1317');
+ }
 
-// .btn.action.gridfield-better-buttons-delete:hover,
-// .gridfield-better-buttons-delete:active {
-// 	background: #b61318;
-// 	background: -webkit-gradient(linear, left top, left bottom, from(#c9151b), to(#a11115));
-// 	background: -moz-linear-gradient(top,  #c9151b,  #a11115);
-// 	filter:  progid:DXImageTransform.Microsoft.gradient(startColorstr='#c9151b', endColorstr='#a11115');
-// }
+ .btn.action.gridfield-better-buttons-delete:hover,
+ .gridfield-better-buttons-delete:active {
+ 	background: #b61318;
+ 	background: -webkit-gradient(linear, left top, left bottom, from(#c9151b), to(#a11115));
+ 	background: -moz-linear-gradient(top,  #c9151b,  #a11115);
+ 	filter:  progid:DXImageTransform.Microsoft.gradient(startColorstr='#c9151b', endColorstr='#a11115');
+ }
+*/
 
 .gridfield-better-buttons-undodelete {
 	display:none;

lang/da.yml

@@ -0,0 +1,9 @@
+da:
+  GridFieldBetterButtons:
+    NEWRECORD: 'Ny'
+    PUBLISHANDADD: 'Udgiv og tilføj ny'
+    PUBLISHANDQUITE: 'Udgiv og luk'
+    SAVEANDADDNEW: 'Gem og tilføj ny'
+    SAVEANDCLOSE: 'Gem og luk'
+    SAVEANDNEXT: 'Gem og gå til næste'
+    SAVEANDPREV: 'Gem og gå til forrige'

src/Buttons/Archive.php

@@ -0,0 +1,54 @@
+<?php
+
+namespace UncleCheese\BetterButtons\Buttons;
+
+use SilverStripe\Forms\GridField\GridFieldDetailForm;
+use SilverStripe\ORM\DataObject;
+use SilverStripe\Versioned\Versioned;
+use SilverStripe\View\Requirements;
+
+/**
+ * Defines the button that archives a record, with confirmation
+ *
+ * @author  Uncle Cheese <unclecheese@leftandmain.com>
+ * @package  silverstripe-gridfield-betterbuttons
+ */
+class Archive extends Button
+{
+    /**
+     * Builds the button
+     */
+    public function __construct()
+    {
+        parent::__construct('doArchive', _t('SilverStripe\Versioned\VersionedGridFieldItemRequest.ARCHIVE', 'Archive'));
+    }
+
+    /**
+     * Adds the JS, sets up necessary HTML attributes
+     * @return Archive
+     */
+    public function baseTransform()
+    {
+        parent::baseTransform();
+
+        return $this
+            ->setUseButtonTag(true)
+            ->addExtraClass('btn-outline-danger btn-hide-outline font-icon-trash-bin gridfield-better-buttons-archive');
+    }
+
+    /**
+     * Determines if the button should show
+     * @return boolean
+     */
+    public function shouldDisplay()
+    {
+        /* @var DataObject|Versioned $record */
+        $record = $this->getGridFieldRequest()->getRecord();
+
+        if(!$record->hasExtension(Versioned::class)){
+            return $record->canDelete();
+        }
+
+        return !$record->isPublished() && $record->canDelete();
+    }
+}

src/Buttons/Delete.php

@@ -2,6 +2,7 @@
 
 namespace UncleCheese\BetterButtons\Buttons;
 
+use SilverStripe\Forms\GridField\GridFieldDetailForm;
 use SilverStripe\ORM\DataObject;
 use SilverStripe\Versioned\Versioned;
 use SilverStripe\View\Requirements;
@@ -19,7 +20,7 @@ class Delete extends Button
      */
     public function __construct()
     {
-        parent::__construct('doDelete', _t('GridFieldDetailForm.Delete', 'Delete'));
+        parent::__construct('doDelete', _t(GridFieldDetailForm::class . '.Delete', 'Delete'));
     }
 
     /**
@@ -33,7 +34,7 @@ public function baseTransform()
 
         return $this
             ->setUseButtonTag(true)
-            ->addExtraClass('btn-danger-outline btn-hide-outline font-icon-trash-bin gridfield-better-buttons-delete')
+            ->addExtraClass('btn-outline-danger btn-hide-outline font-icon-trash-bin gridfield-better-buttons-delete')
             ->setAttribute("data-toggletext", _t('GridFieldBetterButtons.AREYOUSURE', 'Yes. Delete this item.'))
             ->setAttribute("data-confirmtext", _t('GridFieldDetailForm.CANCELDELETE', 'No. Don\'t delete.'));
     }
@@ -47,6 +48,10 @@ public function shouldDisplay()
         /* @var DataObject|Versioned $record */
         $record = $this->getGridFieldRequest()->getRecord();
 
+        if(!$record->hasExtension(Versioned::class)){
+            return $record->canDelete();
+        }
+
         return !$record->isPublished() && $record->canDelete();
     }
 }

src/Buttons/Publish.php

@@ -0,0 +1,47 @@
+<?php
+
+namespace UncleCheese\BetterButtons\Buttons;
+
+use SilverStripe\Forms\FormAction;
+use SilverStripe\Forms\GridField\GridFieldDetailForm;
+
+/**
+ * Defines the button that saves a record
+ *
+ * @author   Uncle Cheese <unclecheese@leftandmain.com>
+ * @package  silverstripe-gridfield-betterbuttons
+ */
+class Publish extends Button
+{
+    /**
+     * Builds the button
+     */
+    public function __construct()
+    {
+        parent::__construct('doPublish', _t('SilverStripe\Versioned\VersionedGridFieldItemRequest.BUTTONPUBLISH', 'Publish'));
+    }
+
+    /**
+     * Determines if the button should show
+     *
+     * @return boolean
+     */
+    public function shouldDisplay()
+    {
+        $record = $this->getGridFieldRequest()->getRecord();
+
+        return $record->canEdit();
+    }
+
+    /**
+     * Adds the appropriate icon and style
+     *
+     * @return FormAction
+     */
+    public function transformToButton()
+    {
+        return parent::transformToButton()
+            ->addExtraClass('btn-primary font-icon-save')
+            ->setAttribute('data-icon', 'accept');
+    }
+}

src/Buttons/PublishAndAdd.php

@@ -3,6 +3,7 @@
 namespace UncleCheese\BetterButtons\Buttons;
 
 use SilverStripe\Forms\Form;
+use SilverStripe\Forms\GridField\GridFieldDetailForm;
 use SilverStripe\Forms\GridField\GridFieldDetailForm_ItemRequest;
 use UncleCheese\BetterButtons\Interfaces\BetterButtonVersioned;
 use UncleCheese\BetterButtons\Traits\SaveAndAddTransforms;
@@ -25,7 +26,7 @@ class PublishAndAdd extends Button implements BetterButtonVersioned
      */
     public function __construct(Form $form, GridFieldDetailForm_ItemRequest $request)
     {
-        parent::__construct('doPublishAndAdd', _t('GridFieldDetailForm.PUBLISHANDADD', 'Publish and add new'));
+        parent::__construct('doPublishAndAdd', _t('GridFieldBetterButtons.PUBLISHANDADD', 'Publish and add new'));
     }
 
     /**

src/Buttons/PublishAndClose.php

@@ -2,6 +2,7 @@
 
 namespace UncleCheese\BetterButtons\Buttons;
 
+use SilverStripe\Forms\GridField\GridFieldDetailForm;
 use UncleCheese\BetterButtons\Interfaces\BetterButtonVersioned;
 use UncleCheese\BetterButtons\Traits\SaveAndCloseTransforms;
 
@@ -20,7 +21,7 @@ class PublishAndClose extends Button implements BetterButtonVersioned
      */
     public function __construct()
     {
-        return parent::__construct('doPublishAndQuit', _t('GridFieldDetailForm.PUBLISHANDQUITE', 'Publish and close'));
+        return parent::__construct('doPublishAndQuit', _t('GridFieldBetterButtons.PUBLISHANDQUITE', 'Publish and close'));
     }
 
     /**

src/Buttons/Rollback.php

@@ -2,6 +2,7 @@
 
 namespace UncleCheese\BetterButtons\Buttons;
 
+use SilverStripe\CMS\Model\SiteTree;
 use SilverStripe\Forms\FormAction;
 use UncleCheese\BetterButtons\Interfaces\BetterButtonVersioned;
 use SilverStripe\ORM\DataObject;
@@ -20,7 +21,7 @@ class Rollback extends Button implements BetterButtonVersioned
      */
     public function __construct()
     {
-        parent::__construct('rollback', _t('SiteTree.BUTTONCANCELDRAFT', 'Cancel draft changes'));
+        parent::__construct('rollback', _t(SiteTree::class . '.BUTTONCANCELDRAFT', 'Cancel draft changes'));
     }
 
     /**

src/Buttons/Save.php

@@ -3,11 +3,12 @@
 namespace UncleCheese\BetterButtons\Buttons;
 
 use SilverStripe\Forms\FormAction;
+use SilverStripe\Forms\GridField\GridFieldDetailForm;
 
 /**
  * Defines the button that saves a record
  *
- * @author  Uncle Cheese <unclecheese@leftandmain.com>
+ * @author   Uncle Cheese <unclecheese@leftandmain.com>
  * @package  silverstripe-gridfield-betterbuttons
  */
 class Save extends Button
@@ -17,11 +18,12 @@ class Save extends Button
      */
     public function __construct()
     {
-        parent::__construct('save', _t('GridFieldDetailForm.SAVE', 'Save'));
+        parent::__construct('doSave', _t(GridFieldDetailForm::class . '.Save', 'Save'));
     }
 
     /**
      * Determines if the button should show
+     *
      * @return boolean
      */
     public function shouldDisplay()
@@ -33,6 +35,7 @@ public function shouldDisplay()
 
     /**
      * Adds the appropriate icon and style
+     *
      * @return FormAction
      */
     public function transformToButton()

src/Buttons/SaveAndClose.php

@@ -2,6 +2,7 @@
 
 namespace UncleCheese\BetterButtons\Buttons;
 
+use SilverStripe\Forms\GridField\GridFieldDetailForm;
 use UncleCheese\BetterButtons\Traits\SaveAndCloseTransforms;
 
 /**
@@ -19,7 +20,7 @@ class SaveAndClose extends Button
      */
     public function __construct()
     {
-        parent::__construct("doSaveAndQuit", _t('GridFieldDetailForm.SAVEANDCLOSE', 'Save and close'));
+        parent::__construct("doSaveAndQuit", _t('GridFieldBetterButtons.SAVEANDCLOSE', 'Save and close'));
     }
 
     /**

src/Buttons/SaveAndNext.php

@@ -3,6 +3,7 @@
 namespace UncleCheese\BetterButtons\Buttons;
 
 use SilverStripe\Forms\FormAction;
+use SilverStripe\Forms\GridField\GridFieldDetailForm;
 use SilverStripe\Forms\GridField\GridFieldDetailForm_ItemRequest;
 use UncleCheese\BetterButtons\Controllers\ItemRequest;
 
@@ -19,7 +20,7 @@ class SaveAndNext extends Button
      */
     public function __construct()
     {
-        parent::__construct("doSaveAndNext", _t('GridFieldDetailForm.SAVEANDNEXT', 'Save and go to next record'));
+        parent::__construct("doSaveAndNext", _t('GridFieldBetterButtons.SAVEANDNEXT', 'Save and go to next record'));
     }
 
     /**

src/Buttons/SaveAndPrev.php

@@ -3,6 +3,7 @@
 namespace UncleCheese\BetterButtons\Buttons;
 
 use SilverStripe\Forms\FormAction;
+use SilverStripe\Forms\GridField\GridFieldDetailForm;
 use SilverStripe\Forms\GridField\GridFieldDetailForm_ItemRequest;
 use UncleCheese\BetterButtons\Controllers\ItemRequest;
 
@@ -19,7 +20,7 @@ class SaveAndPrev extends Button
      */
     public function __construct()
     {
-        parent::__construct("doSaveAndPrev", _t('GridFieldDetailForm.SAVEANDPREV', 'Save and go to previous record'));
+        parent::__construct("doSaveAndPrev", _t('GridFieldBetterButtons.SAVEANDPREV', 'Save and go to previous record'));
     }
 
     /**