diff --git a/Customizing/README.md b/Customizing/README.md deleted file mode 100755 index 315562dee557..000000000000 --- a/Customizing/README.md +++ /dev/null @@ -1,58 +0,0 @@ -# Customizing - - - -1. [Introduction](#introduction) -1. [System Language Changes](#system-language-changes) -1. [Skins and Styles](#skins-and-styles) -1. [Plugins](#plugins) - - - - -## Introduction - -This directory holds all customized files for this ILIAS installation. - -On the top level two directories may be created: `/Customizing/global` for -global changes and `/Customizing/clients` for changes that should be applied to -clients. - -The clients directory holds a subdirectory for each client: - -``` -/Customizing/clients/ -``` - -At the time being, only user agreements can be offered for clients! Customized -skins and languages are only supported globally. - - -## System Language Changes - -You may change terms used in the user interface of ILIAS. To do this, use the -same format as is used in the language files in directory `/lang`. Store the -values to be overwritten in files ending with `.lang.local` and put them into -the `/global/lang` directory. Client specific changes are not supported yet. - -``` -/global/lang/ilias_.lang.local -``` - -Example: - -``` -/global/lang/ilias_en.lang.local -``` - - -## Skins and Styles - -You find all information about how to create your own skin in the [Custom -Styles](/templates/Readme.md#custom-styles) documentation. - - -## Plugins - -Plugins are installed under `/global/plugins`. Each plugin should come with its -own documentation stating the exact target directory. diff --git a/Customizing/global/plugins/.gitkeep b/Customizing/global/plugins/.gitkeep deleted file mode 100755 index e69de29bb2d1..000000000000 diff --git a/components/ILIAS/App/tests/RootFolderTest.php b/components/ILIAS/App/tests/RootFolderTest.php index 3492fb7f090b..39004fd14b49 100755 --- a/components/ILIAS/App/tests/RootFolderTest.php +++ b/components/ILIAS/App/tests/RootFolderTest.php @@ -63,7 +63,6 @@ final class RootFolderTest extends TestCase 'artifacts', 'cli', 'components', - 'Customizing', 'docs', 'extern', 'lang', diff --git a/components/ILIAS/FileServices/classes/class.ilFileUtils.php b/components/ILIAS/FileServices/classes/class.ilFileUtils.php index fe54b05e8dd0..4760da13e857 100755 --- a/components/ILIAS/FileServices/classes/class.ilFileUtils.php +++ b/components/ILIAS/FileServices/classes/class.ilFileUtils.php @@ -364,7 +364,7 @@ protected static function sanitateTargetPath(string $a_target): array str_starts_with($a_target, CLIENT_DATA_DIR . "/temp") => Location::TEMPORARY, str_starts_with($a_target, CLIENT_DATA_DIR) => Location::STORAGE, - str_starts_with($a_target, ILIAS_ABSOLUTE_PATH . '/Customizing') => Location::CUSTOMIZING, + str_starts_with($a_target, ILIAS_ABSOLUTE_PATH . '/public/Customizing') => Location::CUSTOMIZING, default => throw new InvalidArgumentException( "Can not move files to \"$a_target\" because path can not be mapped to web, storage or customizing location." ), diff --git a/components/ILIAS/Filesystem/classes/Setup/class.ilFileSystemDirectoriesCreatedObjective.php b/components/ILIAS/Filesystem/classes/Setup/class.ilFileSystemDirectoriesCreatedObjective.php index 2109b2a70b6a..3ed0ef12d01d 100755 --- a/components/ILIAS/Filesystem/classes/Setup/class.ilFileSystemDirectoriesCreatedObjective.php +++ b/components/ILIAS/Filesystem/classes/Setup/class.ilFileSystemDirectoriesCreatedObjective.php @@ -90,7 +90,7 @@ public function getPreconditions(Setup\Environment $environment): array ); $customizing_dir_objective = new ilFileSystemDirectoryCopiedRecursivelyObjective( $tmp_dir . DIRECTORY_SEPARATOR . "Customizing", - $root . "/Customizing", + $root . "/public/Customizing", false, true ); diff --git a/components/ILIAS/Filesystem/src/Util/LegacyPathHelper.php b/components/ILIAS/Filesystem/src/Util/LegacyPathHelper.php index bd0c57448117..9219d22ea416 100755 --- a/components/ILIAS/Filesystem/src/Util/LegacyPathHelper.php +++ b/components/ILIAS/Filesystem/src/Util/LegacyPathHelper.php @@ -220,7 +220,7 @@ private static function listPaths(): array $webRelativeWithLeadingDot = './' . ILIAS_WEB_DIR . '/' . CLIENT_ID; $webRelativeWithoutLeadingDot = ILIAS_WEB_DIR . '/' . CLIENT_ID; $storage = CLIENT_DATA_DIR; - $customizing = ILIAS_ABSOLUTE_PATH . '/Customizing'; + $customizing = ILIAS_ABSOLUTE_PATH . '/public/Customizing'; $customizingRelativeWithLeadingDot = './Customizing'; $libs = ILIAS_ABSOLUTE_PATH . '/vendor'; $libsRelativeWithLeadingDot = "./vendor"; diff --git a/components/ILIAS/Init/classes/class.ilInitialisation.php b/components/ILIAS/Init/classes/class.ilInitialisation.php index dfdc9eed2df4..235c6f2ee01d 100755 --- a/components/ILIAS/Init/classes/class.ilInitialisation.php +++ b/components/ILIAS/Init/classes/class.ilInitialisation.php @@ -269,7 +269,7 @@ public static function bootstrapFilesystems(): void * @var FilesystemFactory $delegatingFactory */ $delegatingFactory = $c['filesystem.factory']; - $customizingConfiguration = new \ILIAS\Filesystem\Provider\Configuration\LocalConfig(ILIAS_ABSOLUTE_PATH . '/' . 'Customizing'); + $customizingConfiguration = new \ILIAS\Filesystem\Provider\Configuration\LocalConfig(ILIAS_ABSOLUTE_PATH . '/public/' . 'Customizing'); return $delegatingFactory->getLocal($customizingConfiguration); }; diff --git a/components/ILIAS/Language/classes/Setup/class.ilSetupLanguage.php b/components/ILIAS/Language/classes/Setup/class.ilSetupLanguage.php index 2f5186776e2b..28586866bc92 100755 --- a/components/ILIAS/Language/classes/Setup/class.ilSetupLanguage.php +++ b/components/ILIAS/Language/classes/Setup/class.ilSetupLanguage.php @@ -55,7 +55,7 @@ public function __construct(string $a_lang_key) $this->lang_key = $a_lang_key ?: $this->lang_default; $il_absolute_path = realpath(__DIR__ . "/../../../../../"); $this->lang_path = $il_absolute_path . "/lang"; - $this->cust_lang_path = $il_absolute_path . "/Customizing/global/lang"; + $this->cust_lang_path = $il_absolute_path . "/lang/Customizing"; } /** diff --git a/components/ILIAS/Language/classes/class.ilLanguage.php b/components/ILIAS/Language/classes/class.ilLanguage.php index 2d8158104689..c4ebc3248086 100755 --- a/components/ILIAS/Language/classes/class.ilLanguage.php +++ b/components/ILIAS/Language/classes/class.ilLanguage.php @@ -83,7 +83,7 @@ public function __construct(string $a_lang_key) $this->usage_log_enabled = self::isUsageLogEnabled(); $this->lang_path = ILIAS_ABSOLUTE_PATH . "/lang"; - $this->cust_lang_path = ILIAS_ABSOLUTE_PATH . "/Customizing/global/lang"; + $this->cust_lang_path = ILIAS_ABSOLUTE_PATH . "/lang/Customizing"; $this->lang_default = $client_ini->readVariable("language", "default") ?? 'en'; $this->lang_user = $this->lang_default; diff --git a/components/ILIAS/Mail/README.md b/components/ILIAS/Mail/README.md index 970f9a19d68b..4789dd77125f 100755 --- a/components/ILIAS/Mail/README.md +++ b/components/ILIAS/Mail/README.md @@ -95,7 +95,7 @@ when no template can be determined. Per Skin, one HTML template can be defined and has to be stored in the following location: - ./Customizing/global/skin///components/ILIAS/Mail/tpl.html_mail_template.html. + ./public/Customizing/skin///components/ILIAS/Mail/tpl.html_mail_template.html. The HTML frame template concept consists of the HTML markup file itself and some optional attachments. diff --git a/components/ILIAS/Mail/classes/class.ilMimeMail.php b/components/ILIAS/Mail/classes/class.ilMimeMail.php index c16e212074a4..7d7fe0544730 100755 --- a/components/ILIAS/Mail/classes/class.ilMimeMail.php +++ b/components/ILIAS/Mail/classes/class.ilMimeMail.php @@ -288,7 +288,7 @@ protected function getHtmlEnvelope(string $skin, string $style): string foreach ($locations as $location) { $custom_path = $this->getPathToRootDirectory( - ) . '/public/Customizing/global/skin/' . $location . '/components/ILIAS/Mail/tpl.html_mail_template.html'; + ) . '/public/Customizing/skin/' . $location . '/components/ILIAS/Mail/tpl.html_mail_template.html'; if (is_file($custom_path)) { $bracket_path = $custom_path; break; @@ -313,7 +313,7 @@ protected function buildHtmlInlineImages(string $skin, string $style): void foreach ($locations as $location) { $custom_directory = $this->getPathToRootDirectory( - ) . '/public/Customizing/global/skin/' . $location . '/components/ILIAS/Mail/img'; + ) . '/public/Customizing/skin/' . $location . '/components/ILIAS/Mail/img'; if (is_dir($custom_directory) && is_readable($custom_directory)) { $this->gatherImagesFromDirectory($custom_directory, true); break; diff --git a/components/ILIAS/OrgUnit/classes/Positions/Authorities/class.ilOrgUnitGenericMultiInputGUI.php b/components/ILIAS/OrgUnit/classes/Positions/Authorities/class.ilOrgUnitGenericMultiInputGUI.php index 2b4bc9c54c1f..38b1e98754ae 100755 --- a/components/ILIAS/OrgUnit/classes/Positions/Authorities/class.ilOrgUnitGenericMultiInputGUI.php +++ b/components/ILIAS/OrgUnit/classes/Positions/Authorities/class.ilOrgUnitGenericMultiInputGUI.php @@ -228,7 +228,6 @@ private function createInputPostVar(string $iterator_id, \ilFormPropertyGUI $inp public function render(int|string $iterator_id = 0, bool $clean_render = false): string { $first_label = true; - // $tpl = new \ilTemplate("tpl.multi_line_input.html", true, true, 'Customizing/global/plugins/Services/Repository/RepositoryObject/LiveVoting'); $tpl = new ilTemplate("tpl.prop_generic_multi_line.html", true, true, 'components/ILIAS/OrgUnit'); $class = 'multi_input_line'; diff --git a/components/ILIAS/StaticURL/tests/URIBuilderTest.php b/components/ILIAS/StaticURL/tests/URIBuilderTest.php index 956651775a38..98d21f3eb6f6 100755 --- a/components/ILIAS/StaticURL/tests/URIBuilderTest.php +++ b/components/ILIAS/StaticURL/tests/URIBuilderTest.php @@ -44,7 +44,7 @@ public static function getILIAS_HTTP_Paths(): array ['http://test9.ilias.de/goto.php', 'http://test9.ilias.de'], ['http://test9.ilias.de/go/hello', 'http://test9.ilias.de'], ['http://test9.ilias.de/go/hello', 'http://test9.ilias.de'], - ['http://test9.ilias.de/Customizing/global/plugins/Services/index.php', 'http://test9.ilias.de'], + ['http://test9.ilias.de/Customizing/plugins/Services/index.php', 'http://test9.ilias.de'], ]; } diff --git a/components/ILIAS/Style/System/classes/class.ilImagePathResolver.php b/components/ILIAS/Style/System/classes/class.ilImagePathResolver.php index 34dfd99701a3..68cbe1f21523 100755 --- a/components/ILIAS/Style/System/classes/class.ilImagePathResolver.php +++ b/components/ILIAS/Style/System/classes/class.ilImagePathResolver.php @@ -39,7 +39,7 @@ public function resolveImagePath(string $image_path): string if (is_object($styleDefinition) && $current_skin != "default") { $image_dir = $styleDefinition->getImageDirectory($current_style); - $skin_img = "./Customizing/global/skin/" . + $skin_img = "./Customizing/skin/" . $current_skin . "/" . $current_style . "/" . $image_dir . "/" . $image_path; } diff --git a/components/ILIAS/Test/classes/class.ilTestHTMLGenerator.php b/components/ILIAS/Test/classes/class.ilTestHTMLGenerator.php index c4c8ae3de0de..d010a95e685d 100755 --- a/components/ILIAS/Test/classes/class.ilTestHTMLGenerator.php +++ b/components/ILIAS/Test/classes/class.ilTestHTMLGenerator.php @@ -152,7 +152,7 @@ private function getTemplatePath($a_filename, $module_path = 'components/ILIAS/T { $fname = ''; if (ilStyleDefinition::getCurrentSkin() !== 'default') { - $fname = './Customizing/global/skin/' . + $fname = './Customizing/skin/' . ilStyleDefinition::getCurrentSkin() . '/' . $module_path . basename($a_filename); } diff --git a/components/ILIAS/UICore/classes/class.ilTemplate.php b/components/ILIAS/UICore/classes/class.ilTemplate.php index 2b288b43d001..e98a46f7464e 100755 --- a/components/ILIAS/UICore/classes/class.ilTemplate.php +++ b/components/ILIAS/UICore/classes/class.ilTemplate.php @@ -1,7 +1,5 @@ .lang.local +```