From c3b696cc0f01daa7777beed28e22e08b684b9ee7 Mon Sep 17 00:00:00 2001 From: Jenkins Hudson Date: Mon, 25 May 2020 11:49:56 +0200 Subject: [PATCH] "Release 2.6" --- .../sites/tephydro/db/db-1.2#.sql | 6 ++++++ .../root/styles/img/logo-hydro-old.png | Bin 0 -> 6114 bytes .../sites/tephydro/root/views/login.html | 19 ++++++++++++++++++ pom.xml | 2 +- src/main/web-resources/db/db-1.2#.sql | 6 ++++++ 5 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 Terradue.Tep.Hydrology.WebServer/sites/tephydro/db/db-1.2#.sql create mode 100644 Terradue.Tep.Hydrology.WebServer/sites/tephydro/root/styles/img/logo-hydro-old.png create mode 100644 Terradue.Tep.Hydrology.WebServer/sites/tephydro/root/views/login.html create mode 100644 src/main/web-resources/db/db-1.2#.sql diff --git a/Terradue.Tep.Hydrology.WebServer/sites/tephydro/db/db-1.2#.sql b/Terradue.Tep.Hydrology.WebServer/sites/tephydro/db/db-1.2#.sql new file mode 100644 index 0000000..0ae39e9 --- /dev/null +++ b/Terradue.Tep.Hydrology.WebServer/sites/tephydro/db/db-1.2#.sql @@ -0,0 +1,6 @@ +USE $MAIN$; + +-- Update config...\ +INSERT INTO config (`name`, `type`, `caption`, `hint`, `value`, `optional`) VALUES ('hep-contact-mailaddress', 'string', 'hep-contact-mailaddress', 'hep-contact-mailaddress', 'contact@hydrology-tep.eu', '0'); +INSERT INTO config (`name`, `type`, `caption`, `hint`, `value`, `optional`) VALUES ('dashboard_page', 'string', 'dashboard_page', 'dashboard_page', 'https://hydrology-tep.eu/guest', '0'); +-- RESULT diff --git a/Terradue.Tep.Hydrology.WebServer/sites/tephydro/root/styles/img/logo-hydro-old.png b/Terradue.Tep.Hydrology.WebServer/sites/tephydro/root/styles/img/logo-hydro-old.png new file mode 100644 index 0000000000000000000000000000000000000000..34053571954cb4ff4a4c0784edd03f105fa4182b GIT binary patch literal 6114 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 literal 0 HcmV?d00001 diff --git a/Terradue.Tep.Hydrology.WebServer/sites/tephydro/root/views/login.html b/Terradue.Tep.Hydrology.WebServer/sites/tephydro/root/views/login.html new file mode 100644 index 0000000..57bf71c --- /dev/null +++ b/Terradue.Tep.Hydrology.WebServer/sites/tephydro/root/views/login.html @@ -0,0 +1,19 @@ +{{#current}} +   + {{#ifGreaterThan Balance 0}}{{Balance}}  {{/if}} + {{#ifLevel Level "ADMIN" }} +   + {{/ifLevel}} +   +   + {{#if conf.hasSupport}} +   + {{/if}} + + +{{/current}} +{{#noLogged}} + + | + +{{/noLogged}} \ No newline at end of file diff --git a/pom.xml b/pom.xml index 1b9aea7..6c1786c 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ com.terradue.tephydro webserver-tephydro - 2.5.2 + 2.6 rpm Web Server for Tep Hydrology diff --git a/src/main/web-resources/db/db-1.2#.sql b/src/main/web-resources/db/db-1.2#.sql new file mode 100644 index 0000000..0ae39e9 --- /dev/null +++ b/src/main/web-resources/db/db-1.2#.sql @@ -0,0 +1,6 @@ +USE $MAIN$; + +-- Update config...\ +INSERT INTO config (`name`, `type`, `caption`, `hint`, `value`, `optional`) VALUES ('hep-contact-mailaddress', 'string', 'hep-contact-mailaddress', 'hep-contact-mailaddress', 'contact@hydrology-tep.eu', '0'); +INSERT INTO config (`name`, `type`, `caption`, `hint`, `value`, `optional`) VALUES ('dashboard_page', 'string', 'dashboard_page', 'dashboard_page', 'https://hydrology-tep.eu/guest', '0'); +-- RESULT