updated to fix search news feed in VREs
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portal/liferay62-plugins/social-dockbar-hook@126819 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
parent
48906f6528
commit
b54c473fea
|
@ -1,2 +0,0 @@
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1 @@
|
||||||
gCube System - License
|
${gcube.license}
|
||||||
------------------------------------------------------------
|
|
||||||
|
|
||||||
The gCube/gCore software is licensed as Free Open Source software conveying to the EUPL (http://ec.europa.eu/idabc/eupl).
|
|
||||||
The software and documentation is provided by its authors/distributors "as is" and no expressed or
|
|
||||||
implied warranty is given for its use, quality or fitness for a particular case.
|
|
||||||
|
|
|
@ -1,6 +0,0 @@
|
||||||
Mantainers
|
|
||||||
-------
|
|
||||||
|
|
||||||
* Massimiliano Assante (massimiliano.assante@isti.cnr.it), CNR Pisa,
|
|
||||||
Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo".
|
|
||||||
|
|
|
@ -1,35 +1,45 @@
|
||||||
The gCube System - VRE Members Portlet
|
The gCube System
|
||||||
------------------------------------------------------------
|
------------------------------------------------------------
|
||||||
|
|
||||||
This work has been partially supported by the following European projects: DILIGENT (FP6-2003-IST-2),
|
${gcube.description}
|
||||||
D4Science (FP7-INFRA-2007-1.2.2), D4Science-II (FP7-INFRA-2008-1.2.2), iMarine (FP7-INFRASTRUCTURES-2011-2),
|
|
||||||
and EUBrazilOpenBio (FP7-ICT-2011-EU-Brazil), Parthenos (H2020-INFRADEV-1-2014-1), BlueBridge (H2020-EINFRA-2015-1).
|
${gcube.funding}
|
||||||
|
|
||||||
|
|
||||||
|
Version
|
||||||
|
--------------------------------------------------
|
||||||
|
${version} (${buildDate})
|
||||||
|
|
||||||
|
Please see the file named "changelog.xml" in this directory for the release notes.
|
||||||
|
|
||||||
|
|
||||||
Authors
|
Authors
|
||||||
-------
|
-------
|
||||||
Massimiliano Assante
|
|
||||||
*
|
|
||||||
Version and Release Date
|
Massimiliano Assante (massimiliano.assante-AT-isti.cnr.it), Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo" - CNR, Pisa (Italy).
|
||||||
------------------------
|
|
||||||
|
|
||||||
|
|
||||||
Description
|
Maintainers
|
||||||
-----------
|
-----------
|
||||||
|
|
||||||
|
Massimiliano Assante (massimiliano.assante-AT-isti.cnr.it), Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo" - CNR, Pisa (Italy).
|
||||||
Download information
|
|
||||||
--------------------
|
|
||||||
Source code is available from SVN:
|
Documentation
|
||||||
|
|
||||||
|
|
||||||
Binaries can be downloaded from:
|
|
||||||
|
|
||||||
|
|
||||||
Documentation
|
|
||||||
-------------
|
-------------
|
||||||
Documentation is available on-line from the Projects Documentation Wiki:
|
|
||||||
|
|
||||||
|
Documentation is available on - line from the Projects Documentation wiki:
|
||||||
|
|
||||||
|
{gcube.wikiRoot}/gcube/index.php/UserManagement_Core
|
||||||
|
|
||||||
|
|
||||||
|
Support
|
||||||
|
--------------------------------------------------
|
||||||
|
Bugs and support requests can be reported in the gCube issue tracking tool:
|
||||||
|
${gcube.issueTracking}
|
||||||
|
|
||||||
|
|
||||||
Licensing
|
Licensing
|
||||||
---------
|
--------------------------------------------------
|
||||||
|
This software is licensed under the terms you may find in the file named "LICENSE" in this directory.
|
||||||
This software is licensed under the terms you may find in the file named "LICENSE" in this directory.
|
|
||||||
|
|
|
@ -15,8 +15,7 @@
|
||||||
<includes>
|
<includes>
|
||||||
<include>README</include>
|
<include>README</include>
|
||||||
<include>LICENSE</include>
|
<include>LICENSE</include>
|
||||||
<include>INSTALL</include>
|
<include>profile.xml</include>
|
||||||
<include>MAINTAINERS</include>
|
|
||||||
<include>changelog.xml</include>
|
<include>changelog.xml</include>
|
||||||
</includes>
|
</includes>
|
||||||
<fileMode>755</fileMode>
|
<fileMode>755</fileMode>
|
||||||
|
@ -39,10 +38,5 @@
|
||||||
<source>target/${build.finalName}.war</source>
|
<source>target/${build.finalName}.war</source>
|
||||||
<outputDirectory>/${artifactId}</outputDirectory>
|
<outputDirectory>/${artifactId}</outputDirectory>
|
||||||
</file>
|
</file>
|
||||||
<file>
|
|
||||||
<source>${distroDirectory}/svnpath.txt</source>
|
|
||||||
<outputDirectory>/${artifactId}</outputDirectory>
|
|
||||||
<filtered>true</filtered>
|
|
||||||
</file>
|
|
||||||
</files>
|
</files>
|
||||||
</assembly>
|
</assembly>
|
|
@ -3,7 +3,7 @@
|
||||||
<ID></ID>
|
<ID></ID>
|
||||||
<Type>Service</Type>
|
<Type>Service</Type>
|
||||||
<Profile>
|
<Profile>
|
||||||
<Description>gCube VRE Members Portlet</Description>
|
<Description>${description}</Description>
|
||||||
<Class>PortletUser</Class>
|
<Class>PortletUser</Class>
|
||||||
<Name>${artifactId}</Name>
|
<Name>${artifactId}</Name>
|
||||||
<Version>${version}</Version>
|
<Version>${version}</Version>
|
||||||
|
|
|
@ -1 +0,0 @@
|
||||||
${scm.url}
|
|
35
pom.xml
35
pom.xml
|
@ -1,6 +1,7 @@
|
||||||
<?xml version="1.0"?>
|
<?xml version="1.0"?>
|
||||||
|
|
||||||
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||||
|
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<parent>
|
<parent>
|
||||||
<artifactId>maven-parent</artifactId>
|
<artifactId>maven-parent</artifactId>
|
||||||
|
@ -46,6 +47,12 @@
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
<dependency>
|
||||||
|
<groupId>org.gcube.common.portal</groupId>
|
||||||
|
<artifactId>portal-manager</artifactId>
|
||||||
|
<version>[2.0.0-SNAPSHOT, 3.0.0-SNAPSHOT)</version>
|
||||||
|
<scope>provided</scope>
|
||||||
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>com.liferay.portal</groupId>
|
<groupId>com.liferay.portal</groupId>
|
||||||
<artifactId>portal-service</artifactId>
|
<artifactId>portal-service</artifactId>
|
||||||
|
@ -77,17 +84,17 @@
|
||||||
<scope>provided</scope>
|
<scope>provided</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
<profiles>
|
<profiles>
|
||||||
<profile>
|
<profile>
|
||||||
<id>Liferay-v6.2-CE-(Tomcat-7)-(2)</id>
|
<id>Liferay-v6.2-CE-(Tomcat-7)-(2)</id>
|
||||||
<properties>
|
<properties>
|
||||||
<liferay.version>6.2.5</liferay.version>
|
<liferay.version>6.2.5</liferay.version>
|
||||||
<liferay.maven.plugin.version>6.2.5</liferay.maven.plugin.version>
|
<liferay.maven.plugin.version>6.2.5</liferay.maven.plugin.version>
|
||||||
<liferay.auto.deploy.dir>/Users/massi/portal/liferay-portal-6.2-ce-ga6/deploy</liferay.auto.deploy.dir>
|
<liferay.auto.deploy.dir>/Users/massi/portal/liferay-portal-6.2-ce-ga6/deploy</liferay.auto.deploy.dir>
|
||||||
<liferay.app.server.deploy.dir>/Users/massi/portal/liferay-portal-6.2-ce-ga6/tomcat-7.0.62/webapps</liferay.app.server.deploy.dir>
|
<liferay.app.server.deploy.dir>/Users/massi/portal/liferay-portal-6.2-ce-ga6/tomcat-7.0.62/webapps</liferay.app.server.deploy.dir>
|
||||||
<liferay.app.server.lib.global.dir>/Users/massi/portal/liferay-portal-6.2-ce-ga6/tomcat-7.0.62/lib/ext</liferay.app.server.lib.global.dir>
|
<liferay.app.server.lib.global.dir>/Users/massi/portal/liferay-portal-6.2-ce-ga6/tomcat-7.0.62/lib/ext</liferay.app.server.lib.global.dir>
|
||||||
<liferay.app.server.portal.dir>/Users/massi/portal/liferay-portal-6.2-ce-ga6/tomcat-7.0.62/webapps/ROOT</liferay.app.server.portal.dir>
|
<liferay.app.server.portal.dir>/Users/massi/portal/liferay-portal-6.2-ce-ga6/tomcat-7.0.62/webapps/ROOT</liferay.app.server.portal.dir>
|
||||||
</properties>
|
</properties>
|
||||||
</profile>
|
</profile>
|
||||||
</profiles>
|
</profiles>
|
||||||
</project>
|
</project>
|
|
@ -1,10 +1,12 @@
|
||||||
|
<%@ page import="org.gcube.common.portal.GCubePortalConstants" %>
|
||||||
|
|
||||||
|
|
||||||
<%
|
<%
|
||||||
//themeDisplay.getUser().getScreenName();
|
//themeDisplay.getUser().getScreenName();
|
||||||
String currentVirtualHost = request.getServerName();
|
String currentVirtualHost = request.getServerName();
|
||||||
String groupName = currentVirtualHost.split("\\.")[0];
|
String groupName = currentVirtualHost.split("\\.")[0];
|
||||||
|
|
||||||
String mySiteURL = "/" + groupName;
|
String mySiteURL = GCubePortalConstants.PREFIX_GROUP_URL + "/" + groupName;
|
||||||
%>
|
%>
|
||||||
|
|
||||||
<script>
|
<script>
|
||||||
|
@ -41,8 +43,9 @@
|
||||||
}
|
}
|
||||||
var base64hashtag = btoa($('#searchbox').val());
|
var base64hashtag = btoa($('#searchbox').val());
|
||||||
var base64attr = btoa("hashtagIdentificationParameter");
|
var base64attr = btoa("hashtagIdentificationParameter");
|
||||||
|
|
||||||
if (window.location.href.indexOf("<%=mySiteURL%>") >= 0) {
|
if (window.location.href.indexOf("<%=mySiteURL%>") >= 0) {
|
||||||
window.location.href = "/group<%=mySiteURL%>?"+base64attr+"="+ base64hashtag;
|
window.location.href = "<%=mySiteURL%>?"+base64attr+"="+ base64hashtag;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
//this is when you are in a VRE and you want to search in that VRE, count the slashes to get where to point
|
//this is when you are in a VRE and you want to search in that VRE, count the slashes to get where to point
|
||||||
|
@ -63,7 +66,7 @@
|
||||||
var base64hashtag = btoa($('#searchbox').val());
|
var base64hashtag = btoa($('#searchbox').val());
|
||||||
var base64attr = btoa("elasticSearchIdentificationParameter");
|
var base64attr = btoa("elasticSearchIdentificationParameter");
|
||||||
if (window.location.href.indexOf("<%=mySiteURL%>") >= 0) {
|
if (window.location.href.indexOf("<%=mySiteURL%>") >= 0) {
|
||||||
window.location.href = "/group<%=mySiteURL%>?"+base64attr+"="+ base64hashtag;
|
window.location.href = "<%=mySiteURL%>?"+base64attr+"="+ base64hashtag;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
//this is when you are in a VRE and you want to search in that VRE, count the slashes to get where to point
|
//this is when you are in a VRE and you want to search in that VRE, count the slashes to get where to point
|
||||||
|
@ -116,7 +119,7 @@
|
||||||
var base64hashtag = btoa($('#searchbox-phone').val());
|
var base64hashtag = btoa($('#searchbox-phone').val());
|
||||||
var base64attr = btoa("hashtagIdentificationParameter");
|
var base64attr = btoa("hashtagIdentificationParameter");
|
||||||
if (window.location.href.indexOf("<%=mySiteURL%>") >= 0) {
|
if (window.location.href.indexOf("<%=mySiteURL%>") >= 0) {
|
||||||
window.location.href = "/group<%=mySiteURL%>?"+base64attr+"="+ base64hashtag;
|
window.location.href = "<%=mySiteURL%>?"+base64attr+"="+ base64hashtag;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
//this is when you are in a VRE and you want to search in that VRE, count the slashes to get where to point
|
//this is when you are in a VRE and you want to search in that VRE, count the slashes to get where to point
|
||||||
|
@ -137,7 +140,7 @@
|
||||||
var base64hashtag = btoa($('#searchbox-phone').val());
|
var base64hashtag = btoa($('#searchbox-phone').val());
|
||||||
var base64attr = btoa("elasticSearchIdentificationParameter");
|
var base64attr = btoa("elasticSearchIdentificationParameter");
|
||||||
if (window.location.href.indexOf("<%=mySiteURL%>") >= 0) {
|
if (window.location.href.indexOf("<%=mySiteURL%>") >= 0) {
|
||||||
window.location.href = "/group<%=mySiteURL%>?"
|
window.location.href = "<%=mySiteURL%>?"
|
||||||
+ base64attr
|
+ base64attr
|
||||||
+ "="
|
+ "="
|
||||||
+ base64hashtag;
|
+ base64hashtag;
|
||||||
|
|
Loading…
Reference in New Issue