From: <fg...@us...> - 2013-09-15 19:17:55
|
Revision: 4312 http://openutils.svn.sourceforge.net/openutils/?rev=4312&view=rev Author: fgiust Date: 2013-09-15 19:17:52 +0000 (Sun, 15 Sep 2013) Log Message: ----------- cleanup samples Modified Paths: -------------- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/META-INF/tld/mgnlcontextmenu.tld magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.components.samples-contextmenu-form.xml magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.components.samples-contextmenu-message.xml magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.components.samples-contextmenu-textmedia.xml magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.pages.contextmenu-template-freemarker.xml magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.pages.contextmenu-template-jsp.xml magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/website.sample-contextmenu.xml magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-form.jsp magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-message.jsp magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-textmedia.jsp magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/samples-contextmenu/template-contextmenu.ftl Added Paths: ----------- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.components.samples-contextmenu-message-freemarker.xml magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/template-contextmenu.jsp magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/samples-contextmenu/paragraph-message.ftl Removed Paths: ------------- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/template.jsp Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/META-INF/tld/mgnlcontextmenu.tld =================================================================== --- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/META-INF/tld/mgnlcontextmenu.tld 2013-09-15 18:26:35 UTC (rev 4311) +++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/META-INF/tld/mgnlcontextmenu.tld 2013-09-15 19:17:52 UTC (rev 4312) @@ -5,32 +5,9 @@ <display-name>Magnolia context menu Tags and EL functions</display-name> <tlib-version>1.0</tlib-version> <short-name>mcmenu</short-name> - <uri>mgnlcontextmenu</uri> + <uri>http://openutils/mgnlcontextmenu</uri> <tag> <description> - <![CDATA[Imports js and css resources for the editing of contents via context menu. Should be used in the head - section of the page.]]> - </description> - <display-name>links</display-name> - <name>links</name> - <tag-class>net.sourceforge.openutils.mgnlcontextmenu.tags.LinksTag</tag-class> - <body-content>empty</body-content> - <attribute> - <description>The JavaScript framework to use: can be jquery or mootools.</description> - <name>jsFramework</name> - <required>true</required> - <rtexprvalue>true</rtexprvalue> - </attribute> - <attribute> - <description>Should be set to true if the JavaScript framework is already included in the page.</description> - <name>skipJsFramework</name> - <required>false</required> - <rtexprvalue>true</rtexprvalue> - <type>boolean</type> - </attribute> - </tag> - <tag> - <description> <![CDATA[Wraps an HTML snippet and possibly replaces it with content set by the editor user.<br /> Editor users have access to a context menu which opens on mouse right click.]]> </description> @@ -87,16 +64,6 @@ <type>boolean</type> </attribute> </tag> - <tag> - <description> - <![CDATA[Collects all informations about context menu definitions and use, and exposes them as JavaScript - variables.]]> - </description> - <display-name>script</display-name> - <name>script</name> - <tag-class>net.sourceforge.openutils.mgnlcontextmenu.tags.ScriptTag</tag-class> - <body-content>empty</body-content> - </tag> <function> <description> <![CDATA[Gets the entry value for the specified key, searching for it in the local and global contents Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.components.samples-contextmenu-form.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.components.samples-contextmenu-form.xml 2013-09-15 18:26:35 UTC (rev 4311) +++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.components.samples-contextmenu-form.xml 2013-09-15 19:17:52 UTC (rev 4312) @@ -25,7 +25,7 @@ <sv:value>/templates/samples-contextmenu/paragraph-form.jsp</sv:value> </sv:property> <sv:property sv:name="title" sv:type="String"> - <sv:value>Form sample for module contextmenu</sv:value> + <sv:value>Form sample (jsp)</sv:value> </sv:property> <sv:node sv:name="MetaData"> <sv:property sv:name="jcr:primaryType" sv:type="Name"> @@ -44,7 +44,7 @@ <sv:value>2008-09-25T12:45:26.721+02:00</sv:value> </sv:property> <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> - <sv:value>2013-09-13T19:26:18.358+02:00</sv:value> + <sv:value>2013-09-15T20:31:48.082+02:00</sv:value> </sv:property> </sv:node> </sv:node> Added: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.components.samples-contextmenu-message-freemarker.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.components.samples-contextmenu-message-freemarker.xml (rev 0) +++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.components.samples-contextmenu-message-freemarker.xml 2013-09-15 19:17:52 UTC (rev 4312) @@ -0,0 +1,50 @@ +<?xml version="1.0" encoding="UTF-8"?> +<sv:node sv:name="samples-contextmenu-message-freemarker" 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:multiple="true"> + <sv:value>mix:lockable</sv:value> + </sv:property> + <sv:property sv:name="jcr:uuid" sv:type="String"> + <sv:value>5eb0498e-da6d-4465-b076-84c5354503a4</sv:value> + </sv:property> + <sv:property sv:name="description" sv:type="String"> + <sv:value>Sample paragraph showing a message which can be edited via context menu.</sv:value> + </sv:property> + <sv:property sv:name="dialog" sv:type="String"> + <sv:value>contextmenu:samples-contextmenu-message</sv:value> + </sv:property> + <sv:property sv:name="jcr:createdBy" sv:type="String"> + <sv:value>admin</sv:value> + </sv:property> + <sv:property sv:name="renderType" sv:type="String"> + <sv:value>freemarker</sv:value> + </sv:property> + <sv:property sv:name="templateScript" sv:type="String"> + <sv:value>/samples-contextmenu/paragraph-message.ftl</sv:value> + </sv:property> + <sv:property sv:name="title" sv:type="String"> + <sv:value>Message sample (freemarker)</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>2008-09-25T12:45:26.721+02:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> + <sv:value>2013-09-15T20:31:38.258+02:00</sv:value> + </sv:property> + </sv:node> +</sv:node> Property changes on: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.components.samples-contextmenu-message-freemarker.xml ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/xml \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +Author Date Id Revision \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.components.samples-contextmenu-message.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.components.samples-contextmenu-message.xml 2013-09-15 18:26:35 UTC (rev 4311) +++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.components.samples-contextmenu-message.xml 2013-09-15 19:17:52 UTC (rev 4312) @@ -25,7 +25,7 @@ <sv:value>/templates/samples-contextmenu/paragraph-message.jsp</sv:value> </sv:property> <sv:property sv:name="title" sv:type="String"> - <sv:value>Message sample for module contextmenu</sv:value> + <sv:value>Message sample (jsp)</sv:value> </sv:property> <sv:node sv:name="MetaData"> <sv:property sv:name="jcr:primaryType" sv:type="Name"> @@ -44,7 +44,7 @@ <sv:value>2008-09-25T12:45:26.721+02:00</sv:value> </sv:property> <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> - <sv:value>2013-09-13T19:25:35.319+02:00</sv:value> + <sv:value>2013-09-15T20:31:53.389+02:00</sv:value> </sv:property> </sv:node> </sv:node> Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.components.samples-contextmenu-textmedia.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.components.samples-contextmenu-textmedia.xml 2013-09-15 18:26:35 UTC (rev 4311) +++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.components.samples-contextmenu-textmedia.xml 2013-09-15 19:17:52 UTC (rev 4312) @@ -25,7 +25,7 @@ <sv:value>/templates/samples-contextmenu/paragraph-textmedia.jsp</sv:value> </sv:property> <sv:property sv:name="title" sv:type="String"> - <sv:value>Text-media sample for module contextmenu</sv:value> + <sv:value>Text-media sample (jsp)</sv:value> </sv:property> <sv:node sv:name="MetaData"> <sv:property sv:name="jcr:primaryType" sv:type="Name"> @@ -44,7 +44,7 @@ <sv:value>2008-09-25T12:45:26.721+02:00</sv:value> </sv:property> <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> - <sv:value>2013-09-13T19:26:31.070+02:00</sv:value> + <sv:value>2013-09-15T20:32:01.621+02:00</sv:value> </sv:property> </sv:node> </sv:node> Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.pages.contextmenu-template-freemarker.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.pages.contextmenu-template-freemarker.xml 2013-09-15 18:26:35 UTC (rev 4311) +++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.pages.contextmenu-template-freemarker.xml 2013-09-15 19:17:52 UTC (rev 4312) @@ -16,7 +16,7 @@ <sv:value>freemarker</sv:value> </sv:property> <sv:property sv:name="templateScript" sv:type="String"> - <sv:value>/samples-contextmenu/contextmenu-template.ftl</sv:value> + <sv:value>/samples-contextmenu/template-contextmenu.ftl</sv:value> </sv:property> <sv:property sv:name="title" sv:type="String"> <sv:value>Contextmenu sample (freemarker)</sv:value> @@ -257,6 +257,43 @@ </sv:property> </sv:node> </sv:node> + <sv:node sv:name="samples-contextmenu-message-freemarker"> + <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:multiple="true"> + <sv:value>mix:lockable</sv:value> + </sv:property> + <sv:property sv:name="jcr:uuid" sv:type="String"> + <sv:value>becb783b-3a0e-4893-9b98-9c52951707c2</sv:value> + </sv:property> + <sv:property sv:name="id" sv:type="String"> + <sv:value>contextmenu:components/samples-contextmenu-message-freemarker</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>2012-03-21T07:32:14.200+01:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> + <sv:value>2013-09-15T20:32:43.126+02:00</sv:value> + </sv:property> + </sv:node> + </sv:node> </sv:node> </sv:node> </sv:node> Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.pages.contextmenu-template-jsp.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.pages.contextmenu-template-jsp.xml 2013-09-15 18:26:35 UTC (rev 4311) +++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.pages.contextmenu-template-jsp.xml 2013-09-15 19:17:52 UTC (rev 4312) @@ -16,7 +16,7 @@ <sv:value>jsp</sv:value> </sv:property> <sv:property sv:name="templateScript" sv:type="String"> - <sv:value>/templates/samples-contextmenu/template.jsp</sv:value> + <sv:value>/templates/samples-contextmenu/template-contextmenu.jsp</sv:value> </sv:property> <sv:property sv:name="title" sv:type="String"> <sv:value>Contextmenu sample (jsp)</sv:value> @@ -257,6 +257,43 @@ </sv:property> </sv:node> </sv:node> + <sv:node sv:name="samples-contextmenu-message-freemarker"> + <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:multiple="true"> + <sv:value>mix:lockable</sv:value> + </sv:property> + <sv:property sv:name="jcr:uuid" sv:type="String"> + <sv:value>0827dab8-2621-44cc-801c-55bda8ce1d65</sv:value> + </sv:property> + <sv:property sv:name="id" sv:type="String"> + <sv:value>contextmenu:components/samples-contextmenu-message-freemarker</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>2012-03-21T07:32:14.200+01:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> + <sv:value>2013-09-15T20:32:51.882+02:00</sv:value> + </sv:property> + </sv:node> + </sv:node> </sv:node> </sv:node> </sv:node> Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/website.sample-contextmenu.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/website.sample-contextmenu.xml 2013-09-15 18:26:35 UTC (rev 4311) +++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/website.sample-contextmenu.xml 2013-09-15 19:17:52 UTC (rev 4312) @@ -29,7 +29,7 @@ <sv:value>2010-05-18T14:33:10.812+02:00</sv:value> </sv:property> <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> - <sv:value>2013-09-15T17:38:45.728+02:00</sv:value> + <sv:value>2013-09-15T20:41:36.141+02:00</sv:value> </sv:property> <sv:property sv:name="mgnl:template" sv:type="String"> <sv:value>contextmenu:pages/contextmenu-template-jsp</sv:value> @@ -62,7 +62,7 @@ <sv:value>2010-05-18T16:43:29.812+02:00</sv:value> </sv:property> <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> - <sv:value>2013-09-13T19:28:07.245+02:00</sv:value> + <sv:value>2013-09-15T20:41:06.907+02:00</sv:value> </sv:property> </sv:node> <sv:node sv:name="0"> @@ -219,7 +219,7 @@ </sv:property> </sv:node> </sv:node> - <sv:node sv:name="04"> + <sv:node sv:name="03"> <sv:property sv:name="jcr:primaryType" sv:type="Name"> <sv:value>mgnl:component</sv:value> </sv:property> @@ -227,13 +227,13 @@ <sv:value>mix:lockable</sv:value> </sv:property> <sv:property sv:name="jcr:uuid" sv:type="String"> - <sv:value>291f2c89-13b7-4876-8bed-fb6869fc1ccc</sv:value> + <sv:value>3c8d6a5f-1b83-4959-ace5-cc3ec53236f2</sv:value> </sv:property> <sv:property sv:name="jcr:createdBy" sv:type="String"> <sv:value>admin</sv:value> </sv:property> - <sv:property sv:name="text" sv:type="String"> - <sv:value><p>I'm a text</p></sv:value> + <sv:property sv:name="message" sv:type="String"> + <sv:value>Right click here to edit</sv:value> </sv:property> <sv:node sv:name="MetaData"> <sv:property sv:name="jcr:primaryType" sv:type="Name"> @@ -246,42 +246,54 @@ <sv:value>superuser</sv:value> </sv:property> <sv:property sv:name="mgnl:creationdate" sv:type="Date"> - <sv:value>2013-09-13T19:18:16.577+02:00</sv:value> + <sv:value>2013-09-13T19:17:58.919+02:00</sv:value> </sv:property> <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> - <sv:value>2013-09-13T19:27:55.818+02:00</sv:value> + <sv:value>2013-09-13T19:28:07.245+02:00</sv:value> </sv:property> <sv:property sv:name="mgnl:template" sv:type="String"> - <sv:value>contextmenu:components/samples-contextmenu-textmedia</sv:value> + <sv:value>contextmenu:components/samples-contextmenu-message</sv:value> </sv:property> </sv:node> - <sv:node sv:name="text_files"> + </sv:node> + <sv:node sv:name="05"> + <sv:property sv:name="jcr:primaryType" sv:type="Name"> + <sv:value>mgnl:component</sv:value> + </sv:property> + <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true"> + <sv:value>mix:lockable</sv:value> + </sv:property> + <sv:property sv:name="jcr:uuid" sv:type="String"> + <sv:value>6c35ebd5-e5e2-4bdf-a4e7-c2fca72bf604</sv:value> + </sv:property> + <sv:property sv:name="jcr:createdBy" sv:type="String"> + <sv:value>superuser</sv:value> + </sv:property> + <sv:property sv:name="message" sv:type="String"> + <sv:value>Right click here to edit</sv:value> + </sv:property> + <sv:node sv:name="MetaData"> <sv:property sv:name="jcr:primaryType" sv:type="Name"> - <sv:value>mgnl:contentNode</sv:value> + <sv:value>mgnl:metaData</sv:value> </sv:property> - <sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true"> - <sv:value>mix:lockable</sv:value> + <sv:property sv:name="jcr:createdBy" sv:type="String"> + <sv:value>superuser</sv:value> </sv:property> - <sv:property sv:name="jcr:uuid" sv:type="String"> - <sv:value>c0849975-45ec-49ec-8b03-3c9efaae4bfd</sv:value> + <sv:property sv:name="mgnl:authorid" sv:type="String"> + <sv:value>superuser</sv:value> </sv:property> - <sv:property sv:name="jcr:createdBy" sv:type="String"> - <sv:value>admin</sv:value> + <sv:property sv:name="mgnl:creationdate" sv:type="Date"> + <sv:value>2013-09-15T20:41:06.907+02:00</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:creationdate" sv:type="Date"> - <sv:value>2013-09-13T19:27:55.815+02:00</sv:value> - </sv:property> - </sv:node> + <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> + <sv:value>2013-09-15T20:41:06.907+02:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:template" sv:type="String"> + <sv:value>contextmenu:components/samples-contextmenu-message-freemarker</sv:value> + </sv:property> </sv:node> </sv:node> - <sv:node sv:name="03"> + <sv:node sv:name="04"> <sv:property sv:name="jcr:primaryType" sv:type="Name"> <sv:value>mgnl:component</sv:value> </sv:property> @@ -289,13 +301,13 @@ <sv:value>mix:lockable</sv:value> </sv:property> <sv:property sv:name="jcr:uuid" sv:type="String"> - <sv:value>3c8d6a5f-1b83-4959-ace5-cc3ec53236f2</sv:value> + <sv:value>291f2c89-13b7-4876-8bed-fb6869fc1ccc</sv:value> </sv:property> <sv:property sv:name="jcr:createdBy" sv:type="String"> <sv:value>admin</sv:value> </sv:property> - <sv:property sv:name="message" sv:type="String"> - <sv:value>Right click here to edit</sv:value> + <sv:property sv:name="text" sv:type="String"> + <sv:value><p>I'm a text</p></sv:value> </sv:property> <sv:node sv:name="MetaData"> <sv:property sv:name="jcr:primaryType" sv:type="Name"> @@ -308,15 +320,40 @@ <sv:value>superuser</sv:value> </sv:property> <sv:property sv:name="mgnl:creationdate" sv:type="Date"> - <sv:value>2013-09-13T19:17:58.919+02:00</sv:value> + <sv:value>2013-09-13T19:18:16.577+02:00</sv:value> </sv:property> <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> - <sv:value>2013-09-13T19:28:07.245+02:00</sv:value> + <sv:value>2013-09-13T19:27:55.818+02:00</sv:value> </sv:property> <sv:property sv:name="mgnl:template" sv:type="String"> - <sv:value>contextmenu:components/samples-contextmenu-message</sv:value> + <sv:value>contextmenu:components/samples-contextmenu-textmedia</sv:value> </sv:property> </sv:node> + <sv:node sv:name="text_files"> + <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:multiple="true"> + <sv:value>mix:lockable</sv:value> + </sv:property> + <sv:property sv:name="jcr:uuid" sv:type="String"> + <sv:value>c0849975-45ec-49ec-8b03-3c9efaae4bfd</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:creationdate" sv:type="Date"> + <sv:value>2013-09-13T19:27:55.815+02:00</sv:value> + </sv:property> + </sv:node> + </sv:node> </sv:node> <sv:node sv:name="02"> <sv:property sv:name="jcr:primaryType" sv:type="Name"> Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-form.jsp =================================================================== --- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-form.jsp 2013-09-15 18:26:35 UTC (rev 4311) +++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-form.jsp 2013-09-15 19:17:52 UTC (rev 4312) @@ -1,7 +1,7 @@ <jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms" xmlns:cmsu="cms-util-taglib" xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:media="http://net.sourceforge.openutils/mgnlMedia" - xmlns:contextmenu="mgnlcontextmenu"> + xmlns:contextmenu="http://openutils/mgnlcontextmenu"> <jsp:directive.page contentType="text/html; charset=UTF-8" session="false" /> <section> <h3>Form sample (jsp)</h3> Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-message.jsp =================================================================== --- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-message.jsp 2013-09-15 18:26:35 UTC (rev 4311) +++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-message.jsp 2013-09-15 19:17:52 UTC (rev 4312) @@ -1,7 +1,7 @@ <jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms" xmlns:cmsu="cms-util-taglib" xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:media="http://net.sourceforge.openutils/mgnlMedia" - xmlns:contextmenu="mgnlcontextmenu"> + xmlns:contextmenu="http://openutils/mgnlcontextmenu"> <jsp:directive.page contentType="text/html; charset=UTF-8" session="false" /> <section> <h3>Message sample (jsp)</h3> Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-textmedia.jsp =================================================================== --- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-textmedia.jsp 2013-09-15 18:26:35 UTC (rev 4311) +++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-textmedia.jsp 2013-09-15 19:17:52 UTC (rev 4312) @@ -1,7 +1,7 @@ <jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core" xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms" xmlns:cmsu="cms-util-taglib" xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:media="http://net.sourceforge.openutils/mgnlMedia" - xmlns:contextmenu="mgnlcontextmenu"> + xmlns:contextmenu="http://openutils/mgnlcontextmenu"> <jsp:directive.page contentType="text/html; charset=UTF-8" session="false" /> <section> <h3>Text/media sample (jsp)</h3> Copied: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/template-contextmenu.jsp (from rev 4311, magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/template.jsp) =================================================================== --- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/template-contextmenu.jsp (rev 0) +++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/template-contextmenu.jsp 2013-09-15 19:17:52 UTC (rev 4312) @@ -0,0 +1,46 @@ +<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core" + xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms" + xmlns:cmsu="cms-util-taglib" xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:media="http://net.sourceforge.openutils/mgnlMedia" + xmlns:contextmenu="http://openutils/mgnlcontextmenu"> + <jsp:directive.page contentType="text/html; charset=UTF-8" session="false" /> + <jsp:text> + <![CDATA[<!DOCTYPE html> ]]> + </jsp:text> + <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> + <head> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> + <title>${content.title}</title> + + <script src="${pageContext.request.contextPath}/.resources/contextmenu/js/jquery-1.4.2.min.js">/**/</script> + + ${contextmenu:links()} + + <cms:init /> + + <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/.resources/contextmenu/css/bootstrap.min.css" /> + + <!-- samples css/js --> + <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/.resources/contextmenu/css/contextmenu-samples.css" /> + <script src="${pageContext.request.contextPath}/.resources/contextmenu/js/contextmenu-samples.js">/**/</script> + <!-- end samples css/js --> + </head> + <body> + <div class="container"> + <h1>${content.title}</h1> + <section> + <h2>JSP sample</h2> + <p> + <span>Add the following to your template in order to initialize the contextmenu module:</span> + <ul> + <li>add <code>${'$'}{contextmenu:links()}</code> (just before <code>&lt;/head&gt;</code>)</li> + <li>add <code>${'$'}{contextmenu:scripts()}</code> (just before <code>&lt;/body&gt;</code>)</li> + <li>add the jquery library</li> + </ul> + </p> + </section> + <cms:area name="main" /> + </div> + ${contextmenu:scripts()} + </body> + </html> +</jsp:root> \ No newline at end of file Deleted: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/template.jsp =================================================================== --- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/template.jsp 2013-09-15 18:26:35 UTC (rev 4311) +++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/template.jsp 2013-09-15 19:17:52 UTC (rev 4312) @@ -1,45 +0,0 @@ -<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core" - xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms" - xmlns:cmsu="cms-util-taglib" xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:media="http://net.sourceforge.openutils/mgnlMedia" - xmlns:contextmenu="mgnlcontextmenu"> - <jsp:directive.page contentType="text/html; charset=UTF-8" session="false" /> - <jsp:text> - <![CDATA[<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> ]]> - </jsp:text> - <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> - <head> - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> - <title>${actpage.title}</title> - - <script src="${pageContext.request.contextPath}/.resources/contextmenu/js/jquery-1.4.2.min.js">/**/</script> - - ${contextmenu:links()} - - <cms:init /> - - <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/.resources/contextmenu/css/bootstrap.min.css" /> - - <!-- samples css/js --> - <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/.resources/contextmenu/css/contextmenu-samples.css" /> - <script src="${pageContext.request.contextPath}/.resources/contextmenu/js/contextmenu-samples.js">/**/</script> - <!-- end samples css/js --> - </head> - <body> - <div class="container"> - <h1>${content.title}</h1> - <section> - <p> - <span>Add the following to your template in order to initialize the contextmenu module:</span> - <ul> - <li>add <code>${'$'}{contextmenu:links()}</code> (just before <code>&lt;/head&gt;</code>)</li> - <li>add <code>${'$'}{contextmenu:scripts()}</code> (just before <code>&lt;/body&gt;</code>)</li> - <li>add the jquery library</li> - </ul> - </p> - </section> - <cms:area name="main" /> - </div> - ${contextmenu:scripts()} - </body> - </html> -</jsp:root> \ No newline at end of file Added: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/samples-contextmenu/paragraph-message.ftl =================================================================== --- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/samples-contextmenu/paragraph-message.ftl (rev 0) +++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/samples-contextmenu/paragraph-message.ftl 2013-09-15 19:17:52 UTC (rev 4312) @@ -0,0 +1,10 @@ +[#assign contextmenu=JspTaglibs["http://openutils/mgnlcontextmenu"]] +<section> + <h3>Message sample (freemarker)</h3> + <p>Right click to edit the message below</p> + <pre>${'[#assign contextmenu=JspTaglibs["http://openutils/mgnlcontextmenu"]]'} +${'[@contextmenu.element name="message"]'}${'$'}{content.message}${'[/@contextmenu.element]'}</pre> + <div class="testcontent"> + [@contextmenu.element name="message"]${content.message!}[/@contextmenu.element] + </div> +</section> \ No newline at end of file Property changes on: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/samples-contextmenu/paragraph-message.ftl ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/samples-contextmenu/template-contextmenu.ftl =================================================================== --- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/samples-contextmenu/template-contextmenu.ftl 2013-09-15 18:26:35 UTC (rev 4311) +++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/samples-contextmenu/template-contextmenu.ftl 2013-09-15 19:17:52 UTC (rev 4312) @@ -3,17 +3,36 @@ <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <title>${content.title!}</title> + + <script src="${contextPath}/.resources/contextmenu/js/jquery-1.4.2.min.js">/**/</script> + + ${contextmenu.links()} + [@cms.init /] + <link rel="stylesheet" type="text/css" href="${contextPath}/.resources/contextmenu/css/bootstrap.min.css" /> + + <!-- samples css/js --> <link rel="stylesheet" type="text/css" href="${contextPath}/.resources/contextmenu/css/contextmenu-samples.css" /> + <script src="${contextPath}/.resources/contextmenu/js/contextmenu-samples.js">/**/</script> + <!-- end samples css/js --> </head> <body> <div class="container"> - <header> - <h1>${content.title!}</h1> - </header> - <div> [@cms.area name="main" /] - </div> + <h1>${content.title!}</h1> + <section> + <h2>Freemarker sample</h2> + <p> + <span>Add the following to your template in order to initialize the contextmenu module:</span> + <ul> + <li>add <code>${'$'}{contextmenu.links()}</code> (just before <code></head></code>)</li> + <li>add <code>${'$'}{contextmenu.scripts()}</code> (just before <code></body></code>)</li> + <li>add the jquery library</li> + </ul> + </p> + </section> + [@cms.area name="main" /] </div> + ${contextmenu.scripts()} </body> </html> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |