Menu
▾
▴
[Openutils-svn] SF.net SVN: openutils:[2675] trunk
|
From: <die...@us...> - 2010-06-18 12:45:27
|
Revision: 2675
http://openutils.svn.sourceforge.net/openutils/?rev=2675&view=rev
Author: diego_schivo
Date: 2010-06-18 12:45:20 +0000 (Fri, 18 Jun 2010)
Log Message:
-----------
CONTROLS-31 link 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/GridColumnType.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-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/grid/MediaGridColumnType.java
Added Paths:
-----------
trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/LinkGridColumnType.java
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 10:55:42 UTC (rev 2674)
+++ trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/FckEditorGridColumnType.java 2010-06-18 12:45:20 UTC (rev 2675)
@@ -21,7 +21,9 @@
import info.magnolia.context.MgnlContext;
+import java.util.Map;
+
/**
* @author dschivo
* @version $Id$
@@ -42,7 +44,7 @@
/**
* {@inheritDoc}
*/
- public String getColumnModelSnippet()
+ public String getColumnModelSnippet(Map colmap)
{
return "editor: new Ed(new FckEditorField({\n"
+ "contextPath: '"
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 10:55:42 UTC (rev 2674)
+++ trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/GridColumnType.java 2010-06-18 12:45:20 UTC (rev 2675)
@@ -19,6 +19,8 @@
package net.sourceforge.openutils.mgnlcontrols.configuration;
+import java.util.Map;
+
/**
* @author dschivo
* @version $Id$
@@ -36,6 +38,6 @@
* Returns the columnModelSnippet.
* @return the columnModelSnippet
*/
- public String getColumnModelSnippet();
+ public String getColumnModelSnippet(Map colmap);
}
Added: 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 (rev 0)
+++ trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/LinkGridColumnType.java 2010-06-18 12:45:20 UTC (rev 2675)
@@ -0,0 +1,46 @@
+package net.sourceforge.openutils.mgnlcontrols.configuration;
+
+import info.magnolia.context.MgnlContext;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.lang.StringUtils;
+
+
+/**
+ * @author dschivo
+ * @version $Id$
+ */
+public class LinkGridColumnType implements GridColumnType
+{
+
+ /**
+ * {@inheritDoc}
+ */
+ public String getHeadSnippet()
+ {
+ return "<script type=\"text/javascript\" src=\""
+ + MgnlContext.getContextPath()
+ + "/.resources/controls/js/LinkField.js\"></script>";
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public String getColumnModelSnippet(Map colmap)
+ {
+ List<String> options = new ArrayList<String>();
+ if (!StringUtils.isEmpty((String) colmap.get("repository")))
+ {
+ options.add("repository: '" + colmap.get("repository") + "'");
+ }
+ if (!StringUtils.isEmpty((String) colmap.get("extension")))
+ {
+ options.add("extension: '" + colmap.get("extension") + "'");
+ }
+ return "editor: new Ed(new LinkField({\n" + StringUtils.join(options, ",\n") + "}))";
+ }
+
+}
Property changes on: trunk/openutils-mgnlcontrols/src/main/java/net/sourceforge/openutils/mgnlcontrols/configuration/LinkGridColumnType.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/resources/dialogs/grid.ftl
===================================================================
--- trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl 2010-06-18 10:55:42 UTC (rev 2674)
+++ trunk/openutils-mgnlcontrols/src/main/resources/dialogs/grid.ftl 2010-06-18 12:45:20 UTC (rev 2675)
@@ -6,7 +6,6 @@
[#else]
<script type="text/javascript" src="${request.contextPath}/.resources/ext/ext-all.js"></script>
[/#if]
- <script type="text/javascript" src="${request.contextPath}/.resources/controls/js/LinkField.js"></script>
<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/FileField.js"></script>
@@ -139,13 +138,7 @@
header: '${msgs.getWithDefault(colmap.header?js_string, colmap.header?js_string)}',
dataIndex: '${colmap_index}',
sortable: false,
- [#if (colmap.type?? && (colmap.type = 'link' || colmap.type = 'uuidLink'))]
- editor: new Ed(new LinkField({
- [#if (colmap.repository??)]repository: '${colmap.repository}',[/#if]
- [#if (colmap.extension??)]extension: '${colmap.extension}',[/#if]
- dummy: undefined
- }))
- [#elseif (colmap.type?? && colmap.type = 'date')]
+ [#if (colmap.type?? && colmap.type = 'date')]
renderer: function(value) {
return value && Ext.isDate(value) ? value.format('Y-m-d') : value;
},
@@ -173,7 +166,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].columnModelSnippet}
+ ${gridColumnTypes[colmap.type].getColumnModelSnippet(colmap)}
[#else]
editor: new Ed(new fm.TextField({
allowBlank: true
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 10:55:42 UTC (rev 2674)
+++ trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.dialogs.samples-grid.xml 2010-06-18 12:45:20 UTC (rev 2675)
@@ -290,6 +290,52 @@
</sv:property>
</sv:node>
</sv:node>
+ <sv:node sv:name="02">
+ <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>101ebe73-c8b1-48d2-b3a6-74092c799602</sv:value>
+ </sv:property>
+ <sv:property sv:name="extension" sv:type="String">
+ <sv:value>html</sv:value>
+ </sv:property>
+ <sv:property sv:name="header" sv:type="String">
+ <sv:value>testwebapp.dialogs.samples-grid.columnD.header</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="repository" sv:type="String">
+ <sv:value>website</sv:value>
+ </sv:property>
+ <sv:property sv:name="type" sv:type="String">
+ <sv:value>link</sv:value>
+ </sv:property>
+ <sv:node sv:name="MetaData">
+ <sv:property sv:name="jcr:primaryType" sv:type="Name">
+ <sv:value>mgnl:metaData</sv:value>
+ </sv:property>
+ <sv:property sv:name="jcr:createdBy" sv:type="String">
+ <sv:value>admin</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:activated" sv:type="Boolean">
+ <sv:value>false</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:authorid" sv:type="String">
+ <sv:value>superuser</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:creationdate" sv:type="Date">
+ <sv:value>2010-05-11T18:49:01.296+02:00</sv:value>
+ </sv:property>
+ <sv:property sv:name="mgnl:lastmodified" sv:type="Date">
+ <sv:value>2010-06-18T14:39:23.437+02:00</sv:value>
+ </sv:property>
+ </sv:node>
+ </sv:node>
</sv:node>
</sv:node>
</sv:node>
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 10:55:42 UTC (rev 2674)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/grid/MediaGridColumnType.java 2010-06-18 12:45:20 UTC (rev 2675)
@@ -20,6 +20,9 @@
package net.sourceforge.openutils.mgnlmedia.grid;
import info.magnolia.context.MgnlContext;
+
+import java.util.Map;
+
import net.sourceforge.openutils.mgnlcontrols.configuration.GridColumnType;
@@ -50,7 +53,7 @@
/**
* {@inheritDoc}
*/
- public String getColumnModelSnippet()
+ public String getColumnModelSnippet(Map colmap)
{
return "editor: new Ed(new MediaField({\n"
+ "})),\n"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
