Compare commits
No commits in common. "master" and "v6.5.0" have entirely different histories.
17
CHANGELOG.md
17
CHANGELOG.md
|
@ -5,24 +5,11 @@ 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.2-SNAPSHOT] - 2023-08-31
|
||||
|
||||
- Updated Funded by EU logo
|
||||
|
||||
|
||||
## [v6.6.1] - 2022-12-01
|
||||
|
||||
- updated logo
|
||||
|
||||
## [v6.6.0] - 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
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
# gCube System - Generic Configurable Liferay 6.2 Community Edition GA6 Theme
|
||||
# gCube System - Generic Configurable Liferay 6.2 Communiyty Edition GA6 Theme
|
||||
|
||||
|
||||
## Structure of the project
|
||||
|
|
2
pom.xml
2
pom.xml
|
@ -11,7 +11,7 @@
|
|||
<artifactId>generic-configurable-theme</artifactId>
|
||||
<packaging>war</packaging>
|
||||
<name>generic-configurable-theme Theme</name>
|
||||
<version>6.6.2-SNAPSHOT</version>
|
||||
<version>6.5.0</version>
|
||||
<description>
|
||||
D4Science Generic Configurable Liferay Theme
|
||||
</description>
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
name=generic-configurable-theme
|
||||
module-group-id=liferay
|
||||
module-incremental-version=8
|
||||
module-incremental-version=6
|
||||
tags=
|
||||
short-description=
|
||||
change-log=
|
||||
|
|
Binary file not shown.
Before Width: | Height: | Size: 10 KiB |
Binary file not shown.
Before Width: | Height: | Size: 7.3 KiB |
Binary file not shown.
Before Width: | Height: | Size: 3.2 KiB After Width: | Height: | Size: 1.1 KiB |
|
@ -75,12 +75,12 @@
|
|||
#if ($theme.getSetting("feedback-website-url") !="")
|
||||
#set ($feedback-website-url = $theme.getSetting("feedback-website-url"))
|
||||
#else
|
||||
#set ($feedback-website-url = "")
|
||||
#set ($feedback-website-url = "https://support.d4science.org")
|
||||
#end
|
||||
#if ($theme.getSetting("feedback-label") !="")
|
||||
#set ($feedback-label = $theme.getSetting("feedback-label"))
|
||||
#else
|
||||
#set ($feedback-label = "Request Support")
|
||||
#set ($feedback-label = "Report an issue")
|
||||
#end
|
||||
|
||||
<body class="$css_class">
|
||||
|
@ -116,18 +116,7 @@ $theme.include($body_top_include)
|
|||
</div>
|
||||
#if($is_signed_in)
|
||||
#if ($theme.getSetting("show-feedback-label") == "true")
|
||||
<div class="feedback-container"><a id="requestSupportAnchor" target="_blank"><span>$feedback-label</span><a></div>
|
||||
<script>
|
||||
var supportURL = "${feedback-website-url}";
|
||||
if (supportURL === "") { //if empty we use the automatic site
|
||||
let hostname = location.hostname;
|
||||
let remove = ".d4science.org";
|
||||
let rprojectName = hostname.replace(remove, '').replaceAll('.','-');
|
||||
supportURL = "https://support.d4science.org/projects/" + rprojectName + "-support/issues/new";
|
||||
}
|
||||
console.log(supportURL);
|
||||
document.getElementById("requestSupportAnchor").setAttribute("href", supportURL);
|
||||
</script>
|
||||
<div class="feedback-container"><a href="$feedback-website-url" target="_blank"><span>$feedback-label</span><a></div>
|
||||
#end
|
||||
#end
|
||||
|
||||
|
@ -135,7 +124,7 @@ $theme.include($body_top_include)
|
|||
#if ($theme.getSetting("show-powered-d4science") == "true")
|
||||
<div class="poweredBy-link">
|
||||
<a href="http://www.d4science.org" target="_blank" class="$logo_css_class">
|
||||
<img src="$themeDisplay.getPathThemeImages()/custom/powered-by-d4Science40.png" alt="D4Science Infrastructure" hspace="5" />
|
||||
<img src="$themeDisplay.getPathThemeImages()/custom/powered-by-d4science.png" alt="D4Science Infrastructure" hspace="5" />
|
||||
</a>
|
||||
</div>
|
||||
#end
|
||||
|
@ -184,8 +173,8 @@ $theme.include($body_top_include)
|
|||
</div>
|
||||
<div style="float:right; text-align: right;">
|
||||
#if ($theme.getSetting("show-eu-flag") == "true")
|
||||
<a href="https://commission.europa.eu/funding-tenders_en" target="_blank">
|
||||
<img src="$themeDisplay.getPathThemeImages()/custom/FundedbytheEU.png" style="width: 180px;" alt="EU Commission programme" hspace="5" />
|
||||
<a href="http://ec.europa.eu/programmes/horizon2020/" target="_blank">
|
||||
<img src="$themeDisplay.getPathThemeImages()/custom/logo-ec.jpg" style="width: 35px;" alt="EU H2020 programme" hspace="5" />
|
||||
</a>
|
||||
#end
|
||||
<div style="color: #CCC; font-size: 12px;">$theme.getSetting("footer-text-about")</div>
|
||||
|
|
Loading…
Reference in New Issue