From b3f02f11d3fe593873a598af55373d8eac520c65 Mon Sep 17 00:00:00 2001 From: Massimiliano Assante Date: Tue, 19 Mar 2013 18:02:28 +0000 Subject: [PATCH] fixed clsoe export panel git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/reports@71574 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../client/Presenter/Presenter.java | 1 + .../client/ReportGenerator.java | 2 ++ .../client/uibinder/ExportOptions.java | 17 ++++++++++++++++- .../client/uibinder/ExportOptions.ui.xml | 3 +++ src/main/webapp/ReportGenerator.css | 5 +++++ src/main/webapp/images/close.png | Bin 1027 -> 316 bytes src/main/webapp/images/close_bck.png | Bin 0 -> 1027 bytes 7 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 src/main/webapp/images/close_bck.png 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 4f60bae929460d237eae962405008e8e297a4f9b..978ee4948213ffd2d7ffe973d2ff234bd0622207 100644 GIT binary patch literal 316 zcmeAS@N?(olHy`uVBq!ia0vp^{6Or$!VDzMzZo0=Qd$8%A+G=b|2K-6i624KEV`o3 z3Dm_?666=mu-`XL%D91H^=8*+EnQBTK=G}fE{-7;alO5UTuhEUuFPE9{L&K@gS(C% z;;82R$Wo=O{~)nU`y$Vc*LRNooLu-no*4Oh@KZWunKvKE?xKy!>4ScZnRH2(~a zQdBQ(S8KSYPsk>67$e3oq2m!YMU9Syo?*^H45r|W?Plmt57%g5TN(O9O6PPh59{{$ zvJWfE#j3eHYf2V9b_9%uG7)efHbCgixq%#J=%%hr&as=NK@);!GxSDMHN6D#$cG@s za0!!3b0Ez#{BTkf#lt}0c#h=+mKPGdC=UxV$AQ*IlW4v*EteIw6^mFIx{k3YvuvZ$ zU>d^=@@H6HlB8He5E2BD2$o!Igb6noYAYx(Fn!y@HgZ9%XiT96oS{jk8zneiN7fBm z*F-Li4GoXw87?lV4b=7jLmj7s4saQ6=KD|Kpt|HiwhRNb;G3jz(?fA6PtN<$z{sy6 zG}pexQXOFw)R71Bl@!no({^LKiPv>ma|3L+Ce)M+O%xd0w&WC_74m#iOsi6o=L>?A z%Bh94n#`#JpA%CfZLWgM1qZsg&9yeUBVD=iC^#O8tU%vhgqG?f2Q*8T?e4jxy6UyK zR`*=eUAZhthK(EhSEJi5GClFJGq%L&3_f(pwEJYN#jlG!-3jWU=}Z|T>f!&_3ejC z`|qW%+?d#TKX~0ZyB2Lx_su^MYIEA)Ev52kK9nB(I{D_#sc+Hu^XIaACaM0LJ!izH Q*A5bSN-GqVySd5LKcsg}2LJ#7 diff --git a/src/main/webapp/images/close_bck.png b/src/main/webapp/images/close_bck.png new file mode 100644 index 0000000000000000000000000000000000000000..4f60bae929460d237eae962405008e8e297a4f9b GIT binary patch literal 1027 zcmaJ=O=#3W6b`M3mKG2GfW^a*dQfrm*WFDMy4Kyz#s->o*4Oh@KZWunKvKE?xKy!>4ScZnRH2(~a zQdBQ(S8KSYPsk>67$e3oq2m!YMU9Syo?*^H45r|W?Plmt57%g5TN(O9O6PPh59{{$ zvJWfE#j3eHYf2V9b_9%uG7)efHbCgixq%#J=%%hr&as=NK@);!GxSDMHN6D#$cG@s za0!!3b0Ez#{BTkf#lt}0c#h=+mKPGdC=UxV$AQ*IlW4v*EteIw6^mFIx{k3YvuvZ$ zU>d^=@@H6HlB8He5E2BD2$o!Igb6noYAYx(Fn!y@HgZ9%XiT96oS{jk8zneiN7fBm z*F-Li4GoXw87?lV4b=7jLmj7s4saQ6=KD|Kpt|HiwhRNb;G3jz(?fA6PtN<$z{sy6 zG}pexQXOFw)R71Bl@!no({^LKiPv>ma|3L+Ce)M+O%xd0w&WC_74m#iOsi6o=L>?A z%Bh94n#`#JpA%CfZLWgM1qZsg&9yeUBVD=iC^#O8tU%vhgqG?f2Q*8T?e4jxy6UyK zR`*=eUAZhthK(EhSEJi5GClFJGq%L&3_f(pwEJYN#jlG!-3jWU=}Z|T>f!&_3ejC z`|qW%+?d#TKX~0ZyB2Lx_su^MYIEA)Ev52kK9nB(I{D_#sc+Hu^XIaACaM0LJ!izH Q*A5bSN-GqVySd5LKcsg}2LJ#7 literal 0 HcmV?d00001