From 73968a8311caaab0fca173ec0a2a9041b6987cc9 Mon Sep 17 00:00:00 2001
From: Massimiliano Assante <massimiliano.assante@isti.cnr.it>
Date: Wed, 6 Mar 2019 17:00:23 +0000
Subject: [PATCH] Updated dockbar to reflect selected application (Dashboard,
 Workspace etc.)

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portal/liferay62-plugins/social-dockbar-hook@178494 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 distro/changelog.xml                          |  4 +++
 pom.xml                                       |  2 +-
 .../WEB-INF/liferay-plugin-package.properties |  2 +-
 .../portlet/dockbar/custom_dockbar_view.jspf  | 31 ++++++++++++++++---
 4 files changed, 33 insertions(+), 6 deletions(-)

diff --git a/distro/changelog.xml b/distro/changelog.xml
index 8ac0d77..769d881 100644
--- a/distro/changelog.xml
+++ b/distro/changelog.xml
@@ -1,4 +1,8 @@
 <ReleaseNotes>	
+
+<Changeset component="org.gcube.portal.plugins-social-dockbar-hook-6.5.0" date="2019-03-06">
+		<Change>Updated dockbar to reflect selected application (Dashboard, Workspace etc.)</Change>
+	</Changeset>
 	<Changeset component="org.gcube.portal.plugins-social-dockbar-hook-6.3.0" date="2015-10-06">
 		<Change>First Version</Change>
 	</Changeset>
diff --git a/pom.xml b/pom.xml
index f662b3c..ca522a9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -12,7 +12,7 @@
 	<artifactId>social-dockbar-hook</artifactId>
 	<packaging>war</packaging>
 	<name>social-dockbar-hook Hook</name>
-	<version>6.4.0-SNAPSHOT</version>
+	<version>6.5.0-SNAPSHOT</version>
 	<build>
 		<plugins>
 			<plugin>
diff --git a/src/main/webapp/WEB-INF/liferay-plugin-package.properties b/src/main/webapp/WEB-INF/liferay-plugin-package.properties
index 0c2e122..375374d 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=social-dockbar-hook
 module-group-id=liferay
-module-incremental-version=6
+module-incremental-version=7
 tags=
 short-description=
 change-log=
diff --git a/src/main/webapp/custom_jsps/html/portlet/dockbar/custom_dockbar_view.jspf b/src/main/webapp/custom_jsps/html/portlet/dockbar/custom_dockbar_view.jspf
index 2475a66..d35301a 100644
--- a/src/main/webapp/custom_jsps/html/portlet/dockbar/custom_dockbar_view.jspf
+++ b/src/main/webapp/custom_jsps/html/portlet/dockbar/custom_dockbar_view.jspf
@@ -8,11 +8,33 @@ if (themeDisplay.isSignedIn()) {
 	String groupName = context.getGatewayName(request);
 	String mySiteURL = context.getSiteLandingPagePath(request);
 	String myGatewayURL = context.getGatewayURL(request);
+	pageContext.setAttribute("myDashboardUrl", mySiteURL);
+	String iconBGColor = "#999";
+	if (themeDisplay.getThemeSetting("dockbar-selected-icon-bgcolor") != null)
+		iconBGColor = themeDisplay.getThemeSetting("dockbar-selected-icon-bgcolor");
+	pageContext.setAttribute("iconBGColor", iconBGColor);
 %>
-
 <script>
 	jQuery(document).ready(function() {
-		
+		var pathname = window.location.pathname; 
+		var backgroundColorSetting = '${iconBGColor}';
+		if (pathname == '${myDashboardUrl}' || pathname == '${myDashboardUrl}'+ '/' || pathname == '${myDashboardUrl}'+ '/home') {
+			$('#homeIcon').css("background-color", backgroundColorSetting);
+			$('#homeIcon').css("color", "#FFF");
+		}
+		if (pathname == '${myDashboardUrl}'+ '/workspace') {
+			$('#wsIcon').css("background-color", backgroundColorSetting);
+			$('#wsIcon').css("color", "#FFF");
+		}
+		if (pathname == '${myDashboardUrl}'+ '/data-catalogue') {
+			$('#catalougueIcon').css("background-color", backgroundColorSetting);
+			$('#catalougueIcon').css("color", "#FFF");
+		}
+		if (pathname == '${myDashboardUrl}'+ '/messages') {
+			$('#messagesIcon').css("background-color", backgroundColorSetting);
+			$('#messagesIcon').css("color", "#FFF");
+		}
+
 		//check for notifications on load after 3 seconds
 		var username = "<%=themeDisplay.getUser().getScreenName()%>";
 		
@@ -112,6 +134,7 @@ if (themeDisplay.isSignedIn()) {
 		$('#searchIcon').click(function() {
 			$('#searchbox').show();
 			$('#searchIcon').hide();
+			$("#searchbox").focus();
 		});
 		
 		//search box keyboard handlers
@@ -186,8 +209,8 @@ if (themeDisplay.isSignedIn()) {
 	<ul class="nav nav-add-controls">
 		<li class="dockbar-item"><a class=""
 			href="<%=mySiteURL%>" id="homeIcon"
-			title="<%=groupName%> Home"> <i
-				class="icon-home" style="font-size: 24px;"></i>
+			title="<%=groupName%> Dashboard"> <i
+				class="icon-dashboard" style="font-size: 24px;"></i>
 		</a></li>
 		<li class="dockbar-item" id="lab-li-sbd" style="display: none;"><a class=""
 			href="<%=myGatewayURL + "/group/sobigdata-gateway/explore?siteId=20371853"%>" id="labIcon"