From 492e59f6d5f1f76478c648459c326c7d5fba147a Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 16 Nov 2023 19:32:17 +0100 Subject: [PATCH] Update shadows x LAND --- .gitlab-ci.yml | 1 + MP.Land/Components/CmpFooter.razor | 2 +- MP.Land/MP.Land.csproj | 4 +- MP.Land/Pages/About.razor | 30 ++++++------ MP.Land/Pages/Contacts.razor | 4 +- MP.Land/Pages/Index.razor | 4 +- MP.Land/Pages/SysInfo.razor | 4 +- MP.Land/Pages/UpdateManager.razor | 4 +- MP.Land/Pages/UserQr.razor | 2 +- MP.Land/Resources/ChangeLog.html | 2 +- MP.Land/Resources/VersNum.txt | 2 +- MP.Land/Resources/manifest.xml | 2 +- MP.Land/wwwroot/img/LogoEgalware.svg | 21 +++++++++ MP.Land/wwwroot/img/LogoEgalwareBianco.svg | 55 ++++++++++++++++++++++ 14 files changed, 108 insertions(+), 29 deletions(-) create mode 100644 MP.Land/wwwroot/img/LogoEgalware.svg create mode 100644 MP.Land/wwwroot/img/LogoEgalwareBianco.svg diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index f731a786..33c96601 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -214,6 +214,7 @@ LAND:IIS01:deploy: - dotnet restore "$env:SOL_NAME.sln" only: - develop + - feature\/LAND.+ needs: ["LAND:build"] script: - dotnet build $env:APP_NAME/$env:APP_NAME.csproj diff --git a/MP.Land/Components/CmpFooter.razor b/MP.Land/Components/CmpFooter.razor index 75e13002..1ba50c22 100644 --- a/MP.Land/Components/CmpFooter.razor +++ b/MP.Land/Components/CmpFooter.razor @@ -4,7 +4,7 @@
@adesso - Egalware + Egalware  
diff --git a/MP.Land/MP.Land.csproj b/MP.Land/MP.Land.csproj index 2cc99106..424ea1e4 100644 --- a/MP.Land/MP.Land.csproj +++ b/MP.Land/MP.Land.csproj @@ -3,7 +3,7 @@ net6.0 MP.Land - 6.16.2311.1009 + 6.16.2311.1619 @@ -44,6 +44,8 @@ + + diff --git a/MP.Land/Pages/About.razor b/MP.Land/Pages/About.razor index 945c6f4d..58a78d18 100644 --- a/MP.Land/Pages/About.razor +++ b/MP.Land/Pages/About.razor @@ -6,7 +6,7 @@
-
+
@@ -16,7 +16,7 @@ @@ -41,51 +41,51 @@

Info installazione


-
+
Remote Server:
-
+
@ServerStatus
-
+
Cliente:
-
+
@Installazione
-
+
App:
-
+
@Applicazione
-
+
Licenze:
-
+
@Licenze
-
+
Scadenza:
-
+
@($"{Scadenza:yyyy/MM/dd}")
-
+
Key
-
- @MastKey +
+
diff --git a/MP.Land/Pages/Contacts.razor b/MP.Land/Pages/Contacts.razor index d621d0db..0c2f4157 100644 --- a/MP.Land/Pages/Contacts.razor +++ b/MP.Land/Pages/Contacts.razor @@ -5,7 +5,7 @@
-
+
@@ -15,7 +15,7 @@ diff --git a/MP.Land/Pages/Index.razor b/MP.Land/Pages/Index.razor index 1d0d640f..95835196 100644 --- a/MP.Land/Pages/Index.razor +++ b/MP.Land/Pages/Index.razor @@ -3,7 +3,7 @@ @using MP.Land.Data @using MP.Land.Components -
+

MAPO Land

@@ -24,7 +24,7 @@
-
+
@if (ListRecords == null) { diff --git a/MP.Land/Pages/SysInfo.razor b/MP.Land/Pages/SysInfo.razor index f4e8ffe2..810db569 100644 --- a/MP.Land/Pages/SysInfo.razor +++ b/MP.Land/Pages/SysInfo.razor @@ -9,7 +9,7 @@
-
+
@@ -19,7 +19,7 @@ diff --git a/MP.Land/Pages/UpdateManager.razor b/MP.Land/Pages/UpdateManager.razor index 454cea83..8e50d9b2 100644 --- a/MP.Land/Pages/UpdateManager.razor +++ b/MP.Land/Pages/UpdateManager.razor @@ -4,7 +4,7 @@ @using MP.Land.Components @inject LicenseService LicServ -
+
@@ -43,7 +43,7 @@
} -
+
@if (ListRecords == null) { diff --git a/MP.Land/Pages/UserQr.razor b/MP.Land/Pages/UserQr.razor index 9f46b8c4..02a5b38c 100644 --- a/MP.Land/Pages/UserQr.razor +++ b/MP.Land/Pages/UserQr.razor @@ -3,7 +3,7 @@ @using MP.Land.Data @using MP.Land.Components -
+
@if (ListRecords == null) diff --git a/MP.Land/Resources/ChangeLog.html b/MP.Land/Resources/ChangeLog.html index 2076f49f..609a99c8 100644 --- a/MP.Land/Resources/ChangeLog.html +++ b/MP.Land/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo gestione Programmi MAPO -

Versione: 6.16.2311.1009

+

Versione: 6.16.2311.1619


Note di rilascio:
    diff --git a/MP.Land/Resources/VersNum.txt b/MP.Land/Resources/VersNum.txt index cf39a0ed..1cc366fe 100644 --- a/MP.Land/Resources/VersNum.txt +++ b/MP.Land/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2311.1009 +6.16.2311.1619 diff --git a/MP.Land/Resources/manifest.xml b/MP.Land/Resources/manifest.xml index e09e8ed5..faf03670 100644 --- a/MP.Land/Resources/manifest.xml +++ b/MP.Land/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2311.1009 + 6.16.2311.1619 https://nexus.steamware.net/repository/SWS/MP-LAND/stable/LAST/MP.Land.zip https://nexus.steamware.net/repository/SWS/MP-LAND/stable/LAST/ChangeLog.html false diff --git a/MP.Land/wwwroot/img/LogoEgalware.svg b/MP.Land/wwwroot/img/LogoEgalware.svg new file mode 100644 index 00000000..afcdb10c --- /dev/null +++ b/MP.Land/wwwroot/img/LogoEgalware.svg @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/MP.Land/wwwroot/img/LogoEgalwareBianco.svg b/MP.Land/wwwroot/img/LogoEgalwareBianco.svg new file mode 100644 index 00000000..acb59f58 --- /dev/null +++ b/MP.Land/wwwroot/img/LogoEgalwareBianco.svg @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +