svn commit: r1044510 - in /ofbiz/trunk/framework/widget: src/org/ofbiz/widget/form/ templates/

Author: jleroux
Date: Fri Dec 10 21:00:06 2010
New Revision: 1044510

URL: http://svn.apache.org/viewvc?rev=1044510&view=rev
Log:
Fix a small bug introduced with r1044132 for OFBIZ-4051 i18n for elrte editor. It was crashing renderTextareaField when called from forms

Also while at it renames visualEdtiorEnalble to visualEditorEnable

Modified:
    ofbiz/trunk/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java
    ofbiz/trunk/framework/widget/templates/csvFormMacroLibrary.ftl
    ofbiz/trunk/framework/widget/templates/foFormMacroLibrary.ftl
    ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl
    ofbiz/trunk/framework/widget/templates/textFormMacroLibrary.ftl
    ofbiz/trunk/framework/widget/templates/xmlFormMacroLibrary.ftl

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=1044510&r1=1044509&r2=1044510&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 Fri Dec 10 21:00:06 2010
@@ -418,10 +418,10 @@ public class MacroFormRenderer implement
                 alert = "true";
             }
         }
-        String visualEdtiorEnalble = "";
+        String visualEditorEnable = "";
         String buttons = "";
         if (textareaField.getVisualEditorEnable()) {
-            visualEdtiorEnalble = "true";
+            visualEditorEnable = "true";
             buttons = textareaField.getVisualEditorButtons(context);
             if (UtilValidate.isEmpty(buttons)) {
                 buttons = "maxi";
@@ -455,8 +455,8 @@ public class MacroFormRenderer implement
         sr.append(id);
         sr.append("\" readonly=\"");
         sr.append(readonly);
-        sr.append("\" visualEdtiorEnalble=\"");
-        sr.append(visualEdtiorEnalble);
+        sr.append("\" visualEditorEnable=\"");
+        sr.append(visualEditorEnable);
         sr.append("\" language=\"");
         sr.append(language);
         sr.append("\" buttons=\"");

Modified: ofbiz/trunk/framework/widget/templates/csvFormMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/csvFormMacroLibrary.ftl?rev=1044510&r1=1044509&r2=1044510&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/templates/csvFormMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/csvFormMacroLibrary.ftl Fri Dec 10 21:00:06 2010
@@ -26,7 +26,7 @@ under the License.
 
 <#macro renderTextField name className alert value textSize maxlength id event action disabled clientAutocomplete ajaxUrl ajaxEnabled><@renderField value /></#macro>
 
-<#macro renderTextareaField name className alert cols rows id readonly value visualEdtiorEnalble language buttons><@renderField value /></#macro>
+<#macro renderTextareaField name className alert cols rows id readonly value visualEditorEnable language buttons><@renderField value /></#macro>
 
 <#macro renderDateTimeField name className alert title value size maxlength id dateType shortDateInput timeDropdownParamName defaultDateTimeString localizedIconTitle timeDropdown timeHourName classString hour1 hour2 timeMinutesName minutes isTwelveHour ampmName amSelected pmSelected compositeType formName><@renderField value /></#macro>
 

Modified: ofbiz/trunk/framework/widget/templates/foFormMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/foFormMacroLibrary.ftl?rev=1044510&r1=1044509&r2=1044510&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/templates/foFormMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/foFormMacroLibrary.ftl Fri Dec 10 21:00:06 2010
@@ -50,7 +50,7 @@ under the License.
 
 <#macro renderTextField name className alert value textSize maxlength id event action disabled clientAutocomplete ajaxUrl ajaxEnabled><@makeBlock className value /></#macro>
 
-<#macro renderTextareaField name className alert cols rows id readonly value visualEdtiorEnalble language buttons><@makeBlock className value /></#macro>
+<#macro renderTextareaField name className alert cols rows id readonly value visualEditorEnable language buttons><@makeBlock className value /></#macro>
 
 <#macro renderDateTimeField name className alert title value size maxlength id event action dateType shortDateInput timeDropdownParamName defaultDateTimeString localizedIconTitle timeDropdown timeHourName classString hour1 hour2 timeMinutesName minutes isTwelveHour ampmName amSelected pmSelected compositeType formName><@makeBlock className value /></#macro>
 

Modified: ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl?rev=1044510&r1=1044509&r2=1044510&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl Fri Dec 10 21:00:06 2010
@@ -64,7 +64,7 @@ under the License.
     </#if>
 </#macro>
 
-<#macro renderTextareaField name className alert cols rows id readonly value visualEdtiorEnalble language buttons>
+<#macro renderTextareaField name className alert cols rows id readonly value visualEditorEnable buttons language="">
     <textarea name="${name}"<#t/>
     <@renderClass className alert />
     <#if cols?has_content> cols="${cols}"</#if><#rt/>
@@ -75,7 +75,7 @@ under the License.
     ><#t/>
     <#if value?has_content>${value}</#if><#t/>
     </textarea><#lt/>
-    <#if visualEdtiorEnalble?has_content>
+    <#if visualEditorEnable?has_content>
         <script language="javascript" src="/images/jquery/plugins/elrteEditor/elrte.min.js" type="text/javascript"></script><#rt/>
         <#if language?has_content && language != "en">
             <script language="javascript" src="/images/jquery/plugins/elrteEditor/i18n/elrte.${language!"en"}.js" type="text/javascript"></script><#rt/>

Modified: ofbiz/trunk/framework/widget/templates/textFormMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/textFormMacroLibrary.ftl?rev=1044510&r1=1044509&r2=1044510&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/templates/textFormMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/textFormMacroLibrary.ftl Fri Dec 10 21:00:06 2010
@@ -26,7 +26,7 @@ under the License.
 
 <#macro renderTextField name className alert value textSize maxlength id event action disabled clientAutocomplete ajaxUrl ajaxEnabled><@renderField value /></#macro>
 
-<#macro renderTextareaField name className alert cols rows id readonly value visualEdtiorEnalble language buttons><@renderField value /></#macro>
+<#macro renderTextareaField name className alert cols rows id readonly value visualEditorEnable language buttons><@renderField value /></#macro>
 
 <#macro renderDateTimeField name className alert title value size maxlength id event action dateType shortDateInput timeDropdownParamName defaultDateTimeString localizedIconTitle timeDropdown timeHourName classString hour1 hour2 timeMinutesName minutes isTwelveHour ampmName amSelected pmSelected compositeType formName><@renderField value /></#macro>
 

Modified: ofbiz/trunk/framework/widget/templates/xmlFormMacroLibrary.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/xmlFormMacroLibrary.ftl?rev=1044510&r1=1044509&r2=1044510&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/templates/xmlFormMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/xmlFormMacroLibrary.ftl Fri Dec 10 21:00:06 2010
@@ -42,7 +42,7 @@ under the License.
 
 <#macro renderTextField name className alert value textSize maxlength id event action disabled clientAutocomplete ajaxUrl ajaxEnabled><@renderField value/></#macro>
 
-<#macro renderTextareaField name className alert cols rows id readonly value visualEdtiorEnalble language buttons><@renderField value/></#macro>
+<#macro renderTextareaField name className alert cols rows id readonly value visualEditorEnable language buttons><@renderField value/></#macro>
 
 <#macro renderDateTimeField name className alert title value size maxlength id event action dateType shortDateInput timeDropdownParamName defaultDateTimeString localizedIconTitle timeDropdown timeHourName classString hour1 hour2 timeMinutesName minutes isTwelveHour ampmName amSelected pmSelected compositeType formName><@renderField value/></#macro>