From c85550e3062435752a79d6e1f653b830d51cab96 Mon Sep 17 00:00:00 2001 From: Florian Motteau Date: Wed, 10 Aug 2022 10:35:49 +0200 Subject: [PATCH] Fixed: Wrong Less file path for some theme/locale combinations (OFBIZ-12660) (#521) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For some themes, we rely on toLowerCase method to build a Less file path. toLowerCase("I") = "ı" for some locales (TR, AZ), which lead to incorrect file paths and finally broken themes. --- themes/helveticus/template/includes/Header.ftl | 2 +- .../helveticus/{helveticus-amber.less => HELVETICUS_AMBER.less} | 0 .../{helveticus-emerald.less => HELVETICUS_EMERALD.less} | 0 .../helveticus/{helveticus-ruby.less => HELVETICUS_RUBY.less} | 0 .../{helveticus-saphir.less => HELVETICUS_SAPHIR.less} | 0 themes/rainbowstone/template/includes/Header.ftl | 2 +- .../{rainbowstone-amber.less => RAINBOWSTONE_AMBER.less} | 0 .../{rainbowstone-emerald.less => RAINBOWSTONE_EMERALD.less} | 0 .../{rainbowstone-ruby.less => RAINBOWSTONE_RUBY.less} | 0 .../{rainbowstone-saphir.less => RAINBOWSTONE_SAPHIR.less} | 0 10 files changed, 2 insertions(+), 2 deletions(-) rename themes/helveticus/webapp/helveticus/{helveticus-amber.less => HELVETICUS_AMBER.less} (100%) rename themes/helveticus/webapp/helveticus/{helveticus-emerald.less => HELVETICUS_EMERALD.less} (100%) rename themes/helveticus/webapp/helveticus/{helveticus-ruby.less => HELVETICUS_RUBY.less} (100%) rename themes/helveticus/webapp/helveticus/{helveticus-saphir.less => HELVETICUS_SAPHIR.less} (100%) rename themes/rainbowstone/webapp/rainbowstone/{rainbowstone-amber.less => RAINBOWSTONE_AMBER.less} (100%) rename themes/rainbowstone/webapp/rainbowstone/{rainbowstone-emerald.less => RAINBOWSTONE_EMERALD.less} (100%) rename themes/rainbowstone/webapp/rainbowstone/{rainbowstone-ruby.less => RAINBOWSTONE_RUBY.less} (100%) rename themes/rainbowstone/webapp/rainbowstone/{rainbowstone-saphir.less => RAINBOWSTONE_SAPHIR.less} (100%) diff --git a/themes/helveticus/template/includes/Header.ftl b/themes/helveticus/template/includes/Header.ftl index 1651ac5bc8..3379c86b17 100644 --- a/themes/helveticus/template/includes/Header.ftl +++ b/themes/helveticus/template/includes/Header.ftl @@ -46,7 +46,7 @@ under the License. - " type="text/css"/> + <#if layoutSettings.VT_HDR_JAVASCRIPT?has_content> <#list layoutSettings.VT_HDR_JAVASCRIPT as javaScript> diff --git a/themes/helveticus/webapp/helveticus/helveticus-amber.less b/themes/helveticus/webapp/helveticus/HELVETICUS_AMBER.less similarity index 100% rename from themes/helveticus/webapp/helveticus/helveticus-amber.less rename to themes/helveticus/webapp/helveticus/HELVETICUS_AMBER.less diff --git a/themes/helveticus/webapp/helveticus/helveticus-emerald.less b/themes/helveticus/webapp/helveticus/HELVETICUS_EMERALD.less similarity index 100% rename from themes/helveticus/webapp/helveticus/helveticus-emerald.less rename to themes/helveticus/webapp/helveticus/HELVETICUS_EMERALD.less diff --git a/themes/helveticus/webapp/helveticus/helveticus-ruby.less b/themes/helveticus/webapp/helveticus/HELVETICUS_RUBY.less similarity index 100% rename from themes/helveticus/webapp/helveticus/helveticus-ruby.less rename to themes/helveticus/webapp/helveticus/HELVETICUS_RUBY.less diff --git a/themes/helveticus/webapp/helveticus/helveticus-saphir.less b/themes/helveticus/webapp/helveticus/HELVETICUS_SAPHIR.less similarity index 100% rename from themes/helveticus/webapp/helveticus/helveticus-saphir.less rename to themes/helveticus/webapp/helveticus/HELVETICUS_SAPHIR.less diff --git a/themes/rainbowstone/template/includes/Header.ftl b/themes/rainbowstone/template/includes/Header.ftl index 7b1d016e92..43f7418f56 100644 --- a/themes/rainbowstone/template/includes/Header.ftl +++ b/themes/rainbowstone/template/includes/Header.ftl @@ -46,7 +46,7 @@ under the License. - " type="text/css"/> + <#if layoutSettings.VT_HDR_JAVASCRIPT?has_content> <#list layoutSettings.VT_HDR_JAVASCRIPT as javaScript> diff --git a/themes/rainbowstone/webapp/rainbowstone/rainbowstone-amber.less b/themes/rainbowstone/webapp/rainbowstone/RAINBOWSTONE_AMBER.less similarity index 100% rename from themes/rainbowstone/webapp/rainbowstone/rainbowstone-amber.less rename to themes/rainbowstone/webapp/rainbowstone/RAINBOWSTONE_AMBER.less diff --git a/themes/rainbowstone/webapp/rainbowstone/rainbowstone-emerald.less b/themes/rainbowstone/webapp/rainbowstone/RAINBOWSTONE_EMERALD.less similarity index 100% rename from themes/rainbowstone/webapp/rainbowstone/rainbowstone-emerald.less rename to themes/rainbowstone/webapp/rainbowstone/RAINBOWSTONE_EMERALD.less diff --git a/themes/rainbowstone/webapp/rainbowstone/rainbowstone-ruby.less b/themes/rainbowstone/webapp/rainbowstone/RAINBOWSTONE_RUBY.less similarity index 100% rename from themes/rainbowstone/webapp/rainbowstone/rainbowstone-ruby.less rename to themes/rainbowstone/webapp/rainbowstone/RAINBOWSTONE_RUBY.less diff --git a/themes/rainbowstone/webapp/rainbowstone/rainbowstone-saphir.less b/themes/rainbowstone/webapp/rainbowstone/RAINBOWSTONE_SAPHIR.less similarity index 100% rename from themes/rainbowstone/webapp/rainbowstone/rainbowstone-saphir.less rename to themes/rainbowstone/webapp/rainbowstone/RAINBOWSTONE_SAPHIR.less