Merge branch 'develop' into wip/table-min-max-items

Author: bennothommo

README.md

@@ -7,7 +7,7 @@
 No matter how large or small your project is, Winter provides a rich development environment, regardless of your level of experience.
 
 [![Version](https://img.shields.io/github/v/release/wintercms/winter?sort=semver&style=flat-square)](https://github.com/wintercms/winter/releases)
-[![Tests](https://img.shields.io/github/workflow/status/wintercms/winter/Tests/develop?label=tests&style=flat-square)](https://github.com/wintercms/winter/actions)
+[![Tests](https://img.shields.io/github/actions/workflow/status/wintercms/winter/tests.yml?branch=develop&label=tests&style=flat-square)](https://github.com/wintercms/winter/actions)
 [![License](https://img.shields.io/github/license/wintercms/winter?label=open%20source&style=flat-square)](https://packagist.org/packages/wintercms/winter)
 [![Discord](https://img.shields.io/discord/816852513684193281?label=discord&style=flat-square)](https://discord.gg/D5MFSPH6Ux)
 
@@ -89,8 +89,7 @@ Winter CMS development is financially supported by the generosity of the followi
 
 ### Organizations
 
-[![Spatial Media logo](https://cdn.ca.spatialmedia.io/media/images/sm-logo-dark-full.svg)](https://spatialmedia.io)
-Spatial Media employs two of the core contributors (Luke Towers & Jack Wilkinson) and contributes to the ongoing development of Winter.
+Spatial Media employs one of the core maintainers (Jack Wilkinson) who contributes to the ongoing development of Winter.
 
 [![Froala logo](https://froala.com/wp-content/uploads/2019/10/froala.svg)](https://froala.com/wysiwyg-editor/)
 

modules/backend/ServiceProvider.php

@@ -1,6 +1,5 @@
 <?php namespace Backend;
 
-use App;
 use Backend;
 use BackendMenu;
 use BackendAuth;
@@ -20,6 +19,8 @@ class ServiceProvider extends ModuleServiceProvider
      */
     public function register()
     {
+        parent::register();
+
         $this->registerConsole();
         $this->registerMailer();
         $this->registerAssetBundles();
@@ -28,7 +29,7 @@ public function register()
         /*
          * Backend specific
          */
-        if (App::runningInBackend()) {
+        if ($this->app->runningInBackend()) {
             $this->registerBackendNavigation();
             $this->registerBackendReportWidgets();
             $this->registerBackendWidgets();
@@ -90,10 +91,8 @@ protected function registerAssetBundles()
             $combiner->registerBundle('~/modules/backend/formwidgets/fileupload/assets/less/fileupload.less');
             $combiner->registerBundle('~/modules/backend/formwidgets/nestedform/assets/less/nestedform.less');
             $combiner->registerBundle('~/modules/backend/formwidgets/richeditor/assets/js/build-plugins.js');
-            $combiner->registerBundle('~/modules/backend/formwidgets/colorpicker/assets/less/colorpicker.less');
             $combiner->registerBundle('~/modules/backend/formwidgets/permissioneditor/assets/less/permissioneditor.less');
             $combiner->registerBundle('~/modules/backend/formwidgets/markdowneditor/assets/less/markdowneditor.less');
-            $combiner->registerBundle('~/modules/backend/formwidgets/sensitive/assets/less/sensitive.less');
 
             /*
              * Rich Editor is protected by DRM
@@ -229,6 +228,7 @@ protected function registerBackendWidgets()
             $manager->registerFormWidget('Backend\FormWidgets\MediaFinder', 'mediafinder');
             $manager->registerFormWidget('Backend\FormWidgets\NestedForm', 'nestedform');
             $manager->registerFormWidget('Backend\FormWidgets\Sensitive', 'sensitive');
+            $manager->registerFormWidget('Backend\FormWidgets\IconPicker', 'iconpicker');
         });
     }
 

modules/backend/assets/css/winter.css

@@ -1065,22 +1065,22 @@ body.breadcrumb-fancy .control-breadcrumb li:last-child,
 .control-breadcrumb.breadcrumb-fancy li:last-child{background-color:#d66908}
 body.breadcrumb-fancy .control-breadcrumb li:last-child:before,
 .control-breadcrumb.breadcrumb-fancy li:last-child:before{opacity:1;border-left-color:#d66908}
-.fancy-layout *:not(.nested-form)>.form-widget>.layout-row>.control-tabs .form-buttons,
-.fancy-layout *:not(.nested-form)>.form-widget>.layout-row>.form-tabless-fields .form-buttons{-webkit-transition:all 0.5s;transition:all 0.5s;padding-top:14px;padding-bottom:5px}
-.fancy-layout *:not(.nested-form)>.form-widget>.layout-row>.control-tabs .form-buttons .btn,
-.fancy-layout *:not(.nested-form)>.form-widget>.layout-row>.form-tabless-fields .form-buttons .btn{padding:0;margin-right:5px;margin-top:-6px;margin-right:30px;background:transparent;color:#fff;font-weight:normal;-webkit-box-shadow:none;box-shadow:none;opacity:0.5;filter:alpha(opacity=50);-webkit-transition:all 0.3s ease;transition:all 0.3s ease}
-.fancy-layout *:not(.nested-form)>.form-widget>.layout-row>.control-tabs .form-buttons .btn:hover,
-.fancy-layout *:not(.nested-form)>.form-widget>.layout-row>.form-tabless-fields .form-buttons .btn:hover{opacity:1;filter:alpha(opacity=100)}
-.fancy-layout *:not(.nested-form)>.form-widget>.layout-row>.control-tabs .form-buttons .btn:last-child,
-.fancy-layout *:not(.nested-form)>.form-widget>.layout-row>.form-tabless-fields .form-buttons .btn:last-child{margin-right:0}
-.fancy-layout *:not(.nested-form)>.form-widget>.layout-row>.control-tabs .form-buttons .btn[class^="wn-icon-"]:before,
-.fancy-layout *:not(.nested-form)>.form-widget>.layout-row>.form-tabless-fields .form-buttons .btn[class^="wn-icon-"]:before,
-.fancy-layout *:not(.nested-form)>.form-widget>.layout-row>.control-tabs .form-buttons .btn[class*=" wn-icon-"]:before,
-.fancy-layout *:not(.nested-form)>.form-widget>.layout-row>.form-tabless-fields .form-buttons .btn[class*=" wn-icon-"]:before,
-.fancy-layout *:not(.nested-form)>.form-widget>.layout-row>.control-tabs .form-buttons .btn[class^="oc-icon-"]:before,
-.fancy-layout *:not(.nested-form)>.form-widget>.layout-row>.form-tabless-fields .form-buttons .btn[class^="oc-icon-"]:before,
-.fancy-layout *:not(.nested-form)>.form-widget>.layout-row>.control-tabs .form-buttons .btn[class*=" oc-icon-"]:before,
-.fancy-layout *:not(.nested-form)>.form-widget>.layout-row>.form-tabless-fields .form-buttons .btn[class*=" oc-icon-"]:before{opacity:1}
+.fancy-layout *:not(.nested-form)>.form-widget>.layout-row>.control-tabs .form-buttons:not(.normalized),
+.fancy-layout *:not(.nested-form)>.form-widget>.layout-row>.form-tabless-fields .form-buttons:not(.normalized){-webkit-transition:all 0.5s;transition:all 0.5s;padding-top:14px;padding-bottom:5px}
+.fancy-layout *:not(.nested-form)>.form-widget>.layout-row>.control-tabs .form-buttons:not(.normalized) .btn,
+.fancy-layout *:not(.nested-form)>.form-widget>.layout-row>.form-tabless-fields .form-buttons:not(.normalized) .btn{padding:0;margin-right:5px;margin-top:-6px;margin-right:30px;background:transparent;color:#fff;font-weight:normal;-webkit-box-shadow:none;box-shadow:none;opacity:0.5;filter:alpha(opacity=50);-webkit-transition:all 0.3s ease;transition:all 0.3s ease}
+.fancy-layout *:not(.nested-form)>.form-widget>.layout-row>.control-tabs .form-buttons:not(.normalized) .btn:hover,
+.fancy-layout *:not(.nested-form)>.form-widget>.layout-row>.form-tabless-fields .form-buttons:not(.normalized) .btn:hover{opacity:1;filter:alpha(opacity=100)}
+.fancy-layout *:not(.nested-form)>.form-widget>.layout-row>.control-tabs .form-buttons:not(.normalized) .btn:last-child,
+.fancy-layout *:not(.nested-form)>.form-widget>.layout-row>.form-tabless-fields .form-buttons:not(.normalized) .btn:last-child{margin-right:0}
+.fancy-layout *:not(.nested-form)>.form-widget>.layout-row>.control-tabs .form-buttons:not(.normalized) .btn[class^="wn-icon-"]:before,
+.fancy-layout *:not(.nested-form)>.form-widget>.layout-row>.form-tabless-fields .form-buttons:not(.normalized) .btn[class^="wn-icon-"]:before,
+.fancy-layout *:not(.nested-form)>.form-widget>.layout-row>.control-tabs .form-buttons:not(.normalized) .btn[class*=" wn-icon-"]:before,
+.fancy-layout *:not(.nested-form)>.form-widget>.layout-row>.form-tabless-fields .form-buttons:not(.normalized) .btn[class*=" wn-icon-"]:before,
+.fancy-layout *:not(.nested-form)>.form-widget>.layout-row>.control-tabs .form-buttons:not(.normalized) .btn[class^="oc-icon-"]:before,
+.fancy-layout *:not(.nested-form)>.form-widget>.layout-row>.form-tabless-fields .form-buttons:not(.normalized) .btn[class^="oc-icon-"]:before,
+.fancy-layout *:not(.nested-form)>.form-widget>.layout-row>.control-tabs .form-buttons:not(.normalized) .btn[class*=" oc-icon-"]:before,
+.fancy-layout *:not(.nested-form)>.form-widget>.layout-row>.form-tabless-fields .form-buttons:not(.normalized) .btn[class*=" oc-icon-"]:before{opacity:1}
 .fancy-layout form[class$="-data-changed"] *:not(.nested-form)>.form-widget>.layout-row>.control-tabs .btn.save{opacity:1;filter:alpha(opacity=100)}
 .fancy-layout *:not(.nested-form)>.form-widget>.layout-row>.control-tabs>.tab-content>.tab-pane>.form-group>.field-codeeditor{border:none !important;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}
 .fancy-layout *:not(.nested-form)>.form-widget>.layout-row>.control-tabs>.tab-content>.tab-pane>.form-group>.field-codeeditor .editor-code{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0}

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

@@ -641,8 +641,8 @@ body.breadcrumb-fancy .control-breadcrumb,
 // --- FORM BUTTONS
 //
 
-.fancy-layout *:not(.nested-form) > .form-widget > .layout-row > .control-tabs .form-buttons,
-.fancy-layout *:not(.nested-form) > .form-widget > .layout-row > .form-tabless-fields  .form-buttons {
+.fancy-layout *:not(.nested-form) > .form-widget > .layout-row > .control-tabs .form-buttons:not(.normalized),
+.fancy-layout *:not(.nested-form) > .form-widget > .layout-row > .form-tabless-fields  .form-buttons:not(.normalized) {
     .transition(all 0.5s);
     padding-top: 14px;
     padding-bottom: 5px;

modules/backend/assets/ui/js/ajax/Handler.js

@@ -1,3 +1,5 @@
+import { delegate } from 'jquery-events-to-dom-events';
+
 /**
  * Backend AJAX handler.
  *
@@ -36,6 +38,12 @@ export default class Handler extends Snowboard.Singleton {
             return;
         }
 
+        // Add global event for rendering in Snowboard
+        delegate('render');
+        document.addEventListener('$render', () => {
+            this.snowboard.globalEvent('render');
+        });
+
         // Add "render" event for backwards compatibility
         window.jQuery(document).trigger('render');
     }

modules/backend/assets/ui/js/build/backend.js

@@ -1,11 +1,17 @@
+import * as Vue from 'vue';
 import BackendAjaxHandler from './ajax/Handler';
+import BackendUiEventHandler from './ui/EventHandler';
+import BackendUiWidgetHandler from './ui/WidgetHandler';
 
 if (window.Snowboard === undefined) {
     throw new Error('Snowboard must be loaded in order to use the Backend UI.');
 }
 
 ((Snowboard) => {
     Snowboard.addPlugin('backend.ajax.handler', BackendAjaxHandler);
+    Snowboard.addPlugin('backend.ui.eventHandler', BackendUiEventHandler);
+    Snowboard.addPlugin('backend.ui.widgetHandler', BackendUiWidgetHandler);
+
     // Add the pre-filter immediately
     Snowboard['backend.ajax.handler']().addPrefilter();
 
@@ -23,3 +29,6 @@ if (window.Snowboard === undefined) {
     };
     window.assetManager = window.AssetManager;
 })(window.Snowboard);
+
+// Add Vue to global scope
+window.Vue = Vue;