From bb3bbb387a2f6efc62b660084e9cb0ae6c7bcb98 Mon Sep 17 00:00:00 2001
From: Massimiliano Assante <massimiliano.assante@isti.cnr.it>
Date: Mon, 30 Jan 2017 15:55:36 +0000
Subject: [PATCH] added color picker for selecting color, made customisable
 header and body

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portal/liferay62-plugins/generic-configurable-theme@141915 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .../webapp/WEB-INF/liferay-look-and-feel.xml  | 217 +++++++++++++++++-
 src/main/webapp/css/custom.css                |   9 +-
 .../images/custom/PoweredByD4Science.png      | Bin 6888 -> 0 bytes
 .../images/custom/powered-by-d4science.png    | Bin 0 -> 9505 bytes
 src/main/webapp/templates/init_custom.vm      |   9 +-
 src/main/webapp/templates/portal_normal.vm    |  24 +-
 6 files changed, 233 insertions(+), 26 deletions(-)
 delete mode 100644 src/main/webapp/images/custom/PoweredByD4Science.png
 create mode 100644 src/main/webapp/images/custom/powered-by-d4science.png

diff --git a/src/main/webapp/WEB-INF/liferay-look-and-feel.xml b/src/main/webapp/WEB-INF/liferay-look-and-feel.xml
index 8ae52d0..6dd7e2c 100644
--- a/src/main/webapp/WEB-INF/liferay-look-and-feel.xml
+++ b/src/main/webapp/WEB-INF/liferay-look-and-feel.xml
@@ -7,18 +7,211 @@
 	</compatibility>
 	<theme id="generic-configurable" name="generic-configurable-theme">
 		<settings>
-			<setting configurable="true" key="background-image-name" type="text" />
-			<setting configurable="true" key="portlet-topper-css-attributes" type="text"  />
-			<setting configurable="true" key="navbar-background-color" type="text"  />
-			<setting configurable="true" key="navbar-tabselected-color" type="text"  />
-			<setting configurable="true" key="navbar-tabhover-color" type="text"  />
-			<setting configurable="true" key="login-button-color" type="text"  />
-			<setting configurable="true" key="footer-background-color" type="text"  value="#555"/>
-			<setting configurable="true" key="footer-website-name" type="text"  />
-			<setting configurable="true" key="footer-website-url" type="text"  />
-			<setting configurable="true" key="footer-website-name" type="text"  />
-			<setting configurable="true" key="footer-text-about" type="text"  />
-			<setting configurable="true" key="show-eu-flag" type="checkbox" value="true"/>
+			<setting configurable="true" key="show-powered-d4science" type="checkbox" value="false" />
+			<setting configurable="true" key="show-eu-flag" type="checkbox"	value="true" />
+			<setting configurable="true" key="header-background-css-attributes"	type="textarea" />
+			<setting configurable="true" key="div-wrapper-css-attributes"	type="textarea" />
+			<setting configurable="true" key="div-wrapper-image-name" type="text" />
+			<setting configurable="true" key="portlet-topper-css-attributes" type="textarea" />
+			<setting configurable="true" key="footer-website-name" type="text" />
+			<setting configurable="true" key="footer-website-url" type="text" />
+			<setting configurable="true" key="footer-website-name" type="text" />
+			<setting configurable="true" key="footer-text-about" type="text" />	
+			<setting configurable="true" key="body-background-color">
+   					<![CDATA[
+					AUI().ready(
+						'aui-color-picker-popover',
+						function(A) {
+							var AllControls = A.all("#regularlayoutsAdminLookAndFeelSettingsPanelContent .control-group");
+							AllControls.setStyle('marginBottom', '5px');
+
+							var nodePicker = A.one("#[@NAMESPACE@]body-background-color");
+
+							nodePicker.ancestor().setStyle('float', 'left');
+							nodePicker.ancestor().setStyle('marginRight', '10px');
+
+							nodePicker.setStyle('width', '74px');
+							nodePicker.setStyle('borderLeftWidth', '30px');
+							nodePicker.setStyle('borderLeftColor', nodePicker.get('value'));
+							
+
+							var colorPicker = new A.ColorPickerPopover({
+						        trigger: nodePicker,
+						        zIndex: 99
+							}).render();
+
+							colorPicker.on('select', function(event) {
+								var color = event.color;
+								event.trigger.set('value', color);
+								nodePicker.setStyle('borderLeftColor', color);
+							});
+						}
+					);
+				]]>
+   			</setting>
+			<setting configurable="true" key="navbar-background-color"
+				type="text">
+						<![CDATA[
+					AUI().ready(
+						'aui-color-picker-popover',
+						function(A) {
+							var AllControls = A.all("#regularlayoutsAdminLookAndFeelSettingsPanelContent .control-group");
+							AllControls.setStyle('marginBottom', '5px');
+
+							var nodePicker = A.one("#[@NAMESPACE@]navbar-background-color");
+
+							nodePicker.ancestor().setStyle('float', 'left');
+							nodePicker.ancestor().setStyle('marginRight', '10px');
+
+							nodePicker.setStyle('width', '74px');
+							nodePicker.setStyle('borderLeftWidth', '30px');
+							nodePicker.setStyle('borderLeftColor', nodePicker.get('value'));
+							
+
+							var colorPicker = new A.ColorPickerPopover({
+						        trigger: nodePicker,
+						        zIndex: 99
+							}).render();
+
+							colorPicker.on('select', function(event) {
+								var color = event.color;
+								event.trigger.set('value', color);
+								nodePicker.setStyle('borderLeftColor', color);
+							});
+						}
+					);
+				]]>
+			</setting>
+			<setting configurable="true" key="navbar-tabselected-color"
+				type="text">
+				<![CDATA[
+					AUI().ready(
+						'aui-color-picker-popover',
+						function(A) {
+							var AllControls = A.all("#regularlayoutsAdminLookAndFeelSettingsPanelContent .control-group");
+							AllControls.setStyle('marginBottom', '5px');
+
+							var nodePicker = A.one("#[@NAMESPACE@]navbar-tabselected-color");
+
+							nodePicker.ancestor().setStyle('float', 'left');
+							nodePicker.ancestor().setStyle('marginRight', '10px');
+
+							nodePicker.setStyle('width', '74px');
+							nodePicker.setStyle('borderLeftWidth', '30px');
+							nodePicker.setStyle('borderLeftColor', nodePicker.get('value'));
+							
+
+							var colorPicker = new A.ColorPickerPopover({
+						        trigger: nodePicker,
+						        zIndex: 99
+							}).render();
+
+							colorPicker.on('select', function(event) {
+								var color = event.color;
+								event.trigger.set('value', color);
+								nodePicker.setStyle('borderLeftColor', color);
+							});
+						}
+					);
+				]]>
+			</setting>
+			<setting configurable="true" key="navbar-tabhover-color"
+				type="text">
+				<![CDATA[
+					AUI().ready(
+						'aui-color-picker-popover',
+						function(A) {
+							var AllControls = A.all("#regularlayoutsAdminLookAndFeelSettingsPanelContent .control-group");
+							AllControls.setStyle('marginBottom', '5px');
+
+							var nodePicker = A.one("#[@NAMESPACE@]navbar-tabhover-color");
+
+							nodePicker.ancestor().setStyle('float', 'left');
+							nodePicker.ancestor().setStyle('marginRight', '10px');
+
+							nodePicker.setStyle('width', '74px');
+							nodePicker.setStyle('borderLeftWidth', '30px');
+							nodePicker.setStyle('borderLeftColor', nodePicker.get('value'));
+							
+
+							var colorPicker = new A.ColorPickerPopover({
+						        trigger: nodePicker,
+						        zIndex: 99
+							}).render();
+
+							colorPicker.on('select', function(event) {
+								var color = event.color;
+								event.trigger.set('value', color);
+								nodePicker.setStyle('borderLeftColor', color);
+							});
+						}
+					);
+				]]>
+			</setting>
+			<setting configurable="true" key="login-button-color" type="text">
+			<![CDATA[
+					AUI().ready(
+						'aui-color-picker-popover',
+						function(A) {
+							var AllControls = A.all("#regularlayoutsAdminLookAndFeelSettingsPanelContent .control-group");
+							AllControls.setStyle('marginBottom', '5px');
+
+							var nodePicker = A.one("#[@NAMESPACE@]login-button-color");
+
+							nodePicker.ancestor().setStyle('float', 'left');
+							nodePicker.ancestor().setStyle('marginRight', '10px');
+
+							nodePicker.setStyle('width', '74px');
+							nodePicker.setStyle('borderLeftWidth', '30px');
+							nodePicker.setStyle('borderLeftColor', nodePicker.get('value'));
+							
+
+							var colorPicker = new A.ColorPickerPopover({
+						        trigger: nodePicker,
+						        zIndex: 99
+							}).render();
+
+							colorPicker.on('select', function(event) {
+								var color = event.color;
+								event.trigger.set('value', color);
+								nodePicker.setStyle('borderLeftColor', color);
+							});
+						}
+					);
+				]]>
+			</setting>
+			<setting configurable="true" key="footer-background-color"	type="text" value="#555">
+			<![CDATA[
+					AUI().ready(
+						'aui-color-picker-popover',
+						function(A) {
+							var AllControls = A.all("#regularlayoutsAdminLookAndFeelSettingsPanelContent .control-group");
+							AllControls.setStyle('marginBottom', '5px');
+
+							var nodePicker = A.one("#[@NAMESPACE@]footer-background-color");
+
+							nodePicker.ancestor().setStyle('float', 'left');
+							nodePicker.ancestor().setStyle('marginRight', '10px');
+
+							nodePicker.setStyle('width', '74px');
+							nodePicker.setStyle('borderLeftWidth', '30px');
+							nodePicker.setStyle('borderLeftColor', nodePicker.get('value'));
+							
+
+							var colorPicker = new A.ColorPickerPopover({
+						        trigger: nodePicker,
+						        zIndex: 99
+							}).render();
+
+							colorPicker.on('select', function(event) {
+								var color = event.color;
+								event.trigger.set('value', color);
+								nodePicker.setStyle('borderLeftColor', color);
+							});
+						}
+					);
+				]]>
+			</setting>			
 		</settings>
 	</theme>
 </look-and-feel>
\ No newline at end of file
diff --git a/src/main/webapp/css/custom.css b/src/main/webapp/css/custom.css
index b0dda24..8a0e5d3 100644
--- a/src/main/webapp/css/custom.css
+++ b/src/main/webapp/css/custom.css
@@ -85,7 +85,6 @@ div#wrapper {
 	@include respond-to(phone, tablet) {
 		padding-top: 2px;
 	}
-	/*background: #fff url(@theme_image_path@/custom/splash.jpg) center top no-repeat;*/
 	background-size: 100% 100%;
 	margin-top: -5px;
     min-height: 600px;
@@ -96,8 +95,8 @@ div#wrapper {
 	margin-left: 0;
 }
 
-header#banner {
-	background-color: transparent;
+.aui header#banner {
+	background: transparent;
 }
 
 .aui .btn {
@@ -190,7 +189,7 @@ footer {
 		margin-top: 0;
 		margin-bottom: 3px;
 		text-align: left;
-		padding: 15px 15px 0;
+		padding: 15px;
 	}
 }
 /* --- End Custom */
@@ -222,7 +221,7 @@ footer {
 	}
 	
 	.poweredBy-link {
-		margin-top: 16px;
+		margin-top: 25px;
 		float: right;
 		a:hover {
 			opacity: 0.7;
diff --git a/src/main/webapp/images/custom/PoweredByD4Science.png b/src/main/webapp/images/custom/PoweredByD4Science.png
deleted file mode 100644
index f75c218f2d66ce59a65a8ddb851f04f21f0903a0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6888
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
DdZP2t

diff --git a/src/main/webapp/images/custom/powered-by-d4science.png b/src/main/webapp/images/custom/powered-by-d4science.png
new file mode 100644
index 0000000000000000000000000000000000000000..ab1d281528df2644cb5899cfac2e3537a03539b0
GIT binary patch
literal 9505
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
E0HiC{lK=n!

literal 0
HcmV?d00001

diff --git a/src/main/webapp/templates/init_custom.vm b/src/main/webapp/templates/init_custom.vm
index fbe6a35..597322a 100644
--- a/src/main/webapp/templates/init_custom.vm
+++ b/src/main/webapp/templates/init_custom.vm
@@ -4,12 +4,9 @@
 
 *#
 
-#if ($theme.getSetting("background-image-name") !="")
-	#set ($background-image-name = $themeDisplay.getPathThemeImages() + "/custom/" + $theme.getSetting("background-image-name"))
+#if ($theme.getSetting("div-wrapper-image-name") !="")
+	#set ($div-wrapper-image-name = $themeDisplay.getPathThemeImages() + "/custom/" + $theme.getSetting("div-wrapper-image-name"))
 #else
-	#set ($background-image-name = $themeDisplay.getPathThemeImages() + "/custom/default_background.jpg") 
+	#set ($div-wrapper-image-name = $themeDisplay.getPathThemeImages() + "/custom/default_background.jpg") 
 #end
 
-#if ($theme.getSetting("portlet-topper-css-attributes") !="")
-	#set ($portlet-topper-css-attributes = $theme.getSetting("portlet-topper-css-attributes"))
-#end
diff --git a/src/main/webapp/templates/portal_normal.vm b/src/main/webapp/templates/portal_normal.vm
index cac0b48..b99f983 100644
--- a/src/main/webapp/templates/portal_normal.vm
+++ b/src/main/webapp/templates/portal_normal.vm
@@ -21,9 +21,25 @@
 	<style>
 	#if ($theme.getSetting("portlet-topper-css-attributes") !="")	
 		.aui .portlet-topper .portlet-title { 
-			$portlet-topper-css-attributes
+			$theme.getSetting("portlet-topper-css-attributes")
 		}
 	#end
+	#if ($theme.getSetting("body-background-color") !="")
+		.aui body {
+			background-color: $theme.getSetting("body-background-color");
+		}
+	#end
+	#if ($theme.getSetting("div-wrapper-css-attributes") !="")	
+		.aui div#wrapper { 
+			$theme.getSetting("div-wrapper-css-attributes")
+		}
+	#end
+
+	#if ($theme.getSetting("header-background-css-attributes") !="")
+		.aui header#banner {
+			$theme.getSetting("header-background-css-attributes");
+		}
+	#end	
 	#if ($theme.getSetting("navbar-background-color") !="")
 		.aui #navigation .navbar-inner {
 			background: $theme.getSetting("navbar-background-color");
@@ -92,11 +108,13 @@ $theme.include($body_top_include)
 #end
 
 <header id="banner" role="banner">
+#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/PoweredByD4Science.png" alt="D4Science Infrastructure" hspace="5" />
+		<img src="$themeDisplay.getPathThemeImages()/custom/powered-by-d4science.png" alt="D4Science Infrastructure" hspace="5" />
 		</a>
 </div>
+#end
 <div id="heading">
 	<h1 class="site-title">
 		<a class="$logo_css_class" href="$themeDisplay.getPortalURL()" title="#language_format ("go-to-x", ["D4Science Gateway"])">
@@ -115,7 +133,7 @@ $theme.include($body_top_include)
 #end
 
 </header>
-<div class="container-fluid" id="wrapper" style="background-image: url($background-image-name)" >
+<div class="container-fluid" id="wrapper" style="background-image: url($div-wrapper-image-name)" >
 
 	<div id="content">
 		<!-- nav id="breadcrumbs">#breadcrumbs()</nav -->