From f2387767fe9e09d08f622dfe0b1de1659850f448 Mon Sep 17 00:00:00 2001 From: BettyFromHH Date: Wed, 13 May 2026 16:55:17 +0200 Subject: [PATCH 1/4] Update build script for delos skin repo --- components/ILIAS/UICore/classes/class.ilTemplate.php | 2 +- scripts/Style-To-Repo/build.sh | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/components/ILIAS/UICore/classes/class.ilTemplate.php b/components/ILIAS/UICore/classes/class.ilTemplate.php index 790326bfe613..45046038f642 100755 --- a/components/ILIAS/UICore/classes/class.ilTemplate.php +++ b/components/ILIAS/UICore/classes/class.ilTemplate.php @@ -379,7 +379,7 @@ protected function getTemplatePath(string $a_tplname, string $a_in_module = ''): $base_path = $ilias_root . 'public/Customizing/skin/' . $skin; if ($a_in_module === 'components/ILIAS/UI/src') { - $a_in_module = 'UI'; + $a_in_module = 'components/ILIAS/UI'; } $from_style = $base_path . '/' . $style . '/' . $a_in_module . '/' . $a_tplname; diff --git a/scripts/Style-To-Repo/build.sh b/scripts/Style-To-Repo/build.sh index c3943f31131c..7e8935ec3ad5 100755 --- a/scripts/Style-To-Repo/build.sh +++ b/scripts/Style-To-Repo/build.sh @@ -45,10 +45,19 @@ function build() { cp -r "./components/ILIAS/Mail/templates/default/img" "${BUILD_BASE_FOLDER}/components/ILIAS/Mail" &> /dev/null fi + mv ${BUILD_BASE_FOLDER}/components/ILIAS/UI/src/* ${BUILD_BASE_FOLDER}/components/ILIAS/UI/. + mv ${BUILD_BASE_FOLDER}/components/ILIAS/UI/src/.* ${BUILD_BASE_FOLDER}/components/ILIAS/UI/. 2>/dev/null + rmdir ${BUILD_BASE_FOLDER}/components/ILIAS/UI/src + mv ${BUILD_BASE_FOLDER}/delos/template.xml ${BUILD_BASE_FOLDER}/template.xml - sed -i 's/Delos/SkinRepoDelos/' ${BUILD_BASE_FOLDER}/template.xml + sed -i 's/Delos/Custom Delos Style/' ${BUILD_BASE_FOLDER}/template.xml + sed -i 's#ILIAS#Custom ILIAS Skin#' ${BUILD_BASE_FOLDER}/template.xml + sed -i 's#images#../images#' ${BUILD_BASE_FOLDER}/template.xml + sed -i 's#"$Id$"#"1.0 beta"#' ${BUILD_BASE_FOLDER}/template.xml cp -r ./templates/Readme.md ${BUILD_BASE_FOLDER}/Readme.md cp -r ./templates/Guidelines_SCSS-Coding.md ${BUILD_BASE_FOLDER}/Guidelines_SCSS-Coding.md + + } \ No newline at end of file From 9b5e302aa930a9cae373db3d7db40e8eda8cbc1a Mon Sep 17 00:00:00 2001 From: BettyFromHH Date: Wed, 13 May 2026 17:03:25 +0200 Subject: [PATCH 2/4] Update Test 'ui template from skin' for custom skins --- components/ILIAS/UICore/tests/ilTemplateTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/ILIAS/UICore/tests/ilTemplateTest.php b/components/ILIAS/UICore/tests/ilTemplateTest.php index 4c0b00a7e996..72271051ccc0 100644 --- a/components/ILIAS/UICore/tests/ilTemplateTest.php +++ b/components/ILIAS/UICore/tests/ilTemplateTest.php @@ -119,7 +119,7 @@ public static function templatePathDataProvider(): array 'skin' => 'mySkin', 'style' => 'myStyle', 'file_exists' => true, 'tpl_filename' => 'components/ILIAS/UI/src/templates/default/Input/tpl.standard.html', 'component' => '', - 'expected' => $il_root . '/public/Customizing/skin/mySkin/myStyle/UI/Input/tpl.standard.html', + 'expected' => $il_root . '/public/Customizing/skin/mySkin/templates/default/UI/Input/tpl.standard.html', ], 'ui template from skin, unaltered' => [ 'skin' => 'mySkin', 'style' => 'myStyle', 'file_exists' => false, From 27688382dee19311c4e3cde5e61b06f827f1173a Mon Sep 17 00:00:00 2001 From: BettyFromHH Date: Wed, 13 May 2026 17:11:51 +0200 Subject: [PATCH 3/4] Update Test 'ui template from skin' for custom skins --- components/ILIAS/UICore/tests/ilTemplateTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/ILIAS/UICore/tests/ilTemplateTest.php b/components/ILIAS/UICore/tests/ilTemplateTest.php index 72271051ccc0..cd9adb04eeca 100644 --- a/components/ILIAS/UICore/tests/ilTemplateTest.php +++ b/components/ILIAS/UICore/tests/ilTemplateTest.php @@ -119,7 +119,7 @@ public static function templatePathDataProvider(): array 'skin' => 'mySkin', 'style' => 'myStyle', 'file_exists' => true, 'tpl_filename' => 'components/ILIAS/UI/src/templates/default/Input/tpl.standard.html', 'component' => '', - 'expected' => $il_root . '/public/Customizing/skin/mySkin/templates/default/UI/Input/tpl.standard.html', + 'expected' => $il_root . '/public/Customizing/skin/mySkin/myStyle/templates/default/UI/Input/tpl.standard.html', ], 'ui template from skin, unaltered' => [ 'skin' => 'mySkin', 'style' => 'myStyle', 'file_exists' => false, From 5bd877e726e08f71911c2e5b30ddb60693392902 Mon Sep 17 00:00:00 2001 From: BettyFromHH Date: Wed, 13 May 2026 17:30:20 +0200 Subject: [PATCH 4/4] Update Test 'ui template from skin' for custom skins --- components/ILIAS/UICore/tests/ilTemplateTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/ILIAS/UICore/tests/ilTemplateTest.php b/components/ILIAS/UICore/tests/ilTemplateTest.php index cd9adb04eeca..c25682bc19d1 100644 --- a/components/ILIAS/UICore/tests/ilTemplateTest.php +++ b/components/ILIAS/UICore/tests/ilTemplateTest.php @@ -119,7 +119,7 @@ public static function templatePathDataProvider(): array 'skin' => 'mySkin', 'style' => 'myStyle', 'file_exists' => true, 'tpl_filename' => 'components/ILIAS/UI/src/templates/default/Input/tpl.standard.html', 'component' => '', - 'expected' => $il_root . '/public/Customizing/skin/mySkin/myStyle/templates/default/UI/Input/tpl.standard.html', + 'expected' => $il_root . '/public/Customizing/skin/mySkin/myStyle/components/ILIAS/UI/Input/tpl.standard.html', ], 'ui template from skin, unaltered' => [ 'skin' => 'mySkin', 'style' => 'myStyle', 'file_exists' => false,