Menu
▾
▴
[Openutils-svn] SF.net SVN: openutils:[4253] magnoliamodules/trunk/openutils-mgnlcontrols/ src/main/resources
|
From: <die...@us...> - 2013-06-14 13:31:12
|
Revision: 4253
http://openutils.svn.sourceforge.net/openutils/?rev=4253&view=rev
Author: diego_schivo
Date: 2013-06-14 13:31:09 +0000 (Fri, 14 Jun 2013)
Log Message:
-----------
paragraph-grid.jsp
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.templates.components.samples-grid.xml
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/website.sample-controls.xml
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-files/templates/samples-controls/paragraph-grid.jsp
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-files/templates/samples-controls/template.jsp
Added Paths:
-----------
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-files/templates/samples-controls/area.jsp
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.templates.components.samples-grid.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.templates.components.samples-grid.xml 2013-06-14 12:26:17 UTC (rev 4252)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.templates.components.samples-grid.xml 2013-06-14 13:31:09 UTC (rev 4253)
@@ -12,6 +12,9 @@
<sv:property sv:name="description" sv:type="String">
<sv:value>Sample grid paragraph</sv:value>
</sv:property>
+ <sv:property sv:name="dialog" sv:type="String">
+ <sv:value>controls:samples-grid</sv:value>
+ </sv:property>
<sv:property sv:name="jcr:createdBy" sv:type="String">
<sv:value>admin</sv:value>
</sv:property>
@@ -41,7 +44,7 @@
<sv:value>2008-09-25T12:45:26.721+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2013-06-14T14:25:39.926+02:00</sv:value>
+ <sv:value>2013-06-14T15:09:22.878+02:00</sv:value>
</sv:property>
</sv:node>
</sv:node>
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/website.sample-controls.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/website.sample-controls.xml 2013-06-14 12:26:17 UTC (rev 4252)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/website.sample-controls.xml 2013-06-14 13:31:09 UTC (rev 4253)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<sv:node sv:name="sample-controls" 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:content</sv:value>
+ <sv:value>mgnl:page</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
@@ -10,7 +10,7 @@
<sv:value>1e1df947-3a2b-437c-8e38-d0a03d4c41c0</sv:value>
</sv:property>
<sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
+ <sv:value>superuser</sv:value>
</sv:property>
<sv:property sv:name="title" sv:type="String">
<sv:value>Controls sample</sv:value>
@@ -20,7 +20,7 @@
<sv:value>mgnl:metaData</sv:value>
</sv:property>
<sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
+ <sv:value>superuser</sv:value>
</sv:property>
<sv:property sv:name="mgnl:authorid" sv:type="String">
<sv:value>superuser</sv:value>
@@ -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>2013-06-14T11:08:44.343+02:00</sv:value>
+ <sv:value>2013-06-14T15:14:54.258+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:template" sv:type="String">
<sv:value>controls:pages/sampleControls</sv:value>
@@ -37,7 +37,7 @@
</sv:node>
<sv:node sv:name="main">
<sv:property sv:name="jcr:primaryType" sv:type="Name">
- <sv:value>mgnl:contentNode</sv:value>
+ <sv:value>mgnl:area</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
@@ -46,14 +46,14 @@
<sv:value>04bed0be-23ab-4b18-b581-04f1670b59ad</sv:value>
</sv:property>
<sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
+ <sv:value>superuser</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:value>superuser</sv:value>
</sv:property>
<sv:property sv:name="mgnl:authorid" sv:type="String">
<sv:value>superuser</sv:value>
@@ -62,12 +62,12 @@
<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-21T17:46:04.175+02:00</sv:value>
+ <sv:value>2013-06-14T14:55:50.194+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:value>mgnl:component</sv:value>
</sv:property>
<sv:property sv:name="jcr:mixinTypes" sv:type="Name" sv:multiple="true">
<sv:value>mix:lockable</sv:value>
@@ -97,14 +97,14 @@
</sv:value>
</sv:property>
<sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
+ <sv:value>superuser</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:value>superuser</sv:value>
</sv:property>
<sv:property sv:name="mgnl:authorid" sv:type="String">
<sv:value>superuser</sv:value>
@@ -116,7 +116,7 @@
<sv:value>2010-06-21T17:46:04.175+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:template" sv:type="String">
- <sv:value>samples-grid</sv:value>
+ <sv:value>controls:components/samples-grid</sv:value>
</sv:property>
</sv:node>
<sv:node sv:name="grid_files">
@@ -130,14 +130,14 @@
<sv:value>d71bd42f-e207-4f67-bd9b-bab73a5e83f3</sv:value>
</sv:property>
<sv:property sv:name="jcr:createdBy" sv:type="String">
- <sv:value>admin</sv:value>
+ <sv:value>superuser</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:value>superuser</sv:value>
</sv:property>
<sv:property sv:name="mgnl:creationdate" sv:type="Date">
<sv:value>2010-05-11T18:55:40.515+02:00</sv:value>
Added: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-files/templates/samples-controls/area.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-files/templates/samples-controls/area.jsp (rev 0)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-files/templates/samples-controls/area.jsp 2013-06-14 13:31:09 UTC (rev 4253)
@@ -0,0 +1,9 @@
+<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
+ xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms"
+ xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
+ xmlns:mu="mgnlutils">
+ <jsp:directive.page contentType="text/html; charset=UTF-8" session="false" />
+ <c:forEach var="component" items="${components}">
+ <cms:component content="${component}" />
+ </c:forEach>
+</jsp:root>
\ No newline at end of file
Property changes on: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-files/templates/samples-controls/area.jsp
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+text/xml
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-files/templates/samples-controls/paragraph-grid.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-files/templates/samples-controls/paragraph-grid.jsp 2013-06-14 12:26:17 UTC (rev 4252)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-files/templates/samples-controls/paragraph-grid.jsp 2013-06-14 13:31:09 UTC (rev 4253)
@@ -1,9 +1,8 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:cms="urn:jsptld:cms-taglib"
- xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core" xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt"
- xmlns:fn="urn:jsptld:http://java.sun.com/jsp/jstl/functions" xmlns:cmsu="urn:jsptld:cms-util-taglib"
- xmlns:cmsfn="http://www.magnolia.info/tlds/cmsfn-taglib.tld" xmlns:mu="mgnlutils">
+<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
+ xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms"
+ xmlns:cmsfn="http://magnolia-cms.com/taglib/templating-components/cmsfn" xmlns:media="http://net.sourceforge.openutils/mgnlMedia"
+ xmlns:mu="mgnlutils">
<jsp:directive.page contentType="text/html; charset=UTF-8" session="false" />
- <cms:setNode var="node" />
<table cellspacing="0" border="1">
<thead>
<tr>
@@ -19,7 +18,7 @@
</tr>
</thead>
<tbody>
- <c:forEach var="row" items="${mu:splitAndTokenize(node.grid)}">
+ <c:forEach var="row" items="${mu:splitAndTokenize(content.grid)}">
<tr>
<!-- text -->
@@ -45,10 +44,12 @@
<!-- file -->
<td>
<c:if test="${!empty row[4]}">
- <cms:setNode var="filesNode" path="${fn:substringBefore(row[4], '/grid_files/')}/grid_files" />
+ <c:set var="path" value="${fn:substringBefore(row[4], '/grid_files/')}/grid_files" />
+ <c:set var="filesNode" value="${cmsfn:content(path, 'website')}" />
<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" />
+ <!--cms:out contentNode="${filesNode}" nodeDataName="${property}" fileProperty="name" /-->
+ ${filesNode[property].fileName}
</a>
</c:if>
</td>
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-files/templates/samples-controls/template.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-files/templates/samples-controls/template.jsp 2013-06-14 12:26:17 UTC (rev 4252)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-files/templates/samples-controls/template.jsp 2013-06-14 13:31:09 UTC (rev 4253)
@@ -1,6 +1,6 @@
-<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="http://java.sun.com/jsp/jstl/core"
- xmlns:fmt="http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions" xmlns:cms="urn:jsptld:cms-taglib"
- xmlns:cmsu="urn:jsptld:cms-util-taglib" xmlns:cmsfn="http://www.magnolia.info/tlds/cmsfn-taglib.tld"
+<jsp:root version="2.0" xmlns:jsp="http://java.sun.com/JSP/Page" xmlns:c="urn:jsptld:http://java.sun.com/jsp/jstl/core"
+ xmlns:fmt="urn:jsptld:http://java.sun.com/jsp/jstl/fmt" xmlns:fn="http://java.sun.com/jsp/jstl/functions"
+ xmlns:cms="http://magnolia-cms.com/taglib/templating-components/cms"
xmlns:media="http://net.sourceforge.openutils/mgnlMedia">
<jsp:directive.page contentType="text/html; charset=UTF-8" session="false" />
<jsp:text>
@@ -10,16 +10,12 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<title>${actpage.title}</title>
- <cms:links />
+ <cms:init />
</head>
<body>
<h1>${actpage.title}</h1>
- <cms:contentNodeIterator contentNodeCollectionName="main">
- <cms:editBar />
- <cms:includeTemplate />
- </cms:contentNodeIterator>
- <cms:newBar contentNodeCollectionName="main" paragraph="samples-grid" />
+ <cms:area name="main" />
</body>
</html>
</jsp:root>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
