git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portal/liferay62-plugins/social-dockbar-hook@162034 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
parent
e24e5ee745
commit
bd8bc314a1
16
.classpath
16
.classpath
|
@ -11,16 +11,22 @@
|
||||||
<attribute name="maven.pomderived" value="true"/>
|
<attribute name="maven.pomderived" value="true"/>
|
||||||
</attributes>
|
</attributes>
|
||||||
</classpathentry>
|
</classpathentry>
|
||||||
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
|
|
||||||
<attributes>
|
|
||||||
<attribute name="maven.pomderived" value="true"/>
|
|
||||||
</attributes>
|
|
||||||
</classpathentry>
|
|
||||||
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
|
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER">
|
||||||
<attributes>
|
<attributes>
|
||||||
<attribute name="maven.pomderived" value="true"/>
|
<attribute name="maven.pomderived" value="true"/>
|
||||||
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
|
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
|
||||||
</attributes>
|
</attributes>
|
||||||
</classpathentry>
|
</classpathentry>
|
||||||
|
<classpathentry kind="src" output="target/test-classes" path="src/test/java">
|
||||||
|
<attributes>
|
||||||
|
<attribute name="optional" value="true"/>
|
||||||
|
<attribute name="maven.pomderived" value="true"/>
|
||||||
|
</attributes>
|
||||||
|
</classpathentry>
|
||||||
|
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7">
|
||||||
|
<attributes>
|
||||||
|
<attribute name="owner.project.facets" value="java"/>
|
||||||
|
</attributes>
|
||||||
|
</classpathentry>
|
||||||
<classpathentry kind="output" path="target/classes"/>
|
<classpathentry kind="output" path="target/classes"/>
|
||||||
</classpath>
|
</classpath>
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
eclipse.preferences.version=1
|
eclipse.preferences.version=1
|
||||||
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
|
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
|
||||||
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
|
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
|
||||||
org.eclipse.jdt.core.compiler.compliance=1.6
|
org.eclipse.jdt.core.compiler.compliance=1.7
|
||||||
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
|
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
|
||||||
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
|
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
|
||||||
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
|
org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
|
||||||
org.eclipse.jdt.core.compiler.source=1.6
|
org.eclipse.jdt.core.compiler.source=1.7
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<faceted-project>
|
<faceted-project>
|
||||||
<fixed facet="wst.jsdt.web"/>
|
<fixed facet="wst.jsdt.web"/>
|
||||||
<installed facet="java" version="1.6"/>
|
|
||||||
<installed facet="jst.web" version="2.4"/>
|
<installed facet="jst.web" version="2.4"/>
|
||||||
<installed facet="liferay.hook" version="6.0"/>
|
<installed facet="liferay.hook" version="6.0"/>
|
||||||
<installed facet="wst.jsdt.web" version="1.0"/>
|
<installed facet="wst.jsdt.web" version="1.0"/>
|
||||||
|
<installed facet="java" version="1.7"/>
|
||||||
</faceted-project>
|
</faceted-project>
|
||||||
|
|
6
pom.xml
6
pom.xml
|
@ -12,7 +12,7 @@
|
||||||
<artifactId>social-dockbar-hook</artifactId>
|
<artifactId>social-dockbar-hook</artifactId>
|
||||||
<packaging>war</packaging>
|
<packaging>war</packaging>
|
||||||
<name>social-dockbar-hook Hook</name>
|
<name>social-dockbar-hook Hook</name>
|
||||||
<version>6.3.0-SNAPSHOT</version>
|
<version>6.4.0-SNAPSHOT</version>
|
||||||
<build>
|
<build>
|
||||||
<plugins>
|
<plugins>
|
||||||
<plugin>
|
<plugin>
|
||||||
|
@ -33,8 +33,8 @@
|
||||||
<version>2.5</version>
|
<version>2.5</version>
|
||||||
<configuration>
|
<configuration>
|
||||||
<encoding>UTF-8</encoding>
|
<encoding>UTF-8</encoding>
|
||||||
<source>1.6</source>
|
<source>1.7</source>
|
||||||
<target>1.6</target>
|
<target>1.7</target>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
<plugin>
|
<plugin>
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
name=social-dockbar-hook
|
name=social-dockbar-hook
|
||||||
module-group-id=liferay
|
module-group-id=liferay
|
||||||
module-incremental-version=4
|
module-incremental-version=5
|
||||||
tags=
|
tags=
|
||||||
short-description=
|
short-description=
|
||||||
change-log=
|
change-log=
|
||||||
|
|
|
@ -7,6 +7,7 @@ if (themeDisplay.isSignedIn()) {
|
||||||
PortalContext context = PortalContext.getConfiguration();
|
PortalContext context = PortalContext.getConfiguration();
|
||||||
String groupName = context.getGatewayName(request);
|
String groupName = context.getGatewayName(request);
|
||||||
String mySiteURL = context.getSiteLandingPagePath(request);
|
String mySiteURL = context.getSiteLandingPagePath(request);
|
||||||
|
String myGatewayURL = context.getGatewayURL(request);
|
||||||
%>
|
%>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
|
@ -183,6 +184,11 @@ if (themeDisplay.isSignedIn()) {
|
||||||
title="<%=groupName%> Home"> <i
|
title="<%=groupName%> Home"> <i
|
||||||
class="icon-home" style="font-size: 24px;"></i>
|
class="icon-home" style="font-size: 24px;"></i>
|
||||||
</a></li>
|
</a></li>
|
||||||
|
<li class="dockbar-item" id="lab-li-sbd" style="display: none;"><a class=""
|
||||||
|
href="<%=myGatewayURL + "/group/sobigdatalab"%>" id="labIcon"
|
||||||
|
alt='Go to Lab' title='SoBigData Lab'> <i class="icon-beaker"
|
||||||
|
style="font-size: 24px;"></i>
|
||||||
|
</a></li>
|
||||||
<li class="dockbar-item"><a class=""
|
<li class="dockbar-item"><a class=""
|
||||||
href="<%=mySiteURL+ GCubePortalConstants.USER_WORKSPACE_FRIENDLY_URL%>" id="wsIcon"
|
href="<%=mySiteURL+ GCubePortalConstants.USER_WORKSPACE_FRIENDLY_URL%>" id="wsIcon"
|
||||||
alt='Workspace' title='Virtual Workspace'> <i
|
alt='Workspace' title='Virtual Workspace'> <i
|
||||||
|
@ -198,6 +204,7 @@ if (themeDisplay.isSignedIn()) {
|
||||||
alt='See Messages' title='Messages'> <i class="icon-envelope"
|
alt='See Messages' title='Messages'> <i class="icon-envelope"
|
||||||
style="font-size: 24px;"></i>
|
style="font-size: 24px;"></i>
|
||||||
</a></li>
|
</a></li>
|
||||||
|
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
<div class="collapse nav-collapse">
|
<div class="collapse nav-collapse">
|
||||||
|
@ -230,16 +237,22 @@ if (themeDisplay.isSignedIn()) {
|
||||||
style="font-size: 24px;"></i>
|
style="font-size: 24px;"></i>
|
||||||
</a>
|
</a>
|
||||||
</span>
|
</span>
|
||||||
|
<span id="lab-li-sbd" style="display: none;"> <a class="btn btn-navbar"
|
||||||
|
href="<%=myGatewayURL + "/group/sobigdatalab"%>" id="labIcon"
|
||||||
|
alt='SoBigData Lab' title='SoBigData Lab'> <i class="icon-beaker"
|
||||||
|
style="font-size: 24px;"></i>
|
||||||
|
</a>
|
||||||
|
</span>
|
||||||
<c:choose>
|
<c:choose>
|
||||||
<c:when test="<%=themeDisplay.isShowControlPanelIcon()%>">
|
<c:when test="<%=themeDisplay.isShowControlPanelIcon()%>">
|
||||||
<span class="btn btn-navbar"> <input id="searchbox-phone"
|
<!-- <span class="btn btn-navbar"> <input id="searchbox-phone" -->
|
||||||
type="text" style="width: 70px;" placeholder="Search ...">
|
<!-- type="text" style="width: 70px;" placeholder="Search ..."> -->
|
||||||
</span>
|
<!-- </span> -->
|
||||||
</c:when>
|
</c:when>
|
||||||
<c:otherwise>
|
<c:otherwise>
|
||||||
<span class="btn btn-navbar"> <input id="searchbox-phone"
|
<!-- <span class="btn btn-navbar"> <input id="searchbox-phone" -->
|
||||||
type="text" placeholder="Search News Feed">
|
<!-- type="text" placeholder="Search News Feed"> -->
|
||||||
</span>
|
<!-- </span> -->
|
||||||
</c:otherwise>
|
</c:otherwise>
|
||||||
</c:choose>
|
</c:choose>
|
||||||
</div>
|
</div>
|
||||||
|
|
Loading…
Reference in New Issue