gCubeSystem
/
my-vres
16
1
Fork 0
Code Issues Pull Requests Releases 2 Wiki Activity

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/my-vres@120535 82a268e6-3cf1-43bd-a215-b396298e98cf

This commit is contained in:
Massimiliano Assante 2015-12-01 16:05:28 +00:00
parent 2adc4d5bcd
commit dd7461e405
5 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.classpath
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/my-vres-1.5.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
<classpathentry kind="src" output="target/my-vres-1.6.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
@ -34,5 +34,5 @@
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="output" path="target/my-vres-1.5.0-SNAPSHOT/WEB-INF/classes"/>
<classpathentry kind="output" path="target/my-vres-1.6.0-SNAPSHOT/WEB-INF/classes"/>
</classpath>

7
distro/changelog.xml
View File

@ -1,7 +1,12 @@
<ReleaseNotes>
<Changeset component="org.gcube.portlet.user.my-vres.1-6-0"
date="2015-11-22">
<Change>Bug #1855, does not show join welcome message to new users anymore</Change>
<Change>Feature #861, categorized VREs by virtualGroups</Change>
</Changeset>
<Changeset component="org.gcube.portlet.user.my-vres.1-5-0"
date="2015-10-22">
<Change>Feature #861, categorized VREs by virtualGroups</Change>
</Changeset>
<Changeset component="org.gcube.portlet.user.my-vres.1-4-0"
date="2014-10-27">

2
pom.xml
View File

@ -13,7 +13,7 @@
<groupId>org.gcube.portlets.user</groupId>
<artifactId>my-vres</artifactId>
<packaging>war</packaging>
<version>1.5.0-SNAPSHOT</version>
<version>1.6.0-SNAPSHOT</version>
<name>My VREs Portlet</name>
<description>
gCube My VREs Portlet shows only the VO and VREs a user is member of, divided by category.

8
src/main/java/org/gcube/portlet/user/my_vres/client/NoVresPanel.ui.xml
View File

@ -3,10 +3,10 @@
xmlns:g="urn:import:com.google.gwt.user.client.ui">
<g:HTMLPanel>
<div class="NoVresStyle">
You are not subscribed to anything,
begin by
<a class="vrelink" href="/group/data-e-infrastructure-gateway/join-new/"><span class="important">joining</span></a> something. <br /><br />
<a class="vrelink" href="/group/data-e-infrastructure-gateway/join-new/"><span class="important">Find out</span></a> the what is available in the infrastructure.
You are not subscribed to any environment,
please begin by
<a class="vrelink" href="/group/data-e-infrastructure-gateway/explore-research-environments/"><span class="important">joining</span></a> something. <br /><br />
<a class="vrelink" href="/group/data-e-infrastructure-gateway/explore-research-environments/"><span class="important">Explore</span></a> the research environments available in the infrastructure.
</div>
</g:HTMLPanel>
</ui:UiBinder>

8
src/main/java/org/gcube/portlet/user/my_vres/client/VresPanel.java
View File

@ -90,13 +90,19 @@ public class VresPanel extends Composite {
}
}
if (cachedVREs.isEmpty()) {
if (! hasAtLeastOneVRE(cachedVREs)) {
mainPanel.add(new NoVresPanel());
imagesPanel.clear();
}
}
private boolean hasAtLeastOneVRE(LinkedHashMap<String, ArrayList<VRE>> cachedVREs) {
for (String cat : cachedVREs.keySet())
if (! cachedVREs.get(cat).isEmpty())
return true;
return false;
}