This commit is contained in:
2020-06-14 20:30:48 +00:00
parent ff6fe10908
commit c2cd2b95ca
2 changed files with 19 additions and 21 deletions

View File

@@ -5,8 +5,7 @@ PRIORITY - ALWAYS Lowest level stuff first, i.e. TODO at server, api route chang
WIFI change 5g channel to 52,56,60 and 2g channel to 8
recheck before doing as it seems to vary, maybe someone else's is auto switching
WTF - not the latest vuetify!
https://github.com/vuetifyjs/vuetify/releases/v2.3.0#user-content-upgrade-guide
todo: ensure dbid on about page
No, showing empty for no license mode, wtf?

View File

@@ -6,49 +6,42 @@
<gz-error :errorBoxMessage="formState.errorBoxMessage"></gz-error>
<template v-if="showLicenseUi() == 'ok'">
<!-- Normal active license UI -->
<div>
<div class="ml-1 ml-sm-6">
<div class="text-h5 mb-2">{{ $ay.t("HelpLicense") }}</div>
<div>
<span class="ml-1 ml-sm-6 text-body-2 text-sm-body-1"
>{{ $ay.t("RegisteredUser") }}:
</span>
<span class="ml-1 ml-sm-6 text-subtitle-2"
>abcdefg{{ currentLicenseInfo.licensedTo }}</span
>
{{ $ay.t("RegisteredUser") }}
<span class="font-weight-bold ml-1">{{
currentLicenseInfo.licensedTo
}}</span>
</div>
<div>
<span class="ml-6 ">{{ $ay.t("DatabaseID") }}: </span>
{{ $ay.t("DatabaseID") }}
<span class="body-2">{{ currentLicenseInfo.serverDbId }}</span>
</div>
<div>
<span class="ml-6 body-1">{{ $ay.t("LicenseSerial") }}: </span>
<span class=" body-1">{{ $ay.t("LicenseSerial") }}: </span>
<span class="body-2">{{ currentLicenseInfo.keySerial }}</span>
</div>
<div>
<span class="ml-6 body-1"
>{{ $ay.t("LicenseExpiration") }}:
</span>
<span class=" body-1">{{ $ay.t("LicenseExpiration") }}: </span>
<span class="body-2">{{
$ay.dt(currentLicenseInfo.licenseExpiration)
}}</span>
</div>
<div>
<span class="ml-6 body-1">{{ $ay.t("SupportedUntil") }}: </span>
<span class=" body-1">{{ $ay.t("SupportedUntil") }}: </span>
<span class="body-2">{{
$ay.dt(currentLicenseInfo.maintenanceExpiration)
}}</span>
</div>
<v-divider class="mt-6"></v-divider>
<v-subheader
:data-cy="!!$ay.dev ? 'aboutlicensedoptions' : false"
>{{ $ay.t("LicensedOptions") }}</v-subheader
>
<h2 class="mt-6 mb-2">{{ $ay.t("LicensedOptions") }}</h2>
<div
v-for="item in currentLicenseInfo.features"
:key="item.Feature"
>
<span class="ml-6 body-1">{{ item.Feature }}</span>
<span class=" body-1">{{ item.Feature }}</span>
<span class="body-2">{{
item.Count ? ": " + item.Count : ""
}}</span>
@@ -508,6 +501,12 @@ function initForm(vm) {
//
function fetchTranslatedText(vm) {
return window.$gz.translation.cacheTranslations([
"RegisteredUser",
"DatabaseID",
"LicenseSerial",
"LicenseExpiration",
"SupportedUntil",
"LicensedOptions",
"CheckForLicense",
"SendEvaluationRequest",
"NoLicenseTitle",