Menu
▾
▴
openutils-svn
|
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...
[truncated message content] |
|
From: <luc...@us...> - 2013-09-26 16:23:55
|
Revision: 4349
http://openutils.svn.sourceforge.net/openutils/?rev=4349&view=rev
Author: lucaboati
Date: 2013-09-26 16:23:50 +0000 (Thu, 26 Sep 2013)
Log Message:
-----------
fix textmedia, refactoring addMenu, e sortList
Modified Paths:
--------------
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-textmedia.jsp
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/js/contextmenu-addMenu.js
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/js/contextmenu-sortList.js
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-26 16:10:45 UTC (rev 4348)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-form.jsp 2013-09-26 16:23:50 UTC (rev 4349)
@@ -21,6 +21,8 @@
</label>
<div class="col-lg-4">
<input name="firstname" id="firstname" type="text" />
+ <c:set var="desc" value="${contextmenu:entryValue(cmsfn:asJCRNode(content), 'firstname.description')}" />
+ ${desc}
<c:set var="help" value="${contextmenu:entryValue(cmsfn:asJCRNode(content), 'firstname.help')}" />
<c:if test="${not empty help}">
<span class="help">
@@ -35,6 +37,8 @@
</label>
<div class="col-lg-4">
<input name="lastname" id="lastname" type="text" />
+ <c:set var="desc" value="${contextmenu:entryValue(cmsfn:asJCRNode(content), 'lastname.description')}" />
+ ${desc}
<c:set var="help" value="${contextmenu:entryValue(cmsfn:asJCRNode(content), 'lastname.help')}" />
<c:if test="${not empty help}">
<span class="help">
@@ -49,6 +53,8 @@
</label>
<div class="col-lg-4">
<input name="email" id="email" type="text" />
+ <c:set var="desc" value="${contextmenu:entryValue(cmsfn:asJCRNode(content), 'email.description')}" />
+ ${desc}
<c:set var="help" value="${contextmenu:entryValue(cmsfn:asJCRNode(content), 'email.help')}" />
<c:if test="${not empty help}">
<span class="help">
@@ -72,6 +78,8 @@
<option value="1942">1942</option>
<option value="1999">1999</option>
</select>
+ <c:set var="desc" value="${contextmenu:entryValue(cmsfn:asJCRNode(content), 'year.description')}" />
+ ${desc}
<c:set var="help" value="${contextmenu:entryValue(cmsfn:asJCRNode(content), 'year.help')}" />
<c:if test="${not empty help}">
<span class="help">
@@ -86,6 +94,8 @@
</label>
<div class="col-lg-4">
<input name="username" id="username" type="text" />
+ <c:set var="desc" value="${contextmenu:entryValue(cmsfn:asJCRNode(content), 'username.description')}" />
+ ${desc}
<c:set var="help" value="${contextmenu:entryValue(cmsfn:asJCRNode(content), 'username.help')}" />
<c:if test="${not empty help}">
<span class="help">
@@ -100,6 +110,8 @@
</label>
<div class="col-lg-4">
<input name="password" id="password" type="password" />
+ <c:set var="desc" value="${contextmenu:entryValue(cmsfn:asJCRNode(content), 'password.description')}" />
+ ${desc}
<c:set var="help" value="${contextmenu:entryValue(cmsfn:asJCRNode(content), 'password.help')}" />
<c:if test="${not empty help}">
<span class="help">
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-26 16:10:45 UTC (rev 4348)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-textmedia.jsp 2013-09-26 16:23:50 UTC (rev 4349)
@@ -7,13 +7,11 @@
<h3>Text/media sample (jsp)</h3>
<p>Right click to edit text or media</p>
<pre>
- <![CDATA[<contextmenu:element menu="textmedia" name="media" >${'$'}{cmsfn:decode(content).text}</contextmenu:element>]]>
+ <![CDATA[<contextmenu:element menu="textmedia" name="text" >${'$'}{cmsfn:decode(content).text}</contextmenu:element>]]>
</pre>
<div class="testcontent">
<div style="float: left; margin-right: 10px;">
- <contextmenu:element menu="textmedia" name="media" wrapper="div">
- <media:media item="${content.media}" width="320" height="240" />
- </contextmenu:element>
+ <media:media item="${node.media}" width="60" height="60" />
</div>
<contextmenu:element menu="textmedia" name="text" wrapper="div">${cmsfn:decode(content).text}
</contextmenu:element>
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/js/contextmenu-addMenu.js
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/js/contextmenu-addMenu.js 2013-09-26 16:10:45 UTC (rev 4348)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/js/contextmenu-addMenu.js 2013-09-26 16:23:50 UTC (rev 4349)
@@ -21,68 +21,53 @@
});
jQuery.each(mgnlEditMessages, function(id, info){
+ var menu;
+ var menuName = info.contextMenu || 'default';
+ jQuery.each(mgnlContextMenuInfo.menus, function(){
+ if (this.name == menuName) {
+ menu = this;
+ }
+ });
+
var initTrigger = function(trigger){
- $(trigger).contextMenu({
+ jQuery(trigger).contextMenu({
menu: 'contextmenu-' + (info.contextMenu || 'default'),
showCallback: info.showCallback
- }, function(action) {
- switch (action){
- case 'default':
- case 'text':
- case 'header':
- mgnlOpenDialogEx(info.path,null,null,null,'website','.magnolia/dialogs/contextmenu-edit.html',null,null,null,{
- entryName: info.key
- });
- break;
- case 'fckText':
- mgnlOpenDialogEx(info.path,null,null,null,'website','.magnolia/dialogs/contextmenu-fckEdit.html',null,null,null,{
- entryName: info.key,
- enterMode: info.enterMode
- });
- break;
- case 'label':
- mgnlOpenDialogEx(info.path,null,null,null,'website','.magnolia/dialogs/contextmenu-edit.html',null,null,null,{
- entryName: info.key
- });
- break;
- case 'description':
- mgnlOpenDialogEx(info.path,null,null,null,'website','.magnolia/dialogs/contextmenu-edit.html',null,null,null,{
- entryName: info.key + '.description'
- });
- break;
- case 'media':
- mgnlOpenDialogEx(info.path,null,null,null,'website','.magnolia/dialogs/contextmenu-media.html',null,null,null,{
- entryName: info.key
- });
- break;
- case 'textmedia':
- // TO BE FIX
- mgnlOpenDialogEx(info.path,null,null,null,'website','.magnolia/dialogs/samples-contextmenu-textmedia.html',null,null,null,{
- entryName: info.key
- });
- break;
- case 'help':
- mgnlOpenDialogEx(info.path,null,null,null,'website','.magnolia/dialogs/contextmenu-fckEdit.html',null,null,null,{
- entryName: info.key + '.help',
- enterMode: 'br'
- });
- break;
- case 'info':
- mgnlOpenDialogEx(info.path,null,null,null,'website','.magnolia/dialogs/contextmenu-fckEdit.html',null,null,null,{
- entryName: info.key + '.info',
- enterMode: info.enterMode || 'br'
- });
- break;
+ }, function(itemName) {
+ switch (itemName){
case 'move':
el.parents('.control-group:first').trigger('drag');
- break;
-
+ return;
}
+
+ var entryName = info.entryName || '';
+ if (itemName && itemName != 'default'){
+ if (entryName) {
+ entryName += '.';
+ }
+ entryName += itemName;
+ }
+ var menuItem;
+ jQuery.each(menu.items, function(){
+ if (this.name == itemName)
+ {
+ menuItem = this;
+ }
+ });
+ mgnlOpenDialogEx(info.path,null,null,null,'website','.magnolia/dialogs/contextmenu-' + menuItem.controlType + '.html',null,null,null,{
+ entryName: entryName,
+ globalEnabled: menuItem.globalEnabled,
+ enterMode: info.enterMode
+ });
+
});
};
+
var el = jQuery('#' + id);
- initTrigger(info.parentTrigger ? el.parents(info.parentTrigger + ':first') : el);
+ var trigger = info.parentTrigger ? el.parents(info.parentTrigger + ':first') : el;
+ initTrigger(trigger);
el.data("initTrigger", initTrigger);
+
});
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/js/contextmenu-sortList.js
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/js/contextmenu-sortList.js 2013-09-26 16:10:45 UTC (rev 4348)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/js/contextmenu-sortList.js 2013-09-26 16:23:50 UTC (rev 4349)
@@ -12,12 +12,12 @@
$ol.find('> .control-group').each(function(i, el){
if (el.nodeType === 1){
drags.push(el);
- var li = $('<div class="control-drop"></div>');
- $(el).before(li);
+ var li = jQuery('<div class="control-drop"></div>');
+ jQuery(el).before(li);
drops.push(li[0]);
}
});
- var li = $('<div class="control-group"></div>');
+ var li = jQuery('<div class="control-group"></div>');
$ol.append(li);
drops.push(li[0]);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <fg...@us...> - 2013-10-08 16:07:42
|
Revision: 4361
http://openutils.svn.sourceforge.net/openutils/?rev=4361&view=rev
Author: fgiust
Date: 2013-10-08 16:07:28 +0000 (Tue, 08 Oct 2013)
Log Message:
-----------
new sample with nested fieldset
Modified Paths:
--------------
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-move-fields.jsp
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/css/jquery.contextMenu.css
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/js/contextmenu-sortList.js
Added Paths:
-----------
magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.contextMenus.move.xml
Added: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.contextMenus.move.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.contextMenus.move.xml (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.contextMenus.move.xml 2013-10-08 16:07:28 UTC (rev 4361)
@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="move" 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>8f90cf21-7aab-4beb-8a0e-ba93cdcfaac9</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mouseoverClass" sv:type="String">
+ <sv:value>contextmenuOver</sv:value>
+ </sv:property>
+ <sv:property sv:name="mouseoverIcon" sv:type="String">
+ <sv:value>/.resources/contextmenu/img/rightclicktoedit.png</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-18T18:22:08.296+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-10-08T00:11:15.996+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="items">
+ <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>66547248-8ed5-4836-90f0-b58d0ee28ea3</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-05-18T18:22:40.359+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-10-08T00:11:12.366+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="default">
+ <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>0a06a2c8-cc8c-4b6c-b147-fd9b9eeb779c</sv:value>
+ </sv:property>
+ <sv:property sv:name="controlType" sv:type="String">
+ <sv:value>edit</sv:value>
+ </sv:property>
+ <sv:property sv:name="icon" sv:type="String">
+ <sv:value>/.resources/contextmenu/css/images/menu-text.png</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>Edit label</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-18T18:22:45.406+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-10-08T00:11:12.366+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ <sv:node sv:name="move">
+ <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>a9c57061-6db0-4a1d-9ab4-6f85cac292b2</sv:value>
+ </sv:property>
+ <sv:property sv:name="controlType" sv:type="String">
+ <sv:value>move</sv:value>
+ </sv:property>
+ <sv:property sv:name="icon" sv:type="String">
+ <sv:value>/.resources/contextmenu/css/images/menu-move.gif</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>Move field</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-18T18:22:45.406+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2013-10-08T00:11:12.367+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ </sv:node>
+</sv:node>
Property changes on: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.contextMenus.move.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/website.sample-contextmenu.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/website.sample-contextmenu.xml 2013-10-07 17:14:35 UTC (rev 4360)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/website.sample-contextmenu.xml 2013-10-08 16:07:28 UTC (rev 4361)
@@ -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-27T15:38:09.156+02:00</sv:value>
+ <sv:value>2013-10-07T23:55:31.955+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-27T15:38:09.155+02:00</sv:value>
+ <sv:value>2013-10-07T23:55:31.953+02:00</sv:value>
</sv:property>
</sv:node>
<sv:node sv:name="0">
@@ -392,7 +392,7 @@
</sv:property>
</sv:node>
</sv:node>
- <sv:node sv:name="06">
+ <sv:node sv:name="07">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:component</sv:value>
</sv:property>
@@ -400,20 +400,17 @@
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>7992f867-ed72-44bd-bff6-95027a322a2e</sv:value>
+ <sv:value>3d7f87ad-5783-40ad-a6bc-0cb66c089c99</sv:value>
</sv:property>
<sv:property sv:name="dummy" sv:type="String">
<sv:value>.</sv:value>
</sv:property>
- <sv:property sv:name="field2_label" sv:type="String">
- <sv:value>asd</sv:value>
- </sv:property>
- <sv:property sv:name="fieldList1" sv:type="String">
- <sv:value>1,0</sv:value>
- </sv:property>
<sv:property sv:name="jcr:createdBy" sv:type="String">
<sv:value>admin</sv:value>
</sv:property>
+ <sv:property sv:name="media" sv:type="String">
+ <sv:value>0f076956-3642-48a4-8efd-8cb17f3be49b</sv:value>
+ </sv:property>
<sv:node sv:name="MetaData">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:metaData</sv:value>
@@ -425,17 +422,17 @@
<sv:value>superuser</sv:value>
</sv:property>
<sv:property sv:name="mgnl:creationdate" sv:type="Date">
- <sv:value>2013-09-17T00:12:45.279+02:00</sv:value>
+ <sv:value>2013-09-27T15:28:21.349+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2013-09-27T15:13:31.452+02:00</sv:value>
+ <sv:value>2013-09-27T15:28:45.099+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:template" sv:type="String">
- <sv:value>contextmenu:components/samples-contextmenu-move-fields</sv:value>
+ <sv:value>contextmenu:components/samples-contextmenu-media</sv:value>
</sv:property>
</sv:node>
</sv:node>
- <sv:node sv:name="07">
+ <sv:node sv:name="08">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:component</sv:value>
</sv:property>
@@ -443,39 +440,36 @@
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>3d7f87ad-5783-40ad-a6bc-0cb66c089c99</sv:value>
+ <sv:value>613084f9-3b50-429e-82c6-602c4c70d455</sv:value>
</sv:property>
<sv:property sv:name="dummy" sv:type="String">
<sv:value>.</sv:value>
</sv:property>
<sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>superuser</sv:value>
+ <sv:value>admin</sv:value>
</sv:property>
- <sv:property sv:name="media" sv:type="String">
- <sv:value>0f076956-3642-48a4-8efd-8cb17f3be49b</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>superuser</sv:value>
+ <sv:value>admin</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>2013-09-27T15:28:21.349+02:00</sv:value>
+ <sv:value>2013-09-27T15:32:52.046+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2013-09-27T15:28:45.099+02:00</sv:value>
+ <sv:value>2013-09-27T15:32:52.047+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:template" sv:type="String">
<sv:value>contextmenu:components/samples-contextmenu-media</sv:value>
</sv:property>
</sv:node>
</sv:node>
- <sv:node sv:name="08">
+ <sv:node sv:name="06">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
<sv:value>mgnl:component</sv:value>
</sv:property>
@@ -483,7 +477,7 @@
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>613084f9-3b50-429e-82c6-602c4c70d455</sv:value>
+ <sv:value>69fd5ce5-9560-453d-bad6-ef572443f6e1</sv:value>
</sv:property>
<sv:property sv:name="dummy" sv:type="String">
<sv:value>.</sv:value>
@@ -502,13 +496,13 @@
<sv:value>superuser</sv:value>
</sv:property>
<sv:property sv:name="mgnl:creationdate" sv:type="Date">
- <sv:value>2013-09-27T15:32:52.046+02:00</sv:value>
+ <sv:value>2013-10-07T23:55:31.953+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2013-09-27T15:32:52.047+02:00</sv:value>
+ <sv:value>2013-10-07T23:55:31.953+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:template" sv:type="String">
- <sv:value>contextmenu:components/samples-contextmenu-media</sv:value>
+ <sv:value>contextmenu:components/samples-contextmenu-move-fields</sv:value>
</sv:property>
</sv:node>
</sv:node>
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-move-fields.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-move-fields.jsp 2013-10-07 17:14:35 UTC (rev 4360)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-move-fields.jsp 2013-10-08 16:07:28 UTC (rev 4361)
@@ -23,43 +23,123 @@
</contextmenu:sortList>
]]>
</pre>
- <div class="testcontent">
- <div id="fieldList1">
- <contextmenu:sortList containerId="fieldList1">
- <contextmenu:sortItem>
- <div class="control-group">
- <label class="control-label">
- <contextmenu:element name="field1" menu="formField">Field1:</contextmenu:element>
- </label>
- <div class="controls">
- <input name="field1" id="field1" type="text" />
- <c:set var="help" value="${contextmenu:entryValue(cmsfn:asJCRNode(content), 'field1.help')}" />
- <c:if test="${not empty help}">
- <span class="help">
+ <div class="testcontent" id="fieldsetlist">
+ <contextmenu:sortList containerId="fieldsetlist">
+ <contextmenu:sortItem>
+ <h5 class="control-group">
+ <contextmenu:element name="list1" menu="move">List 1</contextmenu:element>
+ </h5>
+ <div id="fieldList1">
+ <contextmenu:sortList containerId="fieldList1">
+ <contextmenu:sortItem>
+ <div class="control-group">
+ <label class="control-label">
+ <contextmenu:element name="field1" menu="formField">Field1:</contextmenu:element>
+ </label>
+ <div class="controls">
+ <input name="field1" id="field1" type="text" />
+ <c:set var="help" value="${contextmenu:entryValue(cmsfn:asJCRNode(content), 'field1.help')}" />
+ <c:if test="${not empty help}">
+ <span class="help">
<![CDATA[${help}<span class="help-pointer"> </span>]]>
- </span>
- </c:if>
- </div>
- </div>
- </contextmenu:sortItem>
- <contextmenu:sortItem>
- <div class="control-group">
- <label class="control-label">
- <contextmenu:element name="field2" menu="formField">Field2:</contextmenu:element>
- </label>
- <div class="controls">
- <input name="field2" id="field2" type="text" />
- <c:set var="help" value="${contextmenu:entryValue(cmsfn:asJCRNode(content), 'field2.help')}" />
- <c:if test="${not empty help}">
- <span class="help">
+ </span>
+ </c:if>
+ </div>
+ </div>
+ </contextmenu:sortItem>
+ <contextmenu:sortItem>
+ <div class="control-group">
+ <label class="control-label">
+ <contextmenu:element name="field2" menu="formField">Field2:</contextmenu:element>
+ </label>
+ <div class="controls">
+ <input name="field2" id="field2" type="text" />
+ <c:set var="help" value="${contextmenu:entryValue(cmsfn:asJCRNode(content), 'field2.help')}" />
+ <c:if test="${not empty help}">
+ <span class="help">
<![CDATA[${help}<span class="help-pointer"> </span>]]>
- </span>
- </c:if>
- </div>
- </div>
- </contextmenu:sortItem>
- </contextmenu:sortList>
- </div>
+ </span>
+ </c:if>
+ </div>
+ </div>
+ </contextmenu:sortItem>
+ <contextmenu:sortItem>
+ <div class="control-group">
+ <label class="control-label">
+ <contextmenu:element name="field3" menu="formField">Field3:</contextmenu:element>
+ </label>
+ <div class="controls">
+ <input name="field3" id="field3" type="text" />
+ <c:set var="help" value="${contextmenu:entryValue(cmsfn:asJCRNode(content), 'field3.help')}" />
+ <c:if test="${not empty help}">
+ <span class="help">
+ <![CDATA[${help}<span class="help-pointer"> </span>]]>
+ </span>
+ </c:if>
+ </div>
+ </div>
+ </contextmenu:sortItem>
+ </contextmenu:sortList>
+ </div>
+ </contextmenu:sortItem>
+ <contextmenu:sortItem>
+ <h5 class="control-group">
+ <contextmenu:element name="list2" menu="move">List 2</contextmenu:element>
+ </h5>
+ <div id="fieldList2">
+ <contextmenu:sortList containerId="fieldList2">
+ <contextmenu:sortItem>
+ <div class="control-group">
+ <label class="control-label">
+ <contextmenu:element name="field1b" menu="formField">Field1 #2:</contextmenu:element>
+ </label>
+ <div class="controls">
+ <input name="field1" id="field1b" type="text" />
+ <c:set var="help" value="${contextmenu:entryValue(cmsfn:asJCRNode(content), 'field1b.help')}" />
+ <c:if test="${not empty help}">
+ <span class="help">
+ <![CDATA[${help}<span class="help-pointer"> </span>]]>
+ </span>
+ </c:if>
+ </div>
+ </div>
+ </contextmenu:sortItem>
+ <contextmenu:sortItem>
+ <div class="control-group">
+ <label class="control-label">
+ <contextmenu:element name="field2b" menu="formField">Field2 #2:</contextmenu:element>
+ </label>
+ <div class="controls">
+ <input name="field2" id="field2b" type="text" />
+ <c:set var="help" value="${contextmenu:entryValue(cmsfn:asJCRNode(content), 'field2b.help')}" />
+ <c:if test="${not empty help}">
+ <span class="help">
+ <![CDATA[${help}<span class="help-pointer"> </span>]]>
+ </span>
+ </c:if>
+ </div>
+ </div>
+ </contextmenu:sortItem>
+ <contextmenu:sortItem>
+ <div class="control-group">
+ <label class="control-label">
+ <contextmenu:element name="field4b" menu="formField">Field3 #2:</contextmenu:element>
+ </label>
+ <div class="controls">
+ <input name="field3b" id="field3b" type="text" />
+ <c:set var="help" value="${contextmenu:entryValue(cmsfn:asJCRNode(content), 'field3b.help')}" />
+ <c:if test="${not empty help}">
+ <span class="help">
+ <![CDATA[${help}<span class="help-pointer"> </span>]]>
+ </span>
+ </c:if>
+ </div>
+ </div>
+ </contextmenu:sortItem>
+ </contextmenu:sortList>
+ </div>
+ </contextmenu:sortItem>
+ </contextmenu:sortList>
</div>
</section>
</jsp:root>
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/css/jquery.contextMenu.css
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/css/jquery.contextMenu.css 2013-10-07 17:14:35 UTC (rev 4360)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/css/jquery.contextMenu.css 2013-10-08 16:07:28 UTC (rev 4361)
@@ -99,14 +99,6 @@
padding: 0;
}
-.move .dropXX {
- display: block;
- height: 8px;
- border: 1px solid #666;
- background-color: #CCC;
- cursor: pointer;
-}
-
.move .drop {
margin: 2px 0;
height: 12px;
@@ -114,18 +106,31 @@
font-size: 12px;
color: #ffffff;
text-align: center;
- background-color: #5cb85c;
- -webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
- box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
- -webkit-transition: width 0.6s ease;
- transition: width 0.6s ease;
- -webkit-border-radius: 2px;
- -moz-border-radius: 2px;
- border-radius: 2px;
- cursor: pointer;
+ height: 23px !important;
+ line-height: 20px !important;
+ border-top: 1px solid #bcd56f !important;
+ border-left: 1px solid #bcd56f !important;
+ border-bottom: 1px solid #678b0f !important;
+ border-right: 1px solid #678b0f !important;
+ background: url("../../magnolia-templating-editor/img/bars/mgnl-bar.component.png") repeat !important;
+ color: #2f491b !important;
+ clear: both;
}
+.move .sort-list .drop {
+ display: none;
+ margin: 0;
+ padding: 0;
+}
-.edit-content{
+.move .drop.highlighted {
+ border-top: 1px solid #deeab7 !important;
+ border-left: 1px solid #deeab7 !important;
+ border-bottom: 1px solid #b3c587 !important;
+ border-right: 1px solid #b3c587 !important;
+ background-image: url("../../magnolia-templating-editor/img/bars/mgnl-bar.component.deemphasized.png") !important;
+}
+
+.edit-content {
min-height: 20px;
- }
\ No newline at end of file
+}
\ No newline at end of file
Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/js/contextmenu-sortList.js
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/js/contextmenu-sortList.js 2013-10-07 17:14:35 UTC (rev 4360)
+++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/js/contextmenu-sortList.js 2013-10-08 16:07:28 UTC (rev 4361)
@@ -17,10 +17,12 @@
drops.push(li[0]);
}
});
+
var li = jQuery('<div class="control-group"></div>');
$ol.append(li);
drops.push(li[0]);
+
var order = jQuery.merge([], options.order);
for (var i = order.length, j = drags.length; i < j; i++){
order.push(i);
@@ -31,13 +33,31 @@
jQuery(drags).bind('drag', function(e){
i1 = originalOrder[drags.indexOf(e.target)];
+
+ $selected = jQuery(e.target);
+
+ $selected.prev(".control-drop").addClass('highlighted');
+ // $selected.next(".control-drop").addClass('highlighted');
+
+
$ol.addClass('move');
- $ol.find('> .control-group.hide').removeClass('hide')
+ $ol.closest('.sort-list').find('> .control-group.hide').removeClass('hide');
+
+ var $divShadow=jQuery('#mgnlMoveDivShadow');
+ $divShadow.css({visibility: 'visible'});
+
+ // globals per gli effetti di magnolia
+ mgnlMoveNodeCollection ="";
+ mgnlMoveNode ="02";
+ mgnlMove=true;
+
+ mgnlMoveNodeCollection+'__'+mgnlMoveNode
});
jQuery(drops).addClass('drop').click(function(e){
e.stopPropagation();
$ol.removeClass('move');
+ jQuery('#mgnlMoveDivShadow').css({visibility: 'hidden'});
i2 = drops.indexOf(this);
i2 = i2 < drops.length - 1 ? originalOrder[i2] : null;
var newOrder = [];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X