Menu
▾
▴
[Openutils-svn] SF.net SVN: openutils:[4262] magnoliamodules/trunk/openutils-mgnlcontrols/ src/main/resources
|
From: <die...@us...> - 2013-06-14 15:45:07
|
Revision: 4262
http://openutils.svn.sourceforge.net/openutils/?rev=4262&view=rev
Author: diego_schivo
Date: 2013-06-14 15:45:04 +0000 (Fri, 14 Jun 2013)
Log Message:
-----------
CONTROLS-54 itemsPerPage
Modified Paths:
--------------
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/dialogs/dependentSelectListAndRadioGroup.ftl
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.dialogs.samples-dependentSelectList.xml
magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/website.sample-controls.xml
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/dialogs/dependentSelectListAndRadioGroup.ftl
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/dialogs/dependentSelectListAndRadioGroup.ftl 2013-06-14 15:39:57 UTC (rev 4261)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/dialogs/dependentSelectListAndRadioGroup.ftl 2013-06-14 15:45:04 UTC (rev 4262)
@@ -9,11 +9,14 @@
[/#list]
[#assign refresh = request.getParameter("dependentSelectListCK")?has_content]
[#assign found = false]
-[#list radioOptions?keys as key]
+[#list radioOptions.items?keys as key]
[#assign checked = (!refresh && key = value!) || (refresh && key = request.getParameter(name)!)]
[#assign found = found || checked]
-<input type="radio" id="${name}_${key?html!}" name="${name}" value="${key?html!}"[#if checked] checked="checked"[/#if] />${radioOptions[key]!}<br />
+<input type="radio" id="${name}_${key?html!}" name="${name}" value="${key?html!}"[#if checked] checked="checked"[/#if] />${radioOptions.items[key]!}<br />
[/#list]
+[#if radioOptions.more]
+<a href="#" id="${name}More">More</a>
+[/#if]
[#if !refresh]
[#if !found]
<input type="hidden" name="${name}" value="${value?html}" />
Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.dialogs.samples-dependentSelectList.xml
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.dialogs.samples-dependentSelectList.xml 2013-06-14 15:39:57 UTC (rev 4261)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/config.modules.controls.dialogs.samples-dependentSelectList.xml 2013-06-14 15:45:04 UTC (rev 4262)
@@ -103,7 +103,7 @@
<sv:value>dependentSelectList</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="label" sv:type="String">
<sv:value>Foo</sv:value>
@@ -116,7 +116,7 @@
<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>
@@ -142,8 +142,11 @@
<sv:property sv:name="controlType" sv:type="String">
<sv:value>radioGroup</sv:value>
</sv:property>
+ <sv:property sv:name="itemsPerPage" sv:type="String">
+ <sv:value>5</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="label" sv:type="String">
<sv:value>Bar</sv:value>
@@ -156,7 +159,7 @@
<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:activated" sv:type="Boolean">
<sv:value>false</sv:value>
@@ -168,7 +171,7 @@
<sv:value>2013-06-14T15:54:03.927+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2013-06-14T16:35:32.392+02:00</sv:value>
+ <sv:value>2013-06-14T17:40:38.218+02:00</sv:value>
</sv:property>
</sv:node>
</sv:node>
@@ -185,8 +188,11 @@
<sv:property sv:name="controlType" sv:type="String">
<sv:value>dependentSelectListAndRadioGroup</sv:value>
</sv:property>
+ <sv:property sv:name="itemsPerPage" sv:type="String">
+ <sv:value>5</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="label" sv:type="String">
<sv:value>Baz</sv:value>
@@ -202,7 +208,7 @@
<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:activated" sv:type="Boolean">
<sv:value>false</sv:value>
@@ -214,7 +220,7 @@
<sv:value>2013-06-14T15:54:03.927+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2013-06-14T16:43:16.185+02:00</sv:value>
+ <sv:value>2013-06-14T17:40:48.550+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 15:39:57 UTC (rev 4261)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-bootstrap-samples/controls/website.sample-controls.xml 2013-06-14 15:45:04 UTC (rev 4262)
@@ -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>superuser</sv:value>
+ <sv:value>admin</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>superuser</sv:value>
+ <sv:value>admin</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-14T16:45:39.733+02:00</sv:value>
+ <sv:value>2013-06-14T17:42:42.408+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:template" sv:type="String">
<sv:value>controls:pages/sampleControls</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>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>
@@ -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>2013-06-14T16:45:39.732+02:00</sv:value>
+ <sv:value>2013-06-14T17:42:42.408+02:00</sv:value>
</sv:property>
</sv:node>
<sv:node sv:name="0">
@@ -97,14 +97,14 @@
</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>
@@ -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>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:creationdate" sv:type="Date">
<sv:value>2010-05-11T18:55:40.515+02:00</sv:value>
@@ -229,35 +229,14 @@
<sv:value>mix:lockable</sv:value>
</sv:property>
<sv:property sv:name="jcr:uuid" sv:type="String">
- <sv:value>2f0eb337-36c7-4dc6-bdd8-4a904834d038</sv:value>
+ <sv:value>496abe2c-4008-4d1b-9bf5-5c6272620c30</sv:value>
</sv:property>
- <sv:property sv:name="bar" sv:type="String">
- <sv:value>1e1df947-3a2b-437c-8e38-d0a03d4c41c0</sv:value>
- </sv:property>
<sv:property sv:name="baz" sv:type="String">
- <sv:value>9c9b6148-f018-49f9-b674-102b1f4318eb</sv:value>
+ <sv:value/>
</sv:property>
- <sv:property sv:name="bazSelect0" sv:type="String">
- <sv:value>2f363acf-792e-4e2f-9fdb-6a52853b44f0</sv:value>
- </sv:property>
- <sv:property sv:name="bazSelect1" sv:type="String">
- <sv:value>ea1cf7df-1bcf-4b47-b7bc-f4403daa50e6</sv:value>
- </sv:property>
- <sv:property sv:name="bazSelect2" sv:type="String">
- <sv:value>9d29a284-9502-43a8-beba-c57fac3b462f</sv:value>
- </sv:property>
<sv:property sv:name="foo" sv:type="String">
- <sv:value>46b21a36-f8c2-4193-b23e-17f06de93932</sv:value>
+ <sv:value/>
</sv:property>
- <sv:property sv:name="fooSelect0" sv:type="String">
- <sv:value>2f363acf-792e-4e2f-9fdb-6a52853b44f0</sv:value>
- </sv:property>
- <sv:property sv:name="fooSelect1" sv:type="String">
- <sv:value>ea1cf7df-1bcf-4b47-b7bc-f4403daa50e6</sv:value>
- </sv:property>
- <sv:property sv:name="fooSelect2" sv:type="String">
- <sv:value>9d29a284-9502-43a8-beba-c57fac3b462f</sv:value>
- </sv:property>
<sv:property sv:name="jcr:createdBy" sv:type="String">
<sv:value>superuser</sv:value>
</sv:property>
@@ -272,10 +251,10 @@
<sv:value>superuser</sv:value>
</sv:property>
<sv:property sv:name="mgnl:creationdate" sv:type="Date">
- <sv:value>2013-06-14T16:00:43.989+02:00</sv:value>
+ <sv:value>2013-06-14T17:42:42.404+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:lastmodified" sv:type="Date">
- <sv:value>2013-06-14T16:45:39.732+02:00</sv:value>
+ <sv:value>2013-06-14T17:42:42.408+02:00</sv:value>
</sv:property>
<sv:property sv:name="mgnl:template" sv:type="String">
<sv:value>controls:components/samples-dependentSelectList</sv:value>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
