From echatellier@users.forge.codelutin.com Wed Mar 27 18:04:30 2013 From: echatellier@users.forge.codelutin.com To: cantharella-commits@list.forge.codelutin.com Subject: [Cantharella-commits] r192 - in trunk/cantharella.web/src/main: java/nc/ird/cantharella/web/utils/data webapp/images Date: Wed, 27 Mar 2013 18:04:30 +0100 Message-ID: <20130327170430.7648E15BD4@nuiton.codelutin.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============5601635708855737159==" --===============5601635708855737159== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Author: echatellier Date: 2013-03-27 18:04:30 +0100 (Wed, 27 Mar 2013) New Revision: 192 Url: http://forge.codelutin.com/projects/cantharella/repository/revisions/192 Log: Add icone for csv export link Added: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/data/Tabl= eExportToolbar$ImageResourceLink.html trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/data/Tabl= eExportToolbar.html trunk/cantharella.web/src/main/webapp/images/csv_text.png Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/data/Tabl= eExportToolbar.java Added: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/data/= TableExportToolbar$ImageResourceLink.html =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/data/Tab= leExportToolbar$ImageResourceLink.html (rev 0) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/data/Tab= leExportToolbar$ImageResourceLink.html 2013-03-27 17:04:30 UTC (rev 192) @@ -0,0 +1,31 @@ + + + + + + 3D"i"

+ + + + \ No newline at end of file Added: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/data/= TableExportToolbar.html =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/data/Tab= leExportToolbar.html (rev 0) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/data/Tab= leExportToolbar.html 2013-03-27 17:04:30 UTC (rev 192) @@ -0,0 +1,31 @@ + + + + + + [export to message] + [data format name] + + + \ No newline at end of file Modified: trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/da= ta/TableExportToolbar.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/data/Tab= leExportToolbar.java 2013-03-27 16:15:59 UTC (rev 191) +++ trunk/cantharella.web/src/main/java/nc/ird/cantharella/web/utils/data/Tab= leExportToolbar.java 2013-03-27 17:04:30 UTC (rev 192) @@ -27,10 +27,26 @@ import java.util.Date; import java.util.Locale; =20 +import nc.ird.cantharella.web.pages.domain.document.DocumentTooltipColumn; + +import org.apache.wicket.AttributeModifier; +import org.apache.wicket.Component; import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTabl= e; import org.apache.wicket.extensions.markup.html.repeater.data.table.export.C= SVDataExporter; import org.apache.wicket.extensions.markup.html.repeater.data.table.export.E= xportToolbar; +import org.apache.wicket.extensions.markup.html.repeater.data.table.export.I= DataExporter; +import org.apache.wicket.extensions.markup.html.repeater.data.table.export.E= xportToolbar.DataExportResourceStreamWriter; +import org.apache.wicket.markup.html.WebComponent; +import org.apache.wicket.markup.html.image.Image; +import org.apache.wicket.markup.html.link.Link; +import org.apache.wicket.markup.html.link.ResourceLink; +import org.apache.wicket.markup.html.panel.Panel; +import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; +import org.apache.wicket.request.resource.ContextRelativeResource; +import org.apache.wicket.request.resource.IResource; +import org.apache.wicket.request.resource.ResourceStreamResource; +import org.apache.wicket.util.resource.IResourceStream; =20 /** * Cantharella customisation of wicket {@link ExportToolbar}. @@ -68,4 +84,53 @@ } addDataExporter(csvDataExporter); } + =20 + /** + * Creates a new link to the exported data for the provided {@link IData= Exporter}. + * + * @param componentId + * The component of the link. + * @param dataExporter + * The data exporter to use to export the data. + * @return a new link to the exported data for the provided {@link IData= Exporter}. + */ + protected Component createExportLink(String componentId, final IDataExpo= rter dataExporter) + { + IResource resource =3D new ResourceStreamResource() + { + @Override + protected IResourceStream getResourceStream() + { + return new DataExportResourceStreamWriter(dataExporter, getT= able()); + } + }.setFileName(getFileNameModel().getObject() + "." + dataExporter.ge= tFileNameExtension()); + + return new ImageResourceLink(componentId, resource, dataExporter); + } + =20 + /** + * Panel which include a image. Used with the LinkableImagePropertyColum= n$LinkablePanel.html file + */ + public class ImageResourceLink extends Panel { + + /** + * Constructor + * @param id Component id + * @param resource link resource + * @param dataExporter data exporter + */ + public ImageResourceLink(String id, IResource resource, IDataExporte= r dataExporter) { + super(id); + + ResourceLink link =3D new ResourceLink("link", resou= rce); + link.setBody(dataExporter.getDataFormatNameModel()); + add(link); + + // add a link on _text.png image + // for CSV : csv_text.png image + String type =3D dataExporter.getDataFormatNameModel().getObject(= ).toLowerCase(); + WebComponent img =3D new Image("img", new ContextRelativeResourc= e("images/" + type + "_text.png")); + add(img); + } + } } Added: trunk/cantharella.web/src/main/webapp/images/csv_text.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/cantharella.web/src/main/webapp/images/csv_text.png ___________________________________________________________________ Added: svn:mime-type + image/png --===============5601635708855737159==--