From: <die...@us...> - 2010-06-18 12:56:21
|
Revision: 2676 http://openutils.svn.sourceforge.net/openutils/?rev=2676&view=rev Author: diego_schivo Date: 2010-06-18 12:56:14 +0000 (Fri, 18 Jun 2010) Log Message: ----------- CONTROLS-31 UUID link column type Modified Paths: -------------- trunk/magnolia-test-webapp/src/main/resources/net/sourceforge/openutils/mgnltestwebapp/lang/messages.properties trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.dialogs.samples-grid.xml Added Paths: ----------- trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/UUIDLinkGridColumnType.java trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.gridColumnTypes.link.xml trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.gridColumnTypes.uuidLink.xml trunk/openutils-mgnlcontrols/src/main/resources/mgnl-resources/controls/js/UUIDLinkField.js Modified: trunk/magnolia-test-webapp/src/main/resources/net/sourceforge/openutils/mgnltestwebapp/lang/messages.properties =================================================================== --- trunk/magnolia-test-webapp/src/main/resources/net/sourceforge/openutils/mgnltestwebapp/lang/messages.properties 2010-06-18 12:45:20 UTC (rev 2675) +++ trunk/magnolia-test-webapp/src/main/resources/net/sourceforge/openutils/mgnltestwebapp/lang/messages.properties 2010-06-18 12:56:14 UTC (rev 2676) @@ -1,3 +1,6 @@ testwebapp.dialogs.samples-grid.columnA.header=Column A testwebapp.dialogs.samples-grid.columnB.header=Column B testwebapp.dialogs.samples-grid.columnC.header=Column C +testwebapp.dialogs.samples-grid.columnD.header=Column D +testwebapp.dialogs.samples-grid.columnE.header=Column E +testwebapp.dialogs.samples-grid.columnF.header=Column F Added: trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/UUIDLinkGridColumnType.java =================================================================== --- trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/UUIDLinkGridColumnType.java (rev 0) +++ trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/UUIDLinkGridColumnType.java 2010-06-18 12:56:14 UTC (rev 2676) @@ -0,0 +1,46 @@ +package net.sourceforge.openutils.mgnlcontrols.configuration; + +import info.magnolia.context.MgnlContext; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +import org.apache.commons.lang.StringUtils; + + +/** + * @author dschivo + * @version $Id$ + */ +public class UUIDLinkGridColumnType implements GridColumnType +{ + + /** + * {@inheritDoc} + */ + public String getHeadSnippet() + { + return "<script type=\"text/javascript\" src=\"" + + MgnlContext.getContextPath() + + "/.resources/controls/js/UUIDLinkField.js\"></script>"; + } + + /** + * {@inheritDoc} + */ + public String getColumnModelSnippet(Map colmap) + { + List<String> options = new ArrayList<String>(); + if (!StringUtils.isEmpty((String) colmap.get("repository"))) + { + options.add("repository: '" + colmap.get("repository") + "'"); + } + if (!StringUtils.isEmpty((String) colmap.get("extension"))) + { + options.add("extension: '" + colmap.get("extension") + "'"); + } + return "editor: new Ed(new UUIDLinkField({\n" + StringUtils.join(options, ",\n") + "}))"; + } + +} Property changes on: trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/UUIDLinkGridColumnType.java ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.gridColumnTypes.link.xml =================================================================== --- trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.gridColumnTypes.link.xml (rev 0) +++ trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.gridColumnTypes.link.xml 2010-06-18 12:56:14 UTC (rev 2676) @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="UTF-8"?> +<sv:node sv:name="link" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <sv:property sv:name="jcr:primaryType" sv:type="Name"> + <sv:value>mgnl:contentNode</sv:value> + </sv:property> + <sv:property sv:name="jcr:mixinTypes" sv:type="Name"> + <sv:value>mix:lockable</sv:value> + </sv:property> + <sv:property sv:name="jcr:uuid" sv:type="String"> + <sv:value>cd884127-afb5-4e21-9182-55f9a65500cf</sv:value> + </sv:property> + <sv:property sv:name="class" sv:type="String"> + <sv:value>net.sourceforge.openutils.mgnlcontrols.configuration.LinkGridColumnType</sv:value> + </sv:property> + <sv:property sv:name="jcr:createdBy" sv:type="String"> + <sv:value>admin</sv:value> + </sv:property> + <sv:node sv:name="MetaData"> + <sv:property sv:name="jcr:primaryType" sv:type="Name"> + <sv:value>mgnl:metaData</sv:value> + </sv:property> + <sv:property sv:name="jcr:createdBy" sv:type="String"> + <sv:value>admin</sv:value> + </sv:property> + <sv:property sv:name="mgnl:activated" sv:type="Boolean"> + <sv:value>false</sv:value> + </sv:property> + <sv:property sv:name="mgnl:authorid" sv:type="String"> + <sv:value>superuser</sv:value> + </sv:property> + <sv:property sv:name="mgnl:creationdate" sv:type="Date"> + <sv:value>2010-06-18T11:41:55.562+02:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> + <sv:value>2010-06-18T14:42:16.375+02:00</sv:value> + </sv:property> + </sv:node> +</sv:node> Property changes on: trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.gridColumnTypes.link.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Added: trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.gridColumnTypes.uuidLink.xml =================================================================== --- trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.gridColumnTypes.uuidLink.xml (rev 0) +++ trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.gridColumnTypes.uuidLink.xml 2010-06-18 12:56:14 UTC (rev 2676) @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="UTF-8"?> +<sv:node sv:name="uuidLink" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <sv:property sv:name="jcr:primaryType" sv:type="Name"> + <sv:value>mgnl:contentNode</sv:value> + </sv:property> + <sv:property sv:name="jcr:mixinTypes" sv:type="Name"> + <sv:value>mix:lockable</sv:value> + </sv:property> + <sv:property sv:name="jcr:uuid" sv:type="String"> + <sv:value>b4d96a7a-9fed-4988-b30f-358719716363</sv:value> + </sv:property> + <sv:property sv:name="class" sv:type="String"> + <sv:value>net.sourceforge.openutils.mgnlcontrols.configuration.UUIDLinkGridColumnType</sv:value> + </sv:property> + <sv:property sv:name="jcr:createdBy" sv:type="String"> + <sv:value>admin</sv:value> + </sv:property> + <sv:node sv:name="MetaData"> + <sv:property sv:name="jcr:primaryType" sv:type="Name"> + <sv:value>mgnl:metaData</sv:value> + </sv:property> + <sv:property sv:name="jcr:createdBy" sv:type="String"> + <sv:value>admin</sv:value> + </sv:property> + <sv:property sv:name="mgnl:activated" sv:type="Boolean"> + <sv:value>false</sv:value> + </sv:property> + <sv:property sv:name="mgnl:authorid" sv:type="String"> + <sv:value>superuser</sv:value> + </sv:property> + <sv:property sv:name="mgnl:creationdate" sv:type="Date"> + <sv:value>2010-06-18T11:41:55.562+02:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> + <sv:value>2010-06-18T14:51:45.890+02:00</sv:value> + </sv:property> + </sv:node> +</sv:node> Property changes on: trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.gridColumnTypes.uuidLink.xml ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.dialogs.samples-grid.xml =================================================================== --- trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.dialogs.samples-grid.xml 2010-06-18 12:45:20 UTC (rev 2675) +++ trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.dialogs.samples-grid.xml 2010-06-18 12:56:14 UTC (rev 2676) @@ -336,6 +336,52 @@ </sv:property> </sv:node> </sv:node> + <sv:node sv:name="03"> + <sv:property sv:name="jcr:primaryType" sv:type="Name"> + <sv:value>mgnl:contentNode</sv:value> + </sv:property> + <sv:property sv:name="jcr:mixinTypes" sv:type="Name"> + <sv:value>mix:lockable</sv:value> + </sv:property> + <sv:property sv:name="jcr:uuid" sv:type="String"> + <sv:value>5dacea31-6993-4769-9f40-07771cc08855</sv:value> + </sv:property> + <sv:property sv:name="extension" sv:type="String"> + <sv:value>html</sv:value> + </sv:property> + <sv:property sv:name="header" sv:type="String"> + <sv:value>testwebapp.dialogs.samples-grid.columnE.header</sv:value> + </sv:property> + <sv:property sv:name="jcr:createdBy" sv:type="String"> + <sv:value>admin</sv:value> + </sv:property> + <sv:property sv:name="repository" sv:type="String"> + <sv:value>website</sv:value> + </sv:property> + <sv:property sv:name="type" sv:type="String"> + <sv:value>uuidLink</sv:value> + </sv:property> + <sv:node sv:name="MetaData"> + <sv:property sv:name="jcr:primaryType" sv:type="Name"> + <sv:value>mgnl:metaData</sv:value> + </sv:property> + <sv:property sv:name="jcr:createdBy" sv:type="String"> + <sv:value>admin</sv:value> + </sv:property> + <sv:property sv:name="mgnl:activated" sv:type="Boolean"> + <sv:value>false</sv:value> + </sv:property> + <sv:property sv:name="mgnl:authorid" sv:type="String"> + <sv:value>superuser</sv:value> + </sv:property> + <sv:property sv:name="mgnl:creationdate" sv:type="Date"> + <sv:value>2010-05-11T18:49:01.296+02:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> + <sv:value>2010-06-18T14:53:01.359+02:00</sv:value> + </sv:property> + </sv:node> + </sv:node> </sv:node> </sv:node> </sv:node> Added: trunk/openutils-mgnlcontrols/src/main/resources/mgnl-resources/controls/js/UUIDLinkField.js =================================================================== --- trunk/openutils-mgnlcontrols/src/main/resources/mgnl-resources/controls/js/UUIDLinkField.js (rev 0) +++ trunk/openutils-mgnlcontrols/src/main/resources/mgnl-resources/controls/js/UUIDLinkField.js 2010-06-18 12:56:14 UTC (rev 2676) @@ -0,0 +1,2 @@ +var UUIDLinkField = Ext.extend(LinkField, { +}); Property changes on: trunk/openutils-mgnlcontrols/src/main/resources/mgnl-resources/controls/js/UUIDLinkField.js ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |