diff --git a/data/ic_books.md b/resources/data/ic_books.md similarity index 100% rename from data/ic_books.md rename to resources/data/ic_books.md diff --git a/data/tzo/1.md b/resources/data/tzo/1.md similarity index 100% rename from data/tzo/1.md rename to resources/data/tzo/1.md diff --git a/data/tzo/21.md b/resources/data/tzo/21.md similarity index 100% rename from data/tzo/21.md rename to resources/data/tzo/21.md diff --git a/data/tzo/22.md b/resources/data/tzo/22.md similarity index 100% rename from data/tzo/22.md rename to resources/data/tzo/22.md diff --git a/data/tzo/31.md b/resources/data/tzo/31.md similarity index 100% rename from data/tzo/31.md rename to resources/data/tzo/31.md diff --git a/data/tzo/32.md b/resources/data/tzo/32.md similarity index 100% rename from data/tzo/32.md rename to resources/data/tzo/32.md diff --git a/data/tzo/33.md b/resources/data/tzo/33.md similarity index 100% rename from data/tzo/33.md rename to resources/data/tzo/33.md diff --git a/data/tzo/41.md b/resources/data/tzo/41.md similarity index 100% rename from data/tzo/41.md rename to resources/data/tzo/41.md diff --git a/data/tzo/42.md b/resources/data/tzo/42.md similarity index 100% rename from data/tzo/42.md rename to resources/data/tzo/42.md diff --git a/data/tzo/43.md b/resources/data/tzo/43.md similarity index 100% rename from data/tzo/43.md rename to resources/data/tzo/43.md diff --git a/data/tzo/44.md b/resources/data/tzo/44.md similarity index 100% rename from data/tzo/44.md rename to resources/data/tzo/44.md diff --git a/data/tzo/51.md b/resources/data/tzo/51.md similarity index 100% rename from data/tzo/51.md rename to resources/data/tzo/51.md diff --git a/data/tzo/52.md b/resources/data/tzo/52.md similarity index 100% rename from data/tzo/52.md rename to resources/data/tzo/52.md diff --git a/data/tzo/53.md b/resources/data/tzo/53.md similarity index 100% rename from data/tzo/53.md rename to resources/data/tzo/53.md diff --git a/data/tzo/61.md b/resources/data/tzo/61.md similarity index 100% rename from data/tzo/61.md rename to resources/data/tzo/61.md diff --git a/data/tzo/62.md b/resources/data/tzo/62.md similarity index 100% rename from data/tzo/62.md rename to resources/data/tzo/62.md diff --git a/data/tzo/7.md b/resources/data/tzo/7.md similarity index 100% rename from data/tzo/7.md rename to resources/data/tzo/7.md diff --git a/data/tzo/appendix.md b/resources/data/tzo/appendix.md similarity index 100% rename from data/tzo/appendix.md rename to resources/data/tzo/appendix.md diff --git a/data/tzo/info.yaml b/resources/data/tzo/info.yaml similarity index 100% rename from data/tzo/info.yaml rename to resources/data/tzo/info.yaml diff --git a/src/skins/error/error.twig b/resources/skins/error/error.twig similarity index 100% rename from src/skins/error/error.twig rename to resources/skins/error/error.twig diff --git a/src/skins/error/notfound.twig b/resources/skins/error/notfound.twig similarity index 100% rename from src/skins/error/notfound.twig rename to resources/skins/error/notfound.twig diff --git a/src/skins/error/notfound_ic.twig b/resources/skins/error/notfound_ic.twig similarity index 100% rename from src/skins/error/notfound_ic.twig rename to resources/skins/error/notfound_ic.twig diff --git a/src/skins/foreignone/admin_actions_log.twig b/resources/skins/foreignone/admin_actions_log.twig similarity index 100% rename from src/skins/foreignone/admin_actions_log.twig rename to resources/skins/foreignone/admin_actions_log.twig diff --git a/src/skins/foreignone/admin_auth_log.twig b/resources/skins/foreignone/admin_auth_log.twig similarity index 100% rename from src/skins/foreignone/admin_auth_log.twig rename to resources/skins/foreignone/admin_auth_log.twig diff --git a/src/skins/foreignone/admin_errors.twig b/resources/skins/foreignone/admin_errors.twig similarity index 100% rename from src/skins/foreignone/admin_errors.twig rename to resources/skins/foreignone/admin_errors.twig diff --git a/src/skins/foreignone/admin_index.twig b/resources/skins/foreignone/admin_index.twig similarity index 100% rename from src/skins/foreignone/admin_index.twig rename to resources/skins/foreignone/admin_index.twig diff --git a/src/skins/foreignone/admin_login.twig b/resources/skins/foreignone/admin_login.twig similarity index 100% rename from src/skins/foreignone/admin_login.twig rename to resources/skins/foreignone/admin_login.twig diff --git a/src/skins/foreignone/admin_page_form.twig b/resources/skins/foreignone/admin_page_form.twig similarity index 100% rename from src/skins/foreignone/admin_page_form.twig rename to resources/skins/foreignone/admin_page_form.twig diff --git a/src/skins/foreignone/admin_page_new.twig b/resources/skins/foreignone/admin_page_new.twig similarity index 100% rename from src/skins/foreignone/admin_page_new.twig rename to resources/skins/foreignone/admin_page_new.twig diff --git a/src/skins/foreignone/admin_post_form.twig b/resources/skins/foreignone/admin_post_form.twig similarity index 100% rename from src/skins/foreignone/admin_post_form.twig rename to resources/skins/foreignone/admin_post_form.twig diff --git a/src/skins/foreignone/admin_uploads.twig b/resources/skins/foreignone/admin_uploads.twig similarity index 100% rename from src/skins/foreignone/admin_uploads.twig rename to resources/skins/foreignone/admin_uploads.twig diff --git a/src/skins/foreignone/articles.twig b/resources/skins/foreignone/articles.twig similarity index 100% rename from src/skins/foreignone/articles.twig rename to resources/skins/foreignone/articles.twig diff --git a/src/skins/foreignone/articles_right_links.twig b/resources/skins/foreignone/articles_right_links.twig similarity index 100% rename from src/skins/foreignone/articles_right_links.twig rename to resources/skins/foreignone/articles_right_links.twig diff --git a/src/skins/foreignone/files_collection.twig b/resources/skins/foreignone/files_collection.twig similarity index 100% rename from src/skins/foreignone/files_collection.twig rename to resources/skins/foreignone/files_collection.twig diff --git a/src/skins/foreignone/files_file.twig b/resources/skins/foreignone/files_file.twig similarity index 100% rename from src/skins/foreignone/files_file.twig rename to resources/skins/foreignone/files_file.twig diff --git a/src/skins/foreignone/files_folder.twig b/resources/skins/foreignone/files_folder.twig similarity index 100% rename from src/skins/foreignone/files_folder.twig rename to resources/skins/foreignone/files_folder.twig diff --git a/src/skins/foreignone/files_index.twig b/resources/skins/foreignone/files_index.twig similarity index 100% rename from src/skins/foreignone/files_index.twig rename to resources/skins/foreignone/files_index.twig diff --git a/src/skins/foreignone/files_list.twig b/resources/skins/foreignone/files_list.twig similarity index 100% rename from src/skins/foreignone/files_list.twig rename to resources/skins/foreignone/files_list.twig diff --git a/src/skins/foreignone/footer.twig b/resources/skins/foreignone/footer.twig similarity index 100% rename from src/skins/foreignone/footer.twig rename to resources/skins/foreignone/footer.twig diff --git a/src/skins/foreignone/header.twig b/resources/skins/foreignone/header.twig similarity index 100% rename from src/skins/foreignone/header.twig rename to resources/skins/foreignone/header.twig diff --git a/src/skins/foreignone/index.twig b/resources/skins/foreignone/index.twig similarity index 100% rename from src/skins/foreignone/index.twig rename to resources/skins/foreignone/index.twig diff --git a/src/skins/foreignone/markdown_fileupload.twig b/resources/skins/foreignone/markdown_fileupload.twig similarity index 100% rename from src/skins/foreignone/markdown_fileupload.twig rename to resources/skins/foreignone/markdown_fileupload.twig diff --git a/src/skins/foreignone/markdown_image.twig b/resources/skins/foreignone/markdown_image.twig similarity index 100% rename from src/skins/foreignone/markdown_image.twig rename to resources/skins/foreignone/markdown_image.twig diff --git a/src/skins/foreignone/markdown_preview.twig b/resources/skins/foreignone/markdown_preview.twig similarity index 100% rename from src/skins/foreignone/markdown_preview.twig rename to resources/skins/foreignone/markdown_preview.twig diff --git a/src/skins/foreignone/markdown_video.twig b/resources/skins/foreignone/markdown_video.twig similarity index 100% rename from src/skins/foreignone/markdown_video.twig rename to resources/skins/foreignone/markdown_video.twig diff --git a/src/skins/foreignone/metrika.twig b/resources/skins/foreignone/metrika.twig similarity index 100% rename from src/skins/foreignone/metrika.twig rename to resources/skins/foreignone/metrika.twig diff --git a/src/skins/foreignone/page.twig b/resources/skins/foreignone/page.twig similarity index 100% rename from src/skins/foreignone/page.twig rename to resources/skins/foreignone/page.twig diff --git a/src/skins/foreignone/post.twig b/resources/skins/foreignone/post.twig similarity index 100% rename from src/skins/foreignone/post.twig rename to resources/skins/foreignone/post.twig diff --git a/src/skins/foreignone/rss.twig b/resources/skins/foreignone/rss.twig similarity index 100% rename from src/skins/foreignone/rss.twig rename to resources/skins/foreignone/rss.twig diff --git a/src/skins/foreignone/spinner.twig b/resources/skins/foreignone/spinner.twig similarity index 100% rename from src/skins/foreignone/spinner.twig rename to resources/skins/foreignone/spinner.twig diff --git a/src/skins/ic/books.twig b/resources/skins/ic/books.twig similarity index 100% rename from src/skins/ic/books.twig rename to resources/skins/ic/books.twig diff --git a/src/skins/ic/footer.twig b/resources/skins/ic/footer.twig similarity index 100% rename from src/skins/ic/footer.twig rename to resources/skins/ic/footer.twig diff --git a/src/skins/ic/header.twig b/resources/skins/ic/header.twig similarity index 100% rename from src/skins/ic/header.twig rename to resources/skins/ic/header.twig diff --git a/src/skins/ic/index.twig b/resources/skins/ic/index.twig similarity index 100% rename from src/skins/ic/index.twig rename to resources/skins/ic/index.twig diff --git a/src/skins/ic/tzo.twig b/resources/skins/ic/tzo.twig similarity index 100% rename from src/skins/ic/tzo.twig rename to resources/skins/ic/tzo.twig diff --git a/src/skins/ic/tzo_part.twig b/resources/skins/ic/tzo_part.twig similarity index 100% rename from src/skins/ic/tzo_part.twig rename to resources/skins/ic/tzo_part.twig diff --git a/src/skins/omnia/footer.twig b/resources/skins/omnia/footer.twig similarity index 100% rename from src/skins/omnia/footer.twig rename to resources/skins/omnia/footer.twig diff --git a/src/skins/omnia/header.twig b/resources/skins/omnia/header.twig similarity index 100% rename from src/skins/omnia/header.twig rename to resources/skins/omnia/header.twig diff --git a/src/skins/omnia/index.twig b/resources/skins/omnia/index.twig similarity index 100% rename from src/skins/omnia/index.twig rename to resources/skins/omnia/index.twig diff --git a/src/skins/svg/arrow_up_right_out_square_outline_12.svg b/resources/skins/svg/arrow_up_right_out_square_outline_12.svg similarity index 100% rename from src/skins/svg/arrow_up_right_out_square_outline_12.svg rename to resources/skins/svg/arrow_up_right_out_square_outline_12.svg diff --git a/src/skins/svg/book_20.svg b/resources/skins/svg/book_20.svg similarity index 100% rename from src/skins/svg/book_20.svg rename to resources/skins/svg/book_20.svg diff --git a/src/skins/svg/clear_16.svg b/resources/skins/svg/clear_16.svg similarity index 100% rename from src/skins/svg/clear_16.svg rename to resources/skins/svg/clear_16.svg diff --git a/src/skins/svg/clear_20.svg b/resources/skins/svg/clear_20.svg similarity index 100% rename from src/skins/svg/clear_20.svg rename to resources/skins/svg/clear_20.svg diff --git a/src/skins/svg/college_20.svg b/resources/skins/svg/college_20.svg similarity index 100% rename from src/skins/svg/college_20.svg rename to resources/skins/svg/college_20.svg diff --git a/src/skins/svg/file_20.svg b/resources/skins/svg/file_20.svg similarity index 100% rename from src/skins/svg/file_20.svg rename to resources/skins/svg/file_20.svg diff --git a/src/skins/svg/folder_20.svg b/resources/skins/svg/folder_20.svg similarity index 100% rename from src/skins/svg/folder_20.svg rename to resources/skins/svg/folder_20.svg diff --git a/src/skins/svg/moon_auto_18.svg b/resources/skins/svg/moon_auto_18.svg similarity index 100% rename from src/skins/svg/moon_auto_18.svg rename to resources/skins/svg/moon_auto_18.svg diff --git a/src/skins/svg/moon_dark_18.svg b/resources/skins/svg/moon_dark_18.svg similarity index 100% rename from src/skins/svg/moon_dark_18.svg rename to resources/skins/svg/moon_dark_18.svg diff --git a/src/skins/svg/moon_light_18.svg b/resources/skins/svg/moon_light_18.svg similarity index 100% rename from src/skins/svg/moon_light_18.svg rename to resources/skins/svg/moon_light_18.svg diff --git a/src/skins/svg/riverbank_eagle_20.svg b/resources/skins/svg/riverbank_eagle_20.svg similarity index 100% rename from src/skins/svg/riverbank_eagle_20.svg rename to resources/skins/svg/riverbank_eagle_20.svg diff --git a/src/skins/svg/search_20.svg b/resources/skins/svg/search_20.svg similarity index 100% rename from src/skins/svg/search_20.svg rename to resources/skins/svg/search_20.svg diff --git a/src/skins/svg/settings_28.svg b/resources/skins/svg/settings_28.svg similarity index 100% rename from src/skins/svg/settings_28.svg rename to resources/skins/svg/settings_28.svg diff --git a/src/strings/common.yaml b/resources/strings/common.yaml similarity index 100% rename from src/strings/common.yaml rename to resources/strings/common.yaml diff --git a/src/strings/ic.yaml b/resources/strings/ic.yaml similarity index 100% rename from src/strings/ic.yaml rename to resources/strings/ic.yaml diff --git a/src/strings/main.yaml b/resources/strings/main.yaml similarity index 100% rename from src/strings/main.yaml rename to resources/strings/main.yaml diff --git a/src/strings/omnia.yaml b/resources/strings/omnia.yaml similarity index 100% rename from src/strings/omnia.yaml rename to resources/strings/omnia.yaml diff --git a/src/engine/lang/Strings.php b/src/engine/lang/Strings.php index 9c03a76..e17cf3f 100644 --- a/src/engine/lang/Strings.php +++ b/src/engine/lang/Strings.php @@ -42,7 +42,7 @@ class Strings extends StringsBase * @return array|StringsPack */ public static function getStringsPack(string $name, bool $raw = false): array|StringsPack { - $file = APP_ROOT.'/src/strings/'.$name.'.yaml'; + $file = APP_ROOT.'/resources/strings/'.$name.'.yaml'; $data = yaml_parse_file($file); if ($data === false) logError(__METHOD__.': yaml_parse_file failed on file '.$file); diff --git a/src/engine/skin/ErrorSkin.php b/src/engine/skin/ErrorSkin.php index 10b1589..33cbf7f 100644 --- a/src/engine/skin/ErrorSkin.php +++ b/src/engine/skin/ErrorSkin.php @@ -8,7 +8,7 @@ use Twig\Loader\LoaderInterface; class ErrorSkin extends BaseSkin { - const string TEMPLATES_ROOT = APP_ROOT.'/src/skins/error'; + const string TEMPLATES_ROOT = APP_ROOT.'/resources/skins/error'; protected function getTwigLoader(): LoaderInterface { return new FilesystemLoader(self::TEMPLATES_ROOT, APP_ROOT); diff --git a/src/engine/skin/FeaturedSkin.php b/src/engine/skin/FeaturedSkin.php index 1b9278e..8407bd3 100644 --- a/src/engine/skin/FeaturedSkin.php +++ b/src/engine/skin/FeaturedSkin.php @@ -73,7 +73,7 @@ abstract class FeaturedSkin $h = $this->svgDefs[$name]['height']; if ($in_place) { $svg = ''; - $svg .= file_get_contents(APP_ROOT.'/src/skins/svg/'.$name.'.svg'); + $svg .= file_get_contents(APP_ROOT.'/resources/skins/svg/'.$name.'.svg'); $svg .= ''; return $svg; } else { @@ -179,7 +179,7 @@ HTML; protected function getSVGTags(): string { $buf = ''; foreach ($this->svgDefs as $name => $icon) { - $content = file_get_contents(APP_ROOT.'/src/skins/svg/'.$name.'.svg'); + $content = file_get_contents(APP_ROOT.'/resources/skins/svg/'.$name.'.svg'); $buf .= "$content"; } $buf .= ''; diff --git a/src/handlers/ic/MainHandler.php b/src/handlers/ic/MainHandler.php index ffeee23..a664e67 100644 --- a/src/handlers/ic/MainHandler.php +++ b/src/handlers/ic/MainHandler.php @@ -24,7 +24,7 @@ class MainHandler } public function GET_books() { - $html = MarkupUtil::markdownToHtml(file_get_contents(APP_ROOT.'/data/ic_books.md')); + $html = MarkupUtil::markdownToHtml(file_get_contents(APP_ROOT.'/resources/data/ic_books.md')); $this->skin->title = lang('books'); $this->skin->options->headSection = 'books'; $this->skin->set(['html' => $html]);; diff --git a/src/lib/foreignone/ForeignOneSkin.php b/src/lib/foreignone/ForeignOneSkin.php index 90cfc7d..089f7fa 100644 --- a/src/lib/foreignone/ForeignOneSkin.php +++ b/src/lib/foreignone/ForeignOneSkin.php @@ -32,7 +32,7 @@ class ForeignOneSkin } protected function getTwigLoader(): LoaderInterface { - $twig_loader = new FilesystemLoader(APP_ROOT.'/src/skins/foreignone', APP_ROOT); + $twig_loader = new FilesystemLoader(APP_ROOT.'/resources/skins/foreignone', APP_ROOT); // $twig_loader->addPath(APP_ROOT.'/htdocs/svg', 'svg'); return $twig_loader; } diff --git a/src/lib/ic/InvisibleCollegeSkin.php b/src/lib/ic/InvisibleCollegeSkin.php index bc4dd77..574e253 100644 --- a/src/lib/ic/InvisibleCollegeSkin.php +++ b/src/lib/ic/InvisibleCollegeSkin.php @@ -31,8 +31,8 @@ class InvisibleCollegeSkin } protected function getTwigLoader(): LoaderInterface { - $twig_loader = new FilesystemLoader(APP_ROOT.'/src/skins/ic', APP_ROOT); - $twig_loader->addPath(APP_ROOT.'/src/skins/foreignone', 'foreignone'); + $twig_loader = new FilesystemLoader(APP_ROOT.'/resources/skins/ic', APP_ROOT); + $twig_loader->addPath(APP_ROOT.'/resources/skins/foreignone', 'foreignone'); return $twig_loader; } diff --git a/src/lib/ic/TZO.php b/src/lib/ic/TZO.php index 8acda5c..5eec5af 100644 --- a/src/lib/ic/TZO.php +++ b/src/lib/ic/TZO.php @@ -9,7 +9,7 @@ class TZO public static function getStrings(): array { static $strings; if ($strings === null) - $strings = yaml_parse_file(APP_ROOT.'/data/tzo/info.yaml'); + $strings = yaml_parse_file(APP_ROOT.'/resources/data/tzo/info.yaml'); return $strings; } diff --git a/src/lib/ic/TZOPart.php b/src/lib/ic/TZOPart.php index c107a18..57a2501 100644 --- a/src/lib/ic/TZOPart.php +++ b/src/lib/ic/TZOPart.php @@ -63,7 +63,7 @@ class TZOPart if ($this->html !== null) return $this->html; - $markdown_file = APP_ROOT.'/data/tzo/'.($this->appendix ? 'appendix' : $this->part).'.md'; + $markdown_file = APP_ROOT.'/resources/data/tzo/'.($this->appendix ? 'appendix' : $this->part).'.md'; $md = file_get_contents($markdown_file); // images diff --git a/src/lib/omnia/OmniaSkin.php b/src/lib/omnia/OmniaSkin.php index 4c07463..8f910bb 100644 --- a/src/lib/omnia/OmniaSkin.php +++ b/src/lib/omnia/OmniaSkin.php @@ -30,7 +30,7 @@ class OmniaSkin } protected function getTwigLoader(): LoaderInterface { - $twig_loader = new FilesystemLoader(APP_ROOT.'/src/skins/omnia', APP_ROOT); + $twig_loader = new FilesystemLoader(APP_ROOT.'/resources/skins/omnia', APP_ROOT); return $twig_loader; }