From febca207c41e9f45afe492efa0b1b2b08f248472 Mon Sep 17 00:00:00 2001 From: Roman Kelesidis Date: Mon, 26 Jun 2023 21:20:55 +0700 Subject: [PATCH] Revert "Minor improvements (#197)" This reverts commit 1453fc35a10d27fd8c98ad8d37a09e31c2ee2d2a. --- CHANGELOG.md | 2 +- library/config.php | 5 ++--- library/includes/functions.php | 2 -- styles/templates/default/page_header.tpl | 1 - styles/templates/default/scripts.js | 11 ----------- 5 files changed, 3 insertions(+), 18 deletions(-) delete mode 100644 styles/templates/default/scripts.js diff --git a/CHANGELOG.md b/CHANGELOG.md index cf8fa09c..9bb28be9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,7 +11,7 @@ - Corrected translations [\#183](https://github.com/torrentpier/torrentpier-lts/pull/183) ([belomaxorka](https://github.com/belomaxorka)) - Fixed $bb_cfg['pm_days_keep'] [\#180](https://github.com/torrentpier/torrentpier-lts/pull/180) ([belomaxorka](https://github.com/belomaxorka)) - IP storage bugfix [\#177](https://github.com/torrentpier/torrentpier-lts/pull/177) ([belomaxorka](https://github.com/belomaxorka)) -- Minor improvements [\#172](https://github.com/torrentpier/torrentpier-lts/pull/172), [\#175](https://github.com/torrentpier/torrentpier-lts/pull/175), [\#176](https://github.com/torrentpier/torrentpier-lts/pull/176), [\#178](https://github.com/torrentpier/torrentpier-lts/pull/178), [\#179](https://github.com/torrentpier/torrentpier-lts/pull/179), [\#181](https://github.com/torrentpier/torrentpier-lts/pull/181), [\#187](https://github.com/torrentpier/torrentpier-lts/pull/187), [\#192](https://github.com/torrentpier/torrentpier-lts/pull/192), [\#194](https://github.com/torrentpier/torrentpier-lts/pull/194), [\#195](https://github.com/torrentpier/torrentpier-lts/pull/195), [\#197](https://github.com/torrentpier/torrentpier-lts/pull/197) ([belomaxorka](https://github.com/belomaxorka)) +- Minor improvements [\#172](https://github.com/torrentpier/torrentpier-lts/pull/172), [\#175](https://github.com/torrentpier/torrentpier-lts/pull/175), [\#176](https://github.com/torrentpier/torrentpier-lts/pull/176), [\#178](https://github.com/torrentpier/torrentpier-lts/pull/178), [\#179](https://github.com/torrentpier/torrentpier-lts/pull/179), [\#181](https://github.com/torrentpier/torrentpier-lts/pull/181), [\#187](https://github.com/torrentpier/torrentpier-lts/pull/187), [\#192](https://github.com/torrentpier/torrentpier-lts/pull/192), [\#194](https://github.com/torrentpier/torrentpier-lts/pull/194), [\#195](https://github.com/torrentpier/torrentpier-lts/pull/195) ([belomaxorka](https://github.com/belomaxorka)) - Fixed empty user search box [\#171](https://github.com/torrentpier/torrentpier-lts/pull/171) ([belomaxorka](https://github.com/belomaxorka)) - Added some placeholders for input fields [\#173](https://github.com/torrentpier/torrentpier-lts/pull/173) ([belomaxorka](https://github.com/belomaxorka)) diff --git a/library/config.php b/library/config.php index 3cb3fe46..8fda7251 100644 --- a/library/config.php +++ b/library/config.php @@ -317,9 +317,8 @@ $bb_cfg['templates'] = array( 'default' => 'Стандартный', ); -$bb_cfg['tpl_name'] = 'default'; // название шаблона по умолчанию (папка) -$bb_cfg['stylesheet'] = 'main.css'; // файл стилей используемый шаблоном -$bb_cfg['tpl_javascript'] = 'scripts.js'; // путь к js файлу со скриптами для шаблона +$bb_cfg['tpl_name'] = 'default'; // название шаблона по умолчанию (папка) +$bb_cfg['stylesheet'] = 'main.css'; // файл стилей используемый шаблоном $bb_cfg['show_sidebar1_on_every_page'] = false; // показывать левый сайд-бар на каждой странице? $bb_cfg['show_sidebar2_on_every_page'] = false; // показывать правый сайд-бар на каждой странице? diff --git a/library/includes/functions.php b/library/includes/functions.php index b3fcb8e5..46063e8d 100644 --- a/library/includes/functions.php +++ b/library/includes/functions.php @@ -1550,13 +1550,11 @@ function setup_style () $template = new Template(TEMPLATES_DIR . $tpl_dir_name); $css_dir = 'styles/' . basename(TEMPLATES_DIR) . '/' . $tpl_dir_name . '/css/'; - $js_path = 'styles/' . basename(TEMPLATES_DIR) . '/' . $tpl_dir_name . '/' . basename($bb_cfg['tpl_javascript']); $template->assign_vars(array( 'BB_ROOT' => BB_ROOT, 'SPACER' => make_url('styles/images/spacer.gif'), 'STYLESHEET' => make_url($css_dir . $stylesheet), - 'TPL_SCRIPTS' => make_url($js_path), 'EXT_LINK_NEW_WIN' => $bb_cfg['ext_link_new_win'], 'TPL_DIR' => make_url($css_dir), 'SITE_URL' => make_url('/'), diff --git a/styles/templates/default/page_header.tpl b/styles/templates/default/page_header.tpl index 25e458c2..06ca9195 100644 --- a/styles/templates/default/page_header.tpl +++ b/styles/templates/default/page_header.tpl @@ -21,7 +21,6 @@ - diff --git a/styles/templates/default/scripts.js b/styles/templates/default/scripts.js deleted file mode 100644 index c6ca9cf1..00000000 --- a/styles/templates/default/scripts.js +++ /dev/null @@ -1,11 +0,0 @@ -/** - Add here your JavaScript Code. - Note: The code entered here will be added in tag. - - Example: - var x, y, z; - x = 5; - y = 6; - z = x + y; - alert(z); - */