From 387ac69e79e4ca418d4e485d85127104b2dfb078 Mon Sep 17 00:00:00 2001
From: Sam Georges <realsamgeorges@gmail.com>
Date: Fri, 13 May 2022 10:39:58 +1000
Subject: [PATCH] Compatibility with OCv3

---
 Plugin.php                                | 11 -----------
 assets/css/deploy.css                     |  5 +----
 assets/less/deploy.less                   |  6 ++++++
 controllers/servers/_action_form.htm      |  2 +-
 controllers/servers/_field_privatekey.htm |  2 +-
 controllers/servers/_shell_form.htm       |  2 +-
 rainlab-deploy.mix.js                     | 14 ++++++++++++++
 7 files changed, 24 insertions(+), 18 deletions(-)
 create mode 100644 rainlab-deploy.mix.js

diff --git a/Plugin.php b/Plugin.php
index f859853..e2ce289 100644
--- 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
index a83dbcb..affe3ce 100644
--- a/assets/css/deploy.css
+++ b/assets/css/deploy.css
@@ -1,4 +1 @@
-.deploy-action{border-bottom:1px solid #d7e1ea;padding:10px 0 5px;margin-top:-20px}
-.deploy-action p{color:#999}
-.deploy-action .deploy-action-button{margin-top:15px;margin-bottom:10px}
-@media (min-width:992px){.deploy-action .deploy-action-button{text-align:right}}
\ No newline at end of file
+.deploy-action{border-bottom:1px solid #d7e1ea;margin-top:-20px;padding:10px 0 5px}.deploy-action h5{font-size:1rem;font-weight:400;margin-top:.75rem}.deploy-action p{color:#999}.deploy-action .deploy-action-button{margin-bottom:10px;margin-top:15px}@media (min-width:992px){.deploy-action .deploy-action-button{text-align:right}}
diff --git a/assets/less/deploy.less b/assets/less/deploy.less
index dc1a528..cb7501d 100644
--- 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
index ab89c03..ebd96d9 100644
--- 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
index ad99e4b..e226396 100644
--- 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
index e242b31..b7556ea 100644
--- 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
new file mode 100644
index 0000000..c658e59
--- /dev/null
+++ 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/');
+}