Updated Ribbon
git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-portlet@82699 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
parent
5636074dd9
commit
0e0c2fab61
|
|
@ -22,6 +22,9 @@
|
|||
<dependent-module archiveName="tabular-data-gxtservice-1.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-gxtservice/tabular-data-gxtservice">
|
||||
<dependency-type>uses</dependency-type>
|
||||
</dependent-module>
|
||||
<dependent-module archiveName="tabular-data-information-1.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-information/tabular-data-information">
|
||||
<dependency-type>uses</dependency-type>
|
||||
</dependent-module>
|
||||
<property name="java-output-path" value="/${module}/target/www/WEB-INF/classes"/>
|
||||
<property name="context-root" value="tabular-data-portlet"/>
|
||||
</wb-module>
|
||||
|
|
|
|||
|
|
@ -433,7 +433,7 @@ public class TabularDataController {
|
|||
|
||||
@Override
|
||||
public void onSuccess() {
|
||||
TDOpen tdOpen = new TDOpen("Tabular Resources Open");
|
||||
TDOpen tdOpen = new TDOpen("Open Tabular Resource");
|
||||
|
||||
tdOpen.addListener(new org.gcube.portlets.user.td.open.client.general.WizardListener() {
|
||||
|
||||
|
|
|
|||
|
|
@ -32,6 +32,8 @@ public class ChartsToolBar {
|
|||
protected TextButton barButton;
|
||||
protected TextButton curveButton;
|
||||
protected TextButton bullsButton;
|
||||
protected TextButton statisticalButton;
|
||||
protected TextButton rstudioButton;
|
||||
|
||||
protected TextButton gisButton;
|
||||
|
||||
|
|
@ -160,6 +162,55 @@ public class ChartsToolBar {
|
|||
|
||||
cleanCells(gisLayout.getElement());
|
||||
|
||||
|
||||
ButtonGroup externalToolGroup = new ButtonGroup();
|
||||
externalToolGroup.setHeight("78px");
|
||||
externalToolGroup.setStyleName("margin:2px");
|
||||
externalToolGroup.setHeadingText("External Tools");
|
||||
toolBar.add(externalToolGroup);
|
||||
|
||||
FlexTable externalToolLayout = new FlexTable();
|
||||
externalToolGroup.add(externalToolLayout);
|
||||
|
||||
rstudioButton = new TextButton("R Studio",
|
||||
TabularDataResources.INSTANCE.rstudio32());
|
||||
rstudioButton.setScale(ButtonScale.LARGE);
|
||||
rstudioButton.setIconAlign(IconAlign.TOP);
|
||||
rstudioButton.setToolTip("R Studio");
|
||||
rstudioButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
|
||||
rstudioButton.addSelectHandler(new SelectHandler() {
|
||||
|
||||
@Override
|
||||
public void onSelect(SelectEvent event) {
|
||||
// eventBus.fireEvent(new
|
||||
// ImportTableEvent(ImportTableType.JSON));
|
||||
}
|
||||
});
|
||||
|
||||
externalToolLayout.setWidget(0, 1, rstudioButton);
|
||||
externalToolLayout.getFlexCellFormatter().setRowSpan(0, 1, 2);
|
||||
|
||||
statisticalButton = new TextButton("Statistical",
|
||||
TabularDataResources.INSTANCE.statistical32());
|
||||
statisticalButton.setScale(ButtonScale.LARGE);
|
||||
statisticalButton.setIconAlign(IconAlign.TOP);
|
||||
statisticalButton.setToolTip("Statistical");
|
||||
statisticalButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
|
||||
statisticalButton.addSelectHandler(new SelectHandler() {
|
||||
|
||||
@Override
|
||||
public void onSelect(SelectEvent event) {
|
||||
// eventBus.fireEvent(new
|
||||
// ImportTableEvent(ImportTableType.JSON));
|
||||
}
|
||||
});
|
||||
|
||||
externalToolLayout.setWidget(0, 2, statisticalButton);
|
||||
externalToolLayout.getFlexCellFormatter().setRowSpan(0, 2, 2);
|
||||
|
||||
cleanCells(externalToolLayout.getElement());
|
||||
|
||||
|
||||
}
|
||||
|
||||
protected void cleanCells(Element elem) {
|
||||
|
|
|
|||
|
|
@ -84,7 +84,7 @@ public class FileToolBar {
|
|||
openButton = new TextButton("Open", TabularDataResources.INSTANCE.open32());
|
||||
openButton.setScale(ButtonScale.LARGE);
|
||||
openButton.setIconAlign(IconAlign.TOP);
|
||||
openButton.setToolTip("Open table");
|
||||
openButton.setToolTip("Open Tabular Resource");
|
||||
openButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
|
||||
openButton.addSelectHandler(new SelectHandler() {
|
||||
|
||||
|
|
@ -128,7 +128,7 @@ public class FileToolBar {
|
|||
});
|
||||
|
||||
propertiesButton = new TextButton("Properties", TabularDataResources.INSTANCE.properties());
|
||||
propertiesButton.setToolTip("Properties");
|
||||
propertiesButton.setToolTip("Show properties");
|
||||
dataLayout.setWidget(1, 2, propertiesButton);
|
||||
propertiesButton.addSelectHandler(new SelectHandler() {
|
||||
|
||||
|
|
@ -155,7 +155,7 @@ public class FileToolBar {
|
|||
importSDMXButton = new TextButton("SDMX", TabularDataResources.INSTANCE.sdmx32());
|
||||
importSDMXButton.setScale(ButtonScale.LARGE);
|
||||
importSDMXButton.setIconAlign(IconAlign.TOP);
|
||||
importSDMXButton.setToolTip("Import a new table from SDMX");
|
||||
importSDMXButton.setToolTip("Import table from SDMX source");
|
||||
importSDMXButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
|
||||
importSDMXButton.addSelectHandler(new SelectHandler() {
|
||||
|
||||
|
|
@ -169,7 +169,7 @@ public class FileToolBar {
|
|||
importLayout.getFlexCellFormatter().setRowSpan(0, 0, 2);
|
||||
|
||||
importCSVButton = new TextButton("CSV", TabularDataResources.INSTANCE.csv());
|
||||
importCSVButton.setToolTip("Import a new table from CSV");
|
||||
importCSVButton.setToolTip("Import table from CSV source");
|
||||
importCSVButton.addSelectHandler(new SelectHandler() {
|
||||
|
||||
@Override
|
||||
|
|
@ -180,7 +180,7 @@ public class FileToolBar {
|
|||
importLayout.setWidget(0, 2, importCSVButton);
|
||||
|
||||
importJSONButton = new TextButton("JSON", TabularDataResources.INSTANCE.json());
|
||||
importJSONButton.setToolTip("Import a new table from JSON");
|
||||
importJSONButton.setToolTip("Import table from JSON source");
|
||||
importJSONButton.addSelectHandler(new SelectHandler() {
|
||||
|
||||
@Override
|
||||
|
|
@ -205,6 +205,7 @@ public class FileToolBar {
|
|||
exportGroup.add(exportLayout);
|
||||
|
||||
exportSDMXButton = new TextButton("SDMX", TabularDataResources.INSTANCE.sdmx32());
|
||||
exportSDMXButton.setToolTip("Export SDMX document");
|
||||
exportSDMXButton.setScale(ButtonScale.LARGE);
|
||||
exportSDMXButton.setIconAlign(IconAlign.TOP);
|
||||
exportSDMXButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
|
||||
|
|
@ -220,6 +221,7 @@ public class FileToolBar {
|
|||
exportLayout.getFlexCellFormatter().setRowSpan(0, 0, 2);
|
||||
|
||||
exportCSVButton = new TextButton("CSV", TabularDataResources.INSTANCE.csv());
|
||||
exportCSVButton.setToolTip("Export CSV document");
|
||||
exportCSVButton.addSelectHandler(new SelectHandler() {
|
||||
|
||||
@Override
|
||||
|
|
@ -230,6 +232,7 @@ public class FileToolBar {
|
|||
exportLayout.setWidget(0, 2, exportCSVButton);
|
||||
|
||||
exportJSONButton = new TextButton("JSON", TabularDataResources.INSTANCE.json());
|
||||
exportJSONButton.setToolTip("Export JSON document");
|
||||
exportJSONButton.addSelectHandler(new SelectHandler() {
|
||||
|
||||
@Override
|
||||
|
|
|
|||
|
|
@ -76,7 +76,7 @@ public class FormulasToolBar {
|
|||
filterButton = new TextButton("Filter", TabularDataResources.INSTANCE.filter32());
|
||||
filterButton.setScale(ButtonScale.LARGE);
|
||||
filterButton.setIconAlign(IconAlign.TOP);
|
||||
filterButton.setToolTip("Filter the open TS");
|
||||
filterButton.setToolTip("Filter table data");
|
||||
filterButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
|
||||
filterButton.addSelectHandler(new SelectHandler() {
|
||||
|
||||
|
|
@ -92,7 +92,7 @@ public class FormulasToolBar {
|
|||
unionButton = new TextButton("Union", TabularDataResources.INSTANCE.union32());
|
||||
unionButton.setScale(ButtonScale.LARGE);
|
||||
unionButton.setIconAlign(IconAlign.TOP);
|
||||
unionButton.setToolTip("Union the open TS with another one ");
|
||||
unionButton.setToolTip("Merge tables data");
|
||||
unionButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
|
||||
unionButton.addSelectHandler(new SelectHandler() {
|
||||
|
||||
|
|
@ -109,7 +109,7 @@ public class FormulasToolBar {
|
|||
denormalizeButton = new TextButton("Denormalize", TabularDataResources.INSTANCE.denormalize32());
|
||||
denormalizeButton.setScale(ButtonScale.LARGE);
|
||||
denormalizeButton.setIconAlign(IconAlign.TOP);
|
||||
denormalizeButton.setToolTip("Denormalize the open TS");
|
||||
denormalizeButton.setToolTip("Denormalize table");
|
||||
denormalizeButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
|
||||
denormalizeButton.addSelectHandler(new SelectHandler() {
|
||||
|
||||
|
|
@ -144,7 +144,7 @@ public class FormulasToolBar {
|
|||
aggregateButton = new TextButton("Aggregate", TabularDataResources.INSTANCE.aggregate32());
|
||||
aggregateButton.setScale(ButtonScale.LARGE);
|
||||
aggregateButton.setIconAlign(IconAlign.TOP);
|
||||
aggregateButton.setToolTip("Aggregate the open TS");
|
||||
aggregateButton.setToolTip("Perform data aggregation");
|
||||
aggregateButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
|
||||
aggregateButton.addSelectHandler(new SelectHandler() {
|
||||
|
||||
|
|
@ -169,10 +169,10 @@ public class FormulasToolBar {
|
|||
FlexTable columnLayout = new FlexTable();
|
||||
columnGroup.add(columnLayout);
|
||||
|
||||
modifyLabelButton = new TextButton("Label", TabularDataResources.INSTANCE.columnLabel32());
|
||||
modifyLabelButton = new TextButton("Labels", TabularDataResources.INSTANCE.columnLabel32());
|
||||
modifyLabelButton.setScale(ButtonScale.LARGE);
|
||||
modifyLabelButton.setIconAlign(IconAlign.TOP);
|
||||
modifyLabelButton.setToolTip("Changes the column label");
|
||||
modifyLabelButton.setToolTip("Change column labels");
|
||||
modifyLabelButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
|
||||
modifyLabelButton.addSelectHandler(new SelectHandler() {
|
||||
|
||||
|
|
@ -189,7 +189,7 @@ public class FormulasToolBar {
|
|||
modifyColumnTypeButton = new TextButton("Type", TabularDataResources.INSTANCE.columnType32());
|
||||
modifyColumnTypeButton.setScale(ButtonScale.LARGE);
|
||||
modifyColumnTypeButton.setIconAlign(IconAlign.TOP);
|
||||
modifyColumnTypeButton.setToolTip("Changes the column type");
|
||||
modifyColumnTypeButton.setToolTip("Change the column type");
|
||||
modifyColumnTypeButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
|
||||
modifyColumnTypeButton.addSelectHandler(new SelectHandler() {
|
||||
|
||||
|
|
@ -205,7 +205,7 @@ public class FormulasToolBar {
|
|||
modifyColumnValuesButton = new TextButton("Values", TabularDataResources.INSTANCE.columnValues32());
|
||||
modifyColumnValuesButton.setScale(ButtonScale.LARGE);
|
||||
modifyColumnValuesButton.setIconAlign(IconAlign.TOP);
|
||||
modifyColumnValuesButton.setToolTip("Changes the column values");
|
||||
modifyColumnValuesButton.setToolTip("Modify column values according to an expression");
|
||||
modifyColumnValuesButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
|
||||
modifyColumnValuesButton.addSelectHandler(new SelectHandler() {
|
||||
|
||||
|
|
@ -234,7 +234,7 @@ public class FormulasToolBar {
|
|||
historyButton = new TextButton("History", TabularDataResources.INSTANCE.history32());
|
||||
historyButton.setScale(ButtonScale.LARGE);
|
||||
historyButton.setIconAlign(IconAlign.TOP);
|
||||
historyButton.setToolTip("Show the current Time Series history");
|
||||
historyButton.setToolTip("Show history");
|
||||
historyButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
|
||||
historyButton.addSelectHandler(new SelectHandler() {
|
||||
|
||||
|
|
@ -260,7 +260,7 @@ public class FormulasToolBar {
|
|||
});
|
||||
|
||||
discardAllButton = new TextButton("Discard All", TabularDataResources.INSTANCE.discardAll());
|
||||
discardAllButton.setToolTip("Discard all applied operations");
|
||||
discardAllButton.setToolTip("Discard all unsaved operations");
|
||||
historyLayout.setWidget(1, 1, discardAllButton);
|
||||
discardAllButton.addSelectHandler(new SelectHandler() {
|
||||
|
||||
|
|
|
|||
|
|
@ -31,8 +31,8 @@ public class ReviewToolBar {
|
|||
protected TextButton btn;
|
||||
protected TextButton validationButton;
|
||||
protected TextButton rulesButton;
|
||||
protected TextButton statisticalButton;
|
||||
protected TextButton rstudioButton;
|
||||
protected TextButton operationsButton;
|
||||
protected TextButton manageRulesButton;
|
||||
|
||||
public ReviewToolBar(EventBus eventBus) {
|
||||
this.eventBus = eventBus;
|
||||
|
|
@ -57,29 +57,48 @@ public class ReviewToolBar {
|
|||
FlexTable validationLayout = new FlexTable();
|
||||
validationGroup.add(validationLayout);
|
||||
|
||||
rulesButton = new TextButton("Rules",
|
||||
rulesButton = new TextButton("New Rule",
|
||||
TabularDataResources.INSTANCE.rules32());
|
||||
rulesButton.setScale(ButtonScale.LARGE);
|
||||
rulesButton.setIconAlign(IconAlign.TOP);
|
||||
rulesButton.setToolTip("Rules");
|
||||
rulesButton.setToolTip("Define a new validation rule");
|
||||
rulesButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
|
||||
rulesButton.addSelectHandler(new SelectHandler() {
|
||||
|
||||
@Override
|
||||
public void onSelect(SelectEvent event) {
|
||||
// eventBus.fireEvent(new
|
||||
// ImportTableEvent(ImportTableType.JSON));
|
||||
// ImportTableEvent(ImportTableType.JSON));taskButton
|
||||
}
|
||||
});
|
||||
|
||||
validationLayout.setWidget(0, 1, rulesButton);
|
||||
validationLayout.getFlexCellFormatter().setRowSpan(0, 1, 2);
|
||||
|
||||
manageRulesButton = new TextButton("Manage Rules",
|
||||
TabularDataResources.INSTANCE.rules32());
|
||||
manageRulesButton.setScale(ButtonScale.LARGE);
|
||||
manageRulesButton.setIconAlign(IconAlign.TOP);
|
||||
manageRulesButton.setToolTip("View defined rules and apply");
|
||||
manageRulesButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
|
||||
manageRulesButton.addSelectHandler(new SelectHandler() {
|
||||
|
||||
validationButton = new TextButton("Validate",
|
||||
@Override
|
||||
public void onSelect(SelectEvent event) {
|
||||
// eventBus.fireEvent(new
|
||||
// ImportTableEvent(ImportTableType.JSON));taskButton
|
||||
}
|
||||
});
|
||||
|
||||
validationLayout.setWidget(0, 2, manageRulesButton);
|
||||
validationLayout.getFlexCellFormatter().setRowSpan(0, 2, 2);
|
||||
|
||||
|
||||
validationButton = new TextButton("Show Validation",
|
||||
TabularDataResources.INSTANCE.validation32());
|
||||
validationButton.setScale(ButtonScale.LARGE);
|
||||
validationButton.setIconAlign(IconAlign.TOP);
|
||||
validationButton.setToolTip("Validate");
|
||||
validationButton.setToolTip("Show validation outcome on table");
|
||||
validationButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
|
||||
validationButton.addSelectHandler(new SelectHandler() {
|
||||
|
||||
|
|
@ -90,27 +109,28 @@ public class ReviewToolBar {
|
|||
}
|
||||
});
|
||||
|
||||
validationLayout.setWidget(0, 2, validationButton);
|
||||
validationLayout.getFlexCellFormatter().setRowSpan(0, 2, 2);
|
||||
validationLayout.setWidget(0, 3, validationButton);
|
||||
validationLayout.getFlexCellFormatter().setRowSpan(0, 3, 2);
|
||||
|
||||
cleanCells(validationLayout.getElement());
|
||||
|
||||
ButtonGroup externalToolGroup = new ButtonGroup();
|
||||
externalToolGroup.setHeight("78px");
|
||||
externalToolGroup.setStyleName("margin:2px");
|
||||
externalToolGroup.setHeadingText("External Tools");
|
||||
toolBar.add(externalToolGroup);
|
||||
// Operations
|
||||
ButtonGroup operationsGroup = new ButtonGroup();
|
||||
operationsGroup.setHeight("78px");
|
||||
operationsGroup.setStyleName("margin:2px");
|
||||
operationsGroup.setHeadingText("Operations");
|
||||
toolBar.add(operationsGroup);
|
||||
|
||||
FlexTable externalToolLayout = new FlexTable();
|
||||
externalToolGroup.add(externalToolLayout);
|
||||
FlexTable operationsLayout = new FlexTable();
|
||||
operationsGroup.add(operationsLayout);
|
||||
|
||||
rstudioButton = new TextButton("R Studio",
|
||||
TabularDataResources.INSTANCE.rstudio32());
|
||||
rstudioButton.setScale(ButtonScale.LARGE);
|
||||
rstudioButton.setIconAlign(IconAlign.TOP);
|
||||
rstudioButton.setToolTip("R Studio");
|
||||
rstudioButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
|
||||
rstudioButton.addSelectHandler(new SelectHandler() {
|
||||
operationsButton = new TextButton("Review Operations",
|
||||
TabularDataResources.INSTANCE.rules32());
|
||||
operationsButton.setScale(ButtonScale.LARGE);
|
||||
operationsButton.setIconAlign(IconAlign.TOP);
|
||||
operationsButton.setToolTip("View performed operations");
|
||||
operationsButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
|
||||
operationsButton.addSelectHandler(new SelectHandler() {
|
||||
|
||||
@Override
|
||||
public void onSelect(SelectEvent event) {
|
||||
|
|
@ -119,30 +139,13 @@ public class ReviewToolBar {
|
|||
}
|
||||
});
|
||||
|
||||
externalToolLayout.setWidget(0, 1, rstudioButton);
|
||||
externalToolLayout.getFlexCellFormatter().setRowSpan(0, 1, 2);
|
||||
operationsLayout.setWidget(0, 1, operationsButton);
|
||||
operationsLayout.getFlexCellFormatter().setRowSpan(0, 1, 2);
|
||||
|
||||
statisticalButton = new TextButton("Statistical",
|
||||
TabularDataResources.INSTANCE.statistical32());
|
||||
statisticalButton.setScale(ButtonScale.LARGE);
|
||||
statisticalButton.setIconAlign(IconAlign.TOP);
|
||||
statisticalButton.setToolTip("Statistical");
|
||||
statisticalButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
|
||||
statisticalButton.addSelectHandler(new SelectHandler() {
|
||||
|
||||
|
||||
@Override
|
||||
public void onSelect(SelectEvent event) {
|
||||
// eventBus.fireEvent(new
|
||||
// ImportTableEvent(ImportTableType.JSON));
|
||||
}
|
||||
});
|
||||
cleanCells(operationsLayout.getElement());
|
||||
|
||||
externalToolLayout.setWidget(0, 2, statisticalButton);
|
||||
externalToolLayout.getFlexCellFormatter().setRowSpan(0, 2, 2);
|
||||
|
||||
cleanCells(externalToolLayout.getElement());
|
||||
|
||||
|
||||
}
|
||||
|
||||
protected void cleanCells(Element elem) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue