diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/client/Presenter/Presenter.java b/src/main/java/org/gcube/portlets/user/reportgenerator/client/Presenter/Presenter.java index b9fcb9a..098a675 100644 --- a/src/main/java/org/gcube/portlets/user/reportgenerator/client/Presenter/Presenter.java +++ b/src/main/java/org/gcube/portlets/user/reportgenerator/client/Presenter/Presenter.java @@ -1148,6 +1148,7 @@ public class Presenter { * @param type */ public void showExportSaveOptions(final String filePath, final String itemName, final TypeExporter type) { + clearExportPanel(); /* * I need to save a temp file, in case the user uses the Save & Open. * Smart popup blockers will allow a popup if it is directly associated to a user’s action. diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/client/ReportGenerator.java b/src/main/java/org/gcube/portlets/user/reportgenerator/client/ReportGenerator.java index 9b6b994..83cf59e 100644 --- a/src/main/java/org/gcube/portlets/user/reportgenerator/client/ReportGenerator.java +++ b/src/main/java/org/gcube/portlets/user/reportgenerator/client/ReportGenerator.java @@ -9,6 +9,7 @@ import org.gcube.portlets.user.reportgenerator.client.Presenter.Presenter; import org.gcube.portlets.user.reportgenerator.client.toursteps.Intro; import org.gcube.portlets.user.workspace.client.AppControllerExplorer; import org.gcube.portlets.user.workspace.client.rpc.GWTWorkspaceServiceAsync; +import org.gcube.portlets.user.workspace.lighttree.client.ItemType; import com.google.gwt.core.client.EntryPoint; import com.google.gwt.core.client.GWT; @@ -170,6 +171,7 @@ public class ReportGenerator implements EntryPoint { }); + //presenter.showExportPanel("", "", null, ""); //showGuidedTour() ; } diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/client/uibinder/ExportOptions.java b/src/main/java/org/gcube/portlets/user/reportgenerator/client/uibinder/ExportOptions.java index 6478daa..429c7ce 100644 --- a/src/main/java/org/gcube/portlets/user/reportgenerator/client/uibinder/ExportOptions.java +++ b/src/main/java/org/gcube/portlets/user/reportgenerator/client/uibinder/ExportOptions.java @@ -14,6 +14,7 @@ import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.uibinder.client.UiBinder; import com.google.gwt.uibinder.client.UiField; import com.google.gwt.uibinder.client.UiHandler; +import com.google.gwt.user.client.Timer; import com.google.gwt.user.client.Window; import com.google.gwt.user.client.rpc.AsyncCallback; import com.google.gwt.user.client.ui.Composite; @@ -34,6 +35,7 @@ public class ExportOptions extends Composite { @UiField HTML saveOpen; @UiField HTML save; @UiField HTML saveAs; + @UiField HTML close; @UiField HTMLPanel myPanel; private String tempFileId; @@ -55,6 +57,19 @@ public class ExportOptions extends Composite { this.tempFileId = tempFileId; } + @UiHandler("close") + void onSaveCancel(ClickEvent e) { + myPanel.removeStyleName("exportPanel-show"); + //needed for applying the css3 transition effect + final Timer t = new Timer() { + @Override + public void run() { + p.clearExportPanel(); + } + }; + t.schedule(500); + } + @UiHandler("saveOpen") void onSaveOpenClick(ClickEvent e) { GWT.log("SaveOPen"); @@ -135,7 +150,7 @@ public class ExportOptions extends Composite { break; } } - + public HTMLPanel getMainPanel() { return myPanel; } diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/client/uibinder/ExportOptions.ui.xml b/src/main/java/org/gcube/portlets/user/reportgenerator/client/uibinder/ExportOptions.ui.xml index 538f8cc..b4f1b75 100644 --- a/src/main/java/org/gcube/portlets/user/reportgenerator/client/uibinder/ExportOptions.ui.xml +++ b/src/main/java/org/gcube/portlets/user/reportgenerator/client/uibinder/ExportOptions.ui.xml @@ -2,6 +2,9 @@ +
+ +
diff --git a/src/main/webapp/ReportGenerator.css b/src/main/webapp/ReportGenerator.css index c08c9d6..ceaa62b 100644 --- a/src/main/webapp/ReportGenerator.css +++ b/src/main/webapp/ReportGenerator.css @@ -29,6 +29,10 @@ -ms-transition-timing-function: ease-out; } +.exportClose { + width: 775px; +} + .exportPanel-show { opacity: 1; background-color: #FFFFBF; @@ -83,6 +87,7 @@ background: url(images/close.png) 0px 0px no-repeat; height: 15px; width: 15px; + float: right; } .closeImage:hover { diff --git a/src/main/webapp/images/close.png b/src/main/webapp/images/close.png index 4f60bae..978ee49 100644 Binary files a/src/main/webapp/images/close.png and b/src/main/webapp/images/close.png differ diff --git a/src/main/webapp/images/close_bck.png b/src/main/webapp/images/close_bck.png new file mode 100644 index 0000000..4f60bae Binary files /dev/null and b/src/main/webapp/images/close_bck.png differ