svn commit: r893282 - in /ofbiz/trunk/framework: example/config/ExampleUiLabels.xml example/widget/example/FormWidgetExampleForms.xml example/widget/example/FormWidgetExampleScreens.xml widget/src/org/ofbiz/widget/form/MacroFormRenderer.java

[erwan]

Author: erwan
Date: Tue Dec 22 19:33:06 2009
New Revision: 893282

URL: http://svn.apache.org/viewvc?rev=893282&view=rev
Log:
Closing OFBIZ-3375 , adding description to checkboxes. When using an 
entity-options combined with <check>, the description wasn't displayed.
An example form is at <OFBiz instance>/example/control/FormWidgetExamples

Modified:
    ofbiz/trunk/framework/example/config/ExampleUiLabels.xml
    ofbiz/trunk/framework/example/widget/example/FormWidgetExampleForms.xml
    ofbiz/trunk/framework/example/widget/example/FormWidgetExampleScreens.xml
    
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java

Modified: ofbiz/trunk/framework/example/config/ExampleUiLabels.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/config/ExampleUiLabels.xml?rev=893282&r1=893281&r2=893282&view=diff
==============================================================================
--- ofbiz/trunk/framework/example/config/ExampleUiLabels.xml (original)
+++ ofbiz/trunk/framework/example/config/ExampleUiLabels.xml Tue Dec 22 
19:33:06 2009
@@ -523,6 +523,10 @@
         <value xml:lang="it">Bottone di stampa</value>
         <value xml:lang="zh">打印按钮</value>
     </property>
+    <property key="ExampleSelectionBoxes">
+        <value xml:lang="en">Selection boxes</value>
+        <value xml:lang="fr">Boutons de sélection</value>
+    </property>
     <property key="ExampleSourceCode">
         <value xml:lang="en">Source Code</value>
         <value xml:lang="it">Codice sorgente</value>

Modified: 
ofbiz/trunk/framework/example/widget/example/FormWidgetExampleForms.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/widget/example/FormWidgetExampleForms.xml?rev=893282&r1=893281&r2=893282&view=diff
==============================================================================
--- ofbiz/trunk/framework/example/widget/example/FormWidgetExampleForms.xml 
(original)
+++ ofbiz/trunk/framework/example/widget/example/FormWidgetExampleForms.xml Tue 
Dec 22 19:33:06 2009
@@ -280,4 +280,12 @@
 
     </form>
 
+    <form name="SelectionBoxesExampleForm" type="single">
+        <field name="ExampleTypeId">
+           <check>
+              <entity-options key-field-name="exampleTypeId" 
description="${description}" entity-name="ExampleType"/>
+           </check>
+        </field>
+    </form>
+
 </forms>

Modified: 
ofbiz/trunk/framework/example/widget/example/FormWidgetExampleScreens.xml
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/widget/example/FormWidgetExampleScreens.xml?rev=893282&r1=893281&r2=893282&view=diff
==============================================================================
--- ofbiz/trunk/framework/example/widget/example/FormWidgetExampleScreens.xml 
(original)
+++ ofbiz/trunk/framework/example/widget/example/FormWidgetExampleScreens.xml 
Tue Dec 22 19:33:06 2009
@@ -63,6 +63,15 @@
                                     </container>
                                 </container>
                                 <container style="screenlet-body">
+                                    <container style="button-bar"><label 
style="h2">${uiLabelMap.ExampleSelectionBoxes}</label></container>
+                                    <container style="screenlet-body">
+                                        <label 
style="h3">${uiLabelMap.ExampleSourceCode}</label>
+                                        
<label>${uiLabelMap.ExampleDefinitionName} 
&quot;SelectionBoxesExampleForm&quot; 
${uiLabelMap.ExampleDefinitionFile}</label>
+                                        <link 
target="http://svn.apache.org/repos/asf/ofbiz/trunk/framework/example/widget/example/FormWidgetExampleForms.xml";
 url-mode="plain" target-window="svnPage" 
text="${uiLabelMap.ExampleDefinitionFileTooltip}" style="buttontext"/>
+                                        <include-form 
name="SelectionBoxesExampleForm" 
location="component://example/widget/example/FormWidgetExampleForms.xml"/>
+                                    </container>
+                                </container>
+                                <container style="screenlet-body">
                                     <container style="button-bar"><label 
style="h2">${uiLabelMap.ExamplePrintButton}</label></container>
                                     <container style="screenlet-body">
                                         
<label>${uiLabelMap.ExampleFopFonts}</label>

Modified: 
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java
URL: 
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java?rev=893282&r1=893281&r2=893282&view=diff
==============================================================================
--- 
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java 
(original)
+++ 
ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java 
Tue Dec 22 19:33:06 2009
@@ -894,6 +894,7 @@
             }
             items.append("{'value':'");
             items.append(optionValue.getKey());
+            items.append("', 'description':'" + optionValue.getDescription());
             items.append("'}");
         }
         items.append("]");