From af183ee637af499bf70efcf9ef4625cf2a75f788 Mon Sep 17 00:00:00 2001 From: Massimiliano Assante Date: Tue, 15 Mar 2022 15:29:31 +0100 Subject: [PATCH] Added automatic request support URL when none is specified in the setting --- CHANGELOG.md | 8 ++++++-- README.md | 2 +- pom.xml | 2 +- src/main/webapp/templates/portal_normal.vm | 17 ++++++++++++++--- 4 files changed, 22 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 606f52c..27d9c45 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,11 +5,15 @@ All notable changes to this project will be documented in this file. This project does not adhere to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [v6.6.0-SNAPSHOT] - 2022-03-17 + +- Added automatic request support URL when none is specified in the setting + ## [v6.5.0] - 2021-12-17 -Added possibility to customise feedback container URL and Label (Report an issue) and its visibility via a checkbox +- Added possibility to customise feedback container URL and Label (Report an issue) and its visibility via a checkbox ## [v6.4.0-SNAPSHOT] - 2017-01-24 -First release + - First release diff --git a/README.md b/README.md index e9fbf1a..76c68e2 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# gCube System - Generic Configurable Liferay 6.2 Communiyty Edition GA6 Theme +# gCube System - Generic Configurable Liferay 6.2 Community Edition GA6 Theme ## Structure of the project diff --git a/pom.xml b/pom.xml index 9bafb20..53a4fc9 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ generic-configurable-theme war generic-configurable-theme Theme - 6.5.0 + 6.6.0-SNAPSHOT D4Science Generic Configurable Liferay Theme diff --git a/src/main/webapp/templates/portal_normal.vm b/src/main/webapp/templates/portal_normal.vm index 4b4ad16..ecc07d9 100644 --- a/src/main/webapp/templates/portal_normal.vm +++ b/src/main/webapp/templates/portal_normal.vm @@ -75,12 +75,12 @@ #if ($theme.getSetting("feedback-website-url") !="") #set ($feedback-website-url = $theme.getSetting("feedback-website-url")) #else - #set ($feedback-website-url = "https://support.d4science.org") + #set ($feedback-website-url = "") #end #if ($theme.getSetting("feedback-label") !="") #set ($feedback-label = $theme.getSetting("feedback-label")) #else - #set ($feedback-label = "Report an issue") + #set ($feedback-label = "Request Support") #end @@ -116,7 +116,18 @@ $theme.include($body_top_include) #if($is_signed_in) #if ($theme.getSetting("show-feedback-label") == "true") -
$feedback-label
+
$feedback-label
+ #end #end