From 0ff93919d117504cc80e1df1307116085c119338 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Mon, 17 Aug 2020 23:41:06 +0000
Subject: [PATCH]

---
 ayanova/src/components/error-control.vue     |   2 +-
 ayanova/src/views/adm-license.vue            | 238 +++++++------------
 ayanova/src/views/ops-view-configuration.vue | 130 ++++++----
 3 files changed, 169 insertions(+), 201 deletions(-)

diff --git a/ayanova/src/components/error-control.vue b/ayanova/src/components/error-control.vue
index 51311e7c..4c2f1d73 100644
--- a/ayanova/src/components/error-control.vue
+++ b/ayanova/src/components/error-control.vue
@@ -1,5 +1,5 @@
 <template>
-  <v-col cols="12" mt-1 mb-2>
+  <v-col v-if="errorBoxMessage" cols="12" mt-1 mb-2>
     <v-alert
       ref="errorbox"
       :data-cy="!!$ay.dev ? 'errorbox' : false"
diff --git a/ayanova/src/views/adm-license.vue b/ayanova/src/views/adm-license.vue
index 87181c55..96e84d82 100644
--- a/ayanova/src/views/adm-license.vue
+++ b/ayanova/src/views/adm-license.vue
@@ -1,165 +1,103 @@
 <template>
   <v-row v-if="formState.ready">
+    <gz-error :errorBoxMessage="formState.errorBoxMessage"></gz-error>
     <v-col>
       <v-form ref="form">
-        <v-row>
-          <gz-error :errorBoxMessage="formState.errorBoxMessage"></gz-error>
+        <v-row align="start" justify="center">
           <template v-if="showLicenseUi() == 'ok'">
             <!-- Normal active license UI -->
+            <v-col cols="12" md="7">
+              <v-card>
+                <v-list two-line subheader>
+                  <v-subheader>{{ $ay.t("HelpLicense") }}</v-subheader>
 
-            <v-list two-line subheader>
-              <v-subheader>{{ $ay.t("HelpLicense") }}</v-subheader>
+                  <v-list-item>
+                    <v-list-item-content>
+                      <v-list-item-title>{{
+                        $ay.t("RegisteredUser")
+                      }}</v-list-item-title>
+                      <v-list-item-subtitle class="text-wrap">{{
+                        currentLicenseInfo.licensedTo
+                      }}</v-list-item-subtitle>
+                    </v-list-item-content>
+                  </v-list-item>
 
-              <v-list-item>
-                <v-list-item-content>
-                  <v-list-item-title>{{
-                    $ay.t("RegisteredUser")
-                  }}</v-list-item-title>
-                  <v-list-item-subtitle>{{
-                    currentLicenseInfo.licensedTo
-                  }}</v-list-item-subtitle>
-                </v-list-item-content>
-              </v-list-item>
+                  <v-list-item>
+                    <v-list-item-content>
+                      <v-list-item-title>{{
+                        $ay.t("DatabaseID")
+                      }}</v-list-item-title>
+                      <v-list-item-subtitle class="text-wrap">{{
+                        currentLicenseInfo.serverDbId
+                      }}</v-list-item-subtitle>
+                    </v-list-item-content>
+                  </v-list-item>
 
-              <v-list-item>
-                <v-list-item-content>
-                  <v-list-item-title>{{
-                    $ay.t("DatabaseID")
-                  }}</v-list-item-title>
-                  <v-list-item-subtitle>{{
-                    currentLicenseInfo.serverDbId
-                  }}</v-list-item-subtitle>
-                </v-list-item-content>
-              </v-list-item>
+                  <v-list-item>
+                    <v-list-item-content>
+                      <v-list-item-title>
+                        {{ $ay.t("LicenseSerial") }}</v-list-item-title
+                      >
+                      <v-list-item-subtitle class="text-wrap">{{
+                        currentLicenseInfo.keySerial
+                      }}</v-list-item-subtitle>
+                    </v-list-item-content>
+                  </v-list-item>
 
-              <v-list-item>
-                <v-list-item-content>
-                  <v-list-item-title>
-                    {{ $ay.t("LicenseSerial") }}</v-list-item-title
+                  <v-list-item v-if="currentLicenseInfo.licenseWillExpire">
+                    <v-list-item-content>
+                      <v-list-item-title>
+                        {{ $ay.t("LicenseExpiration") }}</v-list-item-title
+                      >
+                      <v-list-item-subtitle class="text-wrap">{{
+                        $ay.sd(currentLicenseInfo.licenseExpiration)
+                      }}</v-list-item-subtitle>
+                    </v-list-item-content>
+                  </v-list-item>
+
+                  <v-list-item>
+                    <v-list-item-content
+                      v-bind:class="{
+                        'red--text text-h6':
+                          currentLicenseInfo.maintenanceExpired
+                      }"
+                    >
+                      <v-list-item-title>
+                        {{ $ay.t("SupportedUntil") }}</v-list-item-title
+                      >
+                      <v-list-item-subtitle class="text-wrap">{{
+                        $ay.sd(currentLicenseInfo.maintenanceExpiration)
+                      }}</v-list-item-subtitle>
+                    </v-list-item-content>
+                  </v-list-item>
+
+                  <v-subheader>{{ $ay.t("LicensedOptions") }}</v-subheader>
+
+                  <v-list-item
+                    v-for="item in currentLicenseInfo.features"
+                    :key="item.Feature"
                   >
-                  <v-list-item-subtitle>{{
-                    currentLicenseInfo.keySerial
-                  }}</v-list-item-subtitle>
-                </v-list-item-content>
-              </v-list-item>
+                    <v-list-item-content>
+                      <v-list-item-title>{{ item.Feature }}</v-list-item-title>
+                      <v-list-item-subtitle class="text-wrap">{{
+                        item.Count ? +item.Count : "&#10003;"
+                      }}</v-list-item-subtitle>
+                    </v-list-item-content>
+                  </v-list-item>
+                </v-list>
+              </v-card>
+            </v-col>
 
-              <v-list-item v-if="currentLicenseInfo.licenseWillExpire">
-                <v-list-item-content>
-                  <v-list-item-title>
-                    {{ $ay.t("LicenseExpiration") }}</v-list-item-title
-                  >
-                  <v-list-item-subtitle>{{
-                    $ay.sd(currentLicenseInfo.licenseExpiration)
-                  }}</v-list-item-subtitle>
-                </v-list-item-content>
-              </v-list-item>
-
-              <v-list-item>
-                <v-list-item-content
-                  v-bind:class="{
-                    'red--text text-h6': currentLicenseInfo.maintenanceExpired
-                  }"
-                >
-                  <v-list-item-title>
-                    {{ $ay.t("SupportedUntil") }}</v-list-item-title
-                  >
-                  <v-list-item-subtitle>{{
-                    $ay.sd(currentLicenseInfo.maintenanceExpiration)
-                  }}</v-list-item-subtitle>
-                </v-list-item-content>
-              </v-list-item>
-
-              <v-subheader>{{ $ay.t("LicensedOptions") }}</v-subheader>
-
-              <v-list-item
-                v-for="item in currentLicenseInfo.features"
-                :key="item.Feature"
-              >
-                <v-list-item-content>
-                  <v-list-item-title>{{ item.Feature }}</v-list-item-title>
-                  <v-list-item-subtitle>{{
-                    item.Count ? +item.Count : "&#10003;"
-                  }}</v-list-item-subtitle>
-                </v-list-item-content>
-              </v-list-item>
-            </v-list>
-
-            <div class="ml-1 ml-sm-6">
-              <div class="text-h5 mb-2">{{ $ay.t("HelpLicense") }}</div>
-
-              <div class="my-1">
-                <span class="text-subtitle-1 text-sm-h5">{{
-                  $ay.t("RegisteredUser")
-                }}</span>
-                <br />
-                <span class="text-subtitle-2 text-sm-h6">{{
-                  currentLicenseInfo.licensedTo
-                }}</span>
-              </div>
-              <div class="my-1">
-                <span class="text-subtitle-1 text-sm-h5">{{
-                  $ay.t("DatabaseID")
-                }}</span>
-                <br />
-                <span class="text-subtitle-2 text-sm-h6">{{
-                  currentLicenseInfo.serverDbId
-                }}</span>
-              </div>
-              <div class="my-1">
-                <span class="text-subtitle-1 text-sm-h5 mt-1">
-                  {{ $ay.t("LicenseSerial") }}</span
-                >
-                <br />
-                <span class="text-subtitle-2 text-sm-h6">{{
-                  currentLicenseInfo.keySerial
-                }}</span>
-              </div>
-              <div v-if="currentLicenseInfo.licenseWillExpire">
-                {{ $ay.t("LicenseExpiration") }}
-                <span class="font-weight-bold ml-1">{{
-                  $ay.sd(currentLicenseInfo.licenseExpiration)
-                }}</span>
-              </div>
-              <div
-                v-bind:class="{
-                  'red--text text-h6': currentLicenseInfo.maintenanceExpired
-                }"
-              >
-                {{ $ay.t("SupportedUntil") }}
-                <span class="font-weight-bold ml-1">{{
-                  $ay.sd(currentLicenseInfo.maintenanceExpiration)
-                }}</span>
-              </div>
-
-              <div class="text-h5 mb-2 mt-5">
-                {{ $ay.t("LicensedOptions") }}
-              </div>
-
-              <div
-                v-for="item in currentLicenseInfo.features"
-                :key="item.Feature"
-              >
-                {{ item.Feature }}
-                <span class="font-weight-bold ml-1">{{
-                  item.Count ? +item.Count : ""
-                }}</span>
-              </div>
-
-              <div class="mt-8">
-                <v-col cols="12">
-                  <v-btn
-                    :href="purchaseLink()"
-                    target="_blank"
-                    class="mt-4 mr-4"
-                    >{{ $ay.t("PurchaseLicense") }}</v-btn
-                  >
-                  <v-btn @click="fetchKey()" class="mt-4">{{
-                    $ay.t("CheckForLicense")
-                  }}</v-btn>
-                </v-col>
-              </div>
-            </div></template
-          >
+            <v-col cols="12" md="7">
+              <v-btn :href="purchaseLink()" target="_blank" class="mt-4 mr-4">{{
+                $ay.t("PurchaseLicense")
+              }}</v-btn>
+              <v-btn @click="fetchKey()" class="mt-4">{{
+                $ay.t("CheckForLicense")
+              }}</v-btn>
+            </v-col>
+            <!-- </div> -->
+          </template>
           <template
             v-if="
               showLicenseUi() == 'needcantrial' ||
diff --git a/ayanova/src/views/ops-view-configuration.vue b/ayanova/src/views/ops-view-configuration.vue
index 1ee418de..a601eeca 100644
--- a/ayanova/src/views/ops-view-configuration.vue
+++ b/ayanova/src/views/ops-view-configuration.vue
@@ -1,63 +1,93 @@
 <template>
-  <v-row v-if="this.formState.ready">
+  <v-row v-if="this.formState.ready" align="start" justify="center">
     <gz-error :errorBoxMessage="formState.errorBoxMessage"></gz-error>
-    <v-col>
-      <div>
-        <span class="ml-sm-6 text-sm-subtitle-1"
-          >AYANOVA_DEFAULT_TRANSLATION:
-        </span>
-        <span class="text-sm-h6">{{ config.ayanovA_DEFAULT_TRANSLATION }}</span>
-      </div>
+    <v-col cols="12" md="7">
+      <v-card>
+        <v-list two-line>
+          <v-list-item>
+            <v-list-item-content>
+              <v-list-item-title>AYANOVA_DEFAULT_TRANSLATION</v-list-item-title>
+              <v-list-item-subtitle class="text-wrap">{{
+                config.ayanovA_DEFAULT_TRANSLATION
+              }}</v-list-item-subtitle>
+            </v-list-item-content>
+          </v-list-item>
 
-      <div class="mt-3">
-        <span class="ml-sm-6 text-sm-subtitle-1">AYANOVA_USE_URLS: </span>
-        <span class="text-sm-h6">{{ config.ayanovA_USE_URLS }}</span>
-      </div>
+          <v-list-item>
+            <v-list-item-content>
+              <v-list-item-title>AYANOVA_USE_URLS</v-list-item-title>
+              <v-list-item-subtitle class="text-wrap">{{
+                config.ayanovA_USE_URLS
+              }}</v-list-item-subtitle>
+            </v-list-item-content>
+          </v-list-item>
 
-      <div class="mt-3">
-        <span class="ml-sm-6 text-sm-subtitle-1">AYANOVA_DB_CONNECTION: </span>
-        <span class="text-sm-h6">{{ config.ayanovA_DB_CONNECTION }}</span>
-      </div>
+          <v-list-item>
+            <v-list-item-content>
+              <v-list-item-title>AYANOVA_DB_CONNECTION</v-list-item-title>
+              <v-list-item-subtitle class="text-wrap">{{
+                config.ayanovA_DB_CONNECTION
+              }}</v-list-item-subtitle>
+            </v-list-item-content>
+          </v-list-item>
 
-      <div class="mt-3">
-        <span class="ml-sm-6 text-sm-subtitle-1"
-          >AYANOVA_FOLDER_USER_FILES:
-        </span>
-        <span class="text-sm-h6">{{ config.ayanovA_FOLDER_USER_FILES }}</span>
-      </div>
+          <v-list-item>
+            <v-list-item-content>
+              <v-list-item-title>AYANOVA_FOLDER_USER_FILES</v-list-item-title>
+              <v-list-item-subtitle class="text-wrap">{{
+                config.ayanovA_FOLDER_USER_FILES
+              }}</v-list-item-subtitle>
+            </v-list-item-content>
+          </v-list-item>
 
-      <div class="mt-3">
-        <span class="ml-sm-6 text-sm-subtitle-1"
-          >AYANOVA_FOLDER_BACKUP_FILES:
-        </span>
-        <span class="text-sm-h6">{{ config.ayanovA_FOLDER_BACKUP_FILES }}</span>
-      </div>
+          <v-list-item>
+            <v-list-item-content>
+              <v-list-item-title>AYANOVA_FOLDER_BACKUP_FILES</v-list-item-title>
+              <v-list-item-subtitle class="text-wrap">{{
+                config.ayanovA_FOLDER_BACKUP_FILES
+              }}</v-list-item-subtitle>
+            </v-list-item-content>
+          </v-list-item>
 
-      <div class="mt-3">
-        <span class="ml-sm-6 text-sm-subtitle-1"
-          >AYANOVA_BACKUP_PG_DUMP_PATH:
-        </span>
-        <span class="text-sm-h6">{{ config.ayanovA_BACKUP_PG_DUMP_PATH }}</span>
-      </div>
+          <v-list-item>
+            <v-list-item-content>
+              <v-list-item-title>AYANOVA_BACKUP_PG_DUMP_PATH</v-list-item-title>
+              <v-list-item-subtitle class="text-wrap">{{
+                config.ayanovA_BACKUP_PG_DUMP_PATH
+              }}</v-list-item-subtitle>
+            </v-list-item-content>
+          </v-list-item>
 
-      <div class="mt-3">
-        <span class="ml-sm-6 text-sm-subtitle-1">AYANOVA_LOG_PATH: </span>
-        <span class="text-sm-h6">{{ config.ayanovA_LOG_PATH }}</span>
-      </div>
+          <v-list-item>
+            <v-list-item-content>
+              <v-list-item-title>AYANOVA_LOG_PATH</v-list-item-title>
+              <v-list-item-subtitle class="text-wrap">{{
+                config.ayanovA_LOG_PATH
+              }}</v-list-item-subtitle>
+            </v-list-item-content>
+          </v-list-item>
 
-      <div class="mt-3">
-        <span class="ml-sm-6 text-sm-subtitle-1">AYANOVA_LOG_LEVEL: </span>
-        <span class="text-sm-h6">{{ config.ayanovA_LOG_LEVEL }}</span>
-      </div>
+          <v-list-item>
+            <v-list-item-content>
+              <v-list-item-title>AYANOVA_LOG_LEVEL</v-list-item-title>
+              <v-list-item-subtitle class="text-wrap">{{
+                config.ayanovA_LOG_LEVEL
+              }}</v-list-item-subtitle>
+            </v-list-item-content>
+          </v-list-item>
 
-      <div class="mt-3">
-        <span class="ml-sm-6 text-sm-subtitle-1"
-          >AYANOVA_LOG_ENABLE_LOGGER_DIAGNOSTIC_LOG:
-        </span>
-        <span class="text-sm-h6">{{
-          config.ayanovA_LOG_ENABLE_LOGGER_DIAGNOSTIC_LOG
-        }}</span>
-      </div>
+          <v-list-item>
+            <v-list-item-content>
+              <v-list-item-title class="text-wrap"
+                >AYANOVA_LOG_ENABLE_LOGGER_DIAGNOSTIC_LOG</v-list-item-title
+              >
+              <v-list-item-subtitle class="text-wrap">{{
+                config.ayanovA_LOG_ENABLE_LOGGER_DIAGNOSTIC_LOG
+              }}</v-list-item-subtitle>
+            </v-list-item-content>
+          </v-list-item>
+        </v-list>
+      </v-card>
     </v-col>
   </v-row>
 </template>