Task #8070: file versioning info panel added into How-to
git-svn-id: http://svn.d4science-ii.research-infrastructures.eu/gcube/trunk/portlets/user/workspace@146831 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
parent
d7419fbf43
commit
9aefd7e87f
|
@ -1,7 +1,8 @@
|
||||||
<ReleaseNotes>
|
<ReleaseNotes>
|
||||||
<Changeset component="org.gcube.portlets-user.workspace-portlet.6-17-0"
|
<Changeset component="org.gcube.portlets-user.workspace-portlet.6-17-0"
|
||||||
date="2017-04-12">
|
date="2017-04-12">
|
||||||
<Change>Task #8070: file versioning shown in a column of workspace grid</Change>
|
<Change>Task #8070: file versioning info panel added into How-to</Change>
|
||||||
|
<Change>Improved responsivness, added collapsible tree panel when device is a phone and shifted download button next to the upload one.</Change>
|
||||||
</Changeset>
|
</Changeset>
|
||||||
<Changeset component="org.gcube.portlets-user.workspace-portlet.6-16-0"
|
<Changeset component="org.gcube.portlets-user.workspace-portlet.6-16-0"
|
||||||
date="2017-03-03">
|
date="2017-03-03">
|
||||||
|
|
|
@ -4,6 +4,7 @@
|
||||||
package org.gcube.portlets.user.workspace.client.view;
|
package org.gcube.portlets.user.workspace.client.view;
|
||||||
|
|
||||||
import org.gcube.portlets.user.workspace.client.AppController;
|
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.ConstantsPortlet;
|
||||||
import org.gcube.portlets.user.workspace.client.resources.Resources;
|
import org.gcube.portlets.user.workspace.client.resources.Resources;
|
||||||
|
|
||||||
|
@ -35,7 +36,7 @@ import com.google.gwt.user.client.ui.Widget;
|
||||||
* The Class WorkspaceFeaturesView.
|
* The Class WorkspaceFeaturesView.
|
||||||
*
|
*
|
||||||
* @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it
|
* @author Francesco Mangiacrapa francesco.mangiacrapa@isti.cnr.it
|
||||||
* Nov 6, 2015
|
* @author Massimiliano Assante, CNR-ISTI
|
||||||
*/
|
*/
|
||||||
public class WorkspaceFeaturesView extends Composite {
|
public class WorkspaceFeaturesView extends Composite {
|
||||||
|
|
||||||
|
@ -54,26 +55,27 @@ public class WorkspaceFeaturesView extends Composite {
|
||||||
@UiField
|
@UiField
|
||||||
com.google.gwt.user.client.ui.Label how_to;
|
com.google.gwt.user.client.ui.Label how_to;
|
||||||
|
|
||||||
@UiField
|
@UiField Label shf; //Share Folders & Files
|
||||||
Label shf; //Share Folders & Files
|
|
||||||
|
|
||||||
private Popover overShF= new Popover();
|
private Popover overShF= new Popover();
|
||||||
|
|
||||||
@UiField
|
@UiField Label upl; //UPLOAD
|
||||||
Label upl; //UPLOAD
|
|
||||||
|
|
||||||
private Popover overUpload = new Popover();
|
private Popover overUpload = new Popover();
|
||||||
|
|
||||||
@UiField
|
@UiField Label plk; //PUBLIC LINK
|
||||||
Label plk; //PUBLIC LINK
|
|
||||||
|
|
||||||
private Popover overPlk = new Popover();
|
private Popover overPlk = new Popover();
|
||||||
|
|
||||||
@UiField
|
@UiField Label flk; //FOLDER PUBLIC LINK
|
||||||
Label flk; //PUBLIC LINK
|
|
||||||
|
|
||||||
private Popover overFolderlk = new Popover();
|
private Popover overFolderlk = new Popover();
|
||||||
|
|
||||||
|
@UiField Label versioning; //VERSIONING
|
||||||
|
|
||||||
|
private Popover overversioninglk = new Popover();
|
||||||
|
|
||||||
|
|
||||||
@UiField
|
@UiField
|
||||||
FlowPanel fp1;
|
FlowPanel fp1;
|
||||||
|
|
||||||
|
@ -139,6 +141,7 @@ public class WorkspaceFeaturesView extends Composite {
|
||||||
initPopupFlkFeature();
|
initPopupFlkFeature();
|
||||||
initPopupUploadFeature();
|
initPopupUploadFeature();
|
||||||
initPopupPlkFeature();
|
initPopupPlkFeature();
|
||||||
|
initPopupVersioningFeature();
|
||||||
|
|
||||||
alert_ws_features.addClosedHandler(new ClosedHandler<AlertBase>() {
|
alert_ws_features.addClosedHandler(new ClosedHandler<AlertBase>() {
|
||||||
|
|
||||||
|
@ -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 = "<span style=\"margin-right:5px\">"+Resources.getIconVersioning().getSafeHtml().asString()+"</span>";
|
||||||
|
overversioninglk.setText(icon+"Workspace keeps track of any file version, transparently. <p>To see the other file versions, " +
|
||||||
|
"select a file, then right click on it and click \""+ ConstantsExplorer.FILE_VERSIONS +"\".</p>");
|
||||||
|
overversioninglk.setHtml(true);
|
||||||
|
overversioninglk.setPlacement(Placement.BOTTOM);
|
||||||
|
overversioninglk.setTrigger(Trigger.HOVER);
|
||||||
|
overversioninglk.reconfigure();
|
||||||
|
}
|
||||||
/**
|
/**
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -32,6 +32,7 @@
|
||||||
<b:Label ui:field="flk" text="Folder Link"></b:Label>
|
<b:Label ui:field="flk" text="Folder Link"></b:Label>
|
||||||
<b:Label ui:field="plk" text="Public Link"></b:Label>
|
<b:Label ui:field="plk" text="Public Link"></b:Label>
|
||||||
<b:Label ui:field="upl" text="Upload"></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> -->
|
<!-- <b:Label ui:field="upa" text="Upload Archive"></b:Label> -->
|
||||||
</g:HorizontalPanel>
|
</g:HorizontalPanel>
|
||||||
</g:FlowPanel>
|
</g:FlowPanel>
|
||||||
|
|
|
@ -91,16 +91,16 @@ public class GxtGridFilterGroupPanel extends LayoutContainer {
|
||||||
ColumnConfig category = new ColumnConfig(FileModel.HUMAN_REDABLE_CATEGORY, FileModel.HUMAN_REDABLE_CATEGORY, 100);
|
ColumnConfig category = new ColumnConfig(FileModel.HUMAN_REDABLE_CATEGORY, FileModel.HUMAN_REDABLE_CATEGORY, 100);
|
||||||
ColumnConfig size = new ColumnConfig(FileGridModel.SIZE, FileGridModel.SIZE, 45);
|
ColumnConfig size = new ColumnConfig(FileGridModel.SIZE, FileGridModel.SIZE, 45);
|
||||||
ColumnConfig ownerFullName = new ColumnConfig(FileGridModel.OWNERFULLNAME, FileGridModel.OWNER, 90);
|
ColumnConfig ownerFullName = new ColumnConfig(FileGridModel.OWNERFULLNAME, FileGridModel.OWNER, 90);
|
||||||
ColumnConfig fileVersion = new ColumnConfig(FileGridModel.VERSION, FileGridModel.VERSION, 35);
|
|
||||||
|
|
||||||
size.setEditor(new CellEditor(new NumberField()));
|
size.setEditor(new CellEditor(new NumberField()));
|
||||||
|
|
||||||
ColumnModel cm = null;
|
ColumnModel cm = null;
|
||||||
|
|
||||||
if(group)
|
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
|
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;
|
final ColumnModel columnModel = cm;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue