Author: jleroux
Date: Mon May 28 06:50:51 2018
New Revision: 1832365
URL: http://svn.apache.org/viewvc?rev=1832365&view=rev
Log:
Improved: Replace Inline js with External js in renderFormClose macro
(OFBIZ-9846)
Fixing patch, we forgot the other macro libraries.
Thanks: Aditya
Modified:
ofbiz/ofbiz-framework/trunk/themes/common-theme/template/macro/CsvFormMacroLibrary.ftl
ofbiz/ofbiz-framework/trunk/themes/common-theme/template/macro/FoFormMacroLibrary.ftl
ofbiz/ofbiz-framework/trunk/themes/common-theme/template/macro/TextFormMacroLibrary.ftl
ofbiz/ofbiz-framework/trunk/themes/common-theme/template/macro/XlsFormMacroLibrary.ftl
ofbiz/ofbiz-framework/trunk/themes/common-theme/template/macro/XmlFormMacroLibrary.ftl
Modified:
ofbiz/ofbiz-framework/trunk/themes/common-theme/template/macro/CsvFormMacroLibrary.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common-theme/template/macro/CsvFormMacroLibrary.ftl?rev=1832365&r1=1832364&r2=1832365&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/themes/common-theme/template/macro/CsvFormMacroLibrary.ftl
(original)
+++
ofbiz/ofbiz-framework/trunk/themes/common-theme/template/macro/CsvFormMacroLibrary.ftl
Mon May 28 06:50:51 2018
@@ -53,8 +53,8 @@ under the License.
<#macro renderFieldTitle style title id="" fieldHelpText=""
for=""><@renderField title />,</#macro>
<#macro renderSingleFormFieldTitle></#macro>
-<#macro renderFormOpen linkUrl formType targetWindow containerId
containerStyle autocomplete name viewIndexField viewSizeField viewIndex
viewSize useRowSubmit></#macro>
-<#macro renderFormClose focusFieldName formName containerId
hasRequiredField></#macro>
+<#macro renderFormOpen linkUrl formType targetWindow containerId
containerStyle autocomplete name viewIndexField viewSizeField viewIndex
viewSize useRowSubmit focusFieldName hasRequiredField></#macro>
+<#macro renderFormClose></#macro>
<#macro renderMultiFormClose></#macro>
<#macro renderFormatListWrapperOpen formName style columnStyles></#macro>
Modified:
ofbiz/ofbiz-framework/trunk/themes/common-theme/template/macro/FoFormMacroLibrary.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common-theme/template/macro/FoFormMacroLibrary.ftl?rev=1832365&r1=1832364&r2=1832365&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/themes/common-theme/template/macro/FoFormMacroLibrary.ftl
(original)
+++
ofbiz/ofbiz-framework/trunk/themes/common-theme/template/macro/FoFormMacroLibrary.ftl
Mon May 28 06:50:51 2018
@@ -79,8 +79,8 @@ under the License.
<#macro renderFieldTitle style title id fieldHelpText="" for=""><fo:block
<@getFoStyle style/>>${title?default("")?replace(" ", "
")}</fo:block></#macro>
<#macro renderSingleFormFieldTitle><!--title form--></#macro>
-<#macro renderFormOpen linkUrl formType targetWindow containerId
containerStyle autocomplete name viewIndexField viewSizeField viewIndex
viewSize useRowSubmit></#macro>
-<#macro renderFormClose focusFieldName formName containerId
hasRequiredField></#macro>
+<#macro renderFormOpen linkUrl formType targetWindow containerId
containerStyle autocomplete name viewIndexField viewSizeField viewIndex
viewSize useRowSubmit focusFieldName hasRequiredField></#macro>
+<#macro renderFormClose></#macro>
<#macro renderMultiFormClose></#macro>
<#macro renderFormatListWrapperOpen formName style columnStyles><fo:table
table-layout="fixed" border="solid black" <@getFoStyle style/>><#list
columnStyles as columnStyle><fo:table-column<#if columnStyle?has_content>
<@getFoStyle columnStyle/></#if>/></#list></#macro>
Modified:
ofbiz/ofbiz-framework/trunk/themes/common-theme/template/macro/TextFormMacroLibrary.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common-theme/template/macro/TextFormMacroLibrary.ftl?rev=1832365&r1=1832364&r2=1832365&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/themes/common-theme/template/macro/TextFormMacroLibrary.ftl
(original)
+++
ofbiz/ofbiz-framework/trunk/themes/common-theme/template/macro/TextFormMacroLibrary.ftl
Mon May 28 06:50:51 2018
@@ -53,8 +53,8 @@ under the License.
<#macro renderFieldTitle style title id fieldHelpText="" for=""><@renderField
title /></#macro>
<#macro renderSingleFormFieldTitle></#macro>
-<#macro renderFormOpen linkUrl formType targetWindow containerId
containerStyle autocomplete name viewIndexField viewSizeField viewIndex
viewSize useRowSubmit></#macro>
-<#macro renderFormClose focusFieldName formName containerId
hasRequiredField></#macro>
+<#macro renderFormOpen linkUrl formType targetWindow containerId
containerStyle autocomplete name viewIndexField viewSizeField viewIndex
viewSize useRowSubmit focusFieldName hasRequiredField></#macro>
+<#macro renderFormClose></#macro>
<#macro renderMultiFormClose></#macro>
<#macro renderFormatListWrapperOpen formName style columnStyles></#macro>
Modified:
ofbiz/ofbiz-framework/trunk/themes/common-theme/template/macro/XlsFormMacroLibrary.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common-theme/template/macro/XlsFormMacroLibrary.ftl?rev=1832365&r1=1832364&r2=1832365&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/themes/common-theme/template/macro/XlsFormMacroLibrary.ftl
(original)
+++
ofbiz/ofbiz-framework/trunk/themes/common-theme/template/macro/XlsFormMacroLibrary.ftl
Mon May 28 06:50:51 2018
@@ -58,8 +58,8 @@ under the License.
<#macro renderSingleFormFieldTitle></#macro>
-<#macro renderFormOpen linkUrl formType targetWindow containerId
containerStyle autocomplete name viewIndexField viewSizeField viewIndex
viewSize useRowSubmit></#macro>
-<#macro renderFormClose focusFieldName formName containerId
hasRequiredField></#macro>
+<#macro renderFormOpen linkUrl formType targetWindow containerId
containerStyle autocomplete name viewIndexField viewSizeField viewIndex
viewSize useRowSubmit focusFieldName hasRequiredField></#macro>
+<#macro renderFormClose></#macro>
<#macro renderMultiFormClose></#macro>
<#macro renderFormatListWrapperOpen formName style
columnStyles><table></#macro>
Modified:
ofbiz/ofbiz-framework/trunk/themes/common-theme/template/macro/XmlFormMacroLibrary.ftl
URL:
http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common-theme/template/macro/XmlFormMacroLibrary.ftl?rev=1832365&r1=1832364&r2=1832365&view=diff
==============================================================================
---
ofbiz/ofbiz-framework/trunk/themes/common-theme/template/macro/XmlFormMacroLibrary.ftl
(original)
+++
ofbiz/ofbiz-framework/trunk/themes/common-theme/template/macro/XmlFormMacroLibrary.ftl
Mon May 28 06:50:51 2018
@@ -61,8 +61,8 @@ under the License.
<#macro renderFieldTitle style title id fieldHelpText="" for=""></#macro>
<#macro renderSingleFormFieldTitle></#macro>
-<#macro renderFormOpen linkUrl formType targetWindow containerId
containerStyle autocomplete name viewIndexField viewSizeField viewIndex
viewSize useRowSubmit></#macro>
-<#macro renderFormClose focusFieldName formName containerId
hasRequiredField></#macro>
+<#macro renderFormOpen linkUrl formType targetWindow containerId
containerStyle autocomplete name viewIndexField viewSizeField viewIndex
viewSize useRowSubmit focusFieldName hasRequiredField></#macro>
+<#macro renderFormClose></#macro>
<#macro renderMultiFormClose></#macro>
<#macro renderFormatHeaderOpen></#macro>
