Menu
▾
▴
[Openutils-svn] SF.net SVN: openutils:[2692] trunk
|
From: <die...@us...> - 2010-06-18 16:37:48
|
Revision: 2692
http://openutils.svn.sourceforge.net/openutils/?rev=2692&view=rev
Author: diego_schivo
Date: 2010-06-18 16:37:42 +0000 (Fri, 18 Jun 2010)
Log Message:
-----------
CONTROLS-31 combo column type
Modified Paths:
--------------
trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/FckEditorGridColumnType.java
trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/FileGridColumnType.java
trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/GridColumnType.java
trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/LinkGridColumnType.java
trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/UUIDLinkGridColumnType.java
trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/DialogGridSaveHandler.java
trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl
trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.dialogs.samples-grid.xml
trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/website.sample-controls.xml
trunk/openutils-mgnlcontrols/src/main/resources/mgnl-files/templates/samples-controls/paragraph-grid.jsp
trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/grid/MediaGridColumnType.java
Added Paths:
-----------
trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/ComboGridColumnType.java
trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.gridColumnTypes.combo.xml
Added: trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/ComboGridColumnType.java
===================================================================
--- trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/ComboGridColumnType.java (rev 0)
+++ trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/ComboGridColumnType.java 2010-06-18 16:37:42 UTC (rev 2692)
@@ -0,0 +1,76 @@
+package net.sourceforge.openutils.mgnlcontrols.configuration;
+
+import info.magnolia.cms.core.Content;
+import info.magnolia.cms.security.AccessDeniedException;
+import info.magnolia.context.MgnlContext;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import javax.jcr.RepositoryException;
+
+import org.apache.commons.lang.StringUtils;
+
+
+/**
+ * @author dschivo
+ * @version $Id$
+ */
+public class ComboGridColumnType implements GridColumnType
+{
+
+ /**
+ * {@inheritDoc}
+ */
+ public String getHeadSnippet()
+ {
+ return "<script type=\"text/javascript\" src=\""
+ + MgnlContext.getContextPath()
+ + "/.resources/controls/js/PipeComboBox.js\"></script>";
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String drawSupportHtml(String propertyName, Map colmap)
+ {
+ return StringUtils.EMPTY;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String drawColumnModelJs(String propertyName, Map colmap)
+ {
+ List<String> options = new ArrayList<String>();
+ options.add("typeAhead: true");
+ options.add("triggerAction: 'all'");
+ options.add("transform: 'combo-" + propertyName + "'");
+ options.add("lazyRender: true");
+ options.add("listClass: 'x-combo-list-small'");
+
+ return "editor: new Ed(new "
+ + ("true".equals(String.valueOf(colmap.get("pipe"))) ? "PipeComboBox" : "fm.ComboBox")
+ + "({\n"
+ + StringUtils.join(options, ",\n")
+ + "}))";
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String processValueOnLoad(String value, Content colConfig)
+ {
+ return value;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public void processColumnOnSave(String[] column, Content colConfig, String propertyName, Content parentNode)
+ throws RepositoryException, AccessDeniedException
+ {
+ }
+
+}
Property changes on: trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/ComboGridColumnType.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Modified: trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/FckEditorGridColumnType.java
===================================================================
--- trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/FckEditorGridColumnType.java 2010-06-18 16:37:15 UTC (rev 2691)
+++ trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/FckEditorGridColumnType.java 2010-06-18 16:37:42 UTC (rev 2692)
@@ -27,7 +27,9 @@
import javax.jcr.RepositoryException;
+import org.apache.commons.lang.StringUtils;
+
/**
* @author dschivo
* @version $Id$
@@ -48,8 +50,16 @@
/**
* {@inheritDoc}
*/
- public String getColumnModelSnippet(Map colmap)
+ public String drawSupportHtml(String propertyName, Map colmap)
{
+ return StringUtils.EMPTY;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String drawColumnModelJs(String propertyName, Map colmap)
+ {
return "editor: new Ed(new FckEditorField({\n"
+ "contextPath: '"
+ MgnlContext.getContextPath()
@@ -68,7 +78,7 @@
/**
* {@inheritDoc}
*/
- public void processValueOnSave(String[] column, Content colConfig, String propertyName, Content parentNode)
+ public void processColumnOnSave(String[] column, Content colConfig, String propertyName, Content parentNode)
throws RepositoryException, AccessDeniedException
{
}
Modified: trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/FileGridColumnType.java
===================================================================
--- trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/FileGridColumnType.java 2010-06-18 16:37:15 UTC (rev 2691)
+++ trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/FileGridColumnType.java 2010-06-18 16:37:42 UTC (rev 2692)
@@ -48,8 +48,16 @@
/**
* {@inheritDoc}
*/
- public String getColumnModelSnippet(Map colmap)
+ public String drawSupportHtml(String propertyName, Map colmap)
{
+ return StringUtils.EMPTY;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String drawColumnModelJs(String propertyName, Map colmap)
+ {
return "editor: new Ed(new FileField({\n"
+ "})),\n"
+ "renderer : function(v, p, record){\n"
@@ -68,7 +76,7 @@
/**
* {@inheritDoc}
*/
- public void processValueOnSave(String[] column, Content colConfig, String propertyName, Content parentNode)
+ public void processColumnOnSave(String[] column, Content colConfig, String propertyName, Content parentNode)
throws RepositoryException, AccessDeniedException
{
String ctx = MgnlContext.getContextPath();
Modified: trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/GridColumnType.java
===================================================================
--- trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/GridColumnType.java 2010-06-18 16:37:15 UTC (rev 2691)
+++ trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/GridColumnType.java 2010-06-18 16:37:42 UTC (rev 2692)
@@ -40,14 +40,12 @@
*/
public String getHeadSnippet();
- /**
- * Returns the columnModelSnippet.
- * @return the columnModelSnippet
- */
- public String getColumnModelSnippet(Map colmap);
+ public String drawSupportHtml(String propertyName, Map colmap);
+ public String drawColumnModelJs(String propertyName, Map colmap);
+
public String processValueOnLoad(String value, Content colConfig);
- public void processValueOnSave(String[] column, Content colConfig, String propertyName, Content parentNode)
+ public void processColumnOnSave(String[] column, Content colConfig, String propertyName, Content parentNode)
throws RepositoryException, AccessDeniedException;
}
Modified: trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/LinkGridColumnType.java
===================================================================
--- trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/LinkGridColumnType.java 2010-06-18 16:37:15 UTC (rev 2691)
+++ trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/LinkGridColumnType.java 2010-06-18 16:37:42 UTC (rev 2692)
@@ -33,8 +33,16 @@
/**
* {@inheritDoc}
*/
- public String getColumnModelSnippet(Map colmap)
+ public String drawSupportHtml(String propertyName, Map colmap)
{
+ return StringUtils.EMPTY;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String drawColumnModelJs(String propertyName, Map colmap)
+ {
List<String> options = new ArrayList<String>();
if (!StringUtils.isEmpty((String) colmap.get("repository")))
{
@@ -58,7 +66,7 @@
/**
* {@inheritDoc}
*/
- public void processValueOnSave(String[] column, Content colConfig, String propertyName, Content parentNode)
+ public void processColumnOnSave(String[] column, Content colConfig, String propertyName, Content parentNode)
throws RepositoryException, AccessDeniedException
{
}
Modified: trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/UUIDLinkGridColumnType.java
===================================================================
--- trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/UUIDLinkGridColumnType.java 2010-06-18 16:37:15 UTC (rev 2691)
+++ trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/UUIDLinkGridColumnType.java 2010-06-18 16:37:42 UTC (rev 2692)
@@ -36,8 +36,16 @@
/**
* {@inheritDoc}
*/
- public String getColumnModelSnippet(Map colmap)
+ public String drawSupportHtml(String propertyName, Map colmap)
{
+ return StringUtils.EMPTY;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String drawColumnModelJs(String propertyName, Map colmap)
+ {
List<String> options = new ArrayList<String>();
if (!StringUtils.isEmpty((String) colmap.get("repository")))
{
@@ -69,7 +77,7 @@
/**
* {@inheritDoc}
*/
- public void processValueOnSave(String[] column, Content colConfig, String propertyName, Content parentNode)
+ public void processColumnOnSave(String[] column, Content colConfig, String propertyName, Content parentNode)
throws RepositoryException, AccessDeniedException
{
String repository = StringUtils.defaultIfEmpty(
Modified: trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/DialogGridSaveHandler.java
===================================================================
--- trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/DialogGridSaveHandler.java 2010-06-18 16:37:15 UTC (rev 2691)
+++ trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/dialog/DialogGridSaveHandler.java 2010-06-18 16:37:42 UTC (rev 2692)
@@ -93,7 +93,7 @@
GridColumnType colType = colTypeMap.get(colTypeName);
if (colType != null && colIndex < columns.size())
{
- colType.processValueOnSave(columns.get(colIndex), colConfig, name, parentNode);
+ colType.processColumnOnSave(columns.get(colIndex), colConfig, name, parentNode);
}
colIndex++;
}
Modified: trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl
===================================================================
--- trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl 2010-06-18 16:37:15 UTC (rev 2691)
+++ trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl 2010-06-18 16:37:42 UTC (rev 2692)
@@ -7,7 +7,6 @@
<script type="text/javascript" src="${request.contextPath}/.resources/ext/ext-all.js"></script>
[/#if]
<script type="text/javascript" src="${request.contextPath}/.resources/controls/js/CheckColumn.js"></script>
- <script type="text/javascript" src="${request.contextPath}/.resources/controls/js/PipeComboBox.js"></script>
<script type="text/javascript" src="${request.contextPath}/.resources/controls/js/ColorField.js"></script>
<script type="text/javascript">
@@ -144,14 +143,6 @@
editor: new Ed(new fm.DateField({
format: 'Y-m-d'
}))
- [#elseif (colmap.type?? && colmap.type = 'combo')]
- editor: new Ed(new [#if (colmap.pipe?? && colmap.pipe = 'true')]PipeComboBox[#else]fm.ComboBox[/#if]({
- typeAhead: true,
- triggerAction: 'all',
- transform: 'combo-${name}',
- lazyRender: true,
- listClass: 'x-combo-list-small'
- }))
[#elseif (colmap.type?? && colmap.type = 'color')]
editor: new Ed(new Ext.ux.ColorField({
})),
@@ -159,7 +150,7 @@
return v ? '<em style="display: block; float: left; border: 1px solid #ACA899;"><span style="display: block; width: 10px; height: 10px; line-height: 10px; background-color: ' + v + ';"></span></em>' : '';
}
[#elseif (colmap.type?? && gridColumnTypes[colmap.type]??)]
- ${gridColumnTypes[colmap.type].getColumnModelSnippet(colmap)}
+ ${gridColumnTypes[colmap.type].drawColumnModelJs(name, colmap)}
[#else]
editor: new Ed(new fm.TextField({
allowBlank: true
Added: trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.gridColumnTypes.combo.xml
===================================================================
--- trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.gridColumnTypes.combo.xml (rev 0)
+++ trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.gridColumnTypes.combo.xml 2010-06-18 16:37:42 UTC (rev 2692)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<sv:node sv:name="combo" 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>b5b9e73c-c966-4cb4-a543-9d0fc8572b5f</sv:value>
+ </sv:property>
+ <sv:property sv:name="class" sv:type="String">
+ <sv:value>net.sourceforge.openutils.mgnlcontrols.configuration.ComboGridColumnType</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2010-06-18T11:41:55.562+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-06-18T18:34:45.343+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+</sv:node>
Property changes on: trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap/controls/config.modules.controls.gridColumnTypes.combo.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:keywords
+ Author Date Id Revision
Added: svn:eol-style
+ native
Modified: trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.dialogs.samples-grid.xml
===================================================================
--- trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.dialogs.samples-grid.xml 2010-06-18 16:37:15 UTC (rev 2691)
+++ trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.dialogs.samples-grid.xml 2010-06-18 16:37:42 UTC (rev 2692)
@@ -376,6 +376,194 @@
</sv:property>
</sv:node>
</sv:node>
+ <sv:node sv:name="04">
+ <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>5649ba37-5590-46f8-b522-b03df09235db</sv:value>
+ </sv:property>
+ <sv:property sv:name="header" sv:type="String">
+ <sv:value>testwebapp.dialogs.samples-grid.columnF.header</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="type" sv:type="String">
+ <sv:value>combo</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2010-05-11T18:49:01.296+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-06-18T18:33:09.500+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="options">
+ <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>af9e8e76-5b72-4a1a-9065-cae37fc582ca</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-06-18T18:33:13.093+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-06-18T18:33:15.953+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ <sv:node sv:name="0">
+ <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>34a0e6b4-5151-4b50-bb44-a247649c4149</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>---</sv:value>
+ </sv:property>
+ <sv:property sv:name="value" sv:type="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:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2010-06-18T18:33:19.093+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-06-18T18:33:51.890+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ <sv:node sv:name="00">
+ <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>06c92448-abc7-45cc-ad20-daa764e89a51</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>one</sv:value>
+ </sv:property>
+ <sv:property sv:name="value" sv:type="String">
+ <sv:value>1</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2010-06-18T18:33:19.093+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-06-18T18:34:02.921+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ <sv:node sv:name="01">
+ <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>80dd1510-9dcb-418a-b651-b80c08a50b7f</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>two</sv:value>
+ </sv:property>
+ <sv:property sv:name="value" sv:type="String">
+ <sv:value>2</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2010-06-18T18:33:19.093+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-06-18T18:34:12.187+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
+ </sv:node>
+ </sv:node>
</sv:node>
</sv:node>
</sv:node>
Modified: trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/website.sample-controls.xml
===================================================================
--- trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/website.sample-controls.xml 2010-06-18 16:37:15 UTC (rev 2691)
+++ trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/website.sample-controls.xml 2010-06-18 16:37:42 UTC (rev 2692)
@@ -29,7 +29,7 @@
<sv:value>2010-05-11T18:45:03.281+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-06-18T17:55:28.281+02:00</sv:value>
+ <sv:value>2010-06-18T18:35:15.265+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:template" sv:type="String">
<sv:value>sampleControls</sv:value>
@@ -62,7 +62,7 @@
<sv:value>2010-05-11T18:55:40.453+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-06-18T17:55:28.281+02:00</sv:value>
+ <sv:value>2010-06-18T18:35:15.265+02:00</sv:value>
</sv:property>
</sv:node>
<sv:node sv:name="0">
@@ -76,20 +76,21 @@
<sv:value>0aea2f91-916f-43c9-8778-6498d2764c17</sv:value>
</sv:property>
<sv:property sv:name="grid" sv:type="String">
- <sv:value>hello /sample-controls.html 1e1df947-3a2b-437c-8e38-d0a03d4c41c0 <p>Lorem ipsum dolor sit amet</p> /sample-controls/main/0/grid_files/file/logo-openmindlab.png
-world /demo-project.html 1be12547-ad82-4c83-8396-213466ceb003 <p>consectetur adipisici elit</p> /sample-controls/main/0/grid_files/file0/logocontrols.gif
-
-
-
-
-
-
-
-
-
-
-
- </sv:value>
+ <sv:value>hello /sample-controls.html 1e1df947-3a2b-437c-8e38-d0a03d4c41c0 <p>Lorem ipsum dolor sit amet</p> /sample-controls/main/0/grid_files/file/logo-openmindlab.png 1
+world /demo-project.html 1be12547-ad82-4c83-8396-213466ceb003 <p>consectetur adipisici elit</p> /sample-controls/main/0/grid_files/file0/logocontrols.gif 2
+
+
+
+
+
+
+
+
+
+
+
+
+ </sv:value>
</sv:property>
<sv:property sv:name="jcr:createdBy" sv:type="String">
<sv:value>admin</sv:value>
@@ -108,7 +109,7 @@
<sv:value>2010-05-11T18:55:40.468+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2010-06-18T17:55:28.281+02:00</sv:value>
+ <sv:value>2010-06-18T18:35:15.265+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:template" sv:type="String">
<sv:value>samples-grid</sv:value>
Modified: trunk/openutils-mgnlcontrols/src/main/resources/mgnl-files/templates/samples-controls/paragraph-grid.jsp
===================================================================
--- trunk/openutils-mgnlcontrols/src/main/resources/mgnl-files/templates/samples-controls/paragraph-grid.jsp 2010-06-18 16:37:15 UTC (rev 2691)
+++ trunk/openutils-mgnlcontrols/src/main/resources/mgnl-files/templates/samples-controls/paragraph-grid.jsp 2010-06-18 16:37:42 UTC (rev 2692)
@@ -4,31 +4,52 @@
xmlns:cmsfn="http://www.magnolia.info/tlds/cmsfn-taglib.tld" xmlns:mu="mgnlutils">
<jsp:directive.page contentType="text/html; charset=UTF-8" session="false" />
<cms:setNode var="node" />
- <table>
- <c:forEach var="row" items="${mu:splitAndTokenize(node.grid)}">
+ <table cellspacing="0" border="1">
+ <thead>
<tr>
- <td>${row[0]}</td>
- <td>
- <c:if test="${!empty row[1]}">
- <a href="${mu:link(row[1])}">${row[1]}</a>
- </c:if>
- </td>
- <td>
- <c:if test="${!empty row[2]}">
- <a href="${mu:link(row[2])}">${row[2]}</a>
- </c:if>
- </td>
- <td>${row[3]}</td>
- <td>
- <c:if test="${!empty row[4]}">
- <cms:setNode var="filesNode" path="${fn:substringBefore(row[4], '/grid_files/')}/grid_files" />
- <c:set var="property" value="${fn:substringBefore(fn:substringAfter(row[4], '/grid_files/'), '/')}" />
- <a href="${pageContext.request.contextPath}${row[4]}">
- <cms:out contentNode="${filesNode}" nodeDataName="${property}" fileProperty="name" />
- </a>
- </c:if>
- </td>
+ <th>text</th>
+ <th>link</th>
+ <th>uuidLink</th>
+ <th>fckedit</th>
+ <th>file</th>
</tr>
- </c:forEach>
+ </thead>
+ <tbody>
+ <c:forEach var="row" items="${mu:splitAndTokenize(node.grid)}">
+ <tr>
+
+ <!-- text -->
+ <td>${row[0]}</td>
+
+ <!-- link -->
+ <td>
+ <c:if test="${!empty row[1]}">
+ <a href="${mu:link(row[1])}">${row[1]}</a>
+ </c:if>
+ </td>
+
+ <!-- uuidLink -->
+ <td>
+ <c:if test="${!empty row[2]}">
+ <a href="${mu:link(row[2])}">${row[2]}</a>
+ </c:if>
+ </td>
+
+ <!-- fckedit -->
+ <td>${row[3]}</td>
+
+ <!-- file -->
+ <td>
+ <c:if test="${!empty row[4]}">
+ <cms:setNode var="filesNode" path="${fn:substringBefore(row[4], '/grid_files/')}/grid_files" />
+ <c:set var="property" value="${fn:substringBefore(fn:substringAfter(row[4], '/grid_files/'), '/')}" />
+ <a href="${pageContext.request.contextPath}${row[4]}">
+ <cms:out contentNode="${filesNode}" nodeDataName="${property}" fileProperty="name" />
+ </a>
+ </c:if>
+ </td>
+ </tr>
+ </c:forEach>
+ </tbody>
</table>
</jsp:root>
\ No newline at end of file
Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/grid/MediaGridColumnType.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/grid/MediaGridColumnType.java 2010-06-18 16:37:15 UTC (rev 2691)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/grid/MediaGridColumnType.java 2010-06-18 16:37:42 UTC (rev 2692)
@@ -62,8 +62,16 @@
/**
* {@inheritDoc}
*/
- public String getColumnModelSnippet(Map colmap)
+ public String drawSupportHtml(String propertyName, Map colmap)
{
+ return StringUtils.EMPTY;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String drawColumnModelJs(String propertyName, Map colmap)
+ {
return "editor: new Ed(new MediaField({\n"
+ "})),\n"
+ "renderer : function(v, p, record){\n"
@@ -93,7 +101,7 @@
/**
* {@inheritDoc}
*/
- public void processValueOnSave(String[] column, Content colConfig, String propertyName, Content parentNode)
+ public void processColumnOnSave(String[] column, Content colConfig, String propertyName, Content parentNode)
throws RepositoryException, AccessDeniedException
{
String mediaValueType = StringUtils.defaultIfEmpty(NodeDataUtil.getString(colConfig, "valueType"), "uuid");
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
