diff --git a/src/main/java/org/gcube/portlets/widgets/netcdfbasicwidgets/client/resource/NetCDFBasic.css b/src/main/java/org/gcube/portlets/widgets/netcdfbasicwidgets/client/resource/NetCDFBasic.css index e7e1a4f..f319f4e 100644 --- a/src/main/java/org/gcube/portlets/widgets/netcdfbasicwidgets/client/resource/NetCDFBasic.css +++ b/src/main/java/org/gcube/portlets/widgets/netcdfbasicwidgets/client/resource/NetCDFBasic.css @@ -63,4 +63,13 @@ .combo-geometry-type { width: 406px !important; -} \ No newline at end of file +} + +/* Sample Data Text Area */ +.sample-data-text-area { + height: 318px; + width: 616px !important; + resize: none; + +} + diff --git a/src/main/java/org/gcube/portlets/widgets/netcdfbasicwidgets/client/resource/NetCDFBasicCSS.java b/src/main/java/org/gcube/portlets/widgets/netcdfbasicwidgets/client/resource/NetCDFBasicCSS.java index 63c44e0..71ffee2 100644 --- a/src/main/java/org/gcube/portlets/widgets/netcdfbasicwidgets/client/resource/NetCDFBasicCSS.java +++ b/src/main/java/org/gcube/portlets/widgets/netcdfbasicwidgets/client/resource/NetCDFBasicCSS.java @@ -39,5 +39,8 @@ public interface NetCDFBasicCSS extends CssResource { @ClassName("combo-geometry-type") public String getComboGeometryType(); + + @ClassName("sample-data-text-area") + public String getSampleDataTextArea(); } diff --git a/src/main/java/org/gcube/portlets/widgets/netcdfbasicwidgets/client/resource/NetCDFBasicResources.java b/src/main/java/org/gcube/portlets/widgets/netcdfbasicwidgets/client/resource/NetCDFBasicResources.java index 3dbf0c8..3c9fa1d 100644 --- a/src/main/java/org/gcube/portlets/widgets/netcdfbasicwidgets/client/resource/NetCDFBasicResources.java +++ b/src/main/java/org/gcube/portlets/widgets/netcdfbasicwidgets/client/resource/NetCDFBasicResources.java @@ -15,7 +15,7 @@ public interface NetCDFBasicResources extends ClientBundle { public static final NetCDFBasicResources INSTANCE = GWT.create(NetCDFBasicResources.class); @Source("NetCDFBasic.css") - NetCDFBasicCSS olBasicCSS(); + NetCDFBasicCSS netCDFBasicCSS(); @Source("tool-button-close_20.png") ImageResource toolButtonClose20(); diff --git a/src/main/java/org/gcube/portlets/widgets/netcdfbasicwidgets/client/util/WaitDialog.java b/src/main/java/org/gcube/portlets/widgets/netcdfbasicwidgets/client/util/WaitDialog.java index 2c14d42..b4afd57 100644 --- a/src/main/java/org/gcube/portlets/widgets/netcdfbasicwidgets/client/util/WaitDialog.java +++ b/src/main/java/org/gcube/portlets/widgets/netcdfbasicwidgets/client/util/WaitDialog.java @@ -36,18 +36,18 @@ public class WaitDialog extends DialogBox { private void init(String title, String text, int zIndex) { GWT.log("WaitDialog:[title=" + title + ", text=" + text + "]"); - NetCDFBasicResources.INSTANCE.olBasicCSS().ensureInjected(); + NetCDFBasicResources.INSTANCE.netCDFBasicCSS().ensureInjected(); setModal(true); setGlassEnabled(true); initHandler(); setText(title); msg = new HTML("
" + "
" + "
" + + NetCDFBasicResources.INSTANCE.netCDFBasicCSS().getProgressBarText() + "'>" + text + "
" + "

"); msg.setWidth(msgWidth); diff --git a/src/main/java/org/gcube/portlets/widgets/netcdfbasicwidgets/client/widgets/NetCDFPreviewDialog.java b/src/main/java/org/gcube/portlets/widgets/netcdfbasicwidgets/client/widgets/NetCDFPreviewDialog.java index 03ec495..0276960 100644 --- a/src/main/java/org/gcube/portlets/widgets/netcdfbasicwidgets/client/widgets/NetCDFPreviewDialog.java +++ b/src/main/java/org/gcube/portlets/widgets/netcdfbasicwidgets/client/widgets/NetCDFPreviewDialog.java @@ -75,7 +75,7 @@ public class NetCDFPreviewDialog extends DialogBox implements SelectVariableEven private void initWindow() { GWT.log(messages.dialogTitle()); - NetCDFBasicResources.INSTANCE.olBasicCSS().ensureInjected(); + NetCDFBasicResources.INSTANCE.netCDFBasicCSS().ensureInjected(); setModal(true); setGlassEnabled(true); setAnimationEnabled(true); @@ -247,9 +247,9 @@ public class NetCDFPreviewDialog extends DialogBox implements SelectVariableEven // close button image html dialogTopRight.setInnerHTML("
" + "" + "
"); + + NetCDFBasicResources.INSTANCE.netCDFBasicCSS().getDialogToolButtonIcon() + "' />"); // set the event target closeEventTarget = dialogTopRight.getChild(0).getChild(0); diff --git a/src/main/java/org/gcube/portlets/widgets/netcdfbasicwidgets/client/widgets/SamplePanel.java b/src/main/java/org/gcube/portlets/widgets/netcdfbasicwidgets/client/widgets/SamplePanel.java index c3e123e..9b9ae6f 100644 --- a/src/main/java/org/gcube/portlets/widgets/netcdfbasicwidgets/client/widgets/SamplePanel.java +++ b/src/main/java/org/gcube/portlets/widgets/netcdfbasicwidgets/client/widgets/SamplePanel.java @@ -7,6 +7,7 @@ import org.gcube.portlets.widgets.netcdfbasicwidgets.client.event.NetCDFDataEven import org.gcube.portlets.widgets.netcdfbasicwidgets.client.event.SampleVariableDataEvent; import org.gcube.portlets.widgets.netcdfbasicwidgets.client.event.SampleVariableDataEvent.SampleVariableDataEventHandler; import org.gcube.portlets.widgets.netcdfbasicwidgets.client.model.NetCDFDataModel; +import org.gcube.portlets.widgets.netcdfbasicwidgets.client.resource.NetCDFBasicResources; import org.gcube.portlets.widgets.netcdfbasicwidgets.shared.netcdf.VariableData; import com.google.gwt.event.dom.client.ChangeEvent; @@ -65,14 +66,11 @@ public class SamplePanel extends SimplePanel implements NetCDFDataEventHandler { sampleFlexTable.setWidget(0, 1, variablesBox); sampleData = new TextArea(); - //sampleData.setWidth("616px"); - sampleData.setHeight("318px"); - sampleData.getElement().setPropertyString("resize", "none"); - sampleData.getElement().setPropertyString("width", "616px !important"); - - + sampleData.getElement().setId("netcdfSampleTextArea"); + sampleData.setStylePrimaryName(NetCDFBasicResources.INSTANCE.netCDFBasicCSS().getSampleDataTextArea()); sampleData.setReadOnly(true); + sampleFlexTable.getFlexCellFormatter().setVerticalAlignment(1, 0, HasVerticalAlignment.ALIGN_TOP); sampleFlexTable.setHTML(1, 0, "Sample:"); sampleFlexTable.setWidget(1, 1, sampleData); diff --git a/src/main/java/org/gcube/portlets/widgets/netcdfbasicwidgets/client/widgets/VariablesPanel.java b/src/main/java/org/gcube/portlets/widgets/netcdfbasicwidgets/client/widgets/VariablesPanel.java index ae05652..ac3216a 100644 --- a/src/main/java/org/gcube/portlets/widgets/netcdfbasicwidgets/client/widgets/VariablesPanel.java +++ b/src/main/java/org/gcube/portlets/widgets/netcdfbasicwidgets/client/widgets/VariablesPanel.java @@ -48,7 +48,7 @@ public class VariablesPanel extends SimplePanel implements NetCDFDataEventHandle private void create() { netCDFDataModel.addNetCDFDataEventHandler(this); - setStyleName(NetCDFBasicResources.INSTANCE.olBasicCSS().getAreaSelectionPanel()); + setStyleName(NetCDFBasicResources.INSTANCE.netCDFBasicCSS().getAreaSelectionPanel()); createGrid(); diff --git a/src/main/resources/org/gcube/portlets/widgets/netcdfbasicwidgets/client/resource/NetCDFBasic.css b/src/main/resources/org/gcube/portlets/widgets/netcdfbasicwidgets/client/resource/NetCDFBasic.css index e7e1a4f..f319f4e 100644 --- a/src/main/resources/org/gcube/portlets/widgets/netcdfbasicwidgets/client/resource/NetCDFBasic.css +++ b/src/main/resources/org/gcube/portlets/widgets/netcdfbasicwidgets/client/resource/NetCDFBasic.css @@ -63,4 +63,13 @@ .combo-geometry-type { width: 406px !important; -} \ No newline at end of file +} + +/* Sample Data Text Area */ +.sample-data-text-area { + height: 318px; + width: 616px !important; + resize: none; + +} +