From 6b1d6300329ceab3c64e5878a43be5846bc9a161 Mon Sep 17 00:00:00 2001 From: Francesco Mangiacrapa Date: Tue, 24 Sep 2019 13:13:37 +0000 Subject: [PATCH] Updated shareable links description git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace-tree-widget@181841 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../view/windows/DialogShareableLink.java | 10 +++++---- .../view/windows/DialogShareableLink.ui.xml | 21 +++++++------------ .../user/workspace/public/workspacetree.css | 2 +- 3 files changed, 14 insertions(+), 19 deletions(-) diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogShareableLink.java b/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogShareableLink.java index 0757fd6..0b98e53 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogShareableLink.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogShareableLink.java @@ -116,8 +116,8 @@ public class DialogShareableLink extends Composite { private boolean itemIsPublicStatus; private final String privateShareToFileDescription = "By sharing the following Private Link " - + "to file with your coworkers, you will enact the users of the group the folder is shared with, " - + "after login, to access the file and the shared folder content"; + + "with your coworkers, you will enact the users of the group the folder is shared with, " + + "to access the file and the shared folder content. Login required"; /** @@ -223,8 +223,9 @@ public class DialogShareableLink extends Composite { fieldSetPrivate.setVisible(true); fieldPrivateSharing.setVisible(true); - if(item.isShareable()) + if(item.isShareable()) { buttonShareSettings.setVisible(true); + } loadAndShowPrivateLink(item, textPrivateLink); @@ -235,7 +236,7 @@ public class DialogShareableLink extends Composite { //labelLinkSharing.setText("Only your cowokers (sharing members) can access to the content"); } } - + //THE FOLDER IS PRIVATE - NO SHARED AND NO PUBLIC if(!item.isPublic() && !item.isShared()) { @@ -243,6 +244,7 @@ public class DialogShareableLink extends Composite { if(item.isShareable()) { fieldPrivateSharing.setVisible(true); buttonShareSettings.setVisible(true); + buttonShareSettings.setText("Enable Share"); } //SHARING WITH EVERYONE diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogShareableLink.ui.xml b/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogShareableLink.ui.xml index 42a1711..a7884fe 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogShareableLink.ui.xml +++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogShareableLink.ui.xml @@ -79,15 +79,12 @@ addStyleNames="my-control-group"> - By sharing the following Private Link - to - folder with + By sharing the following Private Link with your coworkers, you will enact the users of the group - the folder is shared with, - after login, to access the shared - folder content + the folder is shared with to access the shared + folder content. Login required Private Link By sharing the following Public - Link - to folder, you will + Link, you will enact anyone with the link to view the - content, no login will be - requested + content. No login required By sharing the following - Public Link to file, your coworkers can download it. - No login will be - requested. + Public Link, anyone with link can download it. The link will always point to the version of the file at the - time of link creation + time of link creation. No login required Public Link