From 3cd598aeaca8784836cfa0adcd1f7f83b652a472 Mon Sep 17 00:00:00 2001 From: Massimiliano Assante Date: Fri, 15 Feb 2013 15:54:13 +0000 Subject: [PATCH] comments red git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/user/reports@69342 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../client/dialog/CommentDialog.java | 6 ++++-- .../client/model/TemplateModel.java | 2 +- .../server/servlet/ReportServiceImpl.java | 4 ++-- src/main/webapp/images/comment.gif | Bin 1599 -> 1467 bytes src/main/webapp/images/comment.jpg | Bin 0 -> 1480 bytes 5 files changed, 7 insertions(+), 5 deletions(-) create mode 100644 src/main/webapp/images/comment.jpg diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/client/dialog/CommentDialog.java b/src/main/java/org/gcube/portlets/user/reportgenerator/client/dialog/CommentDialog.java index 33eed62..3ab5386 100644 --- a/src/main/java/org/gcube/portlets/user/reportgenerator/client/dialog/CommentDialog.java +++ b/src/main/java/org/gcube/portlets/user/reportgenerator/client/dialog/CommentDialog.java @@ -1,10 +1,12 @@ package org.gcube.portlets.user.reportgenerator.client.dialog; import org.gcube.portlets.d4sreporting.common.client.ImageConstants; +import org.gcube.portlets.d4sreporting.common.client.uicomponents.resources.Images; import org.gcube.portlets.user.reportgenerator.client.events.AddCommentEvent; import org.gcube.portlets.user.reportgenerator.client.events.RemovedUserCommentEvent; import org.gcube.portlets.user.reportgenerator.client.targets.ReportTextArea; +import com.google.gwt.core.client.GWT; import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.event.dom.client.ClickHandler; import com.google.gwt.event.shared.HandlerManager; @@ -21,7 +23,7 @@ public class CommentDialog extends DialogBox { VerticalPanel mainPanel = new VerticalPanel(); AbsolutePanel header = new AbsolutePanel(); TextArea area; - + Images images = GWT.create(Images.class); public CommentDialog(final HandlerManager eventBus, final ReportTextArea source, final String username, final String previousComment, int areaHeight) { super(true); setStyleName("comment-popup"); @@ -39,7 +41,7 @@ public class CommentDialog extends DialogBox { setSize(PANEL_WIDTH+"px", "100px"); header.setPixelSize(PANEL_WIDTH, 15); final Image enterImage = new Image(ImageConstants.IMAGE_ARROW_ENTER); - final Image closeImage = new Image(ImageConstants.IMAGE_CLOSE_15x15); + final Image closeImage = new Image(images.close()); final Image binImage = new Image(ImageConstants.IMAGE_BIN); closeImage.setStyleName("selectable"); binImage.setStyleName("selectable"); diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/client/model/TemplateModel.java b/src/main/java/org/gcube/portlets/user/reportgenerator/client/model/TemplateModel.java index 02c0cf4..03bf588 100644 --- a/src/main/java/org/gcube/portlets/user/reportgenerator/client/model/TemplateModel.java +++ b/src/main/java/org/gcube/portlets/user/reportgenerator/client/model/TemplateModel.java @@ -276,7 +276,7 @@ public class TemplateModel { this.templateName = toLoad.getTemplateName(); this.pageWidth = toLoad.getPageWidth(); this.pageHeight = toLoad.getPageHeight(); - this.currentPage = 1; + this.currentPage = toLoad.getCurrPage(); this.totalPages = toLoad.getTotalPages(); this.marginLeft = toLoad.getMarginLeft(); this.marginRight = toLoad.getMarginRight(); diff --git a/src/main/java/org/gcube/portlets/user/reportgenerator/server/servlet/ReportServiceImpl.java b/src/main/java/org/gcube/portlets/user/reportgenerator/server/servlet/ReportServiceImpl.java index 2256a09..6552a3a 100644 --- a/src/main/java/org/gcube/portlets/user/reportgenerator/server/servlet/ReportServiceImpl.java +++ b/src/main/java/org/gcube/portlets/user/reportgenerator/server/servlet/ReportServiceImpl.java @@ -1093,7 +1093,7 @@ public class ReportServiceImpl extends RemoteServiceServlet implements ReportSe return d4Session.getAttribute(CURRENT_REPORT_ID_ATTRIBUTE).toString(); } /** - * used to save the report in the same basket * + * used to save the report in the same folder * */ public void saveReport() { Workspace root = null; @@ -1135,7 +1135,7 @@ public class ReportServiceImpl extends RemoteServiceServlet implements ReportSe /** - * @param basketidToSaveIn . + * @param save a report in another folder . * */ public void saveReport(String folderid, String newname) { diff --git a/src/main/webapp/images/comment.gif b/src/main/webapp/images/comment.gif index 49c4c8c8f48259cd6f726f47e8d47000cfc8ef95..04f1667a32502872f1ef4d24ef42934b848d43c8 100644 GIT binary patch delta 584 zcmajcTWC^o0LSs8$D*jkj8SW9s5P3f%lRKY$D^a{=sc-pQN%Vz6qXiNGjRpRg!M28 z2CKj*dI)LJYXpNqt;>3eh%z>3Gx4&iyRe7WL$^WW*XpIG*!TGZzlYz;&7+(84!9-3 z;;W{rskDv4;sOeJsA~}I!LJo$(zw=-JGW4oL8*wRPjD`PZ(lKyL}?o3GEQ{i^AeVq zVQNC|6OMPlVnn5c`B`MA5D8&$0GUZ}3?2@l{RqDQz~ne)3b0vG%;Dq2AuP;du8dR? zsSnU>$5aY)738wWWnf`3okt;ud=@$tJQD8S#?=@W=b@>^mnFCzc=r~`_o!9kZ^MH! zl`K9k_s8$c4g14huk~;wcs3aFU1+;_`f_(5bjjVeS0C*TH~WKrD?K>F z7VVmo28DV}G#pTPWPLWOky`D~b=3OkSR(9dth@30jXizd+MA%1r*8gy)LDF`SF(zJ zHPsUtYhV-C_rwmy%&B_igPQgi14AokbX#{fud6p)>9w6yQ2M4FYF$;;K2xjXn4)t- q1J$)n>+s0EbO%N6I_heX(Spil=j)8zWBV4(#+@Uh&z_HnRO@d(mi+?& delta 728 zcmdnZy`QJv-P6s&GEsm*fZ>@F!{2}ZqB?dyfA@9nj;k*}{o8W#{_j73AH4lnFyqkY z@4vqP{L{JW?DZFabEY16^zPrvgSTFP{C@7vtH~QLcCR^i`_tnih#rN#K z`{v(^kN@(fAFN(*{O;?2x1PLTd*n`R_pa9Er{916aqrE)TQC1!d;a&%tG`#C{Vkny zXR`z}15x$VmRH~(rEop|~F+l428pMLlk(Z1t97%&hC>WNfGD`f)c25&qo%{V!j zNon#!#_Y+4%(|05F-dEx^|#0uTKVr7^KE~&-IMVSR9nfZANAQKal@=Hr>m4GgVcpGJ%njnB$V4T$-Dj zSK{ens|1wMOUX>JGBC6-Ff=qbF)%kWFtac;v@~^dwJ@-7H8XXzFm-k`f|-F$ud$(p zsjH)jg_)a?p`oFxk%gJDshgvrnVXxTr6bS~m|oAk;*!L?0bwQ?>> zO)SYT3dzsUfu(?ejQo=P;*9(P1?ON>1>eNv%sdbu6g?2%x}+9mmZhe+73JqDfWy}+ z6N~+X{SDEZLQa_J10ACeN*qXu1ttVcfgmP4=>s|N%#)f2%rQm4tnvRH10OiSGo%~< zWFm#RrhZ#LU9M2m;8WOe~D70t`%GzzmZB3Nj0^3Mw+N845cFssK%8WCj9Om^>qs zAcG>aW1x^>A{OqMjY}Sfr^mT$te>pIr?X!+t!dh} z6>kDgXB>XL<&1VIFVo)i&}p34yf5uJ(iwU$=E(8aXLt^DPgc{HZ_u=}i8S2*IV3gC zVP)+V$0uj^O|05}qc%&Hd**e?)!Vi)B+j~-n)oWoc!P$9vP*PNcT9Z@?Py02lwRF