Author: jleroux
Date: Thu Apr 29 20:46:44 2010
New Revision: 939479
URL: http://svn.apache.org/viewvc?rev=939479&view=rev
Log:
A last patch from Chris Snow "Provide better user help"
(https://issues.apache.org/jira/browse/OFBIZ-3702) - OFBIZ-3702
Answers the last point Scott outlined on dev ML
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=939479&r1=939478&r2=939479&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
Thu Apr 29 20:46:44 2010
@@ -1220,7 +1220,7 @@ public class MacroFormRenderer implement
sr.append("\" fieldHelpText=\"");
sr.append(FreeMarkerWorker.encodeDoubleQuotes(helpText));
}
- sr.append("\" fieldTitle=\"");
+ sr.append("\" title=\"");
sr.append(sb.toString());
sr.append("\" />");
executeMacro(writer, sr.toString());
Modified: ofbiz/trunk/framework/widget/templates/csvFormMacroLibrary.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/csvFormMacroLibrary.ftl?rev=939479&r1=939478&r2=939479&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/templates/csvFormMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/csvFormMacroLibrary.ftl Thu Apr 29
20:46:44 2010
@@ -50,7 +50,7 @@ under the License.
<#macro renderHiddenField name value id event action></#macro>
<#macro renderIgnoredField></#macro>
-<#macro renderFieldTitle style title><@renderField title />, </#macro>
+<#macro renderFieldTitle style title fieldHelpText=""><@renderField title />,
</#macro>
<#macro renderSingleFormFieldTitle></#macro>
<#macro renderFormOpen linkUrl formType targetWindow containerId
containerStyle autocomplete name useRowSubmit></#macro>
Modified: ofbiz/trunk/framework/widget/templates/foFormMacroLibrary.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/foFormMacroLibrary.ftl?rev=939479&r1=939478&r2=939479&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/templates/foFormMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/foFormMacroLibrary.ftl Thu Apr 29
20:46:44 2010
@@ -71,7 +71,7 @@ under the License.
<#macro renderHiddenField name value id event action></#macro>
<#macro renderIgnoredField></#macro>
-<#macro renderFieldTitle style title>${title?default("")}</#macro>
+<#macro renderFieldTitle style title
fieldHelpText="">${title?default("")}</#macro>
<#macro renderSingleFormFieldTitle title>${title?default("")}</#macro>
<#macro renderFormOpen linkUrl formType targetWindow containerId
containerStyle autocomplete name useRowSubmit></#macro>
Modified: ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl?rev=939479&r1=939478&r2=939479&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/htmlFormMacroLibrary.ftl Thu Apr 29
20:46:44 2010
@@ -205,14 +205,14 @@ ${item.description}</span>
<#macro renderIgnoredField></#macro>
-<#macro renderFieldTitle style fieldTitle fieldHelpText="">
+<#macro renderFieldTitle style title fieldHelpText="">
<#if fieldHelpText?has_content>
<span title="${fieldHelpText}"><#t/>
</#if>
<#if style?has_content>
<span class="${style}"><#t/>
</#if>
- ${fieldTitle}<#t/>
+ ${title}<#t/>
<#if style?has_content>
</span><#t/>
</#if>
Modified: ofbiz/trunk/framework/widget/templates/textFormMacroLibrary.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/textFormMacroLibrary.ftl?rev=939479&r1=939478&r2=939479&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/templates/textFormMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/textFormMacroLibrary.ftl Thu Apr 29
20:46:44 2010
@@ -50,7 +50,7 @@ under the License.
<#macro renderHiddenField name value id event action></#macro>
<#macro renderIgnoredField></#macro>
-<#macro renderFieldTitle style title><@renderField title /></#macro>
+<#macro renderFieldTitle style title fieldHelpText=""><@renderField title
/></#macro>
<#macro renderSingleFormFieldTitle></#macro>
<#macro renderFormOpen linkUrl formType targetWindow containerId
containerStyle autocomplete name useRowSubmit></#macro>
Modified: ofbiz/trunk/framework/widget/templates/xmlFormMacroLibrary.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/templates/xmlFormMacroLibrary.ftl?rev=939479&r1=939478&r2=939479&view=diff
==============================================================================
--- ofbiz/trunk/framework/widget/templates/xmlFormMacroLibrary.ftl (original)
+++ ofbiz/trunk/framework/widget/templates/xmlFormMacroLibrary.ftl Thu Apr 29
20:46:44 2010
@@ -58,7 +58,7 @@ under the License.
<#macro renderHiddenField name value id event action></#macro>
<#macro renderIgnoredField></#macro>
-<#macro renderFieldTitle style title></#macro>
+<#macro renderFieldTitle style title fieldHelpText=""></#macro>
<#macro renderSingleFormFieldTitle title></#macro>
<#macro renderFormOpen linkUrl formType targetWindow containerId
containerStyle autocomplete name useRowSubmit></#macro>
