gCubeSystem
/
generic-configurable-theme
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: gCubeSystem:r5.8.0
Branches Tags
gCubeSystem:master
gCubeSystem:r5.9.0
gCubeSystem:v6.6.0
gCubeSystem:r5.8.0
gCubeSystem:v6.5.0
...
compare: gCubeSystem:master
Branches Tags
gCubeSystem:master
gCubeSystem:r5.9.0
gCubeSystem:v6.6.0
gCubeSystem:r5.8.0
gCubeSystem:v6.5.0

7 Commits
r5.8.0 ... master

Author SHA1 Message Date
Massimiliano Assante 8a70e131d2 typo in changelog fixed 2023-08-31 15:57:45 +02:00
Massimiliano Assante 6a4c844b5d Updated Funded by EU logo 2023-08-31 15:38:09 +02:00
Massimiliano Assante f2099dbfab minor fix 2022-11-30 12:23:26 +01:00
Massimiliano Assante 2003093cb0 updated version for new logo 2022-11-30 12:13:58 +01:00
Massimiliano Assante cf9d5be432 - updated logo 2022-11-30 12:13:24 +01:00
Massimiliano Assante fde54365e1 ready to release 2022-03-15 15:30:17 +01:00
Massimiliano Assante af183ee637 Added automatic request support URL when none is specified in the 
setting
 2022-03-15 15:29:31 +01:00
8 changed files with 35 additions and 11 deletions
Show Stats Expand all files Collapse all files

17
CHANGELOG.md
View File

@ -5,11 +5,24 @@ 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

2
README.md
View File

@ -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

2
pom.xml
View File

@ -11,7 +11,7 @@
<artifactId>generic-configurable-theme</artifactId>
<packaging>war</packaging>
<name>generic-configurable-theme Theme</name>
<version>6.5.0</version>
<version>6.6.2-SNAPSHOT</version>
<description>
D4Science Generic Configurable Liferay Theme
</description>

2
src/main/webapp/WEB-INF/liferay-plugin-package.properties
View File

@ -1,6 +1,6 @@
name=generic-configurable-theme
module-group-id=liferay
module-incremental-version=6
module-incremental-version=8
tags=
short-description=
change-log=

BIN
src/main/webapp/images/custom/FundedbytheEU.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 10 KiB

BIN
src/main/webapp/images/custom/powered-by-d4Science40.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 7.3 KiB

BIN
src/main/webapp/images/favicon.ico
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

23
src/main/webapp/templates/portal_normal.vm
View File

@ -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
<body class="$css_class">
@ -116,7 +116,18 @@ $theme.include($body_top_include)
</div>
#if($is_signed_in)
#if ($theme.getSetting("show-feedback-label") == "true")
<div class="feedback-container"><a href="$feedback-website-url" target="_blank"><span>$feedback-label</span><a></div>
<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>
#end
#end
@ -124,7 +135,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-d4science.png" alt="D4Science Infrastructure" hspace="5" />
<img src="$themeDisplay.getPathThemeImages()/custom/powered-by-d4Science40.png" alt="D4Science Infrastructure" hspace="5" />
</a>
</div>
#end
@ -173,8 +184,8 @@ $theme.include($body_top_include)
</div>
<div style="float:right; text-align: right;">
#if ($theme.getSetting("show-eu-flag") == "true")
<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 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>
#end
<div style="color: #CCC; font-size: 12px;">$theme.getSetting("footer-text-about")</div>