From 27ab16b6dc649fbda0ee329b42f1882623f9cba6 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Thu, 11 Mar 2021 07:44:58 +0300 Subject: [PATCH] add Config::LOCAL_OVERRIDE_JS --- classes/config.php | 17 ++++++++++++++++- classes/handler/public.php | 4 +--- include/functions.php | 2 ++ include/login_form.php | 4 +--- index.php | 4 +--- prefs.php | 4 +--- 6 files changed, 22 insertions(+), 13 deletions(-) diff --git a/classes/config.php b/classes/config.php index a0113bd24..2307665f3 100644 --- a/classes/config.php +++ b/classes/config.php @@ -98,7 +98,10 @@ class Config { // available options: sql (default, event log), syslog, stdout (for debugging) const LOCAL_OVERRIDE_STYLESHEET = "LOCAL_OVERRIDE_STYLESHEET"; - // link this stylesheet on all pages + // link this stylesheet on all pages (if it exists), should be placed in themes.local + + const LOCAL_OVERRIDE_JS = "LOCAL_OVERRIDE_JS"; + // same but this javascript file (you can use that for polyfills), should be placed in themes.local const DAEMON_MAX_CHILD_RUNTIME = "DAEMON_MAX_CHILD_RUNTIME"; // in seconds, terminate update tasks that ran longer than this interval @@ -194,6 +197,8 @@ class Config { Config::LOG_DESTINATION => [ Logger::LOG_DEST_SQL, Config::T_STRING ], Config::LOCAL_OVERRIDE_STYLESHEET => [ "local-overrides.css", Config::T_STRING ], + Config::LOCAL_OVERRIDE_JS => [ "local-overrides.js", + Config::T_STRING ], Config::DAEMON_MAX_CHILD_RUNTIME => [ 1800, Config::T_INT ], Config::DAEMON_MAX_JOBS => [ 2, Config::T_INT ], Config::FEED_FETCH_TIMEOUT => [ 45, Config::T_INT ], @@ -610,4 +615,14 @@ class Config { private static function format_error($msg) { return "
$msg
"; } + + static function get_override_links() { + $rv = ""; + + $local_css = get_theme_path(self::get(self::LOCAL_OVERRIDE_STYLESHEET)); + if ($local_css) $rv .= stylesheet_tag($local_css); + + $local_js = get_theme_path(self::get(self::LOCAL_OVERRIDE_JS)); + if ($local_js) $rv .= javascript_tag($local_js); + } } diff --git a/classes/handler/public.php b/classes/handler/public.php index 2de073cc2..d5319c306 100755 --- a/classes/handler/public.php +++ b/classes/handler/public.php @@ -638,9 +638,7 @@ class Handler_Public extends Handler { } ?> - +