Behaviour default views

modules/backend/assets/less/layout/fancylayout.less

@@ -493,6 +493,10 @@ body.fancy-layout .master-tabs.control-tabs,
         margin-bottom: 0;
     }
 
+    .form-control[disabled] {
+        background-color: rgba(29, 29, 29, 0.11) !important;
+    }
+
     input[type=text] {
         background: transparent;
         border: none;

modules/backend/behaviors/FormController.php

@@ -191,7 +191,9 @@ public function initForm($model, $context = null)
     protected function prepareVars($model)
     {
         $this->controller->vars['formModel'] = $model;
+        $this->controller->vars['formConfig'] = $this->getConfig();
         $this->controller->vars['formContext'] = $this->formGetContext();
+        $this->controller->vars['formController'] = $this;
         $this->controller->vars['formRecordName'] = Lang::get($this->getConfig('name', 'backend::lang.model.name'));
     }
 
@@ -473,6 +475,10 @@ public function makeRedirect($context = null, $model = null)
             return Redirect::refresh();
         }
 
+        if (post('new', false)) {
+            return Redirect::to($this->controller->actionUrl('create'));
+        }
+
         if (post('redirect', true)) {
             $redirectUrl = $this->controller->formGetRedirectUrl($context, $model);
         }
@@ -882,4 +888,20 @@ public static function extendFormFields($callback)
             call_user_func_array($callback, [$widget, $widget->model, $widget->getContext()]);
         });
     }
+
+    /**
+     * Controller accessor for making partials within this behavior.
+     */
+    public function formMakePartial(string $partial, array $params = []): string
+    {
+        $contents = $this->controller->makePartial('form_' . $this->context . '_' . $partial, $params + $this->vars, false);
+        if (!$contents) {
+            $contents = $this->controller->makePartial('form_' . $partial, $params + $this->vars, false);
+        }
+        if (!$contents) {
+            $contents = $this->makePartial($partial, $params);
+        }
+
+        return $contents;
+    }
 }

modules/backend/behaviors/ImportExportController.php

@@ -1,21 +1,22 @@
-<?php namespace Backend\Behaviors;
-
-use Str;
-use Lang;
-use View;
-use Response;
-use Backend;
-use BackendAuth;
-use Backend\Classes\ControllerBehavior;
+<?php
+
+namespace Backend\Behaviors;
+
 use Backend\Behaviors\ImportExportController\TranscodeFilter;
+use Backend\Classes\ControllerBehavior;
+use Backend\Facades\Backend;
+use Backend\Facades\BackendAuth;
+use Exception;
 use Illuminate\Database\Eloquent\MassAssignmentException;
-use League\Csv\Reader as CsvReader;
-use League\Csv\Writer as CsvWriter;
+use Illuminate\Support\Facades\Lang;
+use Illuminate\Support\Facades\Response;
 use League\Csv\EscapeFormula as CsvEscapeFormula;
+use League\Csv\Reader as CsvReader;
 use League\Csv\Statement as CsvStatement;
-use ApplicationException;
+use League\Csv\Writer as CsvWriter;
 use SplTempFileObject;
-use Exception;
+use Winter\Storm\Exception\ApplicationException;
+use Winter\Storm\Support\Str;
 
 /**
  * Adds features for importing and exporting data.
@@ -146,8 +147,8 @@ public function __construct($controller)
 
     public function import()
     {
-        if ($response = $this->checkPermissionsForType('import')) {
-            return $response;
+        if (!$this->userHasAccess('import')) {
+            abort(403);
         }
 
         $this->addJs('js/winter.import.js', 'core');
@@ -161,8 +162,8 @@ public function import()
 
     public function export()
     {
-        if ($response = $this->checkPermissionsForType('export')) {
-            return $response;
+        if (!$this->userHasAccess('export')) {
+            abort(403);
         }
 
         if ($response = $this->checkUseListExportMode()) {
@@ -697,18 +698,18 @@ public function importExportMakePartial($partial, $params = [])
     }
 
     /**
-     * Checks to see if the import/export is controlled by permissions
-     * and if the logged in user has permissions.
-     * @return \View
+     * Check if the current user has access to the provided import/export action
      */
-    protected function checkPermissionsForType($type)
+    public function userHasAccess(string $type): bool
     {
         if (
             ($permissions = $this->getConfig($type.'[permissions]')) &&
             (!BackendAuth::getUser()->hasAnyAccess((array) $permissions))
         ) {
-            return Response::make(View::make('backend::access_denied'), 403);
+            return false;
         }
+
+        return true;
     }
 
     protected function makeOptionsFormWidgetForType($type)

modules/backend/behaviors/formcontroller/partials/_toolbar.php

@@ -0,0 +1,81 @@
+<?php
+    $modelName = $formConfig->name ?? '';
+?>
+<?php if ($formContext === 'create'): ?>
+    <div class="loading-indicator-container">
+        <button
+            type="submit"
+            data-request="onSave"
+            data-request-data="new:1"
+            data-browser-validate
+            data-hotkey="ctrl+shift+s, cmd+shift+s"
+            data-load-indicator="<?= e(trans('backend::lang.form.creating_name', ['name' => trans($modelName)])); ?>"
+            data-request-before-update="$el.trigger('unchange.oc.changeMonitor')"
+            class="btn btn-primary wn-icon-plus">
+            <?= e(trans('backend::lang.form.create_and_new')); ?>
+        </button>
+        <button
+            type="button"
+            data-request="onSave"
+            data-browser-validate
+            data-hotkey="ctrl+s, cmd+s"
+            data-load-indicator="<?= e(trans('backend::lang.form.creating_name', ['name' => trans($modelName)])); ?>"
+            data-request-before-update="$el.trigger('unchange.oc.changeMonitor')"
+            class="btn btn-primary wn-icon-save">
+            <?= e(trans('backend::lang.form.create')); ?>
+        </button>
+        <button
+            type="button"
+            data-request="onSave"
+            data-browser-validate
+            data-request-data="close:1"
+            data-hotkey="ctrl+enter, cmd+enter"
+            data-load-indicator="<?= e(trans('backend::lang.form.creating_name', ['name' => trans($modelName)])); ?>"
+            data-request-before-update="$el.trigger('unchange.oc.changeMonitor')"
+            class="btn btn-default wn-icon-check">
+            <?= e(trans('backend::lang.form.create_and_close')); ?>
+        </button>
+        <span class="btn-text">
+            <?= e(trans('backend::lang.form.or')) ?> <a href="<?= Backend::url($formConfig->defaultRedirect) ?>"><?= e(trans('backend::lang.form.cancel')); ?></a>
+        </span>
+    </div>
+<?php elseif ($formContext === 'update'): ?>
+    <div class="loading-indicator-container">
+        <button
+            type="button"
+            data-request="onSave"
+            data-browser-validate
+            data-load-indicator="<?= e(trans('backend::lang.form.saving')) ?>"
+            data-request-before-update="$el.trigger('unchange.oc.changeMonitor')"
+            data-request-data="redirect:0"
+            data-hotkey="ctrl+s, cmd+s"
+            class="btn btn-primary wn-icon-save"
+        >
+            <?= e(trans('backend::lang.form.save')); ?>
+        </button>
+        <button
+            type="button"
+            data-request="onSave"
+            data-browser-validate
+            data-request-data="close:1"
+            data-hotkey="ctrl+enter, cmd+enter"
+            data-load-indicator="<?= e(trans('backend::lang.form.saving')); ?>"
+            data-request-before-update="$el.trigger('unchange.oc.changeMonitor')"
+            class="btn btn-default wn-icon-check"
+        >
+            <?= e(trans('backend::lang.form.save_and_close')); ?>
+        </button>
+        <button
+            type="button"
+            data-request="onDelete"
+            data-load-indicator="<?= e(trans('backend::lang.form.deleting_name', ['name' => trans($modelName)])); ?>"
+            data-request-before-update="$el.trigger('unchange.oc.changeMonitor')"
+            data-request-confirm="<?= e(trans('backend::lang.form.confirm_delete')); ?>"
+            class="wn-icon-trash-o btn-icon danger pull-right"
+        >
+        </button>
+        <span class="btn-text">
+            <?= e(trans('backend::lang.form.or')) ?> <a href="<?= Backend::url($formConfig->defaultRedirect) ?>"><?= e(trans('backend::lang.form.cancel')); ?></a>
+        </span>
+    </div>
+<?php endif ?>

modules/backend/behaviors/formcontroller/views/create.php

@@ -0,0 +1,20 @@
+<?php
+
+// Decide which layout we should be rendering
+$layout = $this->formLayout ?? $formConfig->formLayout ?? null;
+if (!in_array($layout, ['standard', 'sidebar', 'fancy'])) {
+    $layout = 'standard';
+}
+
+// If required, set the appropriate body classes
+$this->bodyClass = match ($layout) {
+    'fancy' => 'fancy-layout compact-container breadcrumb-flush breadcrumb-fancy',
+    'sidebar' => 'compact-container',
+    default => '',
+};
+
+// Define layout mode view path for inclusion
+$this->appendViewPath(sprintf('%s/create/%s', __DIR__, $layout));
+
+// Render the form layout
+echo $this->makePartial(sprintf('create/%s.php', $layout));

modules/backend/behaviors/formcontroller/views/create/_fancy.php

@@ -0,0 +1,20 @@
+<?php Block::put('breadcrumb') ?>
+    <?= $this->makeLayoutPartial('breadcrumb') ?>
+<?php Block::endPut() ?>
+
+<?php if (!$this->fatalError): ?>
+    <div class="layout fancy-layout">
+        <?= Form::open([
+            'class' => 'layout',
+            'data-change-monitor' => 'true',
+            'data-window-close-confirm' => 'true',
+        ]) ?>
+            <div class="layout-row">
+                <?= $this->formRender() ?>
+            </div>
+        <?= Form::close() ?>
+    </div>
+<?php else: ?>
+    <p class="flash-message static error"><?= e($this->fatalError) ?></p>
+    <p><a href="<?= Backend::url($formConfig->defaultRedirect) ?>" class="btn btn-default"><?= e(trans('backend::lang.form.return_to_list')); ?></a></p>
+<?php endif ?>

modules/backend/behaviors/formcontroller/views/create/_sidebar.php

@@ -0,0 +1,40 @@
+<?php Block::put('breadcrumb') ?>
+    <?= $this->makeLayoutPartial('breadcrumb') ?>
+<?php Block::endPut() ?>
+
+<?php if (!$this->fatalError): ?>
+    <?php Block::put('form-contents') ?>
+        <div class="layout">
+            <div class="layout-row">
+                <?= $this->formRenderOutsideFields() ?>
+                <?= $this->formRenderPrimaryTabs() ?>
+            </div>
+
+            <div class="form-buttons p-t">
+                <?= $this->formMakePartial('toolbar') ?>
+            </div>
+        </div>
+    <?php Block::endPut() ?>
+
+    <?php Block::put('form-sidebar') ?>
+        <div class="hide-tabs"><?= $this->formRenderSecondaryTabs() ?></div>
+    <?php Block::endPut() ?>
+
+    <?php Block::put('body') ?>
+        <?= Form::open([
+            'class' => 'layout stretch',
+            'data-change-monitor' => 'true',
+            'data-window-close-confirm' => 'true',
+        ]) ?>
+            <?= $this->makeLayout('form-with-sidebar') ?>
+        <?= Form::close() ?>
+    <?php Block::endPut() ?>
+<?php else: ?>
+    <div class="control-breadcrumb">
+        <?= Block::placeholder('breadcrumb') ?>
+    </div>
+    <div class="padded-container">
+        <p class="flash-message static error"><?= e(trans($this->fatalError)) ?></p>
+        <p><a href="<?= Backend::url($formConfig->defaultRedirect) ?>" class="btn btn-default"><?= e(trans('backend::lang.form.return_to_list')); ?></a></p>
+    </div>
+<?php endif ?>

modules/backend/behaviors/formcontroller/views/create/_standard.php

@@ -0,0 +1,22 @@
+<?php Block::put('breadcrumb') ?>
+    <?= $this->makeLayoutPartial('breadcrumb') ?>
+<?php Block::endPut() ?>
+
+<?php if (!$this->fatalError): ?>
+    <?= Form::open([
+        'class' => 'layout',
+        'data-change-monitor' => 'true',
+        'data-window-close-confirm' => 'true',
+    ]) ?>
+        <div class="layout-row">
+            <?= $this->formRender() ?>
+        </div>
+
+        <div class="form-buttons p-t">
+            <?= $this->formMakePartial('toolbar') ?>
+        </div>
+    <?= Form::close() ?>
+<?php else: ?>
+    <p class="flash-message static error"><?= e($this->fatalError) ?></p>
+    <p><a href="<?= Backend::url($formConfig->defaultRedirect) ?>" class="btn btn-default"><?= e(trans('backend::lang.form.return_to_list')); ?></a></p>
+<?php endif ?>

modules/backend/behaviors/formcontroller/views/create/fancy/_toolbar.php

@@ -0,0 +1,36 @@
+<div class="form-buttons loading-indicator-container">
+    <button
+        type="submit"
+        data-request="onSave"
+        data-request-data="new:1"
+        data-browser-validate
+        data-hotkey="ctrl+shift+s, cmd+shift+s"
+        data-load-indicator="<?= e(trans('backend::lang.form.creating')); ?>"
+        data-request-before-update="$el.trigger('unchange.oc.changeMonitor')"
+        class="btn btn-primary wn-icon-plus">
+        <?= e(trans('backend::lang.form.create_and_new')); ?>
+    </button>
+    <button
+        type="button"
+        data-request="onSave"
+        data-browser-validate
+        data-hotkey="ctrl+s, cmd+s"
+        data-load-indicator="<?= e(trans('backend::lang.form.creating')); ?>"
+        data-request-before-update="$el.trigger('unchange.oc.changeMonitor')"
+        class="btn btn-primary wn-icon-save">
+        <?= e(trans('backend::lang.form.create')); ?>
+    </button>
+    <button
+        type="button"
+        data-request="onSave"
+        data-browser-validate
+        data-request-data="close:1"
+        data-hotkey="ctrl+enter, cmd+enter"
+        data-load-indicator="<?= e(trans('backend::lang.form.creating')); ?>"
+        data-request-before-update="$el.trigger('unchange.oc.changeMonitor')"
+        class="btn btn-default wn-icon-check">
+        <?= e(trans('backend::lang.form.create_and_close')); ?>
+    </button>
+
+    <a class="btn btn-default wn-icon-ban" href="<?= $this->actionUrl('') ?>"><?= e(trans('backend::lang.form.cancel')); ?></a>
+</div>

modules/backend/behaviors/formcontroller/views/preview.php

@@ -0,0 +1,21 @@
+<?php
+
+
+// Decide which layout we should be rendering
+$layout = $this->formLayout ?? $formConfig->formLayout ?? null;
+if (!in_array($layout, ['standard', 'sidebar', 'fancy'])) {
+    $layout = 'standard';
+}
+
+// If required, set the appropriate body classes
+$this->bodyClass = match ($layout) {
+    'fancy' => 'fancy-layout compact-container breadcrumb-flush breadcrumb-fancy',
+    'sidebar' => 'compact-container',
+    default => '',
+};
+
+// Define layout mode view path for inclusion
+$this->appendViewPath(sprintf('%s/preview/%s', __DIR__, $layout));
+
+// Render the form layout
+echo $this->makePartial(sprintf('preview/%s.php', $layout));

modules/backend/behaviors/formcontroller/views/preview/_fancy.php

@@ -0,0 +1,14 @@
+<?php Block::put('breadcrumb') ?>
+    <?= $this->makeLayoutPartial('breadcrumb') ?>
+<?php Block::endPut() ?>
+
+<?php if (!$this->fatalError): ?>
+    <?= Form::open(['class' => 'layout']) ?>
+        <div class="layout-row form-preview">
+            <?= $this->formRenderPreview() ?>
+        </div>
+    <?= Form::close() ?>
+<?php else: ?>
+    <p class="flash-message static error"><?= e($this->fatalError) ?></p>
+    <p><a href="<?= Backend::url($formConfig->defaultRedirect) ?>" class="btn btn-default"><?= e(trans('backend::lang.form.return_to_list')); ?></a></p>
+<?php endif ?>