[Openutils-svn] SF.net SVN: openutils:[4275] magnoliamodules/trunk/openutils-mgnlcontrols/ src/main/resources

[<die...@us...>]

Revision: 4275
          http://openutils.svn.sourceforge.net/openutils/?rev=4275&view=rev
Author:   diego_schivo
Date:     2013-06-28 15:32:39 +0000 (Fri, 28 Jun 2013)
Log Message:
-----------
CONTROLS-54 dependentSelectListAndRadioGroup.ftl

Modified Paths:
--------------
    magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/dialogs/dependentSelectListAndRadioGroup.ftl
    magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-files/templates/samples-controls/paragraph-dependentSelectList.jsp

Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/dialogs/dependentSelectListAndRadioGroup.ftl
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/dialogs/dependentSelectListAndRadioGroup.ftl	2013-06-27 13:08:19 UTC (rev 4274)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/dialogs/dependentSelectListAndRadioGroup.ftl	2013-06-28 15:32:39 UTC (rev 4275)
@@ -9,22 +9,20 @@
 </select>
 [/#list]
 <div class="radioGroup">
-[#assign found = false]
 [#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.items[key]!}<br />
+  <input type="radio" id="${name}_${key?html!}" name="${name}Radio" value="${key?html!}"[#if checked] checked="checked"[/#if] />${radioOptions.items[key]!}<br />
 [/#list]
 [#if radioOptions.more]
   <a href="#" id="${name}More">More</a>
 [/#if]
+</div>
 [#if !refresh]
-  [#if !found]
-  <input type="hidden" name="${name}" value="${value?html}" />
+  [#if (configuration['showValue']!false)?string == 'true']
+<input type="text" id="${name}" name="${name}" value="${value?html!}" class="mgnlDialogControlEdit" style="width: 100%;" />
+  [#else]
+<input type="hidden" id="${name}" name="${name}" value="${value?html!}" />
   [/#if]
-[/#if]
-</div>
-[#if !refresh]
 <script type="text/javascript">
 (function($){
   var dialogBoxInput;
@@ -33,7 +31,7 @@
   
   function init(){
     dialogBoxInput = $('label[for="${name}"]').closest("tr").find("td.mgnlDialogBoxInput");
-    selects = dialogBoxInput.find('select[name!="${name}"]');
+    selects = dialogBoxInput.find("select");
     selects.change(function(){
       var $this = $(this);
       var data = $("#mgnlPath,#mgnlParagraph,#mgnlRepository,#mgnlLocale,#mgnlRichE,#mgnlRichEPaste").add(selects);
@@ -47,11 +45,15 @@
   }
   
   function initRadio(){
+    var input = dialogBoxInput.find('input[name="${name}"]');
+    dialogBoxInput.find('input[type="radio"]').click(function(){
+      input.val($(this).val());
+    });
     var link = $("a#${name}More");
     link.click(function(e){
       e.preventDefault();
       var $this = $(this);
-      var data = $("#mgnlPath,#mgnlParagraph,#mgnlRepository,#mgnlLocale,#mgnlRichE,#mgnlRichEPaste").add(selects);
+      var data = $("#mgnlPath,#mgnlParagraph,#mgnlRepository,#mgnlLocale,#mgnlRichE,#mgnlRichEPaste").add(selects).add(input);
       $.get($("#mgnlFormMain").attr("action"), data.serialize() + "&radioGroupPage=" + (++page) + "&dependentSelectListCK=" + new Date().getTime(), function(data){
         $(data).find('label[for="${name}"]').closest("tr").find("td.mgnlDialogBoxInput .radioGroup").replaceAll(link);
         initRadio();
@@ -64,4 +66,10 @@
   });
 })(jQuery);
 </script>
+[#else]
+  [#if (configuration['showValue']!false)?string == 'true']
+  <input type="text" id="${name}" name="${name}" value="" class="mgnlDialogControlEdit" style="width: 100%;" />
+  [#else]
+  <input type="hidden" name="${name}" value="" />
+  [/#if]
 [/#if]

Modified: magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-files/templates/samples-controls/paragraph-dependentSelectList.jsp
===================================================================
--- magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-files/templates/samples-controls/paragraph-dependentSelectList.jsp	2013-06-27 13:08:19 UTC (rev 4274)
+++ magnoliamodules/trunk/openutils-mgnlcontrols/src/main/resources/mgnl-files/templates/samples-controls/paragraph-dependentSelectList.jsp	2013-06-28 15:32:39 UTC (rev 4275)
@@ -4,6 +4,6 @@
   xmlns:mu="mgnlutils">
   <jsp:directive.page contentType="text/html; charset=UTF-8" session="false" />
   ${cmsfn:contentByIdentifier(content.foo, "config")}<br />
-  ${cmsfn:contentByIdentifier(content.bar, "website")}<br />
+  ${cmsfn:contentByIdentifier(content.bar, "config")}<br />
   ${cmsfn:contentByIdentifier(content.baz, "config")}<br />
 </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.