gCubeSystem
/
tabular-data-manager
16
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Minor Update 

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-portlet@113933 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2015-04-10 09:22:33 +00:00
parent eb9de961ef
commit d156932a06
11 changed files with 48 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/org/gcube/portlets/user/td/client/TabularDataController.java
View File

@ -12,7 +12,7 @@ import org.gcube.portlets.user.td.client.logs.TDMLogs;
import org.gcube.portlets.user.td.client.rstudio.RStudio; import org.gcube.portlets.user.td.client.rstudio.RStudio;
import org.gcube.portlets.user.td.client.template.TemplateApplyDialog; import org.gcube.portlets.user.td.client.template.TemplateApplyDialog;
import org.gcube.portlets.user.td.client.template.TemplateDeleteDialog; import org.gcube.portlets.user.td.client.template.TemplateDeleteDialog;
import org.gcube.portlets.user.td.client.template.TemplateEditDialog; import org.gcube.portlets.user.td.client.template.TemplateOpenDialog;
import org.gcube.portlets.user.td.client.template.TemplateShareDialog; import org.gcube.portlets.user.td.client.template.TemplateShareDialog;
import org.gcube.portlets.user.td.codelistmappingimportwidget.client.CodelistMappingImportWizardTD; import org.gcube.portlets.user.td.codelistmappingimportwidget.client.CodelistMappingImportWizardTD;
import org.gcube.portlets.user.td.csvexportwidget.client.CSVExportWizardTD; import org.gcube.portlets.user.td.csvexportwidget.client.CSVExportWizardTD;
@ -1638,7 +1638,7 @@ public class TabularDataController {
GWT.runAsync(new RunAsyncCallback() { GWT.runAsync(new RunAsyncCallback() {
public void onSuccess() { public void onSuccess() {
Log.debug("Template Open call"); Log.debug("Template Open call");
TemplateEditDialog tdDialog = new TemplateEditDialog(eventBus); TemplateOpenDialog tdDialog = new TemplateOpenDialog(eventBus);
tdDialog.show(); tdDialog.show();
} }

26
src/main/java/org/gcube/portlets/user/td/client/ribbon/TemplateToolBar.java
View File

@ -38,7 +38,7 @@ public class TemplateToolBar {
//Template //Template
private TextButton templateNewButton; private TextButton templateNewButton;
private TextButton templateEditButton; private TextButton templateOpenButton;
private TextButton templateDeleteButton; private TextButton templateDeleteButton;
private TextButton templateApplyButton; private TextButton templateApplyButton;
private TextButton templateShareButton; private TextButton templateShareButton;
@ -90,14 +90,14 @@ public class TemplateToolBar {
templateLayout.setWidget(0, 0, templateNewButton); templateLayout.setWidget(0, 0, templateNewButton);
templateLayout.getFlexCellFormatter().setRowSpan(0, 0, 2); templateLayout.getFlexCellFormatter().setRowSpan(0, 0, 2);
templateEditButton = new TextButton(msgs.templateEditButton(), templateOpenButton = new TextButton(msgs.templateOpenButton(),
TabularDataResources.INSTANCE.templateEdit32()); TabularDataResources.INSTANCE.templateEdit32());
templateEditButton.enable(); templateOpenButton.enable();
templateEditButton.setToolTip(msgs.templateEditButtonToolTip()); templateOpenButton.setToolTip(msgs.templateOpenButtonToolTip());
templateEditButton.setScale(ButtonScale.LARGE); templateOpenButton.setScale(ButtonScale.LARGE);
templateEditButton.setIconAlign(IconAlign.TOP); templateOpenButton.setIconAlign(IconAlign.TOP);
templateEditButton.setArrowAlign(ButtonArrowAlign.BOTTOM); templateOpenButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
templateEditButton.addSelectHandler(new SelectHandler() { templateOpenButton.addSelectHandler(new SelectHandler() {
public void onSelect(SelectEvent event) { public void onSelect(SelectEvent event) {
eventBus.fireEvent(new RibbonEvent( eventBus.fireEvent(new RibbonEvent(
@ -105,7 +105,7 @@ public class TemplateToolBar {
} }
}); });
templateLayout.setWidget(0, 1, templateEditButton); templateLayout.setWidget(0, 1, templateOpenButton);
templateLayout.getFlexCellFormatter().setRowSpan(0, 1, 2); templateLayout.getFlexCellFormatter().setRowSpan(0, 1, 2);
@ -192,7 +192,7 @@ public class TemplateToolBar {
try { try {
switch (uiStateType) { switch (uiStateType) {
case START: case START:
templateEditButton.enable(); templateOpenButton.enable();
templateNewButton.enable(); templateNewButton.enable();
templateDeleteButton.enable(); templateDeleteButton.enable();
templateApplyButton.disable(); templateApplyButton.disable();
@ -200,7 +200,7 @@ public class TemplateToolBar {
break; break;
case TR_CLOSE: case TR_CLOSE:
case TR_READONLY: case TR_READONLY:
templateEditButton.enable(); templateOpenButton.enable();
templateNewButton.enable(); templateNewButton.enable();
templateDeleteButton.enable(); templateDeleteButton.enable();
templateApplyButton.disable(); templateApplyButton.disable();
@ -209,14 +209,14 @@ public class TemplateToolBar {
case TR_OPEN: case TR_OPEN:
case TABLEUPDATE: case TABLEUPDATE:
case TABLECURATION: case TABLECURATION:
templateEditButton.enable(); templateOpenButton.enable();
templateNewButton.enable(); templateNewButton.enable();
templateDeleteButton.enable(); templateDeleteButton.enable();
templateApplyButton.enable(); templateApplyButton.enable();
templateShareButton.enable(); templateShareButton.enable();
break; break;
case WIZARD_OPEN: case WIZARD_OPEN:
templateEditButton.disable(); templateOpenButton.disable();
templateNewButton.disable(); templateNewButton.disable();
templateDeleteButton.disable(); templateDeleteButton.disable();
templateApplyButton.disable(); templateApplyButton.disable();

8
src/main/java/org/gcube/portlets/user/td/client/ribbon/TemplateToolBarMessages.java
View File

@ -19,11 +19,11 @@ public interface TemplateToolBarMessages extends Messages {
@DefaultMessage("New") @DefaultMessage("New")
String templateNewButtonToolTip(); String templateNewButtonToolTip();
@DefaultMessage("Edit") @DefaultMessage("Open")
String templateEditButton(); String templateOpenButton();
@DefaultMessage("Edit") @DefaultMessage("Open")
String templateEditButtonToolTip(); String templateOpenButtonToolTip();
@DefaultMessage("Delete") @DefaultMessage("Delete")
String templateDeleteButton(); String templateDeleteButton();

4
src/main/java/org/gcube/portlets/user/td/client/template/TemplateApplyPanel.java
View File

@ -212,7 +212,7 @@ public class TemplateApplyPanel extends FramedPanel {
btnApply = new TextButton("Apply"); btnApply = new TextButton("Apply");
btnApply.setIcon(TabularDataResources.INSTANCE.templateApply()); btnApply.setIcon(TabularDataResources.INSTANCE.templateApply());
btnApply.setIconAlign(IconAlign.RIGHT); btnApply.setIconAlign(IconAlign.RIGHT);
btnApply.setTitle("Apply Template"); btnApply.setToolTip("Apply Template");
btnApply.addSelectHandler(new SelectHandler() { btnApply.addSelectHandler(new SelectHandler() {
public void onSelect(SelectEvent event) { public void onSelect(SelectEvent event) {
@ -225,7 +225,7 @@ public class TemplateApplyPanel extends FramedPanel {
btnClose = new TextButton("Close"); btnClose = new TextButton("Close");
btnClose.setIcon(TabularDataResources.INSTANCE.close()); btnClose.setIcon(TabularDataResources.INSTANCE.close());
btnClose.setIconAlign(IconAlign.RIGHT); btnClose.setIconAlign(IconAlign.RIGHT);
btnClose.setTitle("Close"); btnClose.setToolTip("Close");
btnClose.addSelectHandler(new SelectHandler() { btnClose.addSelectHandler(new SelectHandler() {
public void onSelect(SelectEvent event) { public void onSelect(SelectEvent event) {

4
src/main/java/org/gcube/portlets/user/td/client/template/TemplateDeletePanel.java
View File

@ -202,7 +202,7 @@ public class TemplateDeletePanel extends FramedPanel {
btnDelete = new TextButton("Delete"); btnDelete = new TextButton("Delete");
btnDelete.setIcon(TabularDataResources.INSTANCE.templateDelete()); btnDelete.setIcon(TabularDataResources.INSTANCE.templateDelete());
btnDelete.setIconAlign(IconAlign.RIGHT); btnDelete.setIconAlign(IconAlign.RIGHT);
btnDelete.setTitle("Delete Template"); btnDelete.setToolTip("Delete Template");
btnDelete.addSelectHandler(new SelectHandler() { btnDelete.addSelectHandler(new SelectHandler() {
public void onSelect(SelectEvent event) { public void onSelect(SelectEvent event) {
@ -215,7 +215,7 @@ public class TemplateDeletePanel extends FramedPanel {
btnClose = new TextButton("Close"); btnClose = new TextButton("Close");
btnClose.setIcon(TabularDataResources.INSTANCE.close()); btnClose.setIcon(TabularDataResources.INSTANCE.close());
btnClose.setIconAlign(IconAlign.RIGHT); btnClose.setIconAlign(IconAlign.RIGHT);
btnClose.setTitle("Close"); btnClose.setToolTip("Close");
btnClose.addSelectHandler(new SelectHandler() { btnClose.addSelectHandler(new SelectHandler() {
public void onSelect(SelectEvent event) { public void onSelect(SelectEvent event) {

8
src/main/java/org/gcube/portlets/user/td/client/template/TemplateEditDialog.java → src/main/java/org/gcube/portlets/user/td/client/template/TemplateOpenDialog.java
View File

@ -16,16 +16,16 @@ import com.sencha.gxt.widget.core.client.event.SelectEvent.SelectHandler;
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> * href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
* *
*/ */
public class TemplateEditDialog extends Window { public class TemplateOpenDialog extends Window {
private static final String WIDTH = "720px"; private static final String WIDTH = "720px";
private static final String HEIGHT = "530px"; private static final String HEIGHT = "530px";
private EventBus eventBus; private EventBus eventBus;
public TemplateEditDialog(EventBus eventBus) { public TemplateOpenDialog(EventBus eventBus) {
this.eventBus = eventBus; this.eventBus = eventBus;
initWindow(); initWindow();
TemplateEditPanel templateOpenPanel = new TemplateEditPanel(this, TemplateOpenPanel templateOpenPanel = new TemplateOpenPanel(this,
eventBus); eventBus);
add(templateOpenPanel); add(templateOpenPanel);
} }
@ -35,7 +35,7 @@ public class TemplateEditDialog extends Window {
setHeight(HEIGHT); setHeight(HEIGHT);
setBodyBorder(false); setBodyBorder(false);
setResizable(false); setResizable(false);
setHeadingText("Edit Template"); setHeadingText("Open Template");
setClosable(true); setClosable(true);
setModal(true); setModal(true);
forceLayoutOnResize = true; forceLayoutOnResize = true;

26
src/main/java/org/gcube/portlets/user/td/client/template/TemplateEditPanel.java → src/main/java/org/gcube/portlets/user/td/client/template/TemplateOpenPanel.java
View File

@ -58,13 +58,13 @@ import com.sencha.gxt.widget.core.client.toolbar.ToolBar;
* href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a> * href="mailto:g.panichi@isti.cnr.it">g.panichi@isti.cnr.it</a>
* *
*/ */
public class TemplateEditPanel extends FramedPanel { public class TemplateOpenPanel extends FramedPanel {
private static final String WIDTH = "630px"; private static final String WIDTH = "630px";
private static final String HEIGHT = "520px"; private static final String HEIGHT = "520px";
private EventBus eventBus; private EventBus eventBus;
private TemplateEditDialog parent; private TemplateOpenDialog parent;
private TextButton btnEdit; private TextButton btnOpen;
private TextButton btnClose; private TextButton btnClose;
@ -72,7 +72,7 @@ public class TemplateEditPanel extends FramedPanel {
private Grid<TemplateData> grid; private Grid<TemplateData> grid;
private ExtendedListStore<TemplateData> store; private ExtendedListStore<TemplateData> store;
public TemplateEditPanel(TemplateEditDialog parent, EventBus eventBus) { public TemplateOpenPanel(TemplateOpenDialog parent, EventBus eventBus) {
this.parent = parent; this.parent = parent;
Log.debug("TemplateEditPanel"); Log.debug("TemplateEditPanel");
setWidth(WIDTH); setWidth(WIDTH);
@ -144,7 +144,7 @@ public class TemplateEditPanel extends FramedPanel {
String searchTerm = searchField.getCurrentValue(); String searchTerm = searchField.getCurrentValue();
if (searchTerm == null) if (searchTerm == null)
return true; return true;
return TemplateEditPanel.this.select(item, searchTerm); return TemplateOpenPanel.this.select(item, searchTerm);
} }
}); });
@ -204,14 +204,14 @@ public class TemplateEditPanel extends FramedPanel {
toolBar.addStyleName(ThemeStyles.get().style().borderTop()); toolBar.addStyleName(ThemeStyles.get().style().borderTop());
toolBar.getElement().getStyle().setProperty("borderBottom", "none"); toolBar.getElement().getStyle().setProperty("borderBottom", "none");
btnEdit = new TextButton("Edit"); btnOpen = new TextButton("Open");
btnEdit.setIcon(TabularDataResources.INSTANCE.templateEdit()); btnOpen.setIcon(TabularDataResources.INSTANCE.templateEdit());
btnEdit.setIconAlign(IconAlign.RIGHT); btnOpen.setIconAlign(IconAlign.RIGHT);
btnEdit.setTitle("Edit"); btnOpen.setToolTip("Open");
btnEdit.addSelectHandler(new SelectHandler() { btnOpen.addSelectHandler(new SelectHandler() {
public void onSelect(SelectEvent event) { public void onSelect(SelectEvent event) {
Log.debug("Pressed Edit"); Log.debug("Pressed Open");
open(); open();
} }
@ -220,7 +220,7 @@ public class TemplateEditPanel extends FramedPanel {
btnClose = new TextButton("Close"); btnClose = new TextButton("Close");
btnClose.setIcon(TabularDataResources.INSTANCE.close()); btnClose.setIcon(TabularDataResources.INSTANCE.close());
btnClose.setIconAlign(IconAlign.RIGHT); btnClose.setIconAlign(IconAlign.RIGHT);
btnClose.setTitle("Close"); btnClose.setToolTip("Close");
btnClose.addSelectHandler(new SelectHandler() { btnClose.addSelectHandler(new SelectHandler() {
public void onSelect(SelectEvent event) { public void onSelect(SelectEvent event) {
@ -236,7 +236,7 @@ public class TemplateEditPanel extends FramedPanel {
flowButton.setPack(BoxLayoutPack.CENTER); flowButton.setPack(BoxLayoutPack.CENTER);
BoxLayoutData boxLayoutData = new BoxLayoutData(new Margins(2, 4, 2, 4)); BoxLayoutData boxLayoutData = new BoxLayoutData(new Margins(2, 4, 2, 4));
flowButton.add(btnEdit, boxLayoutData); flowButton.add(btnOpen, boxLayoutData);
flowButton.add(btnClose, boxLayoutData); flowButton.add(btnClose, boxLayoutData);

4
src/main/java/org/gcube/portlets/user/td/client/template/TemplateSharePanel.java
View File

@ -208,7 +208,7 @@ public class TemplateSharePanel extends FramedPanel {
btnClose = new TextButton("Close"); btnClose = new TextButton("Close");
btnClose.setIcon(TabularDataResources.INSTANCE.close()); btnClose.setIcon(TabularDataResources.INSTANCE.close());
btnClose.setIconAlign(IconAlign.RIGHT); btnClose.setIconAlign(IconAlign.RIGHT);
btnClose.setTitle("Close"); btnClose.setToolTip("Close");
btnClose.addSelectHandler(new SelectHandler() { btnClose.addSelectHandler(new SelectHandler() {
public void onSelect(SelectEvent event) { public void onSelect(SelectEvent event) {
@ -220,7 +220,7 @@ public class TemplateSharePanel extends FramedPanel {
btnShare = new TextButton("Share"); btnShare = new TextButton("Share");
btnShare.setIcon(TabularDataResources.INSTANCE.share()); btnShare.setIcon(TabularDataResources.INSTANCE.share());
btnShare.setIconAlign(IconAlign.RIGHT); btnShare.setIconAlign(IconAlign.RIGHT);
btnShare.setTitle("Share"); btnShare.setToolTip("Share");
btnShare.addSelectHandler(new SelectHandler() { btnShare.addSelectHandler(new SelectHandler() {
public void onSelect(SelectEvent event) { public void onSelect(SelectEvent event) {

4
src/main/resources/org/gcube/portlets/user/td/client/ribbon/TemplateToolBarMessages.properties
View File

@ -1,8 +1,8 @@
templateGroupHeadingText = Manage templateGroupHeadingText = Manage
templateNewButton = New templateNewButton = New
templateNewButtonToolTip = New templateNewButtonToolTip = New
templateEditButton = Edit templateOpenButton = Open
templateEditButtonToolTip = Edit templateOpenButtonToolTip = Open
templateDeleteButton = Delete templateDeleteButton = Delete
templateDeleteButtonToolTip = Delete templateDeleteButtonToolTip = Delete
templateApplyButton = Apply templateApplyButton = Apply

4
src/main/resources/org/gcube/portlets/user/td/client/ribbon/TemplateToolBarMessages_es.properties
View File

@ -1,8 +1,8 @@
templateGroupHeadingText = Gestionar templateGroupHeadingText = Gestionar
templateNewButton = Nuevo templateNewButton = Nuevo
templateNewButtonToolTip = Nuevo templateNewButtonToolTip = Nuevo
templateEditButton = Editar templateOpenButton = Open
templateEditButtonToolTip = Editar templateOpenButtonToolTip = Open
templateDeleteButton = Borrar templateDeleteButton = Borrar
templateDeleteButtonToolTip = Borrar templateDeleteButtonToolTip = Borrar
templateApplyButton = Aplicar templateApplyButton = Aplicar

4
src/main/resources/org/gcube/portlets/user/td/client/ribbon/TemplateToolBarMessages_it.properties
View File

@ -1,8 +1,8 @@
templateGroupHeadingText = Gestisci templateGroupHeadingText = Gestisci
templateNewButton = Nuovo templateNewButton = Nuovo
templateNewButtonToolTip = Nuovo templateNewButtonToolTip = Nuovo
templateEditButton = Modifica templateOpenButton = Open
templateEditButtonToolTip = Modifica templateOpenButtonToolTip = Open
templateDeleteButton = Elimina templateDeleteButton = Elimina
templateDeleteButtonToolTip = Elimina templateDeleteButtonToolTip = Elimina
templateApplyButton = Applica templateApplyButton = Applica