diff --git a/.classpath b/.classpath index a20ce89..366447a 100644 --- a/.classpath +++ b/.classpath @@ -1,6 +1,6 @@ - + @@ -25,5 +25,5 @@ - + diff --git a/.settings/com.google.gdt.eclipse.core.prefs b/.settings/com.google.gdt.eclipse.core.prefs index 5ede6c5..fba1068 100644 --- a/.settings/com.google.gdt.eclipse.core.prefs +++ b/.settings/com.google.gdt.eclipse.core.prefs @@ -1,5 +1,8 @@ +=\=\=\=\=\=\= +<<<<<<<=.mine +>>>>>>>=.r93212 eclipse.preferences.version=1 jarsExcludedFromWebInfLib= -lastWarOutDir=/home/francesco-mangiacrapa/wseclipse/workspace-TRUNK/target/workspace-6.6.2-SNAPSHOT +lastWarOutDir=/Users/massi/Documents/workspace/workspace/target/workspace-6.6.3-SNAPSHOT warSrcDir=src/main/webapp warSrcDirIsOutput=false diff --git a/.settings/org.eclipse.wst.common.component b/.settings/org.eclipse.wst.common.component index 1c8ae27..7240a72 100644 --- a/.settings/org.eclipse.wst.common.component +++ b/.settings/org.eclipse.wst.common.component @@ -5,9 +5,15 @@ + + + uses + + uses + diff --git a/pom.xml b/pom.xml index f6096d3..82e76ce 100644 --- a/pom.xml +++ b/pom.xml @@ -11,7 +11,7 @@ org.gcube.portlets.user workspace war - 6.6.2-SNAPSHOT + 6.6.3-SNAPSHOT gCube Workspace Portlet gcube Workspace Portlet is a portlet for users workspace management @@ -72,7 +72,17 @@ 2.2.5 provided - + + org.gcube.portlets.widgets + guided-tour-widget + [1.2.0-SNAPSHOT, 2.0.0-SNAPSHOT) + provided + + + org.gcube.applicationsupportlayer + accesslogger + provided + org.gcube.resources.discovery @@ -173,7 +183,7 @@ workspace-light-tree compile - + org.gcube.portlets.widgets fileupload-progress-bar diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/WorkspacePortlet.java b/src/main/java/org/gcube/portlets/user/workspace/client/WorkspacePortlet.java index f5b3c5f..713655f 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/WorkspacePortlet.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/WorkspacePortlet.java @@ -1,6 +1,13 @@ package org.gcube.portlets.user.workspace.client; +import org.gcube.portlets.user.workspace.client.resources.TourResources; +import org.gcube.portlets.widgets.guidedtour.client.GCUBEGuidedTour; +import org.gcube.portlets.widgets.guidedtour.client.GuidedTourResourceProvider; +import org.gcube.portlets.widgets.guidedtour.resources.client.GuidedTourResource; + import com.google.gwt.core.client.EntryPoint; +import com.google.gwt.core.client.GWT; +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; @@ -33,7 +40,8 @@ public class WorkspacePortlet implements EntryPoint { }); updateSize(); - + showGuidedTour(); + } /** @@ -66,5 +74,22 @@ public class WorkspacePortlet implements EntryPoint { appController.getMainPanel().setHeight(rootHeight); appController.getMainPanel().setWidth(rootWidth); } - + private void showGuidedTour() { + GWT.log("oh"); + GWT.runAsync(GCUBEGuidedTour.class, new RunAsyncCallback() { + public void onSuccess() { + + GCUBEGuidedTour.showTour(WorkspacePortlet.class.getName(), new GuidedTourResourceProvider() { + @Override + public GuidedTourResource getResource() { + TourResources resources = GWT.create(TourResources.class); + return resources.quickTour(); + } + }); + } + public void onFailure(Throwable caught) { + Window.alert("Could not check show tour"); + } + }); + } } diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/resources/GuidedTour.xml b/src/main/java/org/gcube/portlets/user/workspace/client/resources/GuidedTour.xml new file mode 100644 index 0000000..063d961 --- /dev/null +++ b/src/main/java/org/gcube/portlets/user/workspace/client/resources/GuidedTour.xml @@ -0,0 +1,141 @@ + + + + Workspace + http://gcube.wiki.gcube-system.org/gcube/index.php/Workspace + + BLUE + + + Workspace + + +
+ Workspace + is a free Storage (and Sharing) area provided as-a-Service. +
+
You can use it to store your own files and to share them with others.
+
+ As you can see it resembles your Operating System + files manager, however there are few things you should know to better exploit the Workspace. +
+
+ Discover + the Workspace features through this quick tour, click next. +
+ + ]]> + + + + + + + + Sharing + + +
+ You can Share + your folders with any other user of the system. +
+
+ Right click on a Folder + select share and choose the users you want to share the folder with. +
+ + ]]> + + +
+ Share Permissions + are very important! There are 3 types of sharing permissions you can set: +
+
+
    +
  • Read Only: users can only read files;
    • +
  • Write Owner: users can write/update their own files;
    • +
  • Write Any: users can write/update any file.
    • +
+
+
+ Please note: the sharing permission is applied on cascade to any file or sub-folder of your shared folder. The owner of the folder is set as Administrator and can do anything she likes. +
+ + ]]> + + + + + + + + + Your Channel Folders + + +
+
+ Your Channel Folders + is a special folder created automatically from the System. +
+
+ It contains one folder for each channel you are subscribed to and please read: +
+
+
    +
  • The users of a channel folder are the ones subscribed to the related Channel (i.e. Staff is shared with the whole institute).
    • +
  • Any action on these special folders (upload/delete/read) is notified to the other users of the folder.
    • +
  • Any action on these special folders is tracked.
    • +
+
+
+ Please note: the sharing permission is applied by an administrator of the Channel. +
+
+ + ]]> + + + + + + + + Public Link Vs. Get Link + + +
+ Whenever you need to attach + a file or folder of your workspace you can use this useful feature: +
+
+
    +
  • Get Link: create a short URL (e.g. http://goo.gl/TK8toC) you can attach to your emails to make users (belonging to your shared folder) + point directly that specific folder;
    • +
+
+
+
    +
  • Public Link: geneate a short URL to make any user (having the URL) download that file. Does not work with folders of course.
    • +
+
+
+ The tour is finished, remember to click on the "Don't show this again" checkbox located at the bottom of this window to not make this popup appear in the future. Enjoy using Workspace. +
+ + ]]> + + + + + + + + \ No newline at end of file diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/resources/GuidedTour_IT.xml b/src/main/java/org/gcube/portlets/user/workspace/client/resources/GuidedTour_IT.xml new file mode 100644 index 0000000..1bd3b5e --- /dev/null +++ b/src/main/java/org/gcube/portlets/user/workspace/client/resources/GuidedTour_IT.xml @@ -0,0 +1,142 @@ + + + + Workspace + http://gcube.wiki.gcube-system.org/gcube/index.php/Workspace + + BLUE + + + Workspace + + +
+ Workspace + è una area di memorizzazione e condivisione fornita gratuitamente come servizio. +
+
La puoi usare per memorizzare i tuoi file e cartelle e per condividerle con altri utenti.
+
+ Come puoi vedere, assomiglia molto al tuo file manager del sistema operativo, ci sono però delle cose che dovresti conoscere + per utilizzare a pieno il Workspace. +
+
+ Scopri + le caratteristiche del Workspace, clicca next. +
+ + ]]> + + + + + + + + File Sharing + + +
+ Puoi Condividere + le tue cartelle e file con qualsiasi utente del sistema. +
+
+ Tasto destro su una cartella + seleziona share e scegli gli utenti con cui vuoi condividere la cartella. +
+ + ]]> + + +
+ I Permessi sulle cartelle condivise + sono molto importanti! Ci sono 3 tipi di permessi: +
+
+
    +
  • Read Only: gli utenti possono solo leggere i files;
    • +
  • Write Owner: gli tuenti possono modificare solo i loro files;
    • +
  • Write Any: gli utenti possono modificare qualsiasi file.
    • +
+
+
+ Nota bene: i permessi sono applicati a cascata su ogni file e sotto cartella della cartella condivisa. + Il proprietario della cartella può operare come meglio crede. +
+ + ]]> + + + + + + + + + Your Channel Folders + + +
+
+ Your Channel Folders + è una cartella speciale creata automaticamente dal Sistema. +
+
+ Contiene una cartella per ogni canale a cui appartieni. Per favore leggi bene: +
+
+
    +
  • Gli utenti di una cartella di canale sono coloro appartenenti al canale. (i.e. Staff è condivisa con tutti gli utenti dell'istituto).
    • +
  • Ogni azione su queste folder speciali (upload/delete/read) è notificata agli altri utenti.
    • +
  • Ogni azione su queste folder speciali è tracciata.
    • +
+
+
+ Nota bene: i permessi su queste folder di canale sono applicati dagli amministratori del canale in questione. +
+
+ + ]]> + + + + + + + + Public Link Vs. Get Link + + +
+ Ogni volta che hai bisogno di allegare + un file od una cartella del tuo workspace puoi usare questa caratteristica molto utile: +
+
+
    +
  • Get Link: crea uno short URL (e.g. http://goo.gl/TK8toC) che puoi incollare nelle tue email per far puntare gli utenti (appartenenti alla cartella condivisa) + direttamente a quella folder/file specifico;
    • +
+
+
+
    +
  • Public Link: crea uno short URL per far scaricare ad ogni utente (avente lo URL) il file. Non funziona con le cartelle chiaramente.
    • +
+
+
+ Il Tour è finito, ricorda di cliccare "Don't show this again" per farsì che questa guida non appaia nel futuro. +
+ + ]]> + + + + + + + + \ No newline at end of file diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/resources/TourResources.java b/src/main/java/org/gcube/portlets/user/workspace/client/resources/TourResources.java new file mode 100644 index 0000000..bfa19e4 --- /dev/null +++ b/src/main/java/org/gcube/portlets/user/workspace/client/resources/TourResources.java @@ -0,0 +1,12 @@ +package org.gcube.portlets.user.workspace.client.resources; + +import org.gcube.portlets.widgets.guidedtour.resources.client.GuidedTourResource; + +import com.google.gwt.resources.client.ClientBundle; + +public interface TourResources extends ClientBundle { + + @Source("GuidedTour.xml") + GuidedTourResource quickTour(); + +} \ No newline at end of file diff --git a/src/main/resources/org/gcube/portlets/user/workspace/WorkspacePortlet.gwt.xml b/src/main/resources/org/gcube/portlets/user/workspace/WorkspacePortlet.gwt.xml index 089dd59..2ba7157 100644 --- a/src/main/resources/org/gcube/portlets/user/workspace/WorkspacePortlet.gwt.xml +++ b/src/main/resources/org/gcube/portlets/user/workspace/WorkspacePortlet.gwt.xml @@ -3,11 +3,9 @@ - - - - + + @@ -20,7 +18,7 @@ - + UploadService /org.gcube.portlets.user.workspace.WorkspacePortletJUnit/UploadService - + + + quicktourServlet + org.gcube.portlets.widgets.guidedtour.server.TourServiceImpl + + + + quicktourServlet + /workspace/quicktourServlet + diff --git a/src/main/webapp/images/tour/1.png b/src/main/webapp/images/tour/1.png new file mode 100644 index 0000000..78ca505 Binary files /dev/null and b/src/main/webapp/images/tour/1.png differ diff --git a/src/main/webapp/images/tour/2.png b/src/main/webapp/images/tour/2.png new file mode 100644 index 0000000..a67a904 Binary files /dev/null and b/src/main/webapp/images/tour/2.png differ diff --git a/src/main/webapp/images/tour/3.png b/src/main/webapp/images/tour/3.png new file mode 100644 index 0000000..f35e5ad Binary files /dev/null and b/src/main/webapp/images/tour/3.png differ diff --git a/src/main/webapp/images/tour/4.png b/src/main/webapp/images/tour/4.png new file mode 100644 index 0000000..84f8374 Binary files /dev/null and b/src/main/webapp/images/tour/4.png differ diff --git a/src/main/webapp/images/tour/6.png b/src/main/webapp/images/tour/6.png new file mode 100644 index 0000000..e575658 Binary files /dev/null and b/src/main/webapp/images/tour/6.png differ