From 9e55c21b9c95aae15e06c94a83628a7b67b5d979 Mon Sep 17 00:00:00 2001 From: Giancarlo Panichi Date: Tue, 29 Sep 2015 15:34:04 +0000 Subject: [PATCH] Minor Update git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-portlet@119186 82a268e6-3cf1-43bd-a215-b396298e98cf --- .classpath | 6 +-- config/profile.xml | 6 +-- distro/README | 2 +- distro/changelog.xml | 4 ++ pom.xml | 4 +- .../user/td/client/ribbon/FileToolBar.java | 18 ++++---- .../ribbon/CurationToolBarMessages.properties | 4 ++ .../CurationToolBarMessages_es.properties | 4 ++ .../CurationToolBarMessages_it.properties | 4 ++ .../ribbon/RuleToolBarMessages.properties | 4 +- .../ribbon/RuleToolBarMessages_es.properties | 4 +- .../ribbon/RuleToolBarMessages_it.properties | 4 +- .../user/td/tabulardataportlet.gwt.xml | 42 +++++++++++-------- templates/changelog.xml | 4 ++ 14 files changed, 70 insertions(+), 40 deletions(-) diff --git a/.classpath b/.classpath index 7078886..792d383 100644 --- a/.classpath +++ b/.classpath @@ -1,12 +1,12 @@ - + - + @@ -45,5 +45,5 @@ - + diff --git a/config/profile.xml b/config/profile.xml index e842ea9..190f3d3 100644 --- a/config/profile.xml +++ b/config/profile.xml @@ -11,15 +11,15 @@ tabular-data-manager manages tabular data tabular-data-manager - 2.8.0-SNAPSHOT + 2.9.0-SNAPSHOT org.gcube.portlets.user tabular-data-manager - 2.8.0-SNAPSHOT + 2.9.0-SNAPSHOT webapplication - tabular-data-manager-2.8.0-SNAPSHOT.war + tabular-data-manager-2.9.0-SNAPSHOT.war diff --git a/distro/README b/distro/README index 1229dc2..3003f7a 100644 --- a/distro/README +++ b/distro/README @@ -13,7 +13,7 @@ Istituto di Scienza e Tecnologie dell'Informazione "A. Faedo" Version and Release Date ------------------------ -v. 2.8.0-SNAPSHOT (2015-07-03) +v. 2.9.0-SNAPSHOT (2015-10-15) Description diff --git a/distro/changelog.xml b/distro/changelog.xml index 3808e0b..739fc45 100644 --- a/distro/changelog.xml +++ b/distro/changelog.xml @@ -1,4 +1,8 @@ + + Added support to WorkspaceExplorer [issue #428] + Added Delete Validations diff --git a/pom.xml b/pom.xml index ff2241f..c94b7ed 100644 --- a/pom.xml +++ b/pom.xml @@ -13,7 +13,7 @@ 4.0.0 org.gcube.portlets.user tabular-data-manager - 2.8.0-SNAPSHOT + 2.9.0-SNAPSHOT war @@ -41,7 +41,7 @@ ${project.basedir}/distro ${project.build.directory}/${project.build.finalName} - 2015-07-03 + 2015-10-15 https://gcube.wiki.gcube-system.org/gcube/index.php/Tabular_Data_Manager templates distro diff --git a/src/main/java/org/gcube/portlets/user/td/client/ribbon/FileToolBar.java b/src/main/java/org/gcube/portlets/user/td/client/ribbon/FileToolBar.java index 9af0efa..d4f9ec7 100644 --- a/src/main/java/org/gcube/portlets/user/td/client/ribbon/FileToolBar.java +++ b/src/main/java/org/gcube/portlets/user/td/client/ribbon/FileToolBar.java @@ -14,6 +14,8 @@ import com.allen_sauer.gwt.log.client.Log; import com.google.gwt.core.client.GWT; import com.google.gwt.dom.client.Element; import com.google.gwt.dom.client.NodeList; +import com.google.gwt.event.logical.shared.SelectionEvent; +import com.google.gwt.event.logical.shared.SelectionHandler; import com.google.gwt.user.client.ui.FlexTable; import com.google.web.bindery.event.shared.EventBus; import com.sencha.gxt.cell.core.client.ButtonCell.ButtonArrowAlign; @@ -24,6 +26,9 @@ import com.sencha.gxt.widget.core.client.button.ButtonGroup; import com.sencha.gxt.widget.core.client.button.TextButton; import com.sencha.gxt.widget.core.client.event.SelectEvent; import com.sencha.gxt.widget.core.client.event.SelectEvent.SelectHandler; +import com.sencha.gxt.widget.core.client.menu.Item; +import com.sencha.gxt.widget.core.client.menu.Menu; +import com.sencha.gxt.widget.core.client.menu.MenuItem; import com.sencha.gxt.widget.core.client.toolbar.ToolBar; /** @@ -63,15 +68,15 @@ public class FileToolBar { //Help private TextButton helpButton; - //private TextButton languageButton; + private TextButton languageButton; //private TextButton logsButton; //private TextButton testButton; //Language Menu - /*private MenuItem enItem; + private MenuItem enItem; private MenuItem itItem; - private MenuItem esItem;*/ + private MenuItem esItem; @@ -427,7 +432,7 @@ public class FileToolBar { FlexTable helpLayout = new FlexTable(); helpGroup.add(helpLayout); - /* + languageButton = new TextButton(msgs.languageButton(), TabularDataResources.INSTANCE.language32()); languageButton.enable(); @@ -439,7 +444,6 @@ public class FileToolBar { helpLayout.setWidget(0, 0, languageButton); helpLayout.getFlexCellFormatter().setRowSpan(0, 0, 2); - */ helpButton = new TextButton(msgs.helpButton(), TabularDataResources.INSTANCE.help32()); @@ -520,7 +524,7 @@ public class FileToolBar { } } - /* + private Menu createLanguageMenu() { Menu menuReplace = new Menu(); enItem = new MenuItem(msgs.english(), @@ -567,7 +571,7 @@ public class FileToolBar { menuReplace.add(esItem); menuReplace.add(itItem); return menuReplace; - }*/ + } public void setUI(UIStateEvent event) { diff --git a/src/main/resources/org/gcube/portlets/user/td/client/ribbon/CurationToolBarMessages.properties b/src/main/resources/org/gcube/portlets/user/td/client/ribbon/CurationToolBarMessages.properties index 6b9f625..91c246a 100644 --- a/src/main/resources/org/gcube/portlets/user/td/client/ribbon/CurationToolBarMessages.properties +++ b/src/main/resources/org/gcube/portlets/user/td/client/ribbon/CurationToolBarMessages.properties @@ -1,4 +1,8 @@ validationGroupHeadingText = Validation +validationsShowButton = Show +validationsShowButtonToolTip = Show Validations +validationsDeleteButton = Delete +validationsDeleteButtonToolTip = Delete Validations duplicateDetectionButton = Duplicate Detection duplicateDetectionButtonToolTip = Duplicate Detection structureGroupHeadingText = Structure diff --git a/src/main/resources/org/gcube/portlets/user/td/client/ribbon/CurationToolBarMessages_es.properties b/src/main/resources/org/gcube/portlets/user/td/client/ribbon/CurationToolBarMessages_es.properties index cb9c17b..4a96c2c 100644 --- a/src/main/resources/org/gcube/portlets/user/td/client/ribbon/CurationToolBarMessages_es.properties +++ b/src/main/resources/org/gcube/portlets/user/td/client/ribbon/CurationToolBarMessages_es.properties @@ -1,4 +1,8 @@ validationGroupHeadingText = Validación +validationsShowButton = Muestra +validationsShowButtonToolTip = Muestra Validaciones +validationsDeleteButton = Eliminar +validationsDeleteButtonToolTip = Elimina validaciones duplicateDetectionButton = Detección Duplicados duplicateDetectionButtonToolTip = Detección de duplicados structureGroupHeadingText = Estructura diff --git a/src/main/resources/org/gcube/portlets/user/td/client/ribbon/CurationToolBarMessages_it.properties b/src/main/resources/org/gcube/portlets/user/td/client/ribbon/CurationToolBarMessages_it.properties index 017b001..e339b9a 100644 --- a/src/main/resources/org/gcube/portlets/user/td/client/ribbon/CurationToolBarMessages_it.properties +++ b/src/main/resources/org/gcube/portlets/user/td/client/ribbon/CurationToolBarMessages_it.properties @@ -1,4 +1,8 @@ validationGroupHeadingText = Validazioni +validationsShowButton = Mostra +validationsShowButtonToolTip = Mostra Validazioni +validationsDeleteButton = Elimina +validationsDeleteButtonToolTip = Elimina Validazioni duplicateDetectionButton = Rilevazione Duplicati duplicateDetectionButtonToolTip = Rilevazioni Duplicati structureGroupHeadingText = Struttura diff --git a/src/main/resources/org/gcube/portlets/user/td/client/ribbon/RuleToolBarMessages.properties b/src/main/resources/org/gcube/portlets/user/td/client/ribbon/RuleToolBarMessages.properties index 94892b7..724b646 100644 --- a/src/main/resources/org/gcube/portlets/user/td/client/ribbon/RuleToolBarMessages.properties +++ b/src/main/resources/org/gcube/portlets/user/td/client/ribbon/RuleToolBarMessages.properties @@ -1,6 +1,6 @@ ruleGroupHeadingText = Manage -ruleEditButton = Open -ruleEditButtonToolTip = Open +ruleOpenButton = Open +ruleOpenButtonToolTip = Open ruleDeleteButton = Delete ruleDeleteButtonToolTip = Delete ruleShareButton = Share diff --git a/src/main/resources/org/gcube/portlets/user/td/client/ribbon/RuleToolBarMessages_es.properties b/src/main/resources/org/gcube/portlets/user/td/client/ribbon/RuleToolBarMessages_es.properties index a705e68..5264711 100644 --- a/src/main/resources/org/gcube/portlets/user/td/client/ribbon/RuleToolBarMessages_es.properties +++ b/src/main/resources/org/gcube/portlets/user/td/client/ribbon/RuleToolBarMessages_es.properties @@ -1,6 +1,6 @@ ruleGroupHeadingText = Gestionar -ruleEditButton = Abre -ruleEditButtonToolTip = Abre +ruleOpenButton = Abre +ruleOpenButtonToolTip = Abre ruleDeleteButton = Borrar ruleDeleteButtonToolTip = Borrar ruleShareButton = Cuota diff --git a/src/main/resources/org/gcube/portlets/user/td/client/ribbon/RuleToolBarMessages_it.properties b/src/main/resources/org/gcube/portlets/user/td/client/ribbon/RuleToolBarMessages_it.properties index d299c1e..20df468 100644 --- a/src/main/resources/org/gcube/portlets/user/td/client/ribbon/RuleToolBarMessages_it.properties +++ b/src/main/resources/org/gcube/portlets/user/td/client/ribbon/RuleToolBarMessages_it.properties @@ -1,6 +1,6 @@ ruleGroupHeadingText = Gestisci -ruleEditButton = Apri -ruleEditButtonToolTip = Apri +ruleOpenButton = Apri +ruleOpenButtonToolTip = Apri ruleDeleteButton = Elimina ruleDeleteButtonToolTip = Elimina ruleShareButton = Condividi diff --git a/src/main/resources/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml b/src/main/resources/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml index 46520c5..1ca3b92 100644 --- a/src/main/resources/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml +++ b/src/main/resources/org/gcube/portlets/user/td/tabulardataportlet.gwt.xml @@ -2,7 +2,7 @@ - + @@ -38,7 +38,7 @@ - + - - + + + + + + + + + + - + + - + - + diff --git a/templates/changelog.xml b/templates/changelog.xml index 3808e0b..739fc45 100644 --- a/templates/changelog.xml +++ b/templates/changelog.xml @@ -1,4 +1,8 @@ + + Added support to WorkspaceExplorer [issue #428] + Added Delete Validations