Compatibility with OCv3

rainlab · May 13, 2022 · 387ac69 · 387ac69 · hackolein · Jan 5, 2024
1 parent 5561264
commit 387ac69
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 18 deletions.
diff --git a/Plugin.php b/Plugin.php
@@ -18,7 +18,6 @@ class Plugin extends PluginBase
      */
     public function register()
     {
-        $this->registerAssetBundles();
     }
 
     /**
@@ -27,14 +26,4 @@ public function register()
     public function boot()
     {
     }
-
-    /**
-     * registerAssetBundles for compiling assets
-     */
-    protected function registerAssetBundles()
-    {
-        CombineAssets::registerCallback(function ($combiner) {
-            $combiner->registerBundle('$/rainlab/deploy/assets/less/deploy.less');
-        });
-    }
 }
diff --git a/assets/css/deploy.css b/assets/css/deploy.css
diff --git a/assets/less/deploy.less b/assets/less/deploy.less
@@ -3,6 +3,12 @@
     padding: 10px 0 5px;
     margin-top: -20px;
 
+    h5 {
+        margin-top: 0.75rem;
+        font-weight: 400;
+        font-size: 1rem;
+    }
+
     p {
         color: #999;
     }

diff --git a/controllers/servers/_action_form.htm b/controllers/servers/_action_form.htm
@@ -5,7 +5,7 @@
 
     <input type="hidden" name="server_id" value="<?= post('server_id') ?>" />
 
-    <div class="modal-header">
+    <div class="modal-header flex-row-reverse">
         <button type="button" class="close" data-dismiss="popup">&times;</button>
         <h4 class="modal-title"><?= e(__($actionTitle)) ?></h4>
     </div>

diff --git a/controllers/servers/_field_privatekey.htm b/controllers/servers/_field_privatekey.htm
@@ -8,7 +8,7 @@
     placeholder="<?= e(trans($field->placeholder)) ?>"
     <?= $field->getAttributes() ?>><?= e($field->value) ?></textarea>
 
-<p class="help-block">
+<p class="help-block form-text">
     <?= __("Paste an existing RSA private key in here or :action.", [
         'action' => '<a href="javascript:generatePrivateKey()">'.__("generate a new one").'</a>'
     ]) ?>

diff --git a/controllers/servers/_shell_form.htm b/controllers/servers/_shell_form.htm
@@ -5,7 +5,7 @@
 
     <input type="hidden" name="server_id" value="<?= post('server_id') ?>" />
 
-    <div class="modal-header">
+    <div class="modal-header flex-row-reverse">
         <button type="button" class="close" data-dismiss="popup">&times;</button>
         <h4 class="modal-title"><?= e(__($actionTitle)) ?></h4>
     </div>

diff --git a/rainlab-deploy.mix.js b/rainlab-deploy.mix.js
@@ -0,0 +1,14 @@
+/*
+ |--------------------------------------------------------------------------
+ | Mix Asset Management
+ |--------------------------------------------------------------------------
+ |
+ | Mix provides a clean, fluent API for defining some Webpack build steps
+ | for your theme assets. By default, we are compiling the CSS
+ | file for the application as well as bundling up all the JS files.
+ |
+ */
+
+module.exports = (mix) => {
+    mix.less('plugins/rainlab/deploy/assets/less/deploy.less', 'plugins/rainlab/deploy/assets/css/');
+}