Updated How-to according to shareable links

git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace@181840 82a268e6-3cf1-43bd-a215-b396298e98cf

.settings/org.eclipse.wst.common.component

@@ -5,6 +5,9 @@
         <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="ckan-util-library-2.10.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/ckan-util-library-TRUNK/ckan-util-library-TRUNK">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
         <dependent-module archiveName="workspace-tree-widget-6.27.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/WorkspaceTree-TRUNK/WorkspaceTree-TRUNK">
             <dependency-type>uses</dependency-type>
         </dependent-module>

src/main/java/org/gcube/portlets/user/workspace/client/resources/WsPortletResources.java

@@ -20,9 +20,9 @@ public interface WsPortletResources extends ClientBundle {
 	@Source("upload16.png")
 	ImageResource upload16();
 	
-	@Source("publiclink-howto.txt")
+	@Source("shareablelinks-howto.txt")
 	TextResource publicLinkHowTo();
 	
-	@Source("sharelink-howto.txt")
+//	@Source("sharelink-howto.txt")
-	TextResource shareLinkkHowTo();
+//	TextResource shareLinkkHowTo();
 }

src/main/java/org/gcube/portlets/user/workspace/client/resources/publiclink-howto.txt

@@ -1,8 +0,0 @@
-<div style='text-align:justify'>
-By sharing this link with your coworkers you will enact anyone with the link to access the content, no login will be requested.
-<br/><span style='font-weight:bold'>Link To File:</span><br/>
-By a public link to file a user can download it. A Public Link to file always points to its latest version.
-<br/><span style='font-weight:bold'>Link To Folder:</span><br/>
-By a public link to folder a 'guest' user can access (in read-only mode) to content and download files of that folder (and its sub-folders). 
-Only the owner or administrator of a folder can create a public link to folder by "Get Public Link"
-</div>

src/main/java/org/gcube/portlets/user/workspace/client/resources/shareablelinks-howto.txt

@@ -0,0 +1,16 @@
+<div style='text-align:justify'>
+<span style='background-color:#3a87ad; color:white; font-weight:bold; padding: 3px'>Link To File</span><br/>
+<ul>
+<li style='font-weight:bold'>as Private</li>
+(Only the) Members of the group the folder is shared with are enacted to access the file and the shared folder content. Login required
+<li style='font-weight:bold'>as Public</li>
+Anyone with link can download it. No Login required
+</ul>
+<br/><span style='background-color:#3a87ad; color:white; font-weight:bold; padding: 3px'>Link To Folder</span><br/>
+<ul>
+<li style='font-weight:bold'>as Private</li>
+(Only the) Members of the group the folder is shared with are enacted to view the content. Login required
+<li style='font-weight:bold'>as Public</li>
+Anyone with link can view the content. No login required
+</ul>
+</div>

src/main/java/org/gcube/portlets/user/workspace/client/view/WorkspaceFeaturesView.java

@@ -68,9 +68,9 @@ public class WorkspaceFeaturesView extends Composite {
 
 	private Popover overPlk = new Popover();
 
-	@UiField Label flk; //FOLDER PUBLIC LINK
+//	@UiField Label flk; //FOLDER PUBLIC LINK
 	
-	private Popover overFolderlk = new Popover();
+//	private Popover overFolderlk = new Popover();
 
 	@UiField Label versioning; //VERSIONING
 	
@@ -136,10 +136,10 @@ public class WorkspaceFeaturesView extends Composite {
 		ck_features_show_again.addStyleName("margin-right-10");
 		shf.addStyleName("margin-right-10");
 		upl.addStyleName("margin-right-10");
-		flk.addStyleName("margin-right-10");
+//		flk.addStyleName("margin-right-10");
 		plk.addStyleName("margin-right-10");
 		initPopupShareFeature();
-		initPopupFlkFeature();
+//		initPopupFlkFeature();
 		initPopupUploadFeature();
 		initPopupPlkFeature();
 		initPopupVersioningFeature();
@@ -188,18 +188,18 @@ public class WorkspaceFeaturesView extends Composite {
 	/**
 	 *
 	 */
-	private void initPopupFlkFeature() {
+//	private void initPopupFlkFeature() {
-
+//
-		overFolderlk.setAnimation(false);
+//		overFolderlk.setAnimation(false);
-		overFolderlk.setWidget(flk);
+//		overFolderlk.setWidget(flk);
-		String icon = "<span style=\"margin-right:5px\">"+Resources.getIconShareLink().getSafeHtml().asString()+"</span>";
+//		String icon = "<span style=\"margin-right:5px\">"+Resources.getIconShareLink().getSafeHtml().asString()+"</span>";
-		overFolderlk.setHeading(icon+"Workspace Share Link");
+//		overFolderlk.setHeading(icon+"Workspace Share Link");
-		overFolderlk.setText(WsPortletResources.INSTANCE.shareLinkkHowTo().getText());
+//		overFolderlk.setText(WsPortletResources.INSTANCE.shareLinkkHowTo().getText());
-		overFolderlk.setHtml(true);
+//		overFolderlk.setHtml(true);
-		overFolderlk.setPlacement(Placement.BOTTOM);
+//		overFolderlk.setPlacement(Placement.BOTTOM);
-		overFolderlk.setTrigger(Trigger.HOVER);
+//		overFolderlk.setTrigger(Trigger.HOVER);
-		overFolderlk.reconfigure();
+//		overFolderlk.reconfigure();
-	}
+//	}
 
 	/**
 	 * Inits the popup share feature.
@@ -244,7 +244,7 @@ public class WorkspaceFeaturesView extends Composite {
 		overPlk.setAnimation(false);
 		overPlk.setWidget(plk);
 		String icon = "<span style=\"margin-right:5px\">"+Resources.getIconPublicLink().getSafeHtml().asString()+"</span>";
-		overPlk.setHeading(icon+"Workspace Public Link");
+		overPlk.setHeading(icon+"Workspace Shareable Links");
 		overPlk.setText(WsPortletResources.INSTANCE.publicLinkHowTo().getText());
 		overPlk.setHtml(true);
 		overPlk.setPlacement(Placement.BOTTOM);

src/main/java/org/gcube/portlets/user/workspace/client/view/WorkspaceFeaturesView.ui.xml

@@ -29,8 +29,8 @@
 						verticalAlignment="middle">
 
 						<b:Label ui:field="shf" text="Share"></b:Label>
-						<b:Label ui:field="flk" text="Share Link"></b:Label>
+<!-- 						<b:Label ui:field="flk" text="Share Link"></b:Label> -->
-						<b:Label ui:field="plk" text="Public Link"></b:Label>
+						<b:Label ui:field="plk" text="Shareable Links"></b:Label>
 						<b:Label ui:field="upl" text="Upload"></b:Label>
 						<b:Label ui:field="versioning" text="Version control"></b:Label>
 						<!-- <b:Label ui:field="upa" text="Upload Archive"></b:Label> -->