Merge branch 'develop' into label-placement

Author: mjauvin

modules/backend/ServiceProvider.php

@@ -10,6 +10,7 @@
 use Backend\Models\UserRole;
 use Exception;
 use Illuminate\Support\Facades\Event;
+use System\Classes\Asset\PackageManager;
 use System\Classes\CombineAssets;
 use System\Classes\MailManager;
 use System\Classes\SettingsManager;
@@ -31,7 +32,6 @@ public function register()
 
         $this->registerConsole();
         $this->registerMailer();
-        $this->registerAssetBundles();
         $this->registerBackendPermissions();
         $this->registerBackendUserEvents();
 
@@ -53,6 +53,7 @@ public function register()
      */
     public function boot()
     {
+        $this->registerAssetBundles();
         parent::boot('backend');
     }
 
@@ -90,13 +91,12 @@ protected function registerAssetBundles()
             $combiner->registerBundle('~/modules/backend/assets/less/winter.less');
             $combiner->registerBundle('~/modules/backend/assets/js/winter.js');
             $combiner->registerBundle('~/modules/backend/widgets/table/assets/js/build.js');
+            $combiner->registerBundle('~/modules/backend/assets/vendor/ace-codeeditor/build.js');
             $combiner->registerBundle('~/modules/backend/widgets/mediamanager/assets/js/mediamanager-browser.js');
             $combiner->registerBundle('~/modules/backend/widgets/mediamanager/assets/less/mediamanager.less');
             $combiner->registerBundle('~/modules/backend/widgets/reportcontainer/assets/less/reportcontainer.less');
             $combiner->registerBundle('~/modules/backend/widgets/table/assets/less/table.less');
-            $combiner->registerBundle('~/modules/backend/formwidgets/codeeditor/assets/less/codeeditor.less');
             $combiner->registerBundle('~/modules/backend/formwidgets/repeater/assets/less/repeater.less');
-            $combiner->registerBundle('~/modules/backend/formwidgets/codeeditor/assets/js/build.js');
             $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');
@@ -111,6 +111,10 @@ protected function registerAssetBundles()
                 $combiner->registerBundle('~/modules/backend/formwidgets/richeditor/assets/js/build.js');
             }
         });
+
+        PackageManager::registerCallback(function ($mix) {
+            $mix->registerPackage('module-backend.formwidgets.codeeditor', '~/modules/backend/formwidgets/codeeditor/assets/winter.mix.js');
+        });
     }
 
     /*

modules/backend/assets/.gitignore

@@ -0,0 +1 @@
+!vendor

modules/backend/assets/css/winter.css

@@ -1021,7 +1021,8 @@ body.fancy-layout .master-tabs.control-tabs>.tab-content>.tab-pane.padded-pane,
 .fancy-layout *:not(.nested-form):not(.modal-body)>.form-widget>.layout-row>.control-tabs.secondary-tabs.secondary-content-tabs>div>ul.nav-tabs>li.active a>span.title{background-color:white}
 .fancy-layout *:not(.nested-form):not(.modal-body)>.form-widget>.layout-row>.control-tabs.secondary-tabs.secondary-content-tabs>div>ul.nav-tabs>li.active a>span.title:before,
 .fancy-layout *:not(.nested-form):not(.modal-body)>.form-widget>.layout-row>.control-tabs.secondary-tabs.secondary-content-tabs>div>ul.nav-tabs>li.active a>span.title:after{display:block}
-.fancy-layout *:not(.nested-form):not(.modal-body)>.form-widget>.layout-row>.control-tabs.secondary-tabs.secondary-content-tabs.primary-collapsed .tab-collapse-icon.primary{color:white}
+.fancy-layout *:not(.nested-form):not(.modal-body)>.form-widget>.layout-row>.control-tabs.secondary-tabs.secondary-content-tabs .tab-collapse-icon.primary{color:#000}
+.fancy-layout *:not(.nested-form):not(.modal-body)>.form-widget>.layout-row>.control-tabs.secondary-tabs.secondary-content-tabs.primary-collapsed .tab-collapse-icon.primary{color:#fff}
 .fancy-layout *:not(.nested-form):not(.modal-body)>.form-widget>.layout-row>.control-tabs.secondary-tabs.secondary-content-tabs.primary-collapsed>div>ul.nav-tabs{background:#2da7c7}
 .fancy-layout *:not(.nested-form):not(.modal-body)>.form-widget>.layout-row>.control-tabs.secondary-tabs.secondary-content-tabs.primary-collapsed>div>ul.nav-tabs>li a{color:white}
 .fancy-layout *:not(.nested-form):not(.modal-body)>.form-widget>.layout-row>.control-tabs.secondary-tabs.secondary-content-tabs.primary-collapsed>div>ul.nav-tabs>li a>span.title:before,

modules/backend/assets/js/preferences/preferences.js

@@ -437,9 +437,13 @@ body.fancy-layout .master-tabs.control-tabs,
             }
         }
 
+        .tab-collapse-icon.primary {
+            color: #000000;
+        }
+
         &.primary-collapsed {
             .tab-collapse-icon.primary {
-                color: white;
+                color: @color-fancy-master-tabs-active-text;
             }
 
             > div > ul.nav-tabs {

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

@@ -37,6 +37,7 @@ export default class Handler extends Snowboard.Singleton {
         if (!window.jQuery) {
             return;
         }
+        delegate('render');
 
         // Add global event for rendering in Snowboard
         delegate('render');
@@ -46,6 +47,11 @@ export default class Handler extends Snowboard.Singleton {
 
         // Add "render" event for backwards compatibility
         window.jQuery(document).trigger('render');
+
+        // Add global event for rendering in Snowboard
+        document.addEventListener('$render', () => {
+            this.snowboard.globalEvent('render');
+        });
     }
 
     /**