gCubeSystem
/
workspace
14
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

updated icon for root folder, added support for folder size and private storage used 

git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace@101090 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Massimiliano Assante 2014-10-28 16:12:52 +00:00
parent 72a93e3384
commit 911ad3b2ec
10 changed files with 54 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.classpath
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="target/workspace-6.6.8-SNAPSHOT/WEB-INF/classes" path="src/main/java">
<classpathentry kind="src" output="target/workspace-6.7.0-SNAPSHOT/WEB-INF/classes" path="src/main/java">
<attributes>
<attribute name="optional" value="true"/>
<attribute name="maven.pomderived" value="true"/>
@ -25,8 +25,8 @@
<attribute name="org.eclipse.jst.component.dependency" value="/WEB-INF/lib"/>
</attributes>
</classpathentry>
<classpathentry kind="lib" path="lib/log4j-1.2.17.jar"/>
<classpathentry kind="lib" path="lib/slf4j-api-1.6.4.jar"/>
<classpathentry kind="lib" path="lib/slf4j-log4j12-1.6.4.jar"/>
<classpathentry kind="output" path="target/workspace-6.6.8-SNAPSHOT/WEB-INF/classes"/>
<classpathentry kind="lib" path="/Users/massi/portal/Portal-Bundle/gCube/lib/_misc/log4j-1.2.16.jar"/>
<classpathentry kind="lib" path="/Users/massi/portal/Portal-Bundle/gCube/lib/_misc/slf4j-api-1.6.4.jar"/>
<classpathentry kind="lib" path="/Users/massi/portal/Portal-Bundle/gCube/lib/_misc/slf4j-log4j12-1.6.4.jar"/>
<classpathentry kind="output" path="target/workspace-6.7.0-SNAPSHOT/WEB-INF/classes"/>
</classpath>

2
.settings/com.google.gdt.eclipse.core.prefs
View File

@ -3,6 +3,6 @@
>>>>>>>=.r93212
eclipse.preferences.version=1
jarsExcludedFromWebInfLib=
lastWarOutDir=/home/francesco-mangiacrapa/wseclipse/workspace/target/workspace-6.6.8-SNAPSHOT
lastWarOutDir=/Users/massi/Documents/workspace/workspace/target/workspace-6.7.0-SNAPSHOT
warSrcDir=src/main/webapp
warSrcDirIsOutput=false

5
.settings/org.eclipse.wst.common.component
View File

@ -5,7 +5,10 @@
<wb-resource deploy-path="/WEB-INF/classes" source-path="/target/generated-sources/gwt"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
<dependent-module archiveName="workspace-tree-widget-6.6.8-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/WorkspaceTree/WorkspaceTree">
<dependent-module archiveName="workspace-tree-widget-6.7.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/workspace-tree-widget/workspace-tree-widget">
<dependency-type>uses</dependency-type>
</dependent-module>
<dependent-module archiveName="workspace-light-tree-2.13.1-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/workspace-light-tree/workspace-light-tree">
<dependency-type>uses</dependency-type>
</dependent-module>

2
pom.xml
View File

@ -11,7 +11,7 @@
<groupId>org.gcube.portlets.user</groupId>
<artifactId>workspace</artifactId>
<packaging>war</packaging>
<version>6.6.8-SNAPSHOT</version>
<version>6.7.0-SNAPSHOT</version>
<name>gCube Workspace Portlet</name>
<description>
gcube Workspace Portlet is a portlet for users workspace management

19
src/main/java/org/gcube/portlets/user/workspace/client/AppController.java
View File

@ -1238,10 +1238,27 @@ public class AppController implements SubscriberInterface {
Scheduler.get().scheduleDeferred(new ScheduledCommand() {
@Override
public void execute() {
executeTrashOperation(WorkspaceTrashOperation.REFRESH, null);
executeTrashOperation(WorkspaceTrashOperation.REFRESH, null);
}
});
Scheduler.get().scheduleDeferred(new ScheduledCommand() {
@Override
public void execute() {
AppControllerExplorer.rpcWorkspaceService.getUserWorkspaceSize(new AsyncCallback<String>() {
@Override
public void onFailure(Throwable caught) { }
@Override
public void onSuccess(String size) {
rootPanel.add(new HTML("<div style=\"width: 100%; text-align: left; font-size: 9px; padding: 5px;\">" + size +" of private storage used</div>"));
}
});
}
});
}

2
src/main/java/org/gcube/portlets/user/workspace/client/ConstantsPortlet.java
View File

@ -45,7 +45,7 @@ public class ConstantsPortlet {
public static final String SEARCH = "Search";
public static final String SAVE = "Save";
public static final String CANCEL = "Cancel";
public static final String SEARCHBYNAME = "Search by Name";
public static final String SEARCHBYNAME = "Search by name";
public static final String SEARCHINMESSAGE = "Search in messages";
public static final String VIEWSPACE = "";//"Filter by Space";
public static final String PREVIEW = "Preview";

4
src/main/java/org/gcube/portlets/user/workspace/client/WorkspacePortlet.java
View File

@ -11,6 +11,7 @@ import com.google.gwt.core.client.RunAsyncCallback;
import com.google.gwt.event.logical.shared.ResizeEvent;
import com.google.gwt.event.logical.shared.ResizeHandler;
import com.google.gwt.user.client.Window;
import com.google.gwt.user.client.ui.HTML;
import com.google.gwt.user.client.ui.RootPanel;
/**
@ -40,7 +41,7 @@ public class WorkspacePortlet implements EntryPoint {
});
updateSize();
// showGuidedTour();
}
@ -74,6 +75,7 @@ public class WorkspacePortlet implements EntryPoint {
appController.getMainPanel().setHeight(rootHeight);
appController.getMainPanel().setWidth(rootWidth);
}
private void showGuidedTour() {

41
src/main/java/org/gcube/portlets/user/workspace/client/view/toolbars/Breadcrumbs.java
View File

@ -17,6 +17,7 @@ import com.google.gwt.event.dom.client.ClickHandler;
import com.google.gwt.uibinder.client.UiBinder;
import com.google.gwt.uibinder.client.UiField;
import com.google.gwt.user.client.ui.Composite;
import com.google.gwt.user.client.ui.HTML;
import com.google.gwt.user.client.ui.Widget;
/**
@ -67,40 +68,34 @@ public class Breadcrumbs extends Composite {
}
}
/**
*
*/
private void initBreadcrumb(boolean addFakeRootName) {
resetBreadcrumbs();
if (addFakeRootName) {
NavLink navLink = new NavLink(rootName);
breadcrumbs.add(navLink);
}
}
private void resetBreadcrumbs() {
breadcrumbs.clear();
}
// @UiHandler("add")
public void addNavigationLink(FileModel parent) {
if (! parent.isRoot()) {
final NavLink navLink = new NavLink(parent.getName());
navLink.setName(parent.getIdentifier());
breadcrumbs.add(navLink);
final NavLink navLink = new NavLink(parent.getName());
navLink.setName(parent.getIdentifier());
breadcrumbs.add(navLink);
navLink.addClickHandler(new ClickHandler() {
navLink.addClickHandler(new ClickHandler() {
@Override
public void onClick(ClickEvent event) {
@Override
public void onClick(ClickEvent event) {
FileModel target = hashFileModel.get(navLink.getName());
AppController.getEventBus().fireEvent(
new PathElementSelectedEvent(target));
FileModel target = hashFileModel.get(navLink.getName());
AppController.getEventBus().fireEvent(
new PathElementSelectedEvent(target));
}
});
}
});
} else {
final NavLink navLink = new NavLink("");
breadcrumbs.add(navLink);
}
}
public boolean breadcrumbIsEmpty() {

2
src/main/java/org/gcube/portlets/user/workspace/client/view/toolbars/GxtBreadcrumbPathPanel.java
View File

@ -12,7 +12,7 @@ import com.google.gwt.user.client.ui.Composite;
*/
public class GxtBreadcrumbPathPanel {
private static final String ROOT_NAME = "Workspace";
private static final String ROOT_NAME = "";
private Breadcrumbs breadCrumbs = new Breadcrumbs(ROOT_NAME);

4
src/main/resources/org/gcube/portlets/user/workspace/WorkspacePortlet.gwt.xml
View File

@ -4,9 +4,9 @@
<inherits name='com.google.gwt.user.User' />
<!-- inherits GCUBE Quick tour -->
<!-- To Comment out -->
<!-- <set-property name="user.agent" value="gecko1_8" /> -->
<!-- <set-property name="user.agent" value="gecko1_8,safari" /> -->
<inherits name='org.gcube.portlets.widgets.guidedtour.GuidedTour' />
<inherits name="com.github.gwtbootstrap.Bootstrap" />