Author: deepak
Date: Sat Nov 11 06:19:48 2017
New Revision: 1814923
URL: http://svn.apache.org/viewvc?rev=1814923&view=rev
Log:
Improved: Set the default value for Csv Screen Macro Library, Text Screen Macro
Library, Xml Form Macro Library and Xls Form Macro Library. (OFBIZ-7992)
Thanks Renuka Srishti for your contribution
Modified:
ofbiz/ofbiz-framework/trunk/themes/common/template/macro/CsvScreenMacroLibrary.ftl
ofbiz/ofbiz-framework/trunk/themes/common/template/macro/TextScreenMacroLibrary.ftl
ofbiz/ofbiz-framework/trunk/themes/common/template/macro/XlsFormMacroLibrary.ftl
ofbiz/ofbiz-framework/trunk/themes/common/template/macro/XmlFormMacroLibrary.ftl
Modified:
ofbiz/ofbiz-framework/trunk/themes/common/template/macro/CsvScreenMacroLibrary.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common/template/macro/CsvScreenMacroLibrary.ftl?rev=1814923&r1=1814922&r2=1814923&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/themes/common/template/macro/CsvScreenMacroLibrary.ftl
(original)
+++
ofbiz/ofbiz-framework/trunk/themes/common/template/macro/CsvScreenMacroLibrary.ftl
Sat Nov 11 06:19:48 2017
@@ -39,7 +39,7 @@ under the License.
<#macro renderSubContentEnd urlString editMode editContainerStyle editRequest
enableEditValue></#macro>
<#macro renderHorizontalSeparator id style></#macro>
-<#macro renderLabel text id style>
+<#macro renderLabel id="" style="" text="">
<#if text??>
${text}<#lt/>
</#if>
Modified:
ofbiz/ofbiz-framework/trunk/themes/common/template/macro/TextScreenMacroLibrary.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common/template/macro/TextScreenMacroLibrary.ftl?rev=1814923&r1=1814922&r2=1814923&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/themes/common/template/macro/TextScreenMacroLibrary.ftl
(original)
+++
ofbiz/ofbiz-framework/trunk/themes/common/template/macro/TextScreenMacroLibrary.ftl
Sat Nov 11 06:19:48 2017
@@ -39,7 +39,7 @@ under the License.
<#macro renderSubContentEnd urlString editMode editContainerStyle editRequest
enableEditValue></#macro>
<#macro renderHorizontalSeparator id style></#macro>
-<#macro renderLabel text id style>
+<#macro renderLabel text="" id="" style="">
<#if text??>
${text}<#lt/>
</#if>
Modified:
ofbiz/ofbiz-framework/trunk/themes/common/template/macro/XlsFormMacroLibrary.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common/template/macro/XlsFormMacroLibrary.ftl?rev=1814923&r1=1814922&r2=1814923&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/themes/common/template/macro/XlsFormMacroLibrary.ftl
(original)
+++
ofbiz/ofbiz-framework/trunk/themes/common/template/macro/XlsFormMacroLibrary.ftl
Sat Nov 11 06:19:48 2017
@@ -17,7 +17,7 @@ specific language governing permissions
under the License.
-->
-<#macro renderField text><#if text??>${text}</#if></#macro>
+<#macro renderField text=""><#if text??>${text}</#if></#macro>
<#macro renderItemField value cellType cellStyle=""><td class="${cellType!}"
<#if cellStyle?has_content>${cellStyle!}</#if>>${value!}</td></#macro>
Modified:
ofbiz/ofbiz-framework/trunk/themes/common/template/macro/XmlFormMacroLibrary.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common/template/macro/XmlFormMacroLibrary.ftl?rev=1814923&r1=1814922&r2=1814923&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/themes/common/template/macro/XmlFormMacroLibrary.ftl
(original)
+++
ofbiz/ofbiz-framework/trunk/themes/common/template/macro/XmlFormMacroLibrary.ftl
Sat Nov 11 06:19:48 2017
@@ -17,7 +17,7 @@ specific language governing permissions
under the License.
-->
-<#macro renderField text><#if text??>${text?xml}</#if></#macro>
+<#macro renderField text=""><#if text??>${text?xml}</#if></#macro>
<#macro renderFormatListWrapperOpen formName style
columnStyles><${formName}Export></#macro>
