Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion components/ILIAS/UICore/classes/class.ilTemplate.php
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion components/ILIAS/UICore/tests/ilTemplateTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -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/myStyle/components/ILIAS/UI/Input/tpl.standard.html',
],
'ui template from skin, unaltered' => [
'skin' => 'mySkin', 'style' => 'myStyle', 'file_exists' => false,
Expand Down
11 changes: 10 additions & 1 deletion scripts/Style-To-Repo/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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


}
Loading