From: <die...@us...> - 2012-03-20 18:07:31
|
Revision: 3856 http://openutils.svn.sourceforge.net/openutils/?rev=3856&view=rev Author: diego_schivo Date: 2012-03-20 18:07:25 +0000 (Tue, 20 Mar 2012) Log Message: ----------- openutils-mgnlcontextmenu components Modified Paths: -------------- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/configuration/ContextMenuManager.java magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/META-INF/magnolia/contextmenu.xml Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/configuration/ContextMenuManager.java =================================================================== --- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/configuration/ContextMenuManager.java 2012-03-20 17:43:13 UTC (rev 3855) +++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/configuration/ContextMenuManager.java 2012-03-20 18:07:25 UTC (rev 3856) @@ -29,6 +29,7 @@ import java.util.Iterator; import java.util.List; +import javax.inject.Singleton; import javax.jcr.RepositoryException; import org.slf4j.Logger; @@ -39,6 +40,7 @@ * Observes the contextMenus node in the configuration workspace, and exposes menu definitions. * @author dschivo */ +@Singleton public class ContextMenuManager extends ObservedManager { Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/META-INF/magnolia/contextmenu.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/META-INF/magnolia/contextmenu.xml 2012-03-20 17:43:13 UTC (rev 3855) +++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/META-INF/magnolia/contextmenu.xml 2012-03-20 18:07:25 UTC (rev 3856) @@ -7,4 +7,11 @@ <class>net.sourceforge.openutils.mgnlcontextmenu.module.ContextMenuModule</class> <versionHandler>net.sourceforge.openutils.mgnlcontextmenu.setup.ContextMenuModuleVersionHandler</versionHandler> <version>${project.version}</version> + <components> + <id>main</id> + <component> + <type>net.sourceforge.openutils.mgnlcontextmenu.configuration.ContextMenuManager</type> + <implementation>net.sourceforge.openutils.mgnlcontextmenu.configuration.ContextMenuManager</implementation> + </component> + </components> </module> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fg...@us...> - 2013-09-15 18:26:40
|
Revision: 4311 http://openutils.svn.sourceforge.net/openutils/?rev=4311&view=rev Author: fgiust Date: 2013-09-15 18:26:35 +0000 (Sun, 15 Sep 2013) Log Message: ----------- cleanup samples Modified Paths: -------------- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/el/ContextMenuElFunctions.java magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/META-INF/tld/mgnlcontextmenu.tld 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/mgnl-files/templates/samples-contextmenu/template.jsp Added Paths: ----------- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/MenuScripts.java magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu/config.server.rendering.freemarker.sharedVariables.contextmenu.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-resources/contextmenu/css/bootstrap.min.css magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/css/contextmenu-samples.css magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/css/img/ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/css/img/ico16-form-hint.png magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/css/img/ico16-form-label.png magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/css/img/ico16-media.png magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/css/img/ico16-text.png magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/css/img/pointer.gif magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/js/contextmenu-samples.js magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/samples-contextmenu/ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/samples-contextmenu/template-contextmenu.ftl Removed Paths: ------------- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/LinksTag.java magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/ScriptTag.java magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.pages.sampleContextMenu.xml magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/docroot/ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/js/contextmenu-mootools.js magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/js/mootools-1.2.4-core-yc.js Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/el/ContextMenuElFunctions.java =================================================================== --- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/el/ContextMenuElFunctions.java 2013-09-15 14:52:07 UTC (rev 4310) +++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/el/ContextMenuElFunctions.java 2013-09-15 18:26:35 UTC (rev 4311) @@ -19,6 +19,8 @@ package net.sourceforge.openutils.mgnlcontextmenu.el; +import info.magnolia.cms.security.Permission; +import info.magnolia.context.MgnlContext; import info.magnolia.jcr.util.NodeUtil; import info.magnolia.jcr.wrapper.HTMLEscapingNodeWrapper; import info.magnolia.objectfactory.Components; @@ -27,6 +29,7 @@ import net.sourceforge.openutils.mgnlcontextmenu.configuration.PersistenceStrategy; import net.sourceforge.openutils.mgnlcontextmenu.module.ContextMenuModule; +import net.sourceforge.openutils.mgnlcontextmenu.tags.MenuScripts; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -55,8 +58,35 @@ ContextMenuModule module = Components.getComponent(ContextMenuModule.class); PersistenceStrategy strategy = module.getPersistenceStrategy(); // LB crazy command! mgnl argsss - Node nodeUnwrapped = NodeUtil.deepUnwrap(node, HTMLEscapingNodeWrapper.class); + Node nodeUnwrapped = NodeUtil.deepUnwrap(node, HTMLEscapingNodeWrapper.class); return strategy != null ? strategy.readEntry(nodeUnwrapped, name) : null; } + public static String scripts() + { + return MenuScripts.write(); + } + + public static String links() + { + String ctx = MgnlContext.getContextPath(); + boolean canEdit = NodeUtil.isGranted( + MgnlContext.getAggregationState().getMainContent().getJCRNode(), + Permission.SET); + + StringBuilder out = new StringBuilder(); + + if (canEdit) + { + out.append("<!-- start contextmenu:links -->\n"); + out.append("<link rel=\"stylesheet\" type=\"text/css\" href=\"" + + ctx + + "/.resources/contextmenu/css/contextmenu.css\" media=\"screen\" />\n"); + out.append("<script src=\"" + ctx + "/.resources/contextmenu/js/mgnladmin-custom.js\"></script>\n"); + out.append("<!-- end contextmenu:links -->\n"); + } + + return out.toString(); + } + } Deleted: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/LinksTag.java =================================================================== --- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/LinksTag.java 2013-09-15 14:52:07 UTC (rev 4310) +++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/LinksTag.java 2013-09-15 18:26:35 UTC (rev 4311) @@ -1,131 +0,0 @@ -/** - * - * ContextMenu Module for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcontextmenu.html) - * Copyright(C) 2010-2013, Openmind S.r.l. http://www.openmindonline.it - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -package net.sourceforge.openutils.mgnlcontextmenu.tags; - -import info.magnolia.cms.security.Permission; -import info.magnolia.context.MgnlContext; -import info.magnolia.jcr.util.NodeUtil; - -import java.io.IOException; - -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.JspWriter; -import javax.servlet.jsp.tagext.TagSupport; - - -/** - * @author dschivo - * @version $Id$ - */ -public class LinksTag extends TagSupport -{ - - private String jsFramework; - - private boolean skipJsFramework; - - /** - * Sets the jsFramework. - * @param jsFramework the jsFramework to set - */ - public void setJsFramework(String jsFramework) - { - this.jsFramework = jsFramework; - } - - /** - * Sets the skipJsFramework. - * @param skipJsFramework the skipJsFramework to set - */ - public void setSkipJsFramework(boolean skipJsFramework) - { - this.skipJsFramework = skipJsFramework; - } - - /** - * {@inheritDoc} - */ - @Override - public int doStartTag() throws JspException - { - String ctx = MgnlContext.getContextPath(); - boolean canEdit = canEdit(); - JspWriter out = pageContext.getOut(); - try - { - if (canEdit) - { - out.print("<link rel=\"stylesheet\" type=\"text/css\" href=\"" - + ctx - + "/.resources/contextmenu/css/contextmenu.css\" media=\"screen\" />"); - out.print("<script src=\"" + ctx + "/.resources/contextmenu/js/mgnladmin-custom.js\"></script>"); - } - if ("jquery".equalsIgnoreCase(jsFramework)) - { - if (!skipJsFramework) - { - out.print("<script src=\"" + ctx + "/.resources/contextmenu/js/jquery-1.4.2.min.js\"></script>"); - } - if (canEdit) - { - out.print("<script src=\"" + ctx + "/.resources/contextmenu/js/contextmenu-jquery.js\"></script>"); - } - } - else if ("mootools".equalsIgnoreCase(jsFramework)) - { - if (!skipJsFramework) - { - out.print("<script src=\"" - + ctx - + "/.resources/contextmenu/js/mootools-1.2.4-core-yc.js\"></script>"); - } - if (canEdit) - { - out - .print("<script src=\"" - + ctx - + "/.resources/contextmenu/js/contextmenu-mootools.js\"></script>"); - } - } - } - catch (IOException e) - { - throw new JspException(e); - } - return EVAL_PAGE; - } - - @SuppressWarnings("deprecation") - private boolean canEdit() - { - return NodeUtil.isGranted(MgnlContext.getAggregationState().getMainContent().getJCRNode(), Permission.SET); - } - - /** - * {@inheritDoc} - */ - @Override - public void release() - { - jsFramework = null; - skipJsFramework = false; - super.release(); - } -} Copied: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/MenuScripts.java (from rev 4310, magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/ScriptTag.java) =================================================================== --- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/MenuScripts.java (rev 0) +++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/MenuScripts.java 2013-09-15 18:26:35 UTC (rev 4311) @@ -0,0 +1,150 @@ +/** + * + * ContextMenu Module for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcontextmenu.html) + * Copyright(C) 2010-2013, Openmind S.r.l. http://www.openmindonline.it + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +package net.sourceforge.openutils.mgnlcontextmenu.tags; + +import info.magnolia.cms.security.Permission; +import info.magnolia.context.MgnlContext; +import info.magnolia.jcr.util.NodeUtil; + +import java.io.IOException; +import java.util.List; + +import javax.servlet.jsp.JspException; +import javax.servlet.jsp.JspWriter; +import javax.servlet.jsp.tagext.TagSupport; + +import net.sourceforge.openutils.mgnlcontextmenu.configuration.ContextMenu; +import net.sourceforge.openutils.mgnlcontextmenu.configuration.ContextMenuItem; +import net.sourceforge.openutils.mgnlcontextmenu.configuration.ContextMenuManager; + +import org.apache.commons.lang.StringUtils; + + +/** + * @author dschivo + * @version $Id$ + */ +public class MenuScripts +{ + + public static String write() + { + if (canEdit()) + { + StringBuilder out = new StringBuilder(); + + out.append("<!-- start contextmenu:scripts -->\n"); + out.append("<script type=\"text/javascript\">\n"); + out.append("var mgnlContextMenuInfo = {\n"); + out.append(" contextPath: '" + MgnlContext.getContextPath() + "',\n"); + out.append(" menus: " + menusJs() + ",\n"); + out.append(" elements: " + elementsJs() + "\n"); + out.append("};\n"); + out.append("</script>\n"); + out.append("<!-- end contextmenu:scripts -->\n"); + return out.toString(); + } + return StringUtils.EMPTY; + } + + private static String menusJs() + { + StringBuilder sb = new StringBuilder(); + int i = 0; + for (ContextMenu menu : ContextMenuManager.getInstance().getMenus()) + { + if (i > 0) + { + sb.append(','); + } + sb.append("{"); + sb.append("'name':'").append(menu.getName()).append("',"); + sb.append("'items':["); + int j = 0; + for (ContextMenuItem item : menu.getItems()) + { + if (j > 0) + { + sb.append(','); + } + sb.append("{"); + sb.append("'name':'").append(item.getName()).append("'"); + sb.append(",'controlType':'").append(item.getControlType()).append("'"); + sb.append(",'icon':'").append(item.getIcon()).append("'"); + sb.append(",'text':'").append(item.getText()).append("'"); + sb.append(",'globalEnabled':").append(item.isGlobalEnabled()); + sb.append("}"); + j++; + } + sb.append("],"); + sb.append("'mouseoverClass':'").append(StringUtils.defaultString(menu.getMouseoverClass())).append("',"); + sb.append("'mouseoverIcon':'").append(StringUtils.defaultString(menu.getMouseoverIcon())).append("'"); + sb.append("}"); + i++; + } + return "[" + sb + "]"; + } + + @SuppressWarnings("unchecked") + private static String elementsJs() + { + StringBuilder sb = new StringBuilder(); + List infos = (List) MgnlContext.getWebContext().getRequest().getAttribute(ElementTag.ELEMENT_INFOS_KEY); + if (infos != null) + { + for (Object item : infos) + { + if (sb.length() > 0) + { + sb.append(','); + } + ElementInfo info = (ElementInfo) item; + sb.append("'").append(info.getElementId()).append("'"); + sb.append(":{"); + if (!StringUtils.isEmpty(info.getEntryName())) + { + sb.append("'entryName':'").append(info.getEntryName()).append("',"); + } + if (!StringUtils.isEmpty(info.getContextMenu())) + { + sb.append("'contextMenu':'").append(info.getContextMenu()).append("',"); + } + if (!StringUtils.isEmpty(info.getParentTrigger())) + { + sb.append("'parentTrigger':'").append(info.getParentTrigger()).append("',"); + } + if (!StringUtils.isEmpty(info.getEnterMode())) + { + sb.append("'enterMode':'").append(info.getEnterMode()).append("',"); + } + sb.append("'path':'").append(info.getPath()).append("'"); + sb.append('}'); + } + } + return "{" + sb + "}"; + } + + @SuppressWarnings("deprecation") + private static boolean canEdit() + { + return NodeUtil.isGranted(MgnlContext.getAggregationState().getMainContent().getJCRNode(), Permission.SET); + } + +} Deleted: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/ScriptTag.java =================================================================== --- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/ScriptTag.java 2013-09-15 14:52:07 UTC (rev 4310) +++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/ScriptTag.java 2013-09-15 18:26:35 UTC (rev 4311) @@ -1,157 +0,0 @@ -/** - * - * ContextMenu Module for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcontextmenu.html) - * Copyright(C) 2010-2013, Openmind S.r.l. http://www.openmindonline.it - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - */ - -package net.sourceforge.openutils.mgnlcontextmenu.tags; - -import info.magnolia.cms.security.Permission; -import info.magnolia.context.MgnlContext; -import info.magnolia.jcr.util.NodeUtil; - -import java.io.IOException; -import java.util.List; - -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.JspWriter; -import javax.servlet.jsp.tagext.TagSupport; - -import net.sourceforge.openutils.mgnlcontextmenu.configuration.ContextMenu; -import net.sourceforge.openutils.mgnlcontextmenu.configuration.ContextMenuItem; -import net.sourceforge.openutils.mgnlcontextmenu.configuration.ContextMenuManager; - -import org.apache.commons.lang.StringUtils; - - -/** - * @author dschivo - * @version $Id$ - */ -public class ScriptTag extends TagSupport -{ - - /** - * {@inheritDoc} - */ - @Override - public int doStartTag() throws JspException - { - if (canEdit()) - { - JspWriter out = pageContext.getOut(); - try - { - out.println("<script type=\"text/javascript\">"); - out.println("var mgnlContextMenuInfo = {"); - out.println(" contextPath: '" + MgnlContext.getContextPath() + "',"); - out.println(" menus: " + menusJs() + ","); - out.println(" elements: " + elementsJs()); - out.println("};"); - out.println("</script>"); - } - catch (IOException e) - { - throw new JspException(e); - } - } - return EVAL_PAGE; - } - - protected String menusJs() - { - StringBuilder sb = new StringBuilder(); - int i = 0; - for (ContextMenu menu : ContextMenuManager.getInstance().getMenus()) - { - if (i > 0) - { - sb.append(','); - } - sb.append("{"); - sb.append("'name':'").append(menu.getName()).append("',"); - sb.append("'items':["); - int j = 0; - for (ContextMenuItem item : menu.getItems()) - { - if (j > 0) - { - sb.append(','); - } - sb.append("{"); - sb.append("'name':'").append(item.getName()).append("'"); - sb.append(",'controlType':'").append(item.getControlType()).append("'"); - sb.append(",'icon':'").append(item.getIcon()).append("'"); - sb.append(",'text':'").append(item.getText()).append("'"); - sb.append(",'globalEnabled':").append(item.isGlobalEnabled()); - sb.append("}"); - j++; - } - sb.append("],"); - sb.append("'mouseoverClass':'").append(StringUtils.defaultString(menu.getMouseoverClass())).append("',"); - sb.append("'mouseoverIcon':'").append(StringUtils.defaultString(menu.getMouseoverIcon())).append("'"); - sb.append("}"); - i++; - } - return "[" + sb + "]"; - } - - @SuppressWarnings("unchecked") - protected String elementsJs() - { - StringBuilder sb = new StringBuilder(); - List infos = (List) MgnlContext.getWebContext().getRequest().getAttribute(ElementTag.ELEMENT_INFOS_KEY); - if (infos != null) - { - for (Object item : infos) - { - if (sb.length() > 0) - { - sb.append(','); - } - ElementInfo info = (ElementInfo) item; - sb.append("'").append(info.getElementId()).append("'"); - sb.append(":{"); - if (!StringUtils.isEmpty(info.getEntryName())) - { - sb.append("'entryName':'").append(info.getEntryName()).append("',"); - } - if (!StringUtils.isEmpty(info.getContextMenu())) - { - sb.append("'contextMenu':'").append(info.getContextMenu()).append("',"); - } - if (!StringUtils.isEmpty(info.getParentTrigger())) - { - sb.append("'parentTrigger':'").append(info.getParentTrigger()).append("',"); - } - if (!StringUtils.isEmpty(info.getEnterMode())) - { - sb.append("'enterMode':'").append(info.getEnterMode()).append("',"); - } - sb.append("'path':'").append(info.getPath()).append("'"); - sb.append('}'); - } - } - return "{" + sb + "}"; - } - - @SuppressWarnings("deprecation") - private boolean canEdit() - { - return NodeUtil.isGranted(MgnlContext.getAggregationState().getMainContent().getJCRNode(), Permission.SET); - } - -} 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 14:52:07 UTC (rev 4310) +++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/META-INF/tld/mgnlcontextmenu.tld 2013-09-15 18:26:35 UTC (rev 4311) @@ -106,4 +106,20 @@ <function-class>net.sourceforge.openutils.mgnlcontextmenu.el.ContextMenuElFunctions</function-class> <function-signature>java.lang.String entryValue(javax.jcr.Node, java.lang.String)</function-signature> </function> + <function> + <description> + Adds the contextmenu scripts/css + </description> + <name>links</name> + <function-class>net.sourceforge.openutils.mgnlcontextmenu.el.ContextMenuElFunctions</function-class> + <function-signature>java.lang.String links()</function-signature> + </function> + <function> + <description> + Initializes the contextmenu scripts + </description> + <name>scripts</name> + <function-class>net.sourceforge.openutils.mgnlcontextmenu.el.ContextMenuElFunctions</function-class> + <function-signature>java.lang.String scripts()</function-signature> + </function> </taglib> \ No newline at end of file Added: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu/config.server.rendering.freemarker.sharedVariables.contextmenu.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu/config.server.rendering.freemarker.sharedVariables.contextmenu.xml (rev 0) +++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu/config.server.rendering.freemarker.sharedVariables.contextmenu.xml 2013-09-15 18:26:35 UTC (rev 4311) @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="UTF-8"?> +<sv:node sv:name="contextmenu" 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>735a8570-4e91-433c-87c2-0a6e8ff219b5</sv:value> + </sv:property> + <sv:property sv:name="class" sv:type="String"> + <sv:value>net.sourceforge.openutils.mgnlcontextmenu.el.ContextMenuElFunctions</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>2011-06-19T22:47:12.877+02:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> + <sv:value>2013-09-15T17:41:15.936+02:00</sv:value> + </sv:property> + </sv:node> +</sv:node> Property changes on: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu/config.server.rendering.freemarker.sharedVariables.contextmenu.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 Added: 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 (rev 0) +++ 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) @@ -0,0 +1,263 @@ +<?xml version="1.0" encoding="UTF-8"?> +<sv:node sv:name="contextmenu-template-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>f1afbb56-2918-4d2c-ac4f-0e206207cc1e</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/contextmenu-template.ftl</sv:value> + </sv:property> + <sv:property sv:name="title" sv:type="String"> + <sv:value>Contextmenu sample (freemarker)</sv:value> + </sv:property> + <sv:property sv:name="visible" sv:type="String"> + <sv:value>true</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-23T16:56:46.344+02:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> + <sv:value>2013-09-15T17:38:27.160+02:00</sv:value> + </sv:property> + </sv:node> + <sv:node sv:name="areas"> + <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>ffdb82d7-78da-4fac-851c-94cbda5d0444</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:30:29.457+01:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> + <sv:value>2013-09-15T17:37:17.378+02:00</sv:value> + </sv:property> + </sv:node> + <sv:node sv:name="main"> + <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>70c7a216-e06c-4844-b06e-e6e5d3e0bce1</sv:value> + </sv:property> + <sv:property sv:name="jcr:createdBy" sv:type="String"> + <sv:value>admin</sv:value> + </sv:property> + <sv:property sv:name="type" sv:type="String"> + <sv:value>list</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:30:36.643+01:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> + <sv:value>2013-09-15T17:37:17.378+02:00</sv:value> + </sv:property> + </sv:node> + <sv:node sv:name="availableComponents"> + <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>bbeee7bb-a843-4c16-9e7c-aa6633acd12d</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:04.848+01:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> + <sv:value>2013-09-15T17:37:17.378+02:00</sv:value> + </sv:property> + </sv:node> + <sv:node sv:name="samples-contextmenu-form"> + <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>be896f41-a62f-4174-95bd-c76effd639d9</sv:value> + </sv:property> + <sv:property sv:name="id" sv:type="String"> + <sv:value>contextmenu:components/samples-contextmenu-form</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-15T17:37:17.379+02:00</sv:value> + </sv:property> + </sv:node> + </sv:node> + <sv:node sv:name="samples-contextmenu-message"> + <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>31119471-71f1-454c-a06e-7f5c530d4b4b</sv:value> + </sv:property> + <sv:property sv:name="id" sv:type="String"> + <sv:value>contextmenu:components/samples-contextmenu-message</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-15T17:37:17.379+02:00</sv:value> + </sv:property> + </sv:node> + </sv:node> + <sv:node sv:name="samples-contextmenu-textmedia"> + <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>cc0984d8-2144-40f3-84f0-3dab7afa0202</sv:value> + </sv:property> + <sv:property sv:name="id" sv:type="String"> + <sv:value>contextmenu:components/samples-contextmenu-textmedia</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-15T17:37:17.379+02:00</sv:value> + </sv:property> + </sv:node> + </sv:node> + </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.templates.pages.contextmenu-template-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 Added: 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 (rev 0) +++ 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) @@ -0,0 +1,263 @@ +<?xml version="1.0" encoding="UTF-8"?> +<sv:node sv:name="contextmenu-template-jsp" 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>b6628cbe-83ba-4175-aeb6-66074c79aa70</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>jsp</sv:value> + </sv:property> + <sv:property sv:name="templateScript" sv:type="String"> + <sv:value>/templates/samples-contextmenu/template.jsp</sv:value> + </sv:property> + <sv:property sv:name="title" sv:type="String"> + <sv:value>Contextmenu sample (jsp)</sv:value> + </sv:property> + <sv:property sv:name="visible" sv:type="String"> + <sv:value>true</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-23T16:56:46.344+02:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> + <sv:value>2013-09-15T17:38:00.886+02:00</sv:value> + </sv:property> + </sv:node> + <sv:node sv:name="areas"> + <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>af60d4a8-3fd3-483f-9722-b0c0b8731b17</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:30:29.457+01:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> + <sv:value>2013-09-15T17:37:08.411+02:00</sv:value> + </sv:property> + </sv:node> + <sv:node sv:name="main"> + <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>c149e129-d0b0-444c-9921-66bf38daf9a8</sv:value> + </sv:property> + <sv:property sv:name="jcr:createdBy" sv:type="String"> + <sv:value>admin</sv:value> + </sv:property> + <sv:property sv:name="type" sv:type="String"> + <sv:value>list</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:30:36.643+01:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> + <sv:value>2013-09-15T17:37:08.411+02:00</sv:value> + </sv:property> + </sv:node> + <sv:node sv:name="availableComponents"> + <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>cf2a6d5c-703b-481c-afe7-377e82fc22f4</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:04.848+01:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> + <sv:value>2013-09-15T17:37:08.411+02:00</sv:value> + </sv:property> + </sv:node> + <sv:node sv:name="samples-contextmenu-form"> + <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>2210fc23-d9cc-416e-8a84-d94e7064adc4</sv:value> + </sv:property> + <sv:property sv:name="id" sv:type="String"> + <sv:value>contextmenu:components/samples-contextmenu-form</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-15T17:37:08.412+02:00</sv:value> + </sv:property> + </sv:node> + </sv:node> + <sv:node sv:name="samples-contextmenu-message"> + <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>17f2736a-ba93-4dcc-8e86-2f8aec9f61a6</sv:value> + </sv:property> + <sv:property sv:name="id" sv:type="String"> + <sv:value>contextmenu:components/samples-contextmenu-message</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-15T17:37:08.412+02:00</sv:value> + </sv:property> + </sv:node> + </sv:node> + <sv:node sv:name="samples-contextmenu-textmedia"> + <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>b816a1a0-cdaf-4aba-ae4e-111ef99de914</sv:value> + </sv:property> + <sv:property sv:name="id" sv:type="String"> + <sv:value>contextmenu:components/samples-contextmenu-textmedia</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-15T17:37:08.412+02:00</sv:value> + </sv:property> + </sv:node> + </sv:node> + </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.templates.pages.contextmenu-template-jsp.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 Deleted: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.pages.sampleContextMenu.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.pages.sampleContextMenu.xml 2013-09-15 14:52:07 UTC (rev 4310) +++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.pages.sampleContextMenu.xml 2013-09-15 18:26:35 UTC (rev 4311) @@ -1,263 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<sv:node sv:name="sampleContextMenu" 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>0581824a-e17f-47ea-9035-3dcc8df430ce</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>jsp</sv:value> - </sv:property> - <sv:property sv:name="templateScript" sv:type="String"> - <sv:value>/templates/samples-contextmenu/template.jsp</sv:value> - </sv:property> - <sv:property sv:name="title" sv:type="String"> - <sv:value>Context menu sample template</sv:value> - </sv:property> - <sv:property sv:name="visible" sv:type="String"> - <sv:value>true</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-23T16:56:46.344+02:00</sv:value> - </sv:property> - <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> - <sv:value>2013-09-13T13:05:57.000+02:00</sv:value> - </sv:property> - </sv:node> - <sv:node sv:name="areas"> - <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>4abf9065-e505-4dad-aa38-4ba4cd20fc6c</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:30:29.457+01:00</sv:value> - </sv:property> - <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> - <sv:value>2013-09-13T13:06:07.585+02:00</sv:value> - </sv:property> - </sv:node> - <sv:node sv:name="main"> - <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>f2422716-9c0f-4ae2-af0c-e5aad9d76915</sv:value> - </sv:property> - <sv:property sv:name="jcr:createdBy" sv:type="String"> - <sv:value>admin</sv:value> - </sv:property> - <sv:property sv:name="type" sv:type="String"> - <sv:value>list</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:30:36.643+01:00</sv:value> - </sv:property> - <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> - <sv:value>2013-09-13T13:06:07.586+02:00</sv:value> - </sv:property> - </sv:node> - <sv:node sv:name="availableComponents"> - <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>84b27713-7935-40d7-8f7a-7cc00bca8306</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> - ... [truncated message content] |
From: <luc...@us...> - 2013-09-16 23:33:35
|
Revision: 4316 http://openutils.svn.sourceforge.net/openutils/?rev=4316&view=rev Author: lucaboati Date: 2013-09-16 23:33:31 +0000 (Mon, 16 Sep 2013) Log Message: ----------- complete js refactoring, "move fields" functionality added + examples Modified Paths: -------------- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/el/ContextMenuElFunctions.java magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/ElementInfo.java magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/ElementTag.java magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/MenuScripts.java 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.contextMenus.samples-form-label.xml magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.dialogs.samples-contextmenu-form.xml 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.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-textmedia.jsp magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/template-contextmenu.jsp magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/css/contextmenu-samples.css Added Paths: ----------- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/servlet/ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/servlet/SetPropertyServlet.java magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/SortItemTag.java magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/SortListTag.java magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu-nooverwrite/ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu-nooverwrite/config.server.filters.servlets.SetPropertyServlet.xml magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.dialogs.samples-contextmenu-move-fields.xml magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.components.samples-contextmenu-move-fields.xml magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/page-editmenu.jsp 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/images/ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/css/images/menu-description.png magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/css/images/menu-header.png magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/css/images/menu-help.png magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/css/images/menu-info.png magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/css/images/menu-label.png magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/css/images/menu-media.png magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/css/images/menu-move.gif magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/css/images/menu-text.png magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/css/images/menu-validation.gif magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/css/images/power_off.png magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/css/images/power_on.png magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/css/img/ico16-form-help.png 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-addMenu.js 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/jquery.contextMenu.js Removed Paths: ------------- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/css/img/ico16-form-hint.png Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/el/ContextMenuElFunctions.java =================================================================== --- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/el/ContextMenuElFunctions.java 2013-09-16 10:55:46 UTC (rev 4315) +++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/el/ContextMenuElFunctions.java 2013-09-16 23:33:31 UTC (rev 4316) @@ -21,16 +21,27 @@ import info.magnolia.cms.security.Permission; import info.magnolia.context.MgnlContext; +import info.magnolia.context.WebContext; import info.magnolia.jcr.util.NodeUtil; import info.magnolia.jcr.wrapper.HTMLEscapingNodeWrapper; import info.magnolia.objectfactory.Components; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; +import java.util.Stack; + import javax.jcr.Node; +import javax.servlet.http.HttpServletRequest; import net.sourceforge.openutils.mgnlcontextmenu.configuration.PersistenceStrategy; import net.sourceforge.openutils.mgnlcontextmenu.module.ContextMenuModule; +import net.sourceforge.openutils.mgnlcontextmenu.tags.ElementInfo; import net.sourceforge.openutils.mgnlcontextmenu.tags.MenuScripts; +import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang.math.NumberUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -46,7 +57,18 @@ */ private static Logger log = LoggerFactory.getLogger(ContextMenuElFunctions.class); + private static final String EDIT_MESSAGE_INFOS_KEY = "mgnlEditMessageInfos"; + /** + * A shortcut to get the current request. + * @return The request. + */ + private static HttpServletRequest getRequest() + { + return ((WebContext) MgnlContext.getInstance()).getRequest(); + } + + /** * Gets the entry value for the specified name, searching for it in the local and global entries corresponding to * the given node. Local entries take precedence on the global ones. * @param node @@ -81,15 +103,128 @@ out.append("<!-- start contextmenu:links -->\n"); out.append("<link rel=\"stylesheet\" type=\"text/css\" href=\"" + ctx - + "/.resources/contextmenu/css/contextmenu.css\" media=\"screen\" />\n"); + + "/.resources/contextmenu/css/jquery.contextMenu.css\" media=\"screen\" />\n"); +// out.append("<link rel=\"stylesheet\" type=\"text/css\" href=\"" +// + ctx +// + "/.resources/contextmenu/css/contextmenu.css\" media=\"screen\" />\n"); +// out.append("<script src=\"" + ctx + "/.resources/contextmenu/js/contextmenu-jquery.js\"></script>\n"); out.append("<script src=\"" + ctx + "/.resources/contextmenu/js/mgnladmin-custom.js\"></script>\n"); - out.append("<script src=\"" + ctx + "/.resources/contextmenu/js/contextmenu-jquery.js\"></script>\n"); + out.append("<script src=\"" + ctx + "/.resources/contextmenu/js/jquery.contextMenu.js\"></script>\n"); + out.append("<script src=\"" + ctx + "/.resources/contextmenu/js/contextmenu-addMenu.js\"></script>\n"); +// if(mgnlSortLists != null){ + out.append("<script src=\"" + ctx + "/.resources/contextmenu/js/contextmenu-sortList.js\"></script>\n"); +// } out.append("<!-- end contextmenu:links -->\n"); - - } return out.toString(); } + @SuppressWarnings({"rawtypes" }) + private static Stack getSortListStack() + { + HttpServletRequest request = getRequest(); + Stack stack = (Stack) request.getAttribute("SORT_LIST_STACK"); + if (stack == null) + { + stack = new Stack(); + request.setAttribute("SORT_LIST_STACK", stack); + } + return stack; + } + + @SuppressWarnings({"unchecked", "rawtypes" }) + public static void beginSortList() + { + getSortListStack().push(new ArrayList()); + } + + @SuppressWarnings({"unchecked", "rawtypes" }) + public static void addSortListItem(String html) + { + ((List) getSortListStack().peek()).add(html); + } + + @SuppressWarnings({"unchecked", "rawtypes" }) + public static List endSortList(String order) + { + String[] tokens = StringUtils.splitPreserveAllTokens(order, ','); + + List input = (List) getSortListStack().pop(); + List output = new ArrayList(input.size()); + + int i = 0; + Iterator iter = input.iterator(); + while (iter.hasNext()) + { + String html = (String) iter.next(); + int index = i < tokens.length ? NumberUtils.toInt(tokens[i], -1) : -1; + output.add(index >= 0 && index < input.size() ? input.get(index) : html); + i++; + } + return output; + } + + @SuppressWarnings({"unchecked", "rawtypes" }) + public static ElementInfo addEditMessageInfo(String key, String path, String elementId) + { + HttpServletRequest request = getRequest(); + List list = (List) request.getAttribute(EDIT_MESSAGE_INFOS_KEY); + if (list == null) + { + list = new ArrayList(); + request.setAttribute(EDIT_MESSAGE_INFOS_KEY, list); + } + ElementInfo item = new ElementInfo(key, path, elementId); + list.add(item); + + return item; + } + + @SuppressWarnings({"rawtypes" }) + public static List editMessageInfos() + { + List list = (List) getRequest().getAttribute(EDIT_MESSAGE_INFOS_KEY); + return list != null ? list : Collections.EMPTY_LIST; + } + + public static String editMessageInfosJs() + { + StringBuilder sb = new StringBuilder(); + for (Object item : editMessageInfos()) + { + if (sb.length() > 0) + { + sb.append(','); + } + ElementInfo info = (ElementInfo) item; + sb.append("'").append(info.getElementId()).append("'"); + sb.append(":{"); + if (!StringUtils.isEmpty(info.getParentTrigger())) + { + sb.append("'parentTrigger':'").append(info.getParentTrigger()).append("',"); + } + if (!StringUtils.isEmpty(info.getEntryName())) + { + sb.append("'entryName':'").append(info.getEntryName()).append("',"); + } + if (!StringUtils.isEmpty(info.getContextMenu())) + { + sb.append("'contextMenu':'").append(info.getContextMenu()).append("',"); + } + if (!StringUtils.isEmpty(info.getEnterMode())) + { + sb.append("'enterMode':'").append(info.getEnterMode()).append("',"); + } + if (!StringUtils.isEmpty(info.getShowCallback())) + { + sb.append("'showCallback':").append(info.getShowCallback()).append(','); + } + sb.append("'key':'").append(info.getKey()).append("',"); + sb.append("'path':'").append(info.getPath()).append("'"); + sb.append('}'); + } + return "{" + sb + "}"; + } + } Added: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/servlet/SetPropertyServlet.java =================================================================== --- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/servlet/SetPropertyServlet.java (rev 0) +++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/servlet/SetPropertyServlet.java 2013-09-16 23:33:31 UTC (rev 4316) @@ -0,0 +1,52 @@ +package net.sourceforge.openutils.mgnlcontextmenu.servlet; + +import info.magnolia.cms.security.Permission; +import info.magnolia.context.MgnlContext; +import info.magnolia.jcr.util.NodeUtil; +import info.magnolia.repository.RepositoryConstants; + +import java.io.IOException; + +import javax.jcr.Node; +import javax.jcr.RepositoryException; +import javax.servlet.ServletException; +import javax.servlet.http.HttpServlet; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + + +public class SetPropertyServlet extends HttpServlet +{ + + private Logger log = LoggerFactory.getLogger(SetPropertyServlet.class); + + @Override + protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException + { + doPost(req, resp); + } + + @Override + protected void doPost(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException + { + String path = req.getParameter("path"); + String name = req.getParameter("name"); + String value = req.getParameter("value"); + try + { + Node node = MgnlContext.getJCRSession(RepositoryConstants.WEBSITE).getNode(path); + if (NodeUtil.isGranted(node, Permission.SET)) + { + node.setProperty(name, value); + MgnlContext.getJCRSession(RepositoryConstants.WEBSITE).save(); + } + } + catch (RepositoryException e) + { + log.error(e.getMessage(), e); + } + } +} Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/ElementInfo.java =================================================================== --- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/ElementInfo.java 2013-09-16 10:55:46 UTC (rev 4315) +++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/ElementInfo.java 2013-09-16 23:33:31 UTC (rev 4316) @@ -25,28 +25,29 @@ * @author dschivo * @version $Id$ */ + public class ElementInfo { /** - * Paragraph's handle + * Message key */ - private final String path; + private final String key; /** - * HTML identifier of the element containing the content + * Entry name */ - private final String elementId; + private String entryName; /** - * Entry name + * Paragraph's handle */ - private String entryName; + private final String path; /** - * Context menu name + * HTML identifier of the element containing the message */ - private String contextMenu; + private final String elementId; /** * Wrapper HTML tag to which attach context menu @@ -54,6 +55,11 @@ private String parentTrigger; /** + * Context menu type + */ + private String contextMenu; + + /** * Enter mode for FCK editor */ private String enterMode; @@ -63,115 +69,73 @@ */ private String showCallback; - public ElementInfo(String path, String elementId) + public ElementInfo(String key, String path, String elementId) { + this.key = key; this.path = path; this.elementId = elementId; } - /** - * Returns the path. - * @return the path - */ + public String getKey() + { + return key; + } + public String getPath() { return path; } - /** - * Returns the elementId. - * @return the elementId - */ public String getElementId() { return elementId; } - /** - * Returns the entryName. - * @return the entryName - */ - public String getEntryName() + public String getParentTrigger() { - return entryName; + return parentTrigger; } - /** - * Sets the entryName. - * @param entryName the entryName to set - */ - public void setEntryName(String entryName) + public void setParentTrigger(String parentTrigger) { - this.entryName = entryName; + this.parentTrigger = parentTrigger; } - /** - * Returns the contextMenu. - * @return the contextMenu - */ public String getContextMenu() { return contextMenu; } - /** - * Sets the contextMenu. - * @param contextMenu the contextMenu to set - */ public void setContextMenu(String contextMenu) { this.contextMenu = contextMenu; } - /** - * Returns the parentTrigger. - * @return the parentTrigger - */ - public String getParentTrigger() + public String getEnterMode() { - return parentTrigger; + return enterMode; } - /** - * Sets the parentTrigger. - * @param parentTrigger the parentTrigger to set - */ - public void setParentTrigger(String parentTrigger) + public void setEnterMode(String enterMode) { - this.parentTrigger = parentTrigger; + this.enterMode = enterMode; } - /** - * Returns the enterMode. - * @return the enterMode - */ - public String getEnterMode() + public String getEntryName() { - return enterMode; + return entryName; } - /** - * Sets the enterMode. - * @param enterMode the enterMode to set - */ - public void setEnterMode(String enterMode) + public void setEntryName(String entryName) { - this.enterMode = enterMode; + this.entryName = entryName; } - /** - * Returns the showCallback. - * @return the showCallback - */ public String getShowCallback() { return showCallback; } - /** - * Sets the showCallback. - * @param showCallback the showCallback to set - */ public void setShowCallback(String showCallback) { this.showCallback = showCallback; Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/ElementTag.java =================================================================== --- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/ElementTag.java 2013-09-16 10:55:46 UTC (rev 4315) +++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/ElementTag.java 2013-09-16 23:33:31 UTC (rev 4316) @@ -19,17 +19,13 @@ package net.sourceforge.openutils.mgnlcontextmenu.tags; -import info.magnolia.cms.core.Content; import info.magnolia.cms.security.Permission; import info.magnolia.context.MgnlContext; import info.magnolia.jcr.util.NodeUtil; import java.io.IOException; -import java.util.ArrayList; -import java.util.List; import javax.jcr.Node; -import javax.servlet.http.HttpServletRequest; import javax.servlet.jsp.JspException; import javax.servlet.jsp.tagext.BodyTagSupport; @@ -170,34 +166,23 @@ throw new JspException(e); } - ElementInfo info = addElementInfo(NodeUtil.getPathIfPossible(node), elementId); + ElementInfo einfo = ContextMenuElFunctions.addEditMessageInfo( + name, + NodeUtil.getPathIfPossible(node), + elementId); if (!StringUtils.isEmpty(name)) { - info.setEntryName(name); + einfo.setEntryName(name); } if (!StringUtils.isEmpty(menu)) { - info.setContextMenu(menu); + einfo.setContextMenu(menu); } + } return EVAL_PAGE; } - @SuppressWarnings("unchecked") - protected ElementInfo addElementInfo(String path, String elementId) - { - HttpServletRequest request = MgnlContext.getWebContext().getRequest(); - List infos = (List) request.getAttribute(ELEMENT_INFOS_KEY); - if (infos == null) - { - infos = new ArrayList(); - request.setAttribute(ELEMENT_INFOS_KEY, infos); - } - ElementInfo info = new ElementInfo(path, elementId); - infos.add(info); - return info; - } - private boolean canEdit() { return NodeUtil.isGranted(MgnlContext.getAggregationState().getMainContent().getJCRNode(), Permission.SET); Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/MenuScripts.java =================================================================== --- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/MenuScripts.java 2013-09-16 10:55:46 UTC (rev 4315) +++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/MenuScripts.java 2013-09-16 23:33:31 UTC (rev 4316) @@ -23,16 +23,12 @@ import info.magnolia.context.MgnlContext; import info.magnolia.jcr.util.NodeUtil; -import java.io.IOException; import java.util.List; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.JspWriter; -import javax.servlet.jsp.tagext.TagSupport; - import net.sourceforge.openutils.mgnlcontextmenu.configuration.ContextMenu; import net.sourceforge.openutils.mgnlcontextmenu.configuration.ContextMenuItem; import net.sourceforge.openutils.mgnlcontextmenu.configuration.ContextMenuManager; +import net.sourceforge.openutils.mgnlcontextmenu.el.ContextMenuElFunctions; import org.apache.commons.lang.StringUtils; @@ -50,15 +46,22 @@ { StringBuilder out = new StringBuilder(); + // out.append("<script type=\"text/javascript\">\n"); + // out.append("var mgnlContextMenuInfo = {\n"); + // out.append(" contextPath: '" + MgnlContext.getContextPath() + "',\n"); + // out.append(" menus: " + menusJs() + ",\n"); + // out.append(" elements: " + elementsJs() + "\n"); + // out.append("};\n"); + // out.append("</script>\n"); + out.append("<!-- start contextmenu:scripts -->\n"); out.append("<script type=\"text/javascript\">\n"); - out.append("var mgnlContextMenuInfo = {\n"); - out.append(" contextPath: '" + MgnlContext.getContextPath() + "',\n"); - out.append(" menus: " + menusJs() + ",\n"); - out.append(" elements: " + elementsJs() + "\n"); - out.append("};\n"); + out.append("jQuery(document).ready(function() {\n"); + out.append(" jQuery.mgnlAddContextMenu(" + ContextMenuElFunctions.editMessageInfosJs() + ");\n"); + out.append("});\n"); out.append("</script>\n"); out.append("<!-- end contextmenu:scripts -->\n"); + return out.toString(); } return StringUtils.EMPTY; @@ -118,10 +121,7 @@ ElementInfo info = (ElementInfo) item; sb.append("'").append(info.getElementId()).append("'"); sb.append(":{"); - if (!StringUtils.isEmpty(info.getEntryName())) - { - sb.append("'entryName':'").append(info.getEntryName()).append("',"); - } + if (!StringUtils.isEmpty(info.getContextMenu())) { sb.append("'contextMenu':'").append(info.getContextMenu()).append("',"); Added: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/SortItemTag.java =================================================================== --- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/SortItemTag.java (rev 0) +++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/SortItemTag.java 2013-09-16 23:33:31 UTC (rev 4316) @@ -0,0 +1,38 @@ +/** + * + * ContextMenu Module for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcontextmenu.html) + * Copyright(C) 2010-2013, Openmind S.r.l. http://www.openmindonline.it + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +package net.sourceforge.openutils.mgnlcontextmenu.tags; + +import javax.servlet.jsp.JspException; +import javax.servlet.jsp.tagext.BodyTagSupport; + +import net.sourceforge.openutils.mgnlcontextmenu.el.ContextMenuElFunctions; + + +public class SortItemTag extends BodyTagSupport +{ + + @Override + public int doEndTag() throws JspException + { + ContextMenuElFunctions.addSortListItem(getBodyContent().getString()); + return EVAL_BODY_BUFFERED; + } + +} Added: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/SortListTag.java =================================================================== --- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/SortListTag.java (rev 0) +++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/SortListTag.java 2013-09-16 23:33:31 UTC (rev 4316) @@ -0,0 +1,130 @@ +/** + * + * ContextMenu Module for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcontextmenu.html) + * Copyright(C) 2010-2013, Openmind S.r.l. http://www.openmindonline.it + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + +package net.sourceforge.openutils.mgnlcontextmenu.tags; + +import info.magnolia.cms.security.Permission; +import info.magnolia.cms.util.NodeDataUtil; +import info.magnolia.context.MgnlContext; +import info.magnolia.jcr.util.NodeUtil; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.servlet.jsp.JspException; +import javax.servlet.jsp.JspWriter; +import javax.servlet.jsp.tagext.TagSupport; + +import net.sourceforge.openutils.mgnlcontextmenu.el.ContextMenuElFunctions; + +import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang.exception.NestableRuntimeException; + + +public class SortListTag extends TagSupport +{ + + private String containerId; + + private String orderProperty; + + public void setContainerId(String containerId) + { + this.containerId = containerId; + } + + public void setOrderProperty(String orderProperty) + { + this.orderProperty = orderProperty; + } + + @Override + public int doStartTag() throws JspException + { + ContextMenuElFunctions.beginSortList(); + return EVAL_BODY_INCLUDE; + } + + @Override + public int doEndTag() throws JspException + { + if (StringUtils.isEmpty(orderProperty)) + { + orderProperty = containerId; + } + String order = StringUtils.defaultString(NodeDataUtil.getString(MgnlContext + .getAggregationState() + .getCurrentContent(), orderProperty)); + + JspWriter out = pageContext.getOut(); + try + { + for (Object item : ContextMenuElFunctions.endSortList(order)) + { + out.print(item); + } + } + catch (IOException e) + { + throw new NestableRuntimeException(e); + } + boolean canEdit; + try + { + canEdit = NodeUtil.isGranted( + MgnlContext.getAggregationState().getMainContent().getJCRNode(), + Permission.SET); + + } + catch (Throwable e) + { + canEdit = false; + } + if (canEdit) + { + Map<String, String> item = new HashMap<String, String>(); + item.put("containerId", containerId); + item.put("url", MgnlContext.getContextPath() + "/mgnl-set-property"); + item.put("path", MgnlContext.getAggregationState().getCurrentContent().getHandle()); + item.put("name", orderProperty); + item.put("order", '[' + order + ']'); + List items = (List) pageContext.getRequest().getAttribute("mgnlSortLists"); + if (items == null) + { + items = new ArrayList(); + pageContext.getRequest().setAttribute("mgnlSortLists", items); + } + items.add(item); + } + containerId = null; + orderProperty = null; + return EVAL_PAGE; + } + + @Override + public void release() + { + super.release(); + containerId = null; + orderProperty = null; + } +} 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-16 10:55:46 UTC (rev 4315) +++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/META-INF/tld/mgnlcontextmenu.tld 2013-09-16 23:33:31 UTC (rev 4316) @@ -64,6 +64,32 @@ <type>boolean</type> </attribute> </tag> + <tag> + <description></description> + <display-name>sortList</display-name> + <name>sortList</name> + <tag-class>net.sourceforge.openutils.mgnlcontextmenu.tags.SortListTag</tag-class> + <body-content>JSP</body-content> + <attribute> + <description></description> + <name>containerId</name> + <required>true</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + <attribute> + <description></description> + <name>orderProperty</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> + </tag> + <tag> + <description></description> + <display-name>sortItem</display-name> + <name>sortItem</name> + <tag-class>net.sourceforge.openutils.mgnlcontextmenu.tags.SortItemTag</tag-class> + <body-content>JSP</body-content> + </tag> <function> <description> <![CDATA[Gets the entry value for the specified key, searching for it in the local and global contents @@ -89,4 +115,35 @@ <function-class>net.sourceforge.openutils.mgnlcontextmenu.el.ContextMenuElFunctions</function-class> <function-signature>java.lang.String scripts()</function-signature> </function> + <function> + <name>beginSortList</name> + <function-class>net.sourceforge.openutils.mgnlcontextmenu.el.ContextMenuElFunctions</function-class> + <function-signature>void beginSortList()</function-signature> + </function> + <function> + <name>addSortListItem</name> + <function-class>net.sourceforge.openutils.mgnlcontextmenu.el.ContextMenuElFunctions</function-class> + <function-signature>void addSortListItem(java.lang.String)</function-signature> + </function> + <function> + <name>endSortList</name> + <function-class>net.sourceforge.openutils.mgnlcontextmenu.el.ContextMenuElFunctions</function-class> + <function-signature>java.util.List endSortList(java.lang.String)</function-signature> + </function> + <function> + <name>addEditMessageInfo</name> + <function-class>net.sourceforge.openutils.mgnlcontextmenu.el.ContextMenuElFunctions</function-class> + <function-signature>net.sourceforge.openutils.mgnlcontextmenu.el.ElementInfo + addEditMessageInfo(java.lang.String, java.lang.String, java.lang.String)</function-signature> + </function> + <function> + <name>editMessageInfos</name> + <function-class>net.sourceforge.openutils.mgnlcontextmenu.el.ContextMenuElFunctions</function-class> + <function-signature>java.util.List editMessageInfos()</function-signature> + </function> + <function> + <name>editMessageInfosJs</name> + <function-class>net.sourceforge.openutils.mgnlcontextmenu.el.ContextMenuElFunctions</function-class> + <function-signature>java.lang.String editMessageInfosJs()</function-signature> + </function> </taglib> \ No newline at end of file Added: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu-nooverwrite/config.server.filters.servlets.SetPropertyServlet.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu-nooverwrite/config.server.filters.servlets.SetPropertyServlet.xml (rev 0) +++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu-nooverwrite/config.server.filters.servlets.SetPropertyServlet.xml 2013-09-16 23:33:31 UTC (rev 4316) @@ -0,0 +1,143 @@ +<?xml version="1.0" encoding="UTF-8"?> +<sv:node sv:name="SetPropertyServlet" 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>87516f73-b4d9-40e4-93fc-9012f4381c4b</sv:value> + </sv:property> + <sv:property sv:name="class" sv:type="String"> + <sv:value>info.magnolia.cms.filters.ServletDispatchingFilter</sv:value> + </sv:property> + <sv:property sv:name="enabled" sv:type="Boolean"> + <sv:value>true</sv:value> + </sv:property> + <sv:property sv:name="jcr:createdBy" sv:type="String"> + <sv:value>admin</sv:value> + </sv:property> + <sv:property sv:name="servletClass" sv:type="String"> + <sv:value>net.sourceforge.openutils.mgnlcontextmenu.servlet.SetPropertyServlet</sv:value> + </sv:property> + <sv:property sv:name="servletName" sv:type="String"> + <sv:value>SetPropertyServlet</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-11-06T12:35:47.671+01:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> + <sv:value>2009-12-16T17:14:54.990+01:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:title" sv:type="String"> + <sv:value/> + </sv:property> + </sv:node> + <sv:node sv:name="mappings"> + <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>9428a424-1007-403e-b299-a6d1b66d306c</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>2008-11-06T12:35:47.671+01:00</sv:value> + </sv:property> + </sv:node> + <sv:node sv:name="-mgnl-set-property"> + <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>058dc477-a183-4817-8e93-0fbb8332377c</sv:value> + </sv:property> + <sv:property sv:name="jcr:createdBy" sv:type="String"> + <sv:value>admin</sv:value> + </sv:property> + <sv:property sv:name="pattern" sv:type="String"> + <sv:value>/mgnl-set-property</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:authorid" sv:type="String"> + <sv:value>superuser</sv:value> + </sv:property> + <sv:property sv:name="mgnl:creationdate" sv:type="Date"> + <sv:value>2008-11-06T12:35:47.671+01:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> + <sv:value>2009-12-16T17:13:46.193+01:00</sv:value> + </sv:property> + </sv:node> + </sv:node> + </sv:node> + <sv:node sv:name="parameters"> + <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>11433323-def8-4bab-a5b9-28c18b2fc9d9</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>2013-09-16T22:51:36.579+02:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> + <sv:value>2013-09-16T22:56:08.123+02:00</sv:value> + </sv:property> + </sv:node> + </sv:node> +</sv:node> Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.contextMenus.samples-form-label.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.contextMenus.samples-form-label.xml 2013-09-16 10:55:46 UTC (rev 4315) +++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.contextMenus.samples-form-label.xml 2013-09-16 23:33:31 UTC (rev 4316) @@ -117,7 +117,7 @@ </sv:property> </sv:node> </sv:node> - <sv:node sv:name="hint"> + <sv:node sv:name="help"> <sv:property sv:name="jcr:primaryType" sv:type="Name"> <sv:value>mgnl:contentNode</sv:value> </sv:property> @@ -134,13 +134,13 @@ <sv:value>true</sv:value> </sv:property> <sv:property sv:name="icon" sv:type="String"> - <sv:value>/docroot/samples-contextmenu/ico16-form-hint.png</sv:value> + <sv:value>/docroot/samples-contextmenu/ico16-form-help.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 hint</sv:value> + <sv:value>Edit help</sv:value> </sv:property> <sv:node sv:name="MetaData"> <sv:property sv:name="jcr:primaryType" sv:type="Name"> Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.dialogs.samples-contextmenu-form.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.dialogs.samples-contextmenu-form.xml 2013-09-16 10:55:46 UTC (rev 4315) +++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.dialogs.samples-contextmenu-form.xml 2013-09-16 23:33:31 UTC (rev 4316) @@ -155,7 +155,7 @@ <sv:value>String</sv:value> </sv:property> <sv:property sv:name="value" sv:type="String"> - <sv:value>Field labels and hints are editable via context menu: just right click on the label of a form field.</sv:value> + <sv:value>Field labels and helps are editable via context menu: just right click on the label of a form field.</sv:value> </sv:property> <sv:node sv:name="MetaData"> <sv:property sv:name="jcr:primaryType" sv:type="Name"> Added: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.dialogs.samples-contextmenu-move-fields.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.dialogs.samples-contextmenu-move-fields.xml (rev 0) +++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.dialogs.samples-contextmenu-move-fields.xml 2013-09-16 23:33:31 UTC (rev 4316) @@ -0,0 +1,191 @@ +<?xml version="1.0" encoding="UTF-8"?> +<sv:node sv:name="samples-contextmenu-move-fields" 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:uuid" sv:type="String"> + <sv:value>0dbd4630-67ef-45ed-9f90-a1c4868b7cfd</sv:value> + </sv:property> + <sv:property sv:name="i18nBasename" sv:type="String"> + <sv:value>net.sourceforge.openutils.mgnltestwebapp.lang.messages</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:Data" sv:type="String"> + <sv:value>MetaData</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:activatorid" sv:type="String"> + <sv:value>superuser</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="String"> + <sv:value>2004-11-02T15:34:43.213+01:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastaction" sv:type="Date"> + <sv:value>2008-04-28T23:43:10.557+02:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> + <sv:value>2013-09-16T23:48:42.477+02:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:title" sv:type="String"> + <sv:value/> + </sv:property> + </sv:node> + <sv:node sv:name="tabForm"> + <sv:property sv:name="jcr:primaryType" sv:type="Name"> + <sv:value>mgnl:contentNode</sv:value> + </sv:property> + <sv:property sv:name="jcr:uuid" sv:type="String"> + <sv:value>6d09ffbd-d685-4824-b3dc-83606843a038</sv:value> + </sv:property> + <sv:property sv:name="controlType" sv:type="String"> + <sv:value>tab</sv:value> + </sv:property> + <sv:property sv:name="jcr:createdBy" sv:type="String"> + <sv:value>admin</sv:value> + </sv:property> + <sv:property sv:name="label" sv:type="String"> + <sv:value>Form</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:Data" sv:type="String"> + <sv:value>MetaData</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:activatorid" sv:type="String"> + <sv:value>superuser</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="String"> + <sv:value>2004-11-02T15:34:29.217+01:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastaction" sv:type="Date"> + <sv:value>2008-06-19T14:49:08.436+02:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> + <sv:value>2013-09-16T23:48:34.242+02:00</sv:value> + </sv:property> + </sv:node> + <sv:node sv:name="dummy"> + <sv:property sv:name="jcr:primaryType" sv:type="Name"> + <sv:value>mgnl:contentNode</sv:value> + </sv:property> + <sv:property sv:name="jcr:uuid" sv:type="String"> + <sv:value>e385ff62-22d7-4645-ab1c-2e56496767a2</sv:value> + </sv:property> + <sv:property sv:name="controlType" sv:type="String"> + <sv:value>hidden</sv:value> + </sv:property> + <sv:property sv:name="defaultValue" sv:type="String"> + <sv:value>.</sv:value> + </sv:property> + <sv:property sv:name="jcr:createdBy" sv:type="String"> + <sv:value>admin</sv:value> + </sv:property> + <sv:property sv:name="type" sv:type="String"> + <sv:value>String</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:Data" sv:type="String"> + <sv:value>MetaData</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:activatorid" sv:type="String"> + <sv:value>superuser</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="String"> + <sv:value>2004-11-02T15:34:29.357+01:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastaction" sv:type="Date"> + <sv:value>2008-07-07T14:56:33.437+02:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> + <sv:value>2013-09-16T23:48:34.242+02:00</sv:value> + </sv:property> + </sv:node> + </sv:node> + <sv:node sv:name="description"> + <sv:property sv:name="jcr:primaryType" sv:type="Name"> + <sv:value>mgnl:contentNode</sv:value> + </sv:property> + <sv:property sv:name="jcr:uuid" sv:type="String"> + <sv:value>b4551617-bc5f-4f74-bfe5-0f088b00a3ac</sv:value> + </sv:property> + <sv:property sv:name="controlType" sv:type="String"> + <sv:value>static</sv:value> + </sv:property> + <sv:property sv:name="jcr:createdBy" sv:type="String"> + <sv:value>admin</sv:value> + </sv:property> + <sv:property sv:name="type" sv:type="String"> + <sv:value>String</sv:value> + </sv:property> + <sv:property sv:name="value" sv:type="String"> + <sv:value>Field position via context menu: just right click on the label of a form 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:Data" sv:type="String"> + <sv:value>MetaData</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:activatorid" sv:type="String"> + <sv:value>superuser</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="String"> + <sv:value>2004-11-02T15:34:29.357+01:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastaction" sv:type="Date"> + <sv:value>2008-07-07T14:56:33.437+02:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> + <sv:value>2013-09-16T23:49:11.424+02:00</sv:value> + </sv:property> + </sv:node> + </sv:node> + </sv:node> +</sv:node> 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-16 10:55:46 UTC (rev 4315) +++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.components.samples-contextmenu-form.xml 2013-09-16 23:33:31 UTC (rev 4316) @@ -10,7 +10,7 @@ <sv:value>9c276214-2a48-4113-aa4f-653ac07854cb</sv:value> </sv:property> <sv:property sv:name="description" sv:type="String"> - <sv:value>Sample paragraph showing a form where field labels and hints can be edited via context menu on labels.</sv:value> + <sv:value>Sample paragraph showing a form where field labels and helps can be edited via context menu on labels.</sv:value> </sv:property> <sv:property sv:name="dialog" sv:type="String"> <sv:value>contextmenu:samples-contextmenu-form</sv:value> Added: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.components.samples-contextmenu-move-fields.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.components.samples-contextmenu-move-fields.xml (rev 0) +++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.components.samples-contextmenu-move-fields.xml 2013-09-16 23:33:31 UTC (rev 4316) @@ -0,0 +1,50 @@ +<?xml version="1.0" encoding="UTF-8"?> +<sv:node sv:name="samples-contextmenu-move-fields" 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>3e2e98d0-9f7b-4a40-87d5-9ce58bfbffef</sv:value> + </sv:property> + <sv:property sv:name="description" sv:type="String"> + <sv:value>Sample paragraph showing fields moved via context menu.</sv:value> + </sv:property> + <sv:property sv:name="dialog" sv:type="String"> + <sv:value>contextmenu:samples-contextmenu-move-fields</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>jsp</sv:value> + </sv:property> + <sv:property sv:name="templateScript" sv:type="String"> + <sv:value>/templates/samples-contextmenu/paragraph-move-fields.jsp</sv:value> + </sv:property> + <sv:property sv:name="title" sv:type="String"> + <sv:value>Move fields sample (jsp)</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-16T23:44:14.391+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-16 10:55:46 UTC (rev 4315) +++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.pages.contextmenu-template-freemarker.xml 2013-09-16 23:33:31 UTC (rev 4316) @@ -257,6 +257,43 @@ </sv:property> </sv:node> </sv:node> + <sv:node sv:name="samples-contextmenu-move-fields"> + <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>b27daf20-3a65-4822-a317-8dc6f9a92c76</sv:value> + </sv:property> + <sv:property sv:name="id" sv:type="String"> + <sv:value>contextmenu:components/samples-contextmenu-move-fields</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-16T23:46:11.009+02:00</sv:value> + </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> Modified: magnoliamodules/trunk/openutils-... [truncated message content] |
From: <luc...@us...> - 2013-09-17 12:24:10
|
Revision: 4317 http://openutils.svn.sourceforge.net/openutils/?rev=4317&view=rev Author: lucaboati Date: 2013-09-17 12:24:07 +0000 (Tue, 17 Sep 2013) Log Message: ----------- menu configured via mgnl config, no more jsp included Modified Paths: -------------- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/MenuScripts.java magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/template-contextmenu.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-jquery.js Added Paths: ----------- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.contextMenus.formField.xml magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.contextMenus.simpleForm.xml Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/MenuScripts.java =================================================================== --- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/MenuScripts.java 2013-09-16 23:33:31 UTC (rev 4316) +++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/MenuScripts.java 2013-09-17 12:24:07 UTC (rev 4317) @@ -46,18 +46,20 @@ { StringBuilder out = new StringBuilder(); - // out.append("<script type=\"text/javascript\">\n"); - // out.append("var mgnlContextMenuInfo = {\n"); - // out.append(" contextPath: '" + MgnlContext.getContextPath() + "',\n"); - // out.append(" menus: " + menusJs() + ",\n"); - // out.append(" elements: " + elementsJs() + "\n"); - // out.append("};\n"); - // out.append("</script>\n"); + out.append("<script type=\"text/javascript\">\n"); + out.append("var mgnlContextMenuInfo = {\n"); + out.append(" contextPath: '" + MgnlContext.getContextPath() + "',\n"); + out.append(" menus: " + menusJs() + ",\n"); + out.append(" elements: " + elementsJs() + "\n"); + out.append("};\n"); + out.append("</script>\n"); out.append("<!-- start contextmenu:scripts -->\n"); out.append("<script type=\"text/javascript\">\n"); out.append("jQuery(document).ready(function() {\n"); - out.append(" jQuery.mgnlAddContextMenu(" + ContextMenuElFunctions.editMessageInfosJs() + ");\n"); + out.append(" jQuery.mgnlAddContextMenu(" + + ContextMenuElFunctions.editMessageInfosJs() + + ", mgnlContextMenuInfo );\n"); out.append("});\n"); out.append("</script>\n"); out.append("<!-- end contextmenu:scripts -->\n"); Added: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.contextMenus.formField.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.contextMenus.formField.xml (rev 0) +++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.contextMenus.formField.xml 2013-09-17 12:24:07 UTC (rev 4317) @@ -0,0 +1,247 @@ +<?xml version="1.0" encoding="UTF-8"?> +<sv:node sv:name="formField" 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>7ed5d7a8-fa8b-4eff-a555-59269837173c</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-09-17T13:22:34.156+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>8283321a-967a-411c-884d-1e74d96adf0d</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-09-17T13:22:22.646+02:00</sv:value> + </sv:property> + </sv:node> + <sv:node sv:name="label"> + <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>2305a310-8910-48f7-a062-4371667797ca</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-09-17T14:14:38.290+02:00</sv:value> + </sv:property> + </sv:node> + </sv:node> + <sv:node sv:name="description"> + <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>69b042c5-5a51-4843-a3e3-9ea4a21e2a12</sv:value> + </sv:property> + <sv:property sv:name="controlType" sv:type="String"> + <sv:value>fckEdit</sv:value> + </sv:property> + <sv:property sv:name="icon" sv:type="String"> + <sv:value>/.resources/contextmenu/css/images/menu-description.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 description</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-09-17T14:14:20.015+02:00</sv:value> + </sv:property> + </sv:node> + </sv:node> + <sv:node sv:name="help"> + <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>da3a489f-06d9-4393-86b2-9452b4bde691</sv:value> + </sv:property> + <sv:property sv:name="controlType" sv:type="String"> + <sv:value>fckEdit</sv:value> + </sv:property> + <sv:property sv:name="icon" sv:type="String"> + <sv:value>/.resources/contextmenu/css/images/menu-help.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 help</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-09-17T14:14:09.968+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>ddfc1626-d328-47e5-a501-e3cccb854081</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-09-17T14:19:59.928+02:00</sv:value> + </sv:property> + </sv:node> + </sv:node> + </sv:node> +</sv:node> Added: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.contextMenus.simpleForm.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.contextMenus.simpleForm.xml (rev 0) +++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.contextMenus.simpleForm.xml 2013-09-17 12:24:07 UTC (rev 4317) @@ -0,0 +1,204 @@ +<?xml version="1.0" encoding="UTF-8"?> +<sv:node sv:name="simpleForm" 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>dd4ec6aa-a45b-4d15-a3c6-d24a8689c546</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-09-17T14:16:23.695+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>49937044-09e6-4902-83a8-1555b8d997df</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-09-17T14:16:19.712+02:00</sv:value> + </sv:property> + </sv:node> + <sv:node sv:name="label"> + <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>e16bbb4a-c477-4e15-baea-9e1892535e7d</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-09-17T14:16:19.712+02:00</sv:value> + </sv:property> + </sv:node> + </sv:node> + <sv:node sv:name="description"> + <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>60e05670-07b2-4ac0-81cf-f11da06b394b</sv:value> + </sv:property> + <sv:property sv:name="controlType" sv:type="String"> + <sv:value>fckEdit</sv:value> + </sv:property> + <sv:property sv:name="icon" sv:type="String"> + <sv:value>/.resources/contextmenu/css/images/menu-description.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 description</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-09-17T14:16:19.712+02:00</sv:value> + </sv:property> + </sv:node> + </sv:node> + <sv:node sv:name="help"> + <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>def69d0e-9d57-40f2-b5ec-d6b741bf29d2</sv:value> + </sv:property> + <sv:property sv:name="controlType" sv:type="String"> + <sv:value>fckEdit</sv:value> + </sv:property> + <sv:property sv:name="icon" sv:type="String"> + <sv:value>/.resources/contextmenu/css/images/menu-help.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 help</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-09-17T14:16:19.712+02:00</sv:value> + </sv:property> + </sv:node> + </sv:node> + </sv:node> +</sv:node> Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/template-contextmenu.jsp =================================================================== --- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/template-contextmenu.jsp 2013-09-16 23:33:31 UTC (rev 4316) +++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/template-contextmenu.jsp 2013-09-17 12:24:07 UTC (rev 4317) @@ -48,15 +48,8 @@ </section> <cms:area name="main" /> </div> - <!-- TO BE CUSTOMIZE --> - <jsp:include page="/templates/samples-contextmenu/page-editmenu.jsp" /> + <!-- <jsp:include page="/templates/samples-contextmenu/page-editmenu.jsp" /> --> ${contextmenu:scripts()} -<!-- <script type="text/javascript"> --> -<!-- <![CDATA[ --> -<!-- jQuery(document).ready(function() { --> -<!-- jQuery.mgnlAddContextMenu(${contextmenu:editMessageInfosJs()}); --> -<!-- });]]> --> -<!-- </script> --> <c:if test="${!empty mgnlSortLists}"> <script type="text/javascript"> <![CDATA[ jQuery(document).ready( function() {]]> 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-16 23:33:31 UTC (rev 4316) +++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/js/contextmenu-addMenu.js 2013-09-17 12:24:07 UTC (rev 4317) @@ -1,12 +1,33 @@ jQuery.extend({ - mgnlAddContextMenu: function( mgnlEditMessages ) { + mgnlAddContextMenu: function( mgnlEditMessages, mgnlContextMenuInfo ) { + + jQuery.each(mgnlContextMenuInfo.menus, function(){ + var ul = document.createElement('ul'); + document.body.appendChild(ul); + jQuery(ul).attr('id', 'contextmenu-' + this.name).attr('class', 'contextMenu'); + jQuery.each(this.items, function(){ + var li = document.createElement('li'); + ul.appendChild(li); + li.innerHTML = '<a href="#' + this.name + '" style=\"background-image: url(' + mgnlContextMenuInfo.contextPath + this.icon + ')\">' + this.text + '</a>'; + }); + if (this.mouseoverIcon){ + var img = document.createElement('img'); + jQuery(img) + .attr('id', 'contextmenufollow-' + this.name) + .attr('src', mgnlContextMenuInfo.contextPath + this.mouseoverIcon) + .css({ position: 'absolute', display: 'none' }); + document.body.appendChild(img); + } + }); + jQuery.each(mgnlEditMessages, function(id, info){ var initTrigger = function(trigger){ $(trigger).contextMenu({ - menu: (info.contextMenu || 'default') + '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,{ @@ -63,5 +84,7 @@ initTrigger(info.parentTrigger ? el.parents(info.parentTrigger + ':first') : el); el.data("initTrigger", initTrigger); }); + + } }); Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/js/contextmenu-jquery.js =================================================================== --- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/js/contextmenu-jquery.js 2013-09-16 23:33:31 UTC (rev 4316) +++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/js/contextmenu-jquery.js 2013-09-17 12:24:07 UTC (rev 4317) @@ -45,6 +45,7 @@ globalEnabled: menuItem.globalEnabled }); }); + if (menu.mouseoverClass || menu.mouseoverIcon){ var followId = 'contextmenufollow-' + menuName; var follow = jQuery('#' + followId); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fg...@us...> - 2013-09-18 11:01:54
|
Revision: 4319 http://openutils.svn.sourceforge.net/openutils/?rev=4319&view=rev Author: fgiust Date: 2013-09-18 11:01:51 +0000 (Wed, 18 Sep 2013) Log Message: ----------- styles Modified Paths: -------------- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/el/ContextMenuElFunctions.java magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/website.sample-contextmenu.xml magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/css/jquery.contextMenu.css Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/el/ContextMenuElFunctions.java =================================================================== --- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/el/ContextMenuElFunctions.java 2013-09-18 08:48:42 UTC (rev 4318) +++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/el/ContextMenuElFunctions.java 2013-09-18 11:01:51 UTC (rev 4319) @@ -23,6 +23,7 @@ import info.magnolia.context.MgnlContext; import info.magnolia.context.WebContext; import info.magnolia.jcr.util.NodeUtil; +import info.magnolia.jcr.util.PropertyUtil; import info.magnolia.jcr.wrapper.HTMLEscapingNodeWrapper; import info.magnolia.objectfactory.Components; @@ -79,9 +80,11 @@ { ContextMenuModule module = Components.getComponent(ContextMenuModule.class); PersistenceStrategy strategy = module.getPersistenceStrategy(); - // LB crazy command! mgnl argsss Node nodeUnwrapped = NodeUtil.deepUnwrap(node, HTMLEscapingNodeWrapper.class); - return strategy != null ? strategy.readEntry(nodeUnwrapped, name) : null; + + String result = strategy != null ? strategy.readEntry(nodeUnwrapped, name) : null; + + return result; } public static String scripts() @@ -104,16 +107,16 @@ out.append("<link rel=\"stylesheet\" type=\"text/css\" href=\"" + ctx + "/.resources/contextmenu/css/jquery.contextMenu.css\" media=\"screen\" />\n"); -// out.append("<link rel=\"stylesheet\" type=\"text/css\" href=\"" -// + ctx -// + "/.resources/contextmenu/css/contextmenu.css\" media=\"screen\" />\n"); -// out.append("<script src=\"" + ctx + "/.resources/contextmenu/js/contextmenu-jquery.js\"></script>\n"); + // out.append("<link rel=\"stylesheet\" type=\"text/css\" href=\"" + // + ctx + // + "/.resources/contextmenu/css/contextmenu.css\" media=\"screen\" />\n"); + // out.append("<script src=\"" + ctx + "/.resources/contextmenu/js/contextmenu-jquery.js\"></script>\n"); out.append("<script src=\"" + ctx + "/.resources/contextmenu/js/mgnladmin-custom.js\"></script>\n"); out.append("<script src=\"" + ctx + "/.resources/contextmenu/js/jquery.contextMenu.js\"></script>\n"); out.append("<script src=\"" + ctx + "/.resources/contextmenu/js/contextmenu-addMenu.js\"></script>\n"); -// if(mgnlSortLists != null){ + // if(mgnlSortLists != null){ out.append("<script src=\"" + ctx + "/.resources/contextmenu/js/contextmenu-sortList.js\"></script>\n"); -// } + // } out.append("<!-- end contextmenu:links -->\n"); } 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-18 08:48:42 UTC (rev 4318) +++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/website.sample-contextmenu.xml 2013-09-18 11:01:51 UTC (rev 4319) @@ -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-17T00:12:45.280+02:00</sv:value> + <sv:value>2013-09-18T12:52:41.534+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-17T00:12:45.280+02:00</sv:value> + <sv:value>2013-09-18T12:52:41.534+02:00</sv:value> </sv:property> </sv:node> <sv:node sv:name="0"> @@ -270,7 +270,7 @@ <sv:value>admin</sv:value> </sv:property> <sv:property sv:name="message" sv:type="String"> - <sv:value>Right click here to edit a</sv:value> + <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"> @@ -286,7 +286,7 @@ <sv:value>2013-09-15T20:41:06.907+02:00</sv:value> </sv:property> <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> - <sv:value>2013-09-17T00:09:46.142+02:00</sv:value> + <sv:value>2013-09-18T12:38:34.813+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> @@ -366,14 +366,14 @@ <sv:value>f9c61bcf-32de-45c2-8ceb-1435e1411060</sv:value> </sv:property> <sv:property sv:name="firstname" sv:type="String"> - <sv:value>label</sv:value> + <sv:value>First Name:</sv:value> </sv:property> + <sv:property sv:name="firstname.help" sv:type="String"> + <sv:value><p>help!</p></sv:value> + </sv:property> <sv:property sv:name="jcr:createdBy" sv:type="String"> <sv:value>admin</sv:value> </sv:property> - <sv:property sv:name="lastname.help" sv:type="String"> - <sv:value><p>luca</p></sv:value> - </sv:property> <sv:node sv:name="MetaData"> <sv:property sv:name="jcr:primaryType" sv:type="Name"> <sv:value>mgnl:metaData</sv:value> @@ -388,7 +388,7 @@ <sv:value>2013-09-13T18:56:07.081+02:00</sv:value> </sv:property> <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> - <sv:value>2013-09-13T19:00:55.111+02:00</sv:value> + <sv:value>2013-09-18T12:52:41.533+02:00</sv:value> </sv:property> <sv:property sv:name="mgnl:template" sv:type="String"> <sv:value>contextmenu:components/samples-contextmenu-form</sv:value> @@ -412,14 +412,14 @@ <sv:value>1,0</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: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> 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-09-18 08:48:42 UTC (rev 4318) +++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-resources/contextmenu/css/jquery.contextMenu.css 2013-09-18 11:01:51 UTC (rev 4319) @@ -1,79 +1,126 @@ /* Generic context menu styles */ .contextMenu { - position: absolute; - width: 150px; - z-index: 99999; - border: solid 1px #CCC; - background: #EEE; - padding: 0px; - margin: 0px; - display: none; + position: absolute; + width: 150px; + z-index: 99999; + border: solid 1px #CCC; + background: #EEE; + padding: 0px; + margin: 0px; + display: none; } -.contextMenu LI { - list-style: none; - padding: 0px; - margin: 0px; +.contextMenu li { + list-style: none; + padding: 0px; + margin: 0px; } -.contextMenu A { - color: #333; - text-decoration: none; - display: block; - line-height: 20px; - height: 20px; - background-position: 6px center; - background-repeat: no-repeat; - outline: none; - padding: 1px 5px; - padding-left: 28px; +.contextMenu a { + color: #333; + text-decoration: none; + display: block; + line-height: 20px; + height: 20px; + background-position: 6px center; + background-repeat: no-repeat; + outline: none; + padding: 1px 5px; + padding-left: 28px; + font-family: arial, helvetica, sans-serif; + font-size: 12px; } -.contextMenu LI.hover A { - color: #FFF; - background-color: #3399FF; +.contextMenu LI.hover a { + color: #FFF; + background-color: #3399FF; } -.contextMenu LI.disabled A { - color: #AAA; - cursor: default; +.contextMenu LI.disabled a { + color: #AAA; + cursor: default; } -.contextMenu LI.hover.disabled A { - background-color: transparent; +.contextMenu LI.hover.disabled a { + background-color: transparent; } .contextMenu LI.separator { - border-top: solid 1px #CCC; + border-top: solid 1px #CCC; } -.contextMenu LI.menuText A { background-image: url(images/menu-text.png); } -.contextMenu LI.menuHelp A { background-image: url(images/menu-help.png); } -.contextMenu LI.menuMove A { background-image: url(images/menu-move.gif); } +.contextMenu li.menuText a { + background-image: url(images/menu-text.png); +} -.contextMenu LI.menuLabel A { background-image: url(images/menu-label.png); } -.contextMenu LI.menuDescription A { background-image: url(images/menu-description.png); } -.contextMenu LI.menuMedia A { background-image: url(images/menu-media.png); } -.contextMenu LI.menuInfo A { background-image: url(images/menu-info.png); } -.contextMenu LI.menuValidation A { background-image: url(images/menu-validation.gif); } -.contextMenu LI.menuHeader A { background-image: url(images/menu-header.png); } -.contextMenu LI.menuScTrackAction A { background-image: url(images/power_off.png); } -.contextMenu LI.menuScTrackAction A.scTrackOn { background-image: url(images/power_on.png); } +.contextMenu li.menuHelp a { + background-image: url(images/menu-help.png); +} +.contextMenu li.menuMove a { + background-image: url(images/menu-move.gif); +} +.contextMenu li.menuLabel a { + background-image: url(images/menu-label.png); +} + +.contextMenu li.menuDescription a { + background-image: url(images/menu-description.png); +} + +.contextMenu li.menuMedia a { + background-image: url(images/menu-media.png); +} + +.contextMenu li.menuInfo a { + background-image: url(images/menu-info.png); +} + +.contextMenu li.menuValidation a { + background-image: url(images/menu-validation.gif); +} + +.contextMenu li.menuHeader a { + background-image: url(images/menu-header.png); +} + +.contextMenu li.menuScTrackAction a { + background-image: url(images/power_off.png); +} + +.contextMenu li.menuScTrackAction a.scTrackOn { + background-image: url(images/power_on.png); +} + .sort-list .drop { display: none; margin: 0; padding: 0; } -.move .drop { +.move .dropXX { display: block; height: 8px; border: 1px solid #666; background-color: #CCC; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; cursor: pointer; +} + +.move .drop { + margin: 2px 0; + height: 12px; + display: block; + 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; } \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fg...@us...> - 2013-09-20 13:39:27
|
Revision: 4332 http://openutils.svn.sourceforge.net/openutils/?rev=4332&view=rev Author: fgiust Date: 2013-09-20 13:39:11 +0000 (Fri, 20 Sep 2013) Log Message: ----------- fix jsp samples Modified Paths: -------------- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/el/ContextMenuElFunctions.java 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-move-fields.jsp Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/el/ContextMenuElFunctions.java =================================================================== --- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/el/ContextMenuElFunctions.java 2013-09-20 12:38:39 UTC (rev 4331) +++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/el/ContextMenuElFunctions.java 2013-09-20 13:39:11 UTC (rev 4332) @@ -78,6 +78,11 @@ */ public static String entryValue(Node node, String name) { + if (node == null) + { + return null; + } + ContextMenuModule module = Components.getComponent(ContextMenuModule.class); PersistenceStrategy strategy = module.getPersistenceStrategy(); Node nodeUnwrapped = NodeUtil.deepUnwrap(node, HTMLEscapingNodeWrapper.class); 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-20 12:38:39 UTC (rev 4331) +++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-form.jsp 2013-09-20 13:39:11 UTC (rev 4332) @@ -9,7 +9,7 @@ <pre> <![CDATA[ <contextmenu:element name="firstname" menu="simpleForm">First Name:</contextmenu:element> -<c:set var="help" value="${'$'}{contextmenu:entryValue(content.JCRNode, 'firstname.help')}" />]]> +<c:set var="help" value="${'$'}{contextmenu:entryValue(cmsfn:asJCRNode(content), 'firstname.help')}" />]]> </pre> <br /> <div class="testcontent clearfix"> @@ -21,7 +21,7 @@ </label> <div class="col-lg-4"> <input name="firstname" id="firstname" type="text" /> - <c:set var="help" value="${contextmenu:entryValue(content.JCRNode, 'firstname.help')}" /> + <c:set var="help" value="${contextmenu:entryValue(cmsfn:asJCRNode(content), 'firstname.help')}" /> <c:if test="${not empty help}"> <span class="help"> <![CDATA[${help}<span class="help-pointer"> </span>]]> @@ -35,7 +35,7 @@ </label> <div class="col-lg-4"> <input name="lastname" id="lastname" type="text" /> - <c:set var="help" value="${contextmenu:entryValue(content.JCRNode, 'lastname.help')}" /> + <c:set var="help" value="${contextmenu:entryValue(cmsfn:asJCRNode(content), 'lastname.help')}" /> <c:if test="${not empty help}"> <span class="help"> <![CDATA[${help}<span class="help-pointer"> </span>]]> @@ -49,7 +49,7 @@ </label> <div class="col-lg-4"> <input name="email" id="email" type="text" /> - <c:set var="help" value="${contextmenu:entryValue(content.JCRNode, 'email.help')}" /> + <c:set var="help" value="${contextmenu:entryValue(cmsfn:asJCRNode(content), 'email.help')}" /> <c:if test="${not empty help}"> <span class="help"> <![CDATA[${help}<span class="help-pointer"> </span>]]> @@ -72,7 +72,7 @@ <option value="1942">1942</option> <option value="1999">1999</option> </select> - <c:set var="help" value="${contextmenu:entryValue(content.JCRNode, 'year.help')}" /> + <c:set var="help" value="${contextmenu:entryValue(cmsfn:asJCRNode(content), 'year.help')}" /> <c:if test="${not empty help}"> <span class="help"> <![CDATA[${help}<span class="help-pointer"> </span>]]> @@ -86,7 +86,7 @@ </label> <div class="col-lg-4"> <input name="username" id="username" type="text" /> - <c:set var="help" value="${contextmenu:entryValue(content.JCRNode, 'username.help')}" /> + <c:set var="help" value="${contextmenu:entryValue(cmsfn:asJCRNode(content), 'username.help')}" /> <c:if test="${not empty help}"> <span class="help"> <![CDATA[${help}<span class="help-pointer"> </span>]]> @@ -100,7 +100,7 @@ </label> <div class="col-lg-4"> <input name="password" id="password" type="password" /> - <c:set var="help" value="${contextmenu:entryValue(content.JCRNode, 'password.help')}" /> + <c:set var="help" value="${contextmenu:entryValue(cmsfn:asJCRNode(content), 'password.help')}" /> <c:if test="${not empty help}"> <span class="help"> <![CDATA[${help}<span class="help-pointer"> </span>]]> 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-09-20 12:38:39 UTC (rev 4331) +++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-move-fields.jsp 2013-09-20 13:39:11 UTC (rev 4332) @@ -33,7 +33,7 @@ </label> <div class="controls"> <input name="field1" id="field1" type="text" /> - <c:set var="help" value="${contextmenu:entryValue(content.JCRNode, 'field1.help')}" /> + <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>]]> @@ -49,7 +49,7 @@ </label> <div class="controls"> <input name="field2" id="field2" type="text" /> - <c:set var="help" value="${contextmenu:entryValue(content.JCRNode, 'field2.help')}" /> + <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>]]> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <luc...@us...> - 2013-09-27 13:53:20
|
Revision: 4351 http://openutils.svn.sourceforge.net/openutils/?rev=4351&view=rev Author: lucaboati Date: 2013-09-27 13:53:16 +0000 (Fri, 27 Sep 2013) Log Message: ----------- fix examples, refactoring addMenu Modified Paths: -------------- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/ElementTag.java 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.contextMenus.formField.xml magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.contextMenus.simpleForm.xml magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.dialogs.samples-contextmenu-textmedia.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-textmedia.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-addMenu.js Added Paths: ----------- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.contextMenus.media.xml magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.contextMenus.textmedia.xml magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.dialogs.samples-contextmenu-media.xml magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.components.samples-contextmenu-media.xml magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/paragraph-media.jsp Removed Paths: ------------- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.contextMenus.samples-form-label.xml magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.contextMenus.samples-textmedia.xml Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/ElementTag.java =================================================================== --- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/ElementTag.java 2013-09-26 17:14:07 UTC (rev 4350) +++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/tags/ElementTag.java 2013-09-27 13:53:16 UTC (rev 4351) @@ -59,7 +59,18 @@ private String elementId; + private boolean usebody; + /** + * Sets the usebody. + * @param usebody the usebody to set + */ + public void setUsebody(boolean usebody) + { + this.usebody = usebody; + } + + /** * Sets the name. * @param name the name to set */ @@ -129,7 +140,7 @@ } } String value = !StringUtils.isEmpty(name) ? ContextMenuElFunctions.entryValue(node, name) : null; - if (!StringUtils.isEmpty(value)) + if (!StringUtils.isEmpty(value) && !usebody) { try { 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-26 17:14:07 UTC (rev 4350) +++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/META-INF/tld/mgnlcontextmenu.tld 2013-09-27 13:53:16 UTC (rev 4351) @@ -63,6 +63,14 @@ <rtexprvalue>true</rtexprvalue> <type>boolean</type> </attribute> + <attribute> + <description> + <![CDATA[If true, the body is always rendered. false as default.]]> + </description> + <name>usebody</name> + <required>false</required> + <rtexprvalue>true</rtexprvalue> + </attribute> </tag> <tag> <description></description> Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.contextMenus.formField.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.contextMenus.formField.xml 2013-09-26 17:14:07 UTC (rev 4350) +++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.contextMenus.formField.xml 2013-09-27 13:53:16 UTC (rev 4351) @@ -71,7 +71,7 @@ <sv:value>2013-09-17T13:22:22.646+02:00</sv:value> </sv:property> </sv:node> - <sv:node sv:name="label"> + <sv:node sv:name="default"> <sv:property sv:name="jcr:primaryType" sv:type="Name"> <sv:value>mgnl:contentNode</sv:value> </sv:property> @@ -110,7 +110,7 @@ <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-09-17T14:14:38.290+02:00</sv:value> + <sv:value>2013-09-27T15:15:52.626+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.contextMenus.media.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.contextMenus.media.xml (rev 0) +++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.contextMenus.media.xml 2013-09-27 13:53:16 UTC (rev 4351) @@ -0,0 +1,118 @@ +<?xml version="1.0" encoding="UTF-8"?> +<sv:node sv:name="media" 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>89494908-6f34-4bfb-85da-bc034b36b7ca</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-09-27T15:23:35.343+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>dc341e8f-e651-4d8b-930f-dd8749c83d9d</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-09-27T15:23:32.245+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>07be96c1-f11c-489e-9441-ac8fc5fbfd0b</sv:value> + </sv:property> + <sv:property sv:name="controlType" sv:type="String"> + <sv:value>media</sv:value> + </sv:property> + <sv:property sv:name="icon" sv:type="String"> + <sv:value>/.resources/contextmenu/css/images/menu-media.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 media</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-09-27T15:23:49.307+02:00</sv:value> + </sv:property> + </sv:node> + </sv:node> + </sv:node> +</sv:node> Deleted: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.contextMenus.samples-form-label.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.contextMenus.samples-form-label.xml 2013-09-26 17:14:07 UTC (rev 4350) +++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.contextMenus.samples-form-label.xml 2013-09-27 13:53:16 UTC (rev 4351) @@ -1,167 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<sv:node sv:name="samples-form-label" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <sv:property sv:name="jcr:primaryType" sv:type="Name"> - <sv:value>mgnl:contentNode</sv:value> - </sv:property> - <sv:property sv:name="jcr:mixinTypes" sv:type="Name"> - <sv:value>mix:lockable</sv:value> - </sv:property> - <sv:property sv:name="jcr:uuid" sv:type="String"> - <sv:value>c875ba96-57c4-4d74-87c7-81e4cc27f9bc</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>2010-05-26T15:35:24.250+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:value>mix:lockable</sv:value> - </sv:property> - <sv:property sv:name="jcr:uuid" sv:type="String"> - <sv:value>f7f6a58e-2152-4653-bcc4-273d1dde5861</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>2010-05-19T09:12:22.953+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:value>mix:lockable</sv:value> - </sv:property> - <sv:property sv:name="jcr:uuid" sv:type="String"> - <sv:value>eaba62da-f46b-42a0-9460-822e8db7679c</sv:value> - </sv:property> - <sv:property sv:name="controlType" sv:type="String"> - <sv:value>edit</sv:value> - </sv:property> - <sv:property sv:name="globalEnabled" sv:type="Boolean"> - <sv:value>true</sv:value> - </sv:property> - <sv:property sv:name="icon" sv:type="String"> - <sv:value>/docroot/samples-contextmenu/ico16-form-label.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>2010-05-25T12:06:55.218+02:00</sv:value> - </sv:property> - </sv:node> - </sv:node> - <sv:node sv:name="help"> - <sv:property sv:name="jcr:primaryType" sv:type="Name"> - <sv:value>mgnl:contentNode</sv:value> - </sv:property> - <sv:property sv:name="jcr:mixinTypes" sv:type="Name"> - <sv:value>mix:lockable</sv:value> - </sv:property> - <sv:property sv:name="jcr:uuid" sv:type="String"> - <sv:value>e5f1cc52-79d4-4bd5-a8e4-67ed5dc32598</sv:value> - </sv:property> - <sv:property sv:name="controlType" sv:type="String"> - <sv:value>fckEdit</sv:value> - </sv:property> - <sv:property sv:name="globalEnabled" sv:type="Boolean"> - <sv:value>true</sv:value> - </sv:property> - <sv:property sv:name="icon" sv:type="String"> - <sv:value>/docroot/samples-contextmenu/ico16-form-help.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 help</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>2010-05-25T12:06:59.656+02:00</sv:value> - </sv:property> - </sv:node> - </sv:node> - </sv:node> -</sv:node> Deleted: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.contextMenus.samples-textmedia.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.contextMenus.samples-textmedia.xml 2013-09-26 17:14:07 UTC (rev 4350) +++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.contextMenus.samples-textmedia.xml 2013-09-27 13:53:16 UTC (rev 4351) @@ -1,161 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<sv:node sv:name="samples-textmedia" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <sv:property sv:name="jcr:primaryType" sv:type="Name"> - <sv:value>mgnl:contentNode</sv:value> - </sv:property> - <sv:property sv:name="jcr:mixinTypes" sv:type="Name"> - <sv:value>mix:lockable</sv:value> - </sv:property> - <sv:property sv:name="jcr:uuid" sv:type="String"> - <sv:value>64758dc1-3878-4777-90d9-dc497cefff74</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>2010-05-26T15:35:01.234+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:value>mix:lockable</sv:value> - </sv:property> - <sv:property sv:name="jcr:uuid" sv:type="String"> - <sv:value>7a2d8ee8-b4e1-4f38-a102-e11558bbee0d</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>2010-05-20T14:58:48.843+02:00</sv:value> - </sv:property> - </sv:node> - <sv:node sv:name="text"> - <sv:property sv:name="jcr:primaryType" sv:type="Name"> - <sv:value>mgnl:contentNode</sv:value> - </sv:property> - <sv:property sv:name="jcr:mixinTypes" sv:type="Name"> - <sv:value>mix:lockable</sv:value> - </sv:property> - <sv:property sv:name="jcr:uuid" sv:type="String"> - <sv:value>670416b0-2b8f-4038-9622-e962fab64743</sv:value> - </sv:property> - <sv:property sv:name="controlType" sv:type="String"> - <sv:value>fckEdit</sv:value> - </sv:property> - <sv:property sv:name="icon" sv:type="String"> - <sv:value>/docroot/samples-contextmenu/ico16-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 text</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>2010-05-20T16:18:36.406+02:00</sv:value> - </sv:property> - </sv:node> - </sv:node> - <sv:node sv:name="media"> - <sv:property sv:name="jcr:primaryType" sv:type="Name"> - <sv:value>mgnl:contentNode</sv:value> - </sv:property> - <sv:property sv:name="jcr:mixinTypes" sv:type="Name"> - <sv:value>mix:lockable</sv:value> - </sv:property> - <sv:property sv:name="jcr:uuid" sv:type="String"> - <sv:value>6ce2923e-5add-4825-a73f-fc563642340e</sv:value> - </sv:property> - <sv:property sv:name="controlType" sv:type="String"> - <sv:value>media</sv:value> - </sv:property> - <sv:property sv:name="icon" sv:type="String"> - <sv:value>/docroot/samples-contextmenu/ico16-media.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 media</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>2010-05-20T16:18:41.562+02:00</sv:value> - </sv:property> - </sv:node> - </sv:node> - </sv:node> -</sv:node> Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.contextMenus.simpleForm.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.contextMenus.simpleForm.xml 2013-09-26 17:14:07 UTC (rev 4350) +++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.contextMenus.simpleForm.xml 2013-09-27 13:53:16 UTC (rev 4351) @@ -71,7 +71,7 @@ <sv:value>2013-09-17T14:16:19.712+02:00</sv:value> </sv:property> </sv:node> - <sv:node sv:name="label"> + <sv:node sv:name="default"> <sv:property sv:name="jcr:primaryType" sv:type="Name"> <sv:value>mgnl:contentNode</sv:value> </sv:property> @@ -110,7 +110,7 @@ <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-09-17T14:16:19.712+02:00</sv:value> + <sv:value>2013-09-27T14:36:17.882+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.contextMenus.textmedia.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.contextMenus.textmedia.xml (rev 0) +++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.contextMenus.textmedia.xml 2013-09-27 13:53:16 UTC (rev 4351) @@ -0,0 +1,161 @@ +<?xml version="1.0" encoding="UTF-8"?> +<sv:node sv:name="textmedia" 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>0341c8c7-847d-431e-8cef-9a9f65eda64d</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-09-23T16:45:29.480+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>83996ba7-d940-4711-a373-570177d83cd9</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-09-23T16:45:25.624+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>786d7968-fcd9-4a89-be96-b65170596548</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 text</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-09-27T14:37:33.878+02:00</sv:value> + </sv:property> + </sv:node> + </sv:node> + <sv:node sv:name="media"> + <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>1f37dd88-4cc0-42ee-87e1-feb2ff99c491</sv:value> + </sv:property> + <sv:property sv:name="controlType" sv:type="String"> + <sv:value>media</sv:value> + </sv:property> + <sv:property sv:name="icon" sv:type="String"> + <sv:value>/.resources/contextmenu/css/images/menu-media.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 media</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-09-27T12:47:34.385+02:00</sv:value> + </sv:property> + </sv:node> + </sv:node> + </sv:node> +</sv:node> Added: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.dialogs.samples-contextmenu-media.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.dialogs.samples-contextmenu-media.xml (rev 0) +++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.dialogs.samples-contextmenu-media.xml 2013-09-27 13:53:16 UTC (rev 4351) @@ -0,0 +1,191 @@ +<?xml version="1.0" encoding="UTF-8"?> +<sv:node sv:name="samples-contextmenu-media" 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:uuid" sv:type="String"> + <sv:value>686f9a72-c7cf-4a4d-9539-b64befc65214</sv:value> + </sv:property> + <sv:property sv:name="i18nBasename" sv:type="String"> + <sv:value>net.sourceforge.openutils.mgnltestwebapp.lang.messages</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:Data" sv:type="String"> + <sv:value>MetaData</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:activatorid" sv:type="String"> + <sv:value>superuser</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="String"> + <sv:value>2004-11-02T15:34:43.213+01:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastaction" sv:type="Date"> + <sv:value>2008-04-28T23:43:10.557+02:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> + <sv:value>2013-09-27T15:25:56.791+02:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:title" sv:type="String"> + <sv:value/> + </sv:property> + </sv:node> + <sv:node sv:name="tabMedia"> + <sv:property sv:name="jcr:primaryType" sv:type="Name"> + <sv:value>mgnl:contentNode</sv:value> + </sv:property> + <sv:property sv:name="jcr:uuid" sv:type="String"> + <sv:value>77a20766-9d41-48fb-9e2d-ecf27642dfaa</sv:value> + </sv:property> + <sv:property sv:name="controlType" sv:type="String"> + <sv:value>tab</sv:value> + </sv:property> + <sv:property sv:name="jcr:createdBy" sv:type="String"> + <sv:value>admin</sv:value> + </sv:property> + <sv:property sv:name="label" sv:type="String"> + <sv:value>Media</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:Data" sv:type="String"> + <sv:value>MetaData</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:activatorid" sv:type="String"> + <sv:value>superuser</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="String"> + <sv:value>2004-11-02T15:34:29.217+01:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastaction" sv:type="Date"> + <sv:value>2008-06-19T14:49:08.436+02:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> + <sv:value>2013-09-27T15:26:20.074+02:00</sv:value> + </sv:property> + </sv:node> + <sv:node sv:name="dummy"> + <sv:property sv:name="jcr:primaryType" sv:type="Name"> + <sv:value>mgnl:contentNode</sv:value> + </sv:property> + <sv:property sv:name="jcr:uuid" sv:type="String"> + <sv:value>dce924a0-98db-4993-8f83-5bc0e4a3f851</sv:value> + </sv:property> + <sv:property sv:name="controlType" sv:type="String"> + <sv:value>hidden</sv:value> + </sv:property> + <sv:property sv:name="defaultValue" sv:type="String"> + <sv:value>.</sv:value> + </sv:property> + <sv:property sv:name="jcr:createdBy" sv:type="String"> + <sv:value>admin</sv:value> + </sv:property> + <sv:property sv:name="type" sv:type="String"> + <sv:value>String</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:Data" sv:type="String"> + <sv:value>MetaData</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:activatorid" sv:type="String"> + <sv:value>superuser</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="String"> + <sv:value>2004-11-02T15:34:29.357+01:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastaction" sv:type="Date"> + <sv:value>2008-07-07T14:56:33.437+02:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> + <sv:value>2013-09-27T15:25:53.582+02:00</sv:value> + </sv:property> + </sv:node> + </sv:node> + <sv:node sv:name="description"> + <sv:property sv:name="jcr:primaryType" sv:type="Name"> + <sv:value>mgnl:contentNode</sv:value> + </sv:property> + <sv:property sv:name="jcr:uuid" sv:type="String"> + <sv:value>25c7805e-8223-4945-835e-bc15ba7be191</sv:value> + </sv:property> + <sv:property sv:name="controlType" sv:type="String"> + <sv:value>static</sv:value> + </sv:property> + <sv:property sv:name="jcr:createdBy" sv:type="String"> + <sv:value>admin</sv:value> + </sv:property> + <sv:property sv:name="type" sv:type="String"> + <sv:value>String</sv:value> + </sv:property> + <sv:property sv:name="value" sv:type="String"> + <sv:value>Media are editable via context menu: just right click on the 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:Data" sv:type="String"> + <sv:value>MetaData</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:activatorid" sv:type="String"> + <sv:value>superuser</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="String"> + <sv:value>2004-11-02T15:34:29.357+01:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastaction" sv:type="Date"> + <sv:value>2008-07-07T14:56:33.437+02:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> + <sv:value>2013-09-27T15:26:09.153+02:00</sv:value> + </sv:property> + </sv:node> + </sv:node> + </sv:node> +</sv:node> Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.dialogs.samples-contextmenu-textmedia.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.dialogs.samples-contextmenu-textmedia.xml 2013-09-26 17:14:07 UTC (rev 4350) +++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.dialogs.samples-contextmenu-textmedia.xml 2013-09-27 13:53:16 UTC (rev 4351) @@ -4,7 +4,7 @@ <sv:value>mgnl:contentNode</sv:value> </sv:property> <sv:property sv:name="jcr:uuid" sv:type="String"> - <sv:value>9b45b361-9122-4c4f-a43c-ee48a62b471f</sv:value> + <sv:value>4c541dd6-2577-4b53-99aa-0fe688063b2c</sv:value> </sv:property> <sv:property sv:name="i18nBasename" sv:type="String"> <sv:value>net.sourceforge.openutils.mgnltestwebapp.lang.messages</sv:value> @@ -38,18 +38,18 @@ <sv:value>2008-04-28T23:43:10.557+02:00</sv:value> </sv:property> <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> - <sv:value>2010-05-20T14:45:53.687+02:00</sv:value> + <sv:value>2013-09-27T15:19:52.894+02:00</sv:value> </sv:property> <sv:property sv:name="mgnl:title" sv:type="String"> <sv:value/> </sv:property> </sv:node> - <sv:node sv:name="tabText"> + <sv:node sv:name="tabTextMedia"> <sv:property sv:name="jcr:primaryType" sv:type="Name"> <sv:value>mgnl:contentNode</sv:value> </sv:property> <sv:property sv:name="jcr:uuid" sv:type="String"> - <sv:value>ab492338-a560-42e1-856d-f534faff5c7d</sv:value> + <sv:value>9793af28-e024-4eb9-8621-efa34a6455a3</sv:value> </sv:property> <sv:property sv:name="controlType" sv:type="String"> <sv:value>tab</sv:value> @@ -58,7 +58,7 @@ <sv:value>admin</sv:value> </sv:property> <sv:property sv:name="label" sv:type="String"> - <sv:value>Text</sv:value> + <sv:value>TextMedia</sv:value> </sv:property> <sv:node sv:name="MetaData"> <sv:property sv:name="jcr:primaryType" sv:type="Name"> @@ -86,28 +86,25 @@ <sv:value>2008-06-19T14:49:08.436+02:00</sv:value> </sv:property> <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> - <sv:value>2010-05-20T14:46:56.890+02:00</sv:value> + <sv:value>2013-09-27T15:26:34.965+02:00</sv:value> </sv:property> </sv:node> - <sv:node sv:name="text"> + <sv:node sv:name="dummy"> <sv:property sv:name="jcr:primaryType" sv:type="Name"> <sv:value>mgnl:contentNode</sv:value> </sv:property> <sv:property sv:name="jcr:uuid" sv:type="String"> - <sv:value>98d67fa7-2631-4356-8322-820f5ec4e3d3</sv:value> + <sv:value>cd6b9585-db46-42c5-b3af-158d09c82b17</sv:value> </sv:property> <sv:property sv:name="controlType" sv:type="String"> - <sv:value>fckEdit</sv:value> + <sv:value>hidden</sv:value> </sv:property> - <sv:property sv:name="description" sv:type="String"> - <sv:value>The text to display (also editable via context menu).</sv:value> + <sv:property sv:name="defaultValue" sv:type="String"> + <sv:value>.</sv:value> </sv:property> <sv:property sv:name="jcr:createdBy" sv:type="String"> <sv:value>admin</sv:value> </sv:property> - <sv:property sv:name="label" sv:type="String"> - <sv:value>Text</sv:value> - </sv:property> <sv:property sv:name="type" sv:type="String"> <sv:value>String</sv:value> </sv:property> @@ -137,78 +134,29 @@ <sv:value>2008-07-07T14:56:33.437+02:00</sv:value> </sv:property> <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> - <sv:value>2010-05-20T14:48:07.906+02:00</sv:value> + <sv:value>2013-09-27T15:18:50.239+02:00</sv:value> </sv:property> </sv:node> </sv:node> - </sv:node> - <sv:node sv:name="tabMedia"> - <sv:property sv:name="jcr:primaryType" sv:type="Name"> - <sv:value>mgnl:contentNode</sv:value> - </sv:property> - <sv:property sv:name="jcr:uuid" sv:type="String"> - <sv:value>8aff74b8-5ca1-48c0-a8df-8ce218e19dff</sv:value> - </sv:property> - <sv:property sv:name="controlType" sv:type="String"> - <sv:value>tab</sv:value> - </sv:property> - <sv:property sv:name="jcr:createdBy" sv:type="String"> - <sv:value>admin</sv:value> - </sv:property> - <sv:property sv:name="label" sv:type="String"> - <sv:value>Media</sv:value> - </sv:property> - <sv:node sv:name="MetaData"> + <sv:node sv:name="description"> <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:Data" sv:type="String"> - <sv:value>MetaData</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:activatorid" sv:type="String"> - <sv:value>superuser</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="String"> - <sv:value>2004-11-02T15:34:29.217+01:00</sv:value> - </sv:property> - <sv:property sv:name="mgnl:lastaction" sv:type="Date"> - <sv:value>2008-06-19T14:49:08.436+02:00</sv:value> - </sv:property> - <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> - <sv:value>2010-05-20T14:48:27.187+02:00</sv:value> - </sv:property> - </sv:node> - <sv:node sv:name="media"> - <sv:property sv:name="jcr:primaryType" sv:type="Name"> <sv:value>mgnl:contentNode</sv:value> </sv:property> <sv:property sv:name="jcr:uuid" sv:type="String"> - <sv:value>0484f652-5433-4cfc-8be7-59cca17b3659</sv:value> + <sv:value>7bac9722-2b8d-4e6f-82d6-3d931d5a8343</sv:value> </sv:property> <sv:property sv:name="controlType" sv:type="String"> - <sv:value>media</sv:value> + <sv:value>static</sv:value> </sv:property> - <sv:property sv:name="description" sv:type="String"> - <sv:value>The media to display (also editable via context menu).</sv:value> - </sv:property> <sv:property sv:name="jcr:createdBy" sv:type="String"> <sv:value>admin</sv:value> </sv:property> - <sv:property sv:name="label" sv:type="String"> - <sv:value>Media</sv:value> - </sv:property> <sv:property sv:name="type" sv:type="String"> <sv:value>String</sv:value> </sv:property> + <sv:property sv:name="value" sv:type="String"> + <sv:value>text and media are editable via context menu: just right click on the 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> @@ -235,7 +183,7 @@ <sv:value>2008-07-07T14:56:33.437+02:00</sv:value> </sv:property> <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> - <sv:value>2010-05-20T14:49:30.203+02:00</sv:value> + <sv:value>2013-09-27T15:19:45.834+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-media.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.components.samples-contextmenu-media.xml (rev 0) +++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.components.samples-contextmenu-media.xml 2013-09-27 13:53:16 UTC (rev 4351) @@ -0,0 +1,50 @@ +<?xml version="1.0" encoding="UTF-8"?> +<sv:node sv:name="samples-contextmenu-media" 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>08ce54f7-9e26-47e2-9908-e88c6db395a1</sv:value> + </sv:property> + <sv:property sv:name="description" sv:type="String"> + <sv:value>Sample paragraph showing media, editable via context menu.</sv:value> + </sv:property> + <sv:property sv:name="dialog" sv:type="String"> + <sv:value>contextmenu:samples-contextmenu-media</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>jsp</sv:value> + </sv:property> + <sv:property sv:name="templateScript" sv:type="String"> + <sv:value>/templates/samples-contextmenu/paragraph-media.jsp</sv:value> + </sv:property> + <sv:property sv:name="title" sv:type="String"> + <sv:value>Media sample (jsp)</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-27T15:25:33.054+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-jsp.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.pages.contextmenu-template-jsp.xml 2013-09-26 17:14:07 UTC (rev 4350) +++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/config.modules.contextmenu.templates.pages.contextmenu-template-jsp.xml 2013-09-27 13:53:16 UTC (rev 4351) @@ -331,6 +331,43 @@ </sv:property> </sv:node> </sv:node> + <sv:node sv:name="samples-contextmenu-media"> + <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>63c2c054-1867-4b07-99cd-dfb13537db8d</sv:value> + </sv:property> + <sv:property sv:name="id" sv:type="String"> + <sv:value>contextmenu:components/samples-contextmenu-media</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-27T15:27:18.091+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-26 17:14:07 UTC (rev 4350) +++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap-samples/contextmenu/website.sample-contextmenu.xml 2013-09-27 13:53:16 UTC (rev 4351) @@ -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-18T12:52:41.534+02:00</sv:value> + <sv:value>2013-09-27T15:38:09.156+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-18T12:52:41.534+02:00</sv:value> + <sv:value>2013-09-27T15:38:09.155+02:00</sv:value> </sv:property> </sv:node> <sv:node sv:name="0"> @@ -306,9 +306,6 @@ <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:node sv:name="MetaData"> <sv:property sv:name="jcr:primaryType" sv:type="Name"> <sv:value>mgnl:metaData</sv:value> @@ -323,7 +320,7 @@ <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:27:55.818+02:00</sv:value> + <sv:value>2013-09-27T15:21:17.754+02:00</sv:value> </sv:property> <sv:property sv:name="mgnl:template" sv:type="String"> <sv:value>contextmenu:components/samples-contextmenu-textmedia</sv:value> @@ -365,10 +362,10 @@ <sv:property sv:name="jcr:uuid" sv:type="String"> <sv:value>f9c61bcf-32de-45c2-8ceb-1435e1411060</sv:value> </sv:property> - <sv:property sv:name="firstname" sv:type="String"> - <sv:value>First Name:</sv:value> + <sv:property sv:name="firstname-label" sv:type="String"> + <sv:value>asdad</sv:value> </sv:property> - <sv:property sv:name="firstname.help" sv:type="String"> + <sv:property sv:name="firstname_help" sv:type="String"> <sv:value><p>help!</p></sv:value> </sv:property> <sv:property sv:name="jcr:createdBy" sv:type="String"> @@ -388,7 +385,7 @@ <sv:value>2013-09-13T18:56:07.081+02:00</sv:value> </sv:property> <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> - <sv:val... [truncated message content] |
From: <luc...@us...> - 2013-09-30 09:52:17
|
Revision: 4353 http://openutils.svn.sourceforge.net/openutils/?rev=4353&view=rev Author: lucaboati Date: 2013-09-30 09:52:13 +0000 (Mon, 30 Sep 2013) Log Message: ----------- add init() function to fix menu in blossom components Modified Paths: -------------- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/el/ContextMenuElFunctions.java magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/META-INF/tld/mgnlcontextmenu.tld magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/template-contextmenu.jsp magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/samples-contextmenu/template-contextmenu.ftl Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/el/ContextMenuElFunctions.java =================================================================== --- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/el/ContextMenuElFunctions.java 2013-09-27 16:13:35 UTC (rev 4352) +++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/el/ContextMenuElFunctions.java 2013-09-30 09:52:13 UTC (rev 4353) @@ -173,6 +173,18 @@ return output; } + @SuppressWarnings({"rawtypes" }) + public static void initContextMenu() + { + HttpServletRequest request = getRequest(); + List list = (List) request.getAttribute(EDIT_MESSAGE_INFOS_KEY); + if (list == null) + { + list = new ArrayList(); + request.setAttribute(EDIT_MESSAGE_INFOS_KEY, list); + } + } + @SuppressWarnings({"unchecked", "rawtypes" }) public static ElementInfo addEditMessageInfo(String key, String path, String elementId) { 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-27 16:13:35 UTC (rev 4352) +++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/META-INF/tld/mgnlcontextmenu.tld 2013-09-30 09:52:13 UTC (rev 4353) @@ -139,10 +139,15 @@ <function-signature>java.util.List endSortList(java.lang.String)</function-signature> </function> <function> + <name>init</name> + <function-class>net.sourceforge.openutils.mgnlcontextmenu.el.ContextMenuElFunctions</function-class> + <function-signature>void initContextMenu()</function-signature> + </function> + <function> <name>addEditMessageInfo</name> <function-class>net.sourceforge.openutils.mgnlcontextmenu.el.ContextMenuElFunctions</function-class> - <function-signature>net.sourceforge.openutils.mgnlcontextmenu.el.ElementInfo - addEditMessageInfo(java.lang.String, java.lang.String, java.lang.String)</function-signature> + <function-signature>net.sourceforge.openutils.mgnlcontextmenu.el.ElementInfo addEditMessageInfo(java.lang.String, + java.lang.String, java.lang.String)</function-signature> </function> <function> <name>editMessageInfos</name> Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/template-contextmenu.jsp =================================================================== --- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/template-contextmenu.jsp 2013-09-27 16:13:35 UTC (rev 4352) +++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-files/templates/samples-contextmenu/template-contextmenu.jsp 2013-09-30 09:52:13 UTC (rev 4353) @@ -11,6 +11,7 @@ <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:init()} ${contextmenu:links()} <cms:init /> <link rel="stylesheet" type="text/css" href="${pageContext.request.contextPath}/.resources/contextmenu/css/bootstrap.min.css" /> @@ -30,6 +31,14 @@ <ul> <li> add + <code>${'$'}{contextmenu:init()}</code> + if you are using blossom (just before + <code>&lt;/head&gt;</code> + ) + </li> + <li>add the jquery library</li> + <li> + add <code>${'$'}{contextmenu:links()}</code> (just before <code>&lt;/head&gt;</code> @@ -42,28 +51,12 @@ <code>&lt;/body&gt;</code> ) </li> - <li>add the jquery library</li> </ul> </p> </section> <cms:area name="main" /> </div> - <!-- <jsp:include page="/templates/samples-contextmenu/page-editmenu.jsp" /> --> ${contextmenu:scripts()} - <c:if test="${!empty mgnlSortLists}"> - <script type="text/javascript"> - <![CDATA[ jQuery(document).ready( function() {]]> - <c:forEach var="item" items="${mgnlSortLists}"> - <![CDATA[jQuery('#${item.containerId}').sortList({ - url: '${item.url}', - path: '${item.path}', - name: '${item.name}', - order: ${item.order} - });]]> - </c:forEach> - <![CDATA[});]]> - </script> - </c:if> </body> </html> </jsp:root> \ No newline at end of file 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-27 16:13:35 UTC (rev 4352) +++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/samples-contextmenu/template-contextmenu.ftl 2013-09-30 09:52:13 UTC (rev 4353) @@ -4,8 +4,9 @@ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> <title>${content.title!}</title> + ${contextmenu.init()} + <script src="${contextPath}/.resources/contextmenu/js/jquery-1.4.2.min.js">/**/</script> - ${contextmenu.links()} [@cms.init /] @@ -25,9 +26,10 @@ <p> <span>Add the following to your template in order to initialize the contextmenu module:</span> <ul> + <li>add <code>${'$'}{contextmenu.init()}</code> if you are using blossom (just before <code></head></code>)</li> + <li>add the jquery library</li> <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> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <luc...@us...> - 2013-10-07 17:05:15
|
Revision: 4359 http://openutils.svn.sourceforge.net/openutils/?rev=4359&view=rev Author: lucaboati Date: 2013-10-07 17:05:11 +0000 (Mon, 07 Oct 2013) Log Message: ----------- fix move for blossom component, initContextMenu now call init Modified Paths: -------------- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/el/ContextMenuElFunctions.java magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/META-INF/tld/mgnlcontextmenu.tld Modified: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/el/ContextMenuElFunctions.java =================================================================== --- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/el/ContextMenuElFunctions.java 2013-10-07 16:49:33 UTC (rev 4358) +++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/el/ContextMenuElFunctions.java 2013-10-07 17:05:11 UTC (rev 4359) @@ -174,7 +174,7 @@ } @SuppressWarnings({"rawtypes" }) - public static void initContextMenu() + public static void init() { HttpServletRequest request = getRequest(); List list = (List) request.getAttribute(EDIT_MESSAGE_INFOS_KEY); @@ -183,6 +183,12 @@ list = new ArrayList(); request.setAttribute(EDIT_MESSAGE_INFOS_KEY, list); } + List items = (List) request.getAttribute("mgnlSortLists"); + if (items == null) + { + items = new ArrayList(); + request.setAttribute("mgnlSortLists", items); + } } @SuppressWarnings({"unchecked", "rawtypes" }) 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-10-07 16:49:33 UTC (rev 4358) +++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/META-INF/tld/mgnlcontextmenu.tld 2013-10-07 17:05:11 UTC (rev 4359) @@ -141,7 +141,7 @@ <function> <name>init</name> <function-class>net.sourceforge.openutils.mgnlcontextmenu.el.ContextMenuElFunctions</function-class> - <function-signature>void initContextMenu()</function-signature> + <function-signature>void init()</function-signature> </function> <function> <name>addEditMessageInfo</name> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <fg...@us...> - 2013-10-28 10:39:11
|
Revision: 4435 http://openutils.svn.sourceforge.net/openutils/?rev=4435&view=rev Author: fgiust Date: 2013-10-28 10:39:07 +0000 (Mon, 28 Oct 2013) Log Message: ----------- added support for checkbox controls Added Paths: ----------- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/dialog/DialogButtonSetControl.java magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu-nooverwrite/config.modules.contextmenu.controls.contextmenu-checkbox.xml magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu-nooverwrite/config.modules.contextmenu.controls.contextmenu-checkboxSwitch.xml magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu-nooverwrite/config.modules.contextmenu.controls.contextmenu-edit.xml magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu-nooverwrite/config.modules.contextmenu.controls.contextmenu-fckEdit.xml magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu-nooverwrite/config.modules.contextmenu.controls.contextmenu-globalTab.xml magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu-nooverwrite/config.modules.contextmenu.controls.contextmenu-media.xml magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu-nooverwrite/config.modules.contextmenu.controls.contextmenu-radio.xml Removed Paths: ------------- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu/config.modules.contextmenu.controls.contextmenu-edit.xml magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu/config.modules.contextmenu.controls.contextmenu-fckEdit.xml magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu/config.modules.contextmenu.controls.contextmenu-globalTab.xml magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu/config.modules.contextmenu.controls.contextmenu-media.xml Added: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/dialog/DialogButtonSetControl.java =================================================================== --- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/dialog/DialogButtonSetControl.java (rev 0) +++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/dialog/DialogButtonSetControl.java 2013-10-28 10:39:07 UTC (rev 4435) @@ -0,0 +1,82 @@ +/** + * + * ContextMenu Module for Magnolia CMS (http://www.openmindlab.com/lab/products/mgnlcontextmenu.html) + * Copyright(C) 2010-2013, Openmind S.r.l. http://www.openmindonline.it + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ +package net.sourceforge.openutils.mgnlcontextmenu.dialog; + +import info.magnolia.cms.core.Content; +import info.magnolia.cms.gui.control.ControlImpl; +import info.magnolia.cms.gui.dialog.DialogButtonSet; + +import javax.jcr.RepositoryException; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + +import org.apache.commons.lang.StringUtils; + + +/** + * @author fgiust + * @version $Id$ + */ +public class DialogButtonSetControl extends DialogButtonSet +{ + + private HttpServletRequest request; + + @Override + public void init(HttpServletRequest request, HttpServletResponse response, Content storageNode, Content configNode) + throws RepositoryException + { + super.init(request, response, storageNode, configNode); + this.request = request; + + String controlType = this.getConfigValue("controlType"); + + // custom settings + if (StringUtils.containsIgnoreCase(controlType, "radio")) { //$NON-NLS-1$ + setButtonType(ControlImpl.BUTTONTYPE_RADIO); + setOptions(configNode, true); + } + else if (StringUtils.containsIgnoreCase(controlType, "checkboxSwitch")) { //$NON-NLS-1$ + setButtonType(ControlImpl.BUTTONTYPE_CHECKBOX); + setOption(configNode); + } + else if (StringUtils.containsIgnoreCase(controlType, "checkbox")) { //$NON-NLS-1$ + setButtonType(ControlImpl.BUTTONTYPE_CHECKBOX); + setOptions(configNode, false); + setConfig("valueType", "multiple"); + setConfig("multiple", "true"); + } + } + + /** + * {@inheritDoc} + */ + @Override + public String getValue() + { + if (this.value == null) + { + this.value = DialogControlUtils.getValue( + request, + getStorageNode().getJCRNode(), + getConfigValue("scope", "local")); + } + return this.value; + } +} Property changes on: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/java/net/sourceforge/openutils/mgnlcontextmenu/dialog/DialogButtonSetControl.java ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +text/plain \ 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 Deleted: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu/config.modules.contextmenu.controls.contextmenu-edit.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu/config.modules.contextmenu.controls.contextmenu-edit.xml 2013-10-28 10:25:04 UTC (rev 4434) +++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu/config.modules.contextmenu.controls.contextmenu-edit.xml 2013-10-28 10:39:07 UTC (rev 4435) @@ -1,38 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<sv:node sv:name="contextmenu-edit" 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:uuid" sv:type="String"> - <sv:value>0769fc3e-349e-4f42-922f-d203902230e1</sv:value> - </sv:property> - <sv:property sv:name="class" sv:type="String"> - <sv:value>net.sourceforge.openutils.mgnlcontextmenu.dialog.EditDialogControl</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:Data" sv:type="String"> - <sv:value>MetaData</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="String"> - <sv:value>2005-04-30T14:46:54.316+02:00</sv:value> - </sv:property> - <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> - <sv:value>2010-05-19T10:51:30.421+02:00</sv:value> - </sv:property> - </sv:node> -</sv:node> Deleted: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu/config.modules.contextmenu.controls.contextmenu-fckEdit.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu/config.modules.contextmenu.controls.contextmenu-fckEdit.xml 2013-10-28 10:25:04 UTC (rev 4434) +++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu/config.modules.contextmenu.controls.contextmenu-fckEdit.xml 2013-10-28 10:39:07 UTC (rev 4435) @@ -1,38 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<sv:node sv:name="contextmenu-fckEdit" 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:uuid" sv:type="String"> - <sv:value>98513ad3-790d-4a61-9027-637655bd5435</sv:value> - </sv:property> - <sv:property sv:name="class" sv:type="String"> - <sv:value>net.sourceforge.openutils.mgnlcontextmenu.dialog.FckEditDialogControl</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:Data" sv:type="String"> - <sv:value>MetaData</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="String"> - <sv:value>2005-04-30T14:46:54.316+02:00</sv:value> - </sv:property> - <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> - <sv:value>2010-05-19T11:05:47.703+02:00</sv:value> - </sv:property> - </sv:node> -</sv:node> Deleted: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu/config.modules.contextmenu.controls.contextmenu-globalTab.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu/config.modules.contextmenu.controls.contextmenu-globalTab.xml 2013-10-28 10:25:04 UTC (rev 4434) +++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu/config.modules.contextmenu.controls.contextmenu-globalTab.xml 2013-10-28 10:39:07 UTC (rev 4435) @@ -1,35 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<sv:node sv:name="contextmenu-globalTab" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> - <sv:property sv:name="jcr:primaryType" sv:type="Name"> - <sv:value>mgnl:contentNode</sv:value> - </sv:property> - <sv:property sv:name="jcr:mixinTypes" sv:type="Name"> - <sv:value>mix:lockable</sv:value> - </sv:property> - <sv:property sv:name="jcr:uuid" sv:type="String"> - <sv:value>5c49339f-415a-4efb-9d2c-ed8b173552c5</sv:value> - </sv:property> - <sv:property sv:name="class" sv:type="String"> - <sv:value>net.sourceforge.openutils.mgnlcontextmenu.dialog.DialogGlobalTab</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:authorid" sv:type="String"> - <sv:value>superuser</sv:value> - </sv:property> - <sv:property sv:name="mgnl:creationdate" sv:type="Date"> - <sv:value>2010-05-25T11:44:50.500+02:00</sv:value> - </sv:property> - <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> - <sv:value>2010-05-25T11:45:13.375+02:00</sv:value> - </sv:property> - </sv:node> -</sv:node> Deleted: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu/config.modules.contextmenu.controls.contextmenu-media.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu/config.modules.contextmenu.controls.contextmenu-media.xml 2013-10-28 10:25:04 UTC (rev 4434) +++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu/config.modules.contextmenu.controls.contextmenu-media.xml 2013-10-28 10:39:07 UTC (rev 4435) @@ -1,38 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<sv:node sv:name="contextmenu-media" 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:uuid" sv:type="String"> - <sv:value>9ef89795-90d3-4685-a6f9-3029ae18da44</sv:value> - </sv:property> - <sv:property sv:name="class" sv:type="String"> - <sv:value>net.sourceforge.openutils.mgnlcontextmenu.dialog.MediaDialogControl</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:Data" sv:type="String"> - <sv:value>MetaData</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="String"> - <sv:value>2005-04-30T14:46:54.316+02:00</sv:value> - </sv:property> - <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> - <sv:value>2010-05-20T15:30:30.875+02:00</sv:value> - </sv:property> - </sv:node> -</sv:node> Added: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu-nooverwrite/config.modules.contextmenu.controls.contextmenu-checkbox.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu-nooverwrite/config.modules.contextmenu.controls.contextmenu-checkbox.xml (rev 0) +++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu-nooverwrite/config.modules.contextmenu.controls.contextmenu-checkbox.xml 2013-10-28 10:39:07 UTC (rev 4435) @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="UTF-8"?> +<sv:node sv:name="contextmenu-checkbox" 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:uuid" sv:type="String"> + <sv:value>40878dcd-c7a7-4a63-a6af-c8d68dea0328</sv:value> + </sv:property> + <sv:property sv:name="class" sv:type="String"> + <sv:value>net.sourceforge.openutils.mgnlcontextmenu.dialog.DialogButtonSetControl</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:Data" sv:type="String"> + <sv:value>MetaData</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="String"> + <sv:value>2005-04-30T14:46:54.316+02:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> + <sv:value>2013-10-24T11:56:27.761+02:00</sv:value> + </sv:property> + </sv:node> +</sv:node> Property changes on: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu-nooverwrite/config.modules.contextmenu.controls.contextmenu-checkbox.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 Added: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu-nooverwrite/config.modules.contextmenu.controls.contextmenu-checkboxSwitch.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu-nooverwrite/config.modules.contextmenu.controls.contextmenu-checkboxSwitch.xml (rev 0) +++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu-nooverwrite/config.modules.contextmenu.controls.contextmenu-checkboxSwitch.xml 2013-10-28 10:39:07 UTC (rev 4435) @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="UTF-8"?> +<sv:node sv:name="contextmenu-checkboxSwitch" 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:uuid" sv:type="String"> + <sv:value>5f7f1b0a-8ac8-4414-8e5b-2ecbcbcadb6a</sv:value> + </sv:property> + <sv:property sv:name="class" sv:type="String"> + <sv:value>net.sourceforge.openutils.mgnlcontextmenu.dialog.DialogButtonSetControl</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:Data" sv:type="String"> + <sv:value>MetaData</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="String"> + <sv:value>2005-04-30T14:46:54.316+02:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> + <sv:value>2013-10-24T12:08:43.258+02:00</sv:value> + </sv:property> + </sv:node> +</sv:node> Property changes on: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu-nooverwrite/config.modules.contextmenu.controls.contextmenu-checkboxSwitch.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 Copied: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu-nooverwrite/config.modules.contextmenu.controls.contextmenu-edit.xml (from rev 4406, magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu/config.modules.contextmenu.controls.contextmenu-edit.xml) =================================================================== --- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu-nooverwrite/config.modules.contextmenu.controls.contextmenu-edit.xml (rev 0) +++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu-nooverwrite/config.modules.contextmenu.controls.contextmenu-edit.xml 2013-10-28 10:39:07 UTC (rev 4435) @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="UTF-8"?> +<sv:node sv:name="contextmenu-edit" 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:uuid" sv:type="String"> + <sv:value>0769fc3e-349e-4f42-922f-d203902230e1</sv:value> + </sv:property> + <sv:property sv:name="class" sv:type="String"> + <sv:value>net.sourceforge.openutils.mgnlcontextmenu.dialog.EditDialogControl</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:Data" sv:type="String"> + <sv:value>MetaData</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="String"> + <sv:value>2005-04-30T14:46:54.316+02:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> + <sv:value>2010-05-19T10:51:30.421+02:00</sv:value> + </sv:property> + </sv:node> +</sv:node> Copied: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu-nooverwrite/config.modules.contextmenu.controls.contextmenu-fckEdit.xml (from rev 4406, magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu/config.modules.contextmenu.controls.contextmenu-fckEdit.xml) =================================================================== --- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu-nooverwrite/config.modules.contextmenu.controls.contextmenu-fckEdit.xml (rev 0) +++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu-nooverwrite/config.modules.contextmenu.controls.contextmenu-fckEdit.xml 2013-10-28 10:39:07 UTC (rev 4435) @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="UTF-8"?> +<sv:node sv:name="contextmenu-fckEdit" 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:uuid" sv:type="String"> + <sv:value>98513ad3-790d-4a61-9027-637655bd5435</sv:value> + </sv:property> + <sv:property sv:name="class" sv:type="String"> + <sv:value>net.sourceforge.openutils.mgnlcontextmenu.dialog.FckEditDialogControl</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:Data" sv:type="String"> + <sv:value>MetaData</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="String"> + <sv:value>2005-04-30T14:46:54.316+02:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> + <sv:value>2010-05-19T11:05:47.703+02:00</sv:value> + </sv:property> + </sv:node> +</sv:node> Copied: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu-nooverwrite/config.modules.contextmenu.controls.contextmenu-globalTab.xml (from rev 4406, magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu/config.modules.contextmenu.controls.contextmenu-globalTab.xml) =================================================================== --- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu-nooverwrite/config.modules.contextmenu.controls.contextmenu-globalTab.xml (rev 0) +++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu-nooverwrite/config.modules.contextmenu.controls.contextmenu-globalTab.xml 2013-10-28 10:39:07 UTC (rev 4435) @@ -0,0 +1,35 @@ +<?xml version="1.0" encoding="UTF-8"?> +<sv:node sv:name="contextmenu-globalTab" xmlns:sv="http://www.jcp.org/jcr/sv/1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> + <sv:property sv:name="jcr:primaryType" sv:type="Name"> + <sv:value>mgnl:contentNode</sv:value> + </sv:property> + <sv:property sv:name="jcr:mixinTypes" sv:type="Name"> + <sv:value>mix:lockable</sv:value> + </sv:property> + <sv:property sv:name="jcr:uuid" sv:type="String"> + <sv:value>5c49339f-415a-4efb-9d2c-ed8b173552c5</sv:value> + </sv:property> + <sv:property sv:name="class" sv:type="String"> + <sv:value>net.sourceforge.openutils.mgnlcontextmenu.dialog.DialogGlobalTab</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:authorid" sv:type="String"> + <sv:value>superuser</sv:value> + </sv:property> + <sv:property sv:name="mgnl:creationdate" sv:type="Date"> + <sv:value>2010-05-25T11:44:50.500+02:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> + <sv:value>2010-05-25T11:45:13.375+02:00</sv:value> + </sv:property> + </sv:node> +</sv:node> Copied: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu-nooverwrite/config.modules.contextmenu.controls.contextmenu-media.xml (from rev 4406, magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu/config.modules.contextmenu.controls.contextmenu-media.xml) =================================================================== --- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu-nooverwrite/config.modules.contextmenu.controls.contextmenu-media.xml (rev 0) +++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu-nooverwrite/config.modules.contextmenu.controls.contextmenu-media.xml 2013-10-28 10:39:07 UTC (rev 4435) @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="UTF-8"?> +<sv:node sv:name="contextmenu-media" 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:uuid" sv:type="String"> + <sv:value>9ef89795-90d3-4685-a6f9-3029ae18da44</sv:value> + </sv:property> + <sv:property sv:name="class" sv:type="String"> + <sv:value>net.sourceforge.openutils.mgnlcontextmenu.dialog.MediaDialogControl</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:Data" sv:type="String"> + <sv:value>MetaData</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="String"> + <sv:value>2005-04-30T14:46:54.316+02:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> + <sv:value>2010-05-20T15:30:30.875+02:00</sv:value> + </sv:property> + </sv:node> +</sv:node> Added: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu-nooverwrite/config.modules.contextmenu.controls.contextmenu-radio.xml =================================================================== --- magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu-nooverwrite/config.modules.contextmenu.controls.contextmenu-radio.xml (rev 0) +++ magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu-nooverwrite/config.modules.contextmenu.controls.contextmenu-radio.xml 2013-10-28 10:39:07 UTC (rev 4435) @@ -0,0 +1,38 @@ +<?xml version="1.0" encoding="UTF-8"?> +<sv:node sv:name="contextmenu-radio" 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:uuid" sv:type="String"> + <sv:value>4f3ba85b-7612-4822-819b-780580775049</sv:value> + </sv:property> + <sv:property sv:name="class" sv:type="String"> + <sv:value>net.sourceforge.openutils.mgnlcontextmenu.dialog.DialogButtonSetControl</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:Data" sv:type="String"> + <sv:value>MetaData</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="String"> + <sv:value>2005-04-30T14:46:54.316+02:00</sv:value> + </sv:property> + <sv:property sv:name="mgnl:lastmodified" sv:type="Date"> + <sv:value>2013-10-24T12:09:17.334+02:00</sv:value> + </sv:property> + </sv:node> +</sv:node> Property changes on: magnoliamodules/trunk/openutils-mgnlcontextmenu/src/main/resources/mgnl-bootstrap/contextmenu-nooverwrite/config.modules.contextmenu.controls.contextmenu-radio.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 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |