Minor Update

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/portlets/user/tabular-data-portlet@90759 82a268e6-3cf1-43bd-a215-b396298e98cf

.settings/org.eclipse.wst.common.component

@@ -4,9 +4,6 @@
         <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
-        <dependent-module archiveName="tabular-model-3.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-model/tabular-model">
-            <dependency-type>uses</dependency-type>
-        </dependent-module>
         <dependent-module archiveName="tabular-data-widget-common-event-1.0.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/tabular-data-widget-common-event/tabular-data-widget-common-event">
             <dependency-type>uses</dependency-type>
         </dependent-module>

src/main/java/org/gcube/portlets/user/td/client/resource/TabularDataResources.java

@@ -255,5 +255,16 @@ public interface TabularDataResources extends ClientBundle {
 	@Source("help.png")
 	ImageResource help();
 	
+	@Source("template-add_32.png")
+	ImageResource templateAdd32();
+	
+	@Source("template-add.png")
+	ImageResource templateAdd();
+	
+	@Source("template-edit_32.png")
+	ImageResource templateEdit32();
+	
+	@Source("template-edit.png")
+	ImageResource templateEdit();
 	
 }

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

@@ -49,8 +49,10 @@ public class FileToolBar {
 	protected TextButton exportCSVButton;
 	protected TextButton exportJSONButton;
 
-	protected TextButton templateButton;
-
+	//Template
+	protected TextButton templateOpenButton;
+	private TextButton templateNewButton;
+	
 	protected TextButton shareButton;
 
 	protected TextButton timelineButton;
@@ -61,6 +63,7 @@ public class FileToolBar {
 	protected TextButton discardAllButton;
 
 	protected TextButton helpButton;
+	
 
 	public FileToolBar(EventBus eventBus) {
 		this.eventBus = eventBus;
@@ -130,7 +133,7 @@ public class FileToolBar {
 		deleteButton.setId("closeButton");
 		deleteButton.setToolTip("Delete Tabular Resource");
 
-		fileLayout.setWidget(0, 3, deleteButton);
+		fileLayout.setWidget(0, 2, deleteButton);
 		deleteButton.addSelectHandler(new SelectHandler() {
 
 			public void onSelect(SelectEvent event) {
@@ -144,7 +147,7 @@ public class FileToolBar {
 		propertiesButton.setId("propertiesButton");
 		propertiesButton.setToolTip("Show properties");
 
-		fileLayout.setWidget(1, 3, propertiesButton);
+		fileLayout.setWidget(1, 2, propertiesButton);
 		propertiesButton.addSelectHandler(new SelectHandler() {
 
 			public void onSelect(SelectEvent event) {
@@ -269,14 +272,14 @@ public class FileToolBar {
 		FlexTable templateLayout = new FlexTable();
 		templateGroup.add(templateLayout);
 
-		templateButton = new TextButton("Template",
-				TabularDataResources.INSTANCE.template32());
-		templateButton.disable();
-		templateButton.setToolTip("Template");
-		templateButton.setScale(ButtonScale.LARGE);
-		templateButton.setIconAlign(IconAlign.TOP);
-		templateButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
-		templateButton.addSelectHandler(new SelectHandler() {
+		templateOpenButton = new TextButton("Open",
+				TabularDataResources.INSTANCE.templateAdd32());
+		templateOpenButton.disable();
+		templateOpenButton.setToolTip("Open");
+		templateOpenButton.setScale(ButtonScale.LARGE);
+		templateOpenButton.setIconAlign(IconAlign.TOP);
+		templateOpenButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
+		templateOpenButton.addSelectHandler(new SelectHandler() {
 
 			public void onSelect(SelectEvent event) {
 				// eventBus.fireEvent(new RibbonEvent(
@@ -284,8 +287,27 @@ public class FileToolBar {
 			}
 		});
 
-		templateLayout.setWidget(0, 0, templateButton);
+		templateLayout.setWidget(0, 0, templateOpenButton);
 		templateLayout.getFlexCellFormatter().setRowSpan(0, 0, 2);
+		
+		templateNewButton = new TextButton("New",
+				TabularDataResources.INSTANCE.templateEdit32());
+		templateNewButton.disable();
+		templateNewButton.setToolTip("New");
+		templateNewButton.setScale(ButtonScale.LARGE);
+		templateNewButton.setIconAlign(IconAlign.TOP);
+		templateNewButton.setArrowAlign(ButtonArrowAlign.BOTTOM);
+		templateNewButton.addSelectHandler(new SelectHandler() {
+
+			public void onSelect(SelectEvent event) {
+				// eventBus.fireEvent(new RibbonEvent(
+				// RibbonType.EXPORTSDMX));
+			}
+		});
+
+		templateLayout.setWidget(0, 1, templateNewButton);
+		templateLayout.getFlexCellFormatter().setRowSpan(0, 1, 2);
+		
 		cleanCells(templateLayout.getElement());
 
 		// Share
@@ -318,7 +340,7 @@ public class FileToolBar {
 		shareLayout.getFlexCellFormatter().setRowSpan(0, 0, 2);
 		cleanCells(shareLayout.getElement());
 
-		// Tasks (TimeLine)
+		// TimeLine (Tasks)
 		ButtonGroup taskGroup = new ButtonGroup();
 		taskGroup.setId("Template");
 		taskGroup.setStyleName("ribbon");
@@ -466,7 +488,7 @@ public class FileToolBar {
 				exportCSVButton.disable();
 				exportJSONButton.disable();
 				exportSDMXButton.disable();
-				templateButton.disable();
+				templateOpenButton.disable();
 				timelineButton.disable();
 				break;
 			case TR_CLOSE:
@@ -481,7 +503,7 @@ public class FileToolBar {
 				exportCSVButton.disable();
 				exportJSONButton.disable();
 				exportSDMXButton.disable();
-				templateButton.disable();
+				templateOpenButton.disable();
 				timelineButton.disable();
 				break;
 			case TR_OPEN:
@@ -501,7 +523,7 @@ public class FileToolBar {
 				}
 				exportCSVButton.enable();
 				exportJSONButton.disable();
-				templateButton.disable();
+				templateOpenButton.disable();
 				timelineButton.enable();
 				break;
 			case WIZARD_OPEN:
@@ -516,7 +538,7 @@ public class FileToolBar {
 				exportCSVButton.disable();
 				exportJSONButton.disable();
 				exportSDMXButton.disable();
-				templateButton.disable();
+				templateOpenButton.disable();
 				timelineButton.disable();
 				break;
 			default: