"Release 2.6"

hydrology-tep · May 25, 2020 · c3b696c · c3b696c
1 parent 2c42138
commit c3b696c
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 1 deletion.
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
@@ -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
diff --git a/Terradue.Tep.Hydrology.WebServer/sites/tephydro/root/views/login.html b/Terradue.Tep.Hydrology.WebServer/sites/tephydro/root/views/login.html
@@ -0,0 +1,19 @@
+{{#current}}			
+	<a href="/#!settings/profile" data-toggle="tooltip" title="Profile" class="Topbar__login">{{#if ProfileError}}<i class="fa fa-warning text text-warning"></i> {{/if}}{{ Username }}</a>&nbsp;
+	{{#ifGreaterThan Balance 0}}<span class="badge badge-info" style="vertical-align: middle;">{{Balance}}</span>&nbsp;&nbsp;{{/if}}
+	{{#ifLevel Level "ADMIN" }}
+		<a href="/#!cpanel" data-toggle="tooltip" title="Control Panel" class="Topbar__login"><i class="fa fa-cog"/></a>&nbsp;
+	{{/ifLevel}}
+	<a href="{{ conf.contactLink }}" data-toggle="tooltip" title="Contact" class="Topbar__login"><i class="fa fa-envelope"/></a>&nbsp;
+	<a href="{{ conf.docsUrl }}" target="_blank" data-toggle="tooltip" title="Documentation" class="Topbar__login"><i class="fa fa-book"/></a>&nbsp;
+	{{#if conf.hasSupport}}
+		<a href="{{ conf.supportUrl }}" target="_blank" data-toggle="tooltip" title="Support" class="Topbar__login"><i class="fa fa-question"/></a>&nbsp;
+	{{/if}}
+	<a href="/t2api/logout?redirect_uri={{conf.signoutRedirectUri}}" data-toggle="tooltip" title="Sign out" class="Topbar__login"><i class="fa fa-sign-out"/></a>
+
+{{/current}}
+{{#noLogged}}
+	<a href="/t2api/oauth" class="Topbar__login">sign in</a> 
+	<span class="Topbar__loginSeparator">|</span> 
+	<a href="/guest/register" class="Topbar__login"> register </a>
+{{/noLogged}}
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
 	<groupId>com.terradue.tephydro</groupId>
 	<artifactId>webserver-tephydro</artifactId>
-	<version>2.5.2</version>
+	<version>2.6</version>
 	<packaging>rpm</packaging>
 
 	<name>Web Server for Tep Hydrology</name>

diff --git a/src/main/web-resources/db/db-1.2#.sql 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