diff --git a/config/profile.xml b/config/profile.xml index 3736d46..98ac1f4 100644 --- a/config/profile.xml +++ b/config/profile.xml @@ -6,7 +6,7 @@ tabular-data-csv-import-widget allows csv import from file and workspace PortletsUser tabular-data-csv-import-widget - 2.8.0-SNAPSHOT + 1.0.0 tabular-data-csv-import-widget allows csv import from file and workspace diff --git a/distro/README b/distro/README index 3da4891..e8e7a37 100644 --- a/distro/README +++ b/distro/README @@ -1,7 +1,9 @@ The gCube System - tabular-data-csv-import-widget ------------------------------------------------------------ -This work has been supported by the following European projects: iMarine (FP7-INFRASTRUCTURES-2011-2) +This work has been partially supported by the following European projects: DILIGENT (FP6-2003-IST-2), +D4Science (FP7-INFRA-2007-1.2.2), D4Science-II (FP7-INFRA-2008-1.2.2), iMarine (FP7-INFRASTRUCTURES-2011-2), +and EUBrazilOpenBio (FP7-ICT-2011-EU-Brazil), Parthenos (H2020-INFRADEV-1-2014-1), BlueBridge (H2020-EINFRA-2015-1). Authors ------- diff --git a/pom.xml b/pom.xml index 11c79d8..e3ed8ea 100644 --- a/pom.xml +++ b/pom.xml @@ -38,7 +38,7 @@ ${project.basedir}/distro ${project.build.directory}/${project.build.finalName} 2015-10-15 - https://gcube.wiki.gcube-system.org/gcube/index.php/Tabular_Data_Manager + http://wiki.gcube-system.org/gcube/Tabular_Data_Manager templates distro config diff --git a/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/CSVTableDetailCard.java b/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/CSVTableDetailCard.java index 56e2d15..b36e367 100644 --- a/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/CSVTableDetailCard.java +++ b/src/main/java/org/gcube/portlets/user/td/csvimportwidget/client/CSVTableDetailCard.java @@ -20,11 +20,11 @@ import com.allen_sauer.gwt.log.client.Log; import com.google.gwt.core.client.GWT; import com.google.gwt.core.client.Scheduler; import com.google.gwt.core.client.Scheduler.ScheduledCommand; -import com.google.gwt.i18n.client.DateTimeFormat; import com.google.gwt.user.client.Command; import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.gwt.user.client.ui.VerticalPanel; import com.sencha.gxt.cell.core.client.form.ComboBoxCell.TriggerAction; +import com.sencha.gxt.core.client.util.Margins; import com.sencha.gxt.data.client.loader.RpcProxy; import com.sencha.gxt.data.shared.ListStore; import com.sencha.gxt.data.shared.loader.ListLoadConfig; @@ -54,28 +54,26 @@ import com.sencha.gxt.widget.core.client.form.TextField; * */ public class CSVTableDetailCard extends WizardCard { - protected DateTimeFormat sdf = DateTimeFormat.getFormat("yyyy-MM-dd"); - protected final String TABLEDETAILPANELWIDTH = "100%"; - protected final String TABLEDETAILPANELHEIGHT = "100%"; - protected final String FORMWIDTH = "538px"; + private final String TABLEDETAILPANELWIDTH = "100%"; + private final String TABLEDETAILPANELHEIGHT = "100%"; + + private CSVImportSession importSession; + private CSVTableDetailCard thisCard; - protected CSVImportSession importSession; - protected CSVTableDetailCard thisCard; + private VerticalLayoutContainer p; + private VerticalPanel tableDetailPanel; - protected VerticalLayoutContainer p; - protected VerticalPanel tableDetailPanel; + private TextField name; + private TextArea description; + private TextArea rights; + private DateField validFrom; + private DateField validUntilTo; - protected TextField name; - protected TextArea description; - protected TextArea rights; - protected DateField validFrom; - protected DateField validUntilTo; + private TabResource detail; - protected TabResource detail; - - protected ListLoader> loader; - protected ComboBox comboLicences; + private ListLoader> loader; + private ComboBox comboLicences; public CSVTableDetailCard(final CSVImportSession importSession) { super("Tabular Resource Detail", ""); @@ -91,16 +89,16 @@ public class CSVTableDetailCard extends WizardCard { FramedPanel form = new FramedPanel(); form.setHeadingText("Details"); - form.setWidth(FORMWIDTH); + FieldSet fieldSet = new FieldSet(); fieldSet.setHeadingText("Information"); fieldSet.setCollapsible(false); - form.add(fieldSet); + form.add(fieldSet, new MarginData(new Margins(0))); p = new VerticalLayoutContainer(); - fieldSet.add(p); + fieldSet.add(p, new MarginData(new Margins(0))); name = new TextField(); name.setAllowBlank(false); diff --git a/templates/README b/templates/README index 7e3ad55..38bf491 100644 --- a/templates/README +++ b/templates/README @@ -1,7 +1,9 @@ The gCube System - ${name} ------------------------------------------------------------ -This work has been supported by the following European projects: iMarine (FP7-INFRASTRUCTURES-2011-2) +This work has been partially supported by the following European projects: DILIGENT (FP6-2003-IST-2), +D4Science (FP7-INFRA-2007-1.2.2), D4Science-II (FP7-INFRA-2008-1.2.2), iMarine (FP7-INFRASTRUCTURES-2011-2), +and EUBrazilOpenBio (FP7-ICT-2011-EU-Brazil), Parthenos (H2020-INFRADEV-1-2014-1), BlueBridge (H2020-EINFRA-2015-1). Authors ------- diff --git a/templates/profile.xml b/templates/profile.xml index 19ed5bc..ffa3274 100644 --- a/templates/profile.xml +++ b/templates/profile.xml @@ -6,7 +6,7 @@ ${project.description} PortletsUser ${project.name} - ${version} + 1.0.0 ${project.description}