[ofbiz-framework] branch trunk updated: Improved: multi-block attribute for html-template tag (OFBIZ-11686)

[James Yong-2]

This is an automated email from the ASF dual-hosted git repository.

jamesyong pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git


The following commit(s) were added to refs/heads/trunk by this push:
     new c3c41b2  Improved: multi-block attribute for html-template tag (OFBIZ-11686)
c3c41b2 is described below

commit c3c41b28b44050f6f76f1f2a6756444c6e7f500e
Author: James Yong <[hidden email]>
AuthorDate: Fri Aug 21 17:59:00 2020 +0800

    Improved: multi-block attribute for html-template tag (OFBIZ-11686)
   
    Moved <@scriptTagsFooter/> within the body tag.
---
 themes/common-theme/template/includes/CloseHtmlBody.ftl | 2 +-
 themes/common-theme/template/includes/LookupFooter.ftl  | 4 ++--
 themes/flatgrey/template/Footer.ftl                     | 2 +-
 themes/rainbowstone/template/includes/Footer.ftl        | 2 +-
 themes/tomahawk/template/Footer.ftl                     | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/themes/common-theme/template/includes/CloseHtmlBody.ftl b/themes/common-theme/template/includes/CloseHtmlBody.ftl
index 9ad25cb..fef39b4 100644
--- a/themes/common-theme/template/includes/CloseHtmlBody.ftl
+++ b/themes/common-theme/template/includes/CloseHtmlBody.ftl
@@ -16,6 +16,6 @@ KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
 -->
-</body>
 <@scriptTagsFooter/>
+</body>
 </html>
diff --git a/themes/common-theme/template/includes/LookupFooter.ftl b/themes/common-theme/template/includes/LookupFooter.ftl
index e00660c..fef39b4 100644
--- a/themes/common-theme/template/includes/LookupFooter.ftl
+++ b/themes/common-theme/template/includes/LookupFooter.ftl
@@ -16,6 +16,6 @@ KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
 -->
-  </body>
-  <@scriptTagsFooter/>
+<@scriptTagsFooter/>
+</body>
 </html>
diff --git a/themes/flatgrey/template/Footer.ftl b/themes/flatgrey/template/Footer.ftl
index 67d70f9..64df1b3 100644
--- a/themes/flatgrey/template/Footer.ftl
+++ b/themes/flatgrey/template/Footer.ftl
@@ -41,6 +41,6 @@ under the License.
     <script type="application/javascript" src="<@ofbizContentUrl>${StringUtil.wrapString(javaScript)}</@ofbizContentUrl>" type="application/javascript"></script>
   </#list>
 </#if>
-</body>
 <@scriptTagsFooter/>
+</body>
 </html>
diff --git a/themes/rainbowstone/template/includes/Footer.ftl b/themes/rainbowstone/template/includes/Footer.ftl
index 2741617..795ace3 100644
--- a/themes/rainbowstone/template/includes/Footer.ftl
+++ b/themes/rainbowstone/template/includes/Footer.ftl
@@ -33,6 +33,6 @@ under the License.
     <script type="application/javascript" src="<@ofbizContentUrl>${StringUtil.wrapString(javaScript)}</@ofbizContentUrl>"></script>
   </#list>
 </#if>
-</body>
 <@scriptTagsFooter/>
+</body>
 </html>
diff --git a/themes/tomahawk/template/Footer.ftl b/themes/tomahawk/template/Footer.ftl
index 1f27daa..a2d78a7 100644
--- a/themes/tomahawk/template/Footer.ftl
+++ b/themes/tomahawk/template/Footer.ftl
@@ -41,6 +41,6 @@ under the License.
 </#if>
 
 </div>
-</body>
 <@scriptTagsFooter/>
+</body>
 </html>