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@101816 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Giancarlo Panichi 2014-12-01 17:50:15 +00:00
parent 94410d289d
commit 92f11875e0
5 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pom.xml
View File

@ -55,6 +55,7 @@
<gwtVersion>2.6.1</gwtVersion> <gwtVersion>2.6.1</gwtVersion>
<gwtLogVersion>3.3.2</gwtLogVersion> <gwtLogVersion>3.3.2</gwtLogVersion>
<gxtVersion>3.1.1</gxtVersion> <gxtVersion>3.1.1</gxtVersion>
<gxt2Version>2.6.1-SNAPSHOT</gxt2Version>
<!-- To make this work on gwt-run you need to set up global env vars. on <!-- To make this work on gwt-run you need to set up global env vars. on
MacOSX edit this file /etc/launchd.conf and put "setenv GLOBUS_LOCATION /Users/massi/portal/Portal-Bundle/gCore" MacOSX edit this file /etc/launchd.conf and put "setenv GLOBUS_LOCATION /Users/massi/portal/Portal-Bundle/gCore"
@ -112,11 +113,15 @@
<!-- GXT 2 --> <!-- GXT 2 -->
<dependency> <dependency>
<groupId>com.extjs.gxt</groupId> <groupId>com.sencha.gxt</groupId>
<artifactId>gxt</artifactId> <artifactId>gxt2.2.5-gwt2.X</artifactId>
<version>2.2.5</version> <version>${gxt2Version}</version>
</dependency> </dependency>
<!-- <dependency> <groupId>com.extjs.gxt</groupId> <artifactId>gxt</artifactId>
<version>2.2.5</version> </dependency> -->
<!-- GXT 3 --> <!-- GXT 3 -->
<dependency> <dependency>
<groupId>com.sencha.gxt</groupId> <groupId>com.sencha.gxt</groupId>

5
src/main/java/org/gcube/portlets/user/td/client/PortalViewport.java
View File

@ -5,9 +5,11 @@ package org.gcube.portlets.user.td.client;
import com.allen_sauer.gwt.log.client.Log; import com.allen_sauer.gwt.log.client.Log;
import com.google.gwt.core.client.GWT; import com.google.gwt.core.client.GWT;
import com.google.gwt.dom.client.Element;
import com.google.gwt.safehtml.shared.SafeHtmlBuilder; import com.google.gwt.safehtml.shared.SafeHtmlBuilder;
import com.google.gwt.user.client.Window; import com.google.gwt.user.client.Window;
import com.sencha.gxt.core.client.dom.XDOM; import com.sencha.gxt.core.client.dom.XDOM;
import com.sencha.gxt.core.client.dom.XElement;
import com.sencha.gxt.widget.core.client.container.SimpleContainer; import com.sencha.gxt.widget.core.client.container.SimpleContainer;
import com.sencha.gxt.widget.core.client.container.Viewport.ViewportAppearance; import com.sencha.gxt.widget.core.client.container.Viewport.ViewportAppearance;
@ -43,7 +45,8 @@ public class PortalViewport extends SimpleContainer {
SafeHtmlBuilder sb = new SafeHtmlBuilder(); SafeHtmlBuilder sb = new SafeHtmlBuilder();
appearance.render(sb); appearance.render(sb);
setElement(XDOM.create(sb.toSafeHtml())); XElement element=XDOM.create(sb.toSafeHtml());
setElement((Element)element);
monitorWindowResize = true; monitorWindowResize = true;
forceLayoutOnResize = true; forceLayoutOnResize = true;
getFocusSupport().setIgnore(false); getFocusSupport().setIgnore(false);

2
src/main/java/org/gcube/portlets/user/td/client/TabularDataPortlet.java
View File

@ -86,7 +86,7 @@ public class TabularDataPortlet implements EntryPoint {
TabularDataRibbon tabularDataRibbon = new TabularDataRibbon(eventBus); TabularDataRibbon tabularDataRibbon = new TabularDataRibbon(eventBus);
TabPanel ribbonBarPanel = tabularDataRibbon.getContainer(); TabPanel ribbonBarPanel = tabularDataRibbon.getContainer();
BorderLayoutData ribbonBarData = new BorderLayoutData(109); BorderLayoutData ribbonBarData = new BorderLayoutData(105);
ribbonBarData.setMargins(new Margins(5)); ribbonBarData.setMargins(new Margins(5));
ribbonBarData.setCollapsible(false); ribbonBarData.setCollapsible(false);
ribbonBarData.setSplit(false); ribbonBarData.setSplit(false);

2
src/main/java/org/gcube/portlets/user/td/client/ribbon/FileToolBar.java
View File

@ -84,7 +84,7 @@ public class FileToolBar {
toolBar = new ToolBar(); toolBar = new ToolBar();
toolBar.setSpacing(1); toolBar.setSpacing(1);
toolBar.setEnableOverflow(false); toolBar.setEnableOverflow(false);
// File // File
ButtonGroup fileGroup = new ButtonGroup(); ButtonGroup fileGroup = new ButtonGroup();
fileGroup.setId("File"); fileGroup.setId("File");

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

@ -18,6 +18,8 @@ import com.sencha.gxt.widget.core.client.container.VerticalLayoutContainer.Verti
*/ */
public class TabularDataRibbon { public class TabularDataRibbon {
private static final String RIBBON_HEIGHT = "100px";
protected TabPanel ribbon; protected TabPanel ribbon;
//protected PlainTabPanel ribbon; //protected PlainTabPanel ribbon;
@ -31,7 +33,7 @@ public class TabularDataRibbon {
try { try {
ribbon = new TabPanel(); ribbon = new TabPanel();
ribbon.setId("Ribbon"); ribbon.setId("Ribbon");
ribbon.setHeight("102px"); ribbon.setHeight(RIBBON_HEIGHT);
VerticalLayoutData vldata=new VerticalLayoutData(1, -1); VerticalLayoutData vldata=new VerticalLayoutData(1, -1);