Merge pull request #218 from creative-commoners/pulls/3.0/remove-prev…

…iewable

API Remove CMSPreviewable interface from BaseElement

.travis.yml

@@ -2,16 +2,16 @@ language: php
 
 env:
   global:
-    - COMPOSER_ROOT_VERSION=2.x-dev
+    - COMPOSER_ROOT_VERSION=3.0.x-dev
 
 matrix:
   include:
     - php: 5.6
-      env: DB=MYSQL RECIPE_VERSION=1.1.x-dev PHPCS_TEST=1 PHPUNIT_TEST=1
+      env: DB=MYSQL RECIPE_VERSION=1.2.x-dev PHPCS_TEST=1 PHPUNIT_TEST=1
     #- php: 7.0
     #  env: DB=PGSQL PHPUNIT_TEST=1
     - php: 7.0
-      env: DB=MYSQL RECIPE_VERSION=1.1.x-dev PHPUNIT_TEST=1
+      env: DB=MYSQL RECIPE_VERSION=1.2.x-dev PHPUNIT_TEST=1
     - php: 7.1
       env: DB=MYSQL RECIPE_VERSION=1.2.x-dev PHPUNIT_COVERAGE_TEST=1
     - php: 7.2

client/src/styles/history.scss

@@ -1,34 +1,4 @@
-// todo: replace with core variable
-$history-blue: #0271c3;
-
-.element-history__date--small {
-  color: $text-muted;
-  font-size: $font-size-xs;
-  margin-left: 2px;
-}
-
-.elemental-block__history--detail {
-  margin-bottom: 40px;
-
-  .ss-gridfield-item {
-    background-color: $history-blue;
-    color: $white;
-  }
-
-  .ss-gridfield-item:hover {
-    background-color: $history-blue;
-    color: $white;
-    cursor: default;
-  }
-
-  .element-history__date--small {
-    color: $white;
-    font-size: $font-size-xs;
-    margin-left: 2px;
-  }
-}
-
-// Reset of icon column
-.ss-gridfield-item[data-class="DNADesign\\Elemental\\Models\\ElementContent"] .col-Version:first-child {
-    width: 1px;
+// Pull history viewer up a little!
+.elemental-block__history-tab {
+  margin-top: -$panel-padding-x;
 }

composer.json

@@ -16,9 +16,10 @@
     "minimum-stability": "dev",
     "prefer-stable": true,
     "require": {
-        "silverstripe/cms": "^4.1",
+        "silverstripe/cms": "^4.2@dev",
+        "silverstripe/versioned-admin": "^1@dev",
         "symbiote/silverstripe-gridfieldextensions": "^3.1",
-        "silverstripe/vendor-plugin": "^1.0"
+        "silverstripe/vendor-plugin": "^1"
     },
     "require-dev": {
         "phpunit/phpunit": "^5.7",

src/Controllers/ElementController.php

@@ -3,12 +3,8 @@
 namespace DNADesign\Elemental\Controllers;
 
 use DNADesign\Elemental\Models\BaseElement;
-use SilverStripe\Admin\LeftAndMain;
 use SilverStripe\Control\Controller;
 use SilverStripe\Control\Director;
-use SilverStripe\Core\ClassInfo;
-use SilverStripe\i18n\i18n;
-use SilverStripe\Security\Member;
 use SilverStripe\View\Requirements;
 
 /**

src/ElementalEditor.php

@@ -14,7 +14,6 @@
 use SilverStripe\Forms\GridField\GridFieldPageCount;
 use SilverStripe\Forms\GridField\GridFieldPaginator;
 use SilverStripe\Forms\GridField\GridFieldSortableHeader;
-use SilverStripe\Forms\GridField\GridFieldVersionedState;
 use SilverStripe\Versioned\VersionedGridFieldState\VersionedGridFieldState;
 use Symbiote\GridFieldExtensions\GridFieldAddNewMultiClass;
 use Symbiote\GridFieldExtensions\GridFieldOrderableRows;
@@ -117,7 +116,6 @@ public function getField()
                     GridFieldDeleteAction::class,
                     GridFieldPaginator::class,
                     GridFieldPageCount::class,
-                    GridFieldVersionedState::class,
                     VersionedGridFieldState::class,
                     GridFieldAddExistingAutocompleter::class,
                 ))

src/Extensions/GridFieldDetailFormItemRequestExtension.php

@@ -2,15 +2,9 @@
 
 namespace DNADesign\Elemental\Extensions;
 
-use SilverStripe\ORM\FieldType\DBField;
-use SilverStripe\Core\Extension;
-use SilverStripe\Control\Controller;
-use SilverStripe\ORM\CMSPreviewable;
-use SilverStripe\CMS\Controllers\SilverStripeNavigator;
-use SilverStripe\Forms\LiteralField;
 use DNADesign\Elemental\Models\BaseElement;
-use SilverStripe\Forms\FieldList;
-use SilverStripe\Forms\FormAction;
+use SilverStripe\Core\Extension;
+use SilverStripe\ORM\FieldType\DBField;
 
 class GridFieldDetailFormItemRequestExtension extends Extension
 {
@@ -28,29 +22,4 @@ public function updateBreadcrumbs($crumbs)
             ));
         }
     }
-
-    /**
-     * Updates the edit form to inject the preview panel controls if needed
-     * i.e. if the class being edited implements CMSPreviewable
-     *
-     * @param SilverStripe\Forms\Form $form to be modified by reference
-     */
-    public function updateItemEditForm(&$form)
-    {
-        $fields = $form->Fields();
-        if ($this->owner->getRecord() instanceof CMSPreviewable &&
-            !$fields->fieldByName('SilverStripeNavigator')
-        ) {
-            $template = Controller::curr()
-                ->getTemplatesWithSuffix('_SilverStripeNavigator');
-            $navigator = SilverStripeNavigator::create($this->owner->record);
-            $field = LiteralField::create(
-                'SilverStripeNavigator',
-                $navigator->renderWith($template)
-            )->setAllowHTML(true);
-            $fields->push($field);
-            $form->addExtraClass('cms-previewable')
-                ->removeExtraClass('cms-panel-padded center');
-        }
-    }
 }