From aba2dc59283d8225e42151932abc1f29ac71bcb5 Mon Sep 17 00:00:00 2001
From: Massimiliano Assante <massimiliano.assante@isti.cnr.it>
Date: Fri, 27 Jan 2017 14:25:03 +0000
Subject: [PATCH] fixed login button color

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portal/liferay62-plugins/generic-configurable-theme@141864 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 src/main/webapp/WEB-INF/liferay-look-and-feel.xml      |  3 ++-
 .../webapp/WEB-INF/liferay-plugin-package.properties   |  2 +-
 src/main/webapp/css/custom.css                         | 10 ----------
 src/main/webapp/templates/portal_normal.vm             | 10 +++++++++-
 4 files changed, 12 insertions(+), 13 deletions(-)

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 7bb2084..d59fa74 100644
--- a/src/main/webapp/WEB-INF/liferay-look-and-feel.xml
+++ b/src/main/webapp/WEB-INF/liferay-look-and-feel.xml
@@ -12,12 +12,13 @@
 			<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="#000"/>
 			<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-eu-flag" type="checkbox" value="true"/>
 		</settings>
 	</theme>
 </look-and-feel>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/liferay-plugin-package.properties b/src/main/webapp/WEB-INF/liferay-plugin-package.properties
index 1d4c363..a7527cb 100644
--- a/src/main/webapp/WEB-INF/liferay-plugin-package.properties
+++ b/src/main/webapp/WEB-INF/liferay-plugin-package.properties
@@ -1,6 +1,6 @@
 name=generic-configurable-theme
 module-group-id=liferay
-module-incremental-version=1
+module-incremental-version=2
 tags=
 short-description=
 change-log=
diff --git a/src/main/webapp/css/custom.css b/src/main/webapp/css/custom.css
index 63fbb33..b0dda24 100644
--- a/src/main/webapp/css/custom.css
+++ b/src/main/webapp/css/custom.css
@@ -63,16 +63,6 @@ div#_1_WAR_calendarportlet_calendarListContainer > div:last-child {
 }
 
 
-/* customize login button */
-.portlet-login button.login-sign-in-button {
-	background-color: green !important;
-	padding: 8px !important;
-	
-	&:hover {
-		opacity: 0.8;
-	}
-}
-
 
 body {
 	padding-top: 0px !important; 
diff --git a/src/main/webapp/templates/portal_normal.vm b/src/main/webapp/templates/portal_normal.vm
index 20a20cd..b1fafec 100644
--- a/src/main/webapp/templates/portal_normal.vm
+++ b/src/main/webapp/templates/portal_normal.vm
@@ -44,7 +44,15 @@
 			background-color: $theme.getSetting("footer-background-color");
 		}
 	#end
-	
+	#if ($theme.getSetting("login-button-color") !="")
+		.aui .portlet-login button.login-sign-in-button {
+			background-color: $theme.getSetting("login-button-color");
+			padding: 8px;
+		}
+		.aui .portlet-login button.login-sign-in-button:hover {
+			opacity: 0.8;
+		}
+	#end
 	</style>
 </head>