From 730cac3e50b22bca235568c8a4b846130ae3be70 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Wed, 24 Aug 2022 21:59:00 +0000
Subject: [PATCH]

---
 wwwroot/js/app.ravLicense.js                  | 10 +++-
 .../js/templates/app.ravLicense.handlebars    | 58 ++++++++++++-------
 2 files changed, 44 insertions(+), 24 deletions(-)

diff --git a/wwwroot/js/app.ravLicense.js b/wwwroot/js/app.ravLicense.js
index bc73543..c1b887f 100644
--- a/wwwroot/js/app.ravLicense.js
+++ b/wwwroot/js/app.ravLicense.js
@@ -22,7 +22,9 @@ app.ravLicense = (function () {
         onRevoke,
         onPerpetualChanged,
         onLicenseExpiresSetOneMonth,
-        onLicenseExpiresSetOneYear;
+        onLicenseExpiresSetOneYear,
+        onMaintExpiresSetOneMonth,
+        onMaintExpiresSetOneYear;
     //----------------- END MODULE SCOPE VARIABLES ---------------
 
     //------------------- BEGIN UTILITY METHODS ------------------
@@ -131,7 +133,11 @@ app.ravLicense = (function () {
         $("#subusercountblock").toggleClass("d-none");
         $("#subcustcountblock").toggleClass("d-none");
 
-        $("#licenseExpires").prop("checked", !$("#perpetual").prop("checked"));
+        const isPerpetual = $("#perpetual").prop("checked");
+        $("#licenseExpires").prop("checked", !isPerpetual);
+        $("#title").text(
+            isPerpetual ? "Perpetual license" : "Subscription license"
+        );
 
         return false; //prevent default
     };
diff --git a/wwwroot/js/templates/app.ravLicense.handlebars b/wwwroot/js/templates/app.ravLicense.handlebars
index e252f7e..cb5a4e7 100644
--- a/wwwroot/js/templates/app.ravLicense.handlebars
+++ b/wwwroot/js/templates/app.ravLicense.handlebars
@@ -3,7 +3,22 @@
         <div class="row">
 
             <input id="siteId" name="siteId" type="hidden" value="" />
-
+            <div class="col-sm-6">
+                <h1 id="title">Subscription license</h1>
+            </div>
+            <div class="col-sm-6">
+                <div class="form-check">
+                    <label class="form-check-label" for="perpetual">
+                        <input
+                            class="form-check-input"
+                            type="checkbox"
+                            name="perpetual"
+                            id="perpetual"
+                        />
+                        Perpetual license
+                    </label>
+                </div>
+            </div>
             <div class="col-sm-6">
                 <div class="form-group">
                     <label for="registeredTo">Registered to</label>
@@ -40,8 +55,14 @@
                         name="maintenanceExpirationDate"
                         value=""
                     />
-                     <button id="btn-maint-expires-plus-one-month" class="btn btn-outline-primary">+1 Month</button>
-                    <button id="btn-maint-expires-plus-one-year" class="btn btn-outline-primary">+1 Year</button>
+                    <button
+                        id="btn-maint-expires-plus-one-month"
+                        class="btn btn-outline-primary"
+                    >+1 Month</button>
+                    <button
+                        id="btn-maint-expires-plus-one-year"
+                        class="btn btn-outline-primary"
+                    >+1 Year</button>
                 </div>
             </div>
 
@@ -53,6 +74,7 @@
                             type="checkbox"
                             name="licenseExpires"
                             id="licenseExpires"
+                            checked
                         />
                         Temporary key / expires
                     </label>
@@ -63,22 +85,14 @@
                         name="licenseExpirationDate"
                         value=""
                     />
-                    <button id="btn-license-expires-plus-one-month" class="btn btn-outline-primary">+1 Month</button>
-                    <button id="btn-license-expires-plus-one-year" class="btn btn-outline-primary">+1 Year</button>
-                </div>
-            </div>
-
-            <div class="col-sm-6">
-                <div class="form-check">
-                    <label class="form-check-label" for="perpetual">
-                        <input
-                            class="form-check-input"
-                            type="checkbox"
-                            name="perpetual"
-                            id="perpetual"
-                        />
-                        Perpetual license
-                    </label>
+                    <button
+                        id="btn-license-expires-plus-one-month"
+                        class="btn btn-outline-primary"
+                    >+1 Month</button>
+                    <button
+                        id="btn-license-expires-plus-one-year"
+                        class="btn btn-outline-primary"
+                    >+1 Year</button>
                 </div>
             </div>
 
@@ -95,7 +109,7 @@
                 </div>
             </div>
 
-            <div  id="subusercountblock" class="col-sm-6">
+            <div id="subusercountblock" class="col-sm-6">
                 <div class="form-group">
                     <label for="subusercount">Internal users</label>
                     <input
@@ -139,8 +153,8 @@
 
         </div>
 
-        {{!-- <div class="app-frm-buttons">
+        {{! <div class="app-frm-buttons">
             <button id="btn-revoke" class="btn btn-warning">Revoke</button>
-        </div> --}}
+        </div> }}
     </form>
 </div>
\ No newline at end of file