diff --git a/distro/changelog.xml b/distro/changelog.xml index 504db1f..f984625 100644 --- a/distro/changelog.xml +++ b/distro/changelog.xml @@ -1,7 +1,8 @@ - Task #8070: file versioning shown in a column of workspace grid + Task #8070: file versioning info panel added into How-to + Improved responsivness, added collapsible tree panel when device is a phone and shifted download button next to the upload one. diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/WorkspaceFeaturesView.java b/src/main/java/org/gcube/portlets/user/workspace/client/view/WorkspaceFeaturesView.java index c60abaf..bfe33f1 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/view/WorkspaceFeaturesView.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/WorkspaceFeaturesView.java @@ -4,6 +4,7 @@ package org.gcube.portlets.user.workspace.client.view; import org.gcube.portlets.user.workspace.client.AppController; +import org.gcube.portlets.user.workspace.client.ConstantsExplorer; import org.gcube.portlets.user.workspace.client.ConstantsPortlet; import org.gcube.portlets.user.workspace.client.resources.Resources; @@ -35,7 +36,7 @@ import com.google.gwt.user.client.ui.Widget; * The Class WorkspaceFeaturesView. * * @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it - * Nov 6, 2015 + * @author Massimiliano Assante, CNR-ISTI */ public class WorkspaceFeaturesView extends Composite { @@ -54,26 +55,27 @@ public class WorkspaceFeaturesView extends Composite { @UiField com.google.gwt.user.client.ui.Label how_to; - @UiField - Label shf; //Share Folders & Files + @UiField Label shf; //Share Folders & Files private Popover overShF= new Popover(); - @UiField - Label upl; //UPLOAD + @UiField Label upl; //UPLOAD private Popover overUpload = new Popover(); - @UiField - Label plk; //PUBLIC LINK + @UiField Label plk; //PUBLIC LINK private Popover overPlk = new Popover(); - @UiField - Label flk; //PUBLIC LINK - + @UiField Label flk; //FOLDER PUBLIC LINK + private Popover overFolderlk = new Popover(); + @UiField Label versioning; //VERSIONING + + private Popover overversioninglk = new Popover(); + + @UiField FlowPanel fp1; @@ -139,6 +141,7 @@ public class WorkspaceFeaturesView extends Composite { initPopupFlkFeature(); initPopupUploadFeature(); initPopupPlkFeature(); + initPopupVersioningFeature(); alert_ws_features.addClosedHandler(new ClosedHandler() { @@ -165,6 +168,22 @@ public class WorkspaceFeaturesView extends Composite { }); } + /** + *Inits the popup versioning feature. + */ + private void initPopupVersioningFeature() { + + overversioninglk.setAnimation(false); + overversioninglk.setWidget(versioning); + overversioninglk.setHeading("Workspace version control"); + String icon = ""+Resources.getIconVersioning().getSafeHtml().asString()+""; + overversioninglk.setText(icon+"Workspace keeps track of any file version, transparently.

To see the other file versions, " + + "select a file, then right click on it and click \""+ ConstantsExplorer.FILE_VERSIONS +"\".

"); + overversioninglk.setHtml(true); + overversioninglk.setPlacement(Placement.BOTTOM); + overversioninglk.setTrigger(Trigger.HOVER); + overversioninglk.reconfigure(); + } /** * */ diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/WorkspaceFeaturesView.ui.xml b/src/main/java/org/gcube/portlets/user/workspace/client/view/WorkspaceFeaturesView.ui.xml index f9bdc84..3b6ca05 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/view/WorkspaceFeaturesView.ui.xml +++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/WorkspaceFeaturesView.ui.xml @@ -32,6 +32,7 @@ + diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/grids/GxtGridFilterGroupPanel.java b/src/main/java/org/gcube/portlets/user/workspace/client/view/grids/GxtGridFilterGroupPanel.java index f94d9b8..4c80460 100644 --- a/src/main/java/org/gcube/portlets/user/workspace/client/view/grids/GxtGridFilterGroupPanel.java +++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/grids/GxtGridFilterGroupPanel.java @@ -91,16 +91,16 @@ public class GxtGridFilterGroupPanel extends LayoutContainer { ColumnConfig category = new ColumnConfig(FileModel.HUMAN_REDABLE_CATEGORY, FileModel.HUMAN_REDABLE_CATEGORY, 100); ColumnConfig size = new ColumnConfig(FileGridModel.SIZE, FileGridModel.SIZE, 45); ColumnConfig ownerFullName = new ColumnConfig(FileGridModel.OWNERFULLNAME, FileGridModel.OWNER, 90); - ColumnConfig fileVersion = new ColumnConfig(FileGridModel.VERSION, FileGridModel.VERSION, 35); + size.setEditor(new CellEditor(new NumberField())); ColumnModel cm = null; if(group) - cm = new ColumnModel(Arrays.asList(icon, name, fileVersion, ownerFullName, type, lastUpdate, size, category)); + cm = new ColumnModel(Arrays.asList(icon, name, ownerFullName, type, lastUpdate, size, category)); else - cm = new ColumnModel(Arrays.asList(icon, name, fileVersion, ownerFullName, type, lastUpdate, size)); + cm = new ColumnModel(Arrays.asList(icon, name, ownerFullName, type, lastUpdate, size)); final ColumnModel columnModel = cm;