From 70fb78b990d687913007228703f9980cd6d33bd3 Mon Sep 17 00:00:00 2001 From: Frederic Guillot Date: Mon, 9 Jan 2017 18:38:32 -0500 Subject: [PATCH] Offer the possibility to define different URL for themes folder --- app/constants.php | 1 + app/helpers/template.php | 3 ++- config.default.php | 5 ++++- docs/config.markdown | 5 ++++- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/app/constants.php b/app/constants.php index bbeae31..a59d995 100644 --- a/app/constants.php +++ b/app/constants.php @@ -25,6 +25,7 @@ defined('DEBUG_MODE') or define('DEBUG_MODE', false); defined('DEBUG_FILENAME') or define('DEBUG_FILENAME', DATA_DIRECTORY.DIRECTORY_SEPARATOR.'debug.log'); defined('THEME_DIRECTORY') or define('THEME_DIRECTORY', 'themes'); +defined('THEME_URL_PATH') or define('THEME_URL_PATH', 'themes'); defined('SESSION_SAVE_PATH') or define('SESSION_SAVE_PATH', ''); defined('PROXY_HOSTNAME') or define('PROXY_HOSTNAME', ''); diff --git a/app/helpers/template.php b/app/helpers/template.php index a2ff84c..1d29f1a 100644 --- a/app/helpers/template.php +++ b/app/helpers/template.php @@ -41,9 +41,10 @@ function css() if ($theme !== 'original') { $css_file = THEME_DIRECTORY.'/'.$theme.'/css/app.css'; + $css_url = THEME_URL_PATH.'/'.$theme.'/css/app.css'; if (file_exists($css_file)) { - return $css_file.'?version='.filemtime($css_file); + return $css_url.'?version='.filemtime($css_file); } } diff --git a/config.default.php b/config.default.php index 444e93f..74069f3 100644 --- a/config.default.php +++ b/config.default.php @@ -33,9 +33,12 @@ define('DEBUG_MODE', false); // DEBUG_FILENAME => default is data/debug.log define('DEBUG_FILENAME', DATA_DIRECTORY.'/debug.log'); -// THEME_DIRECTORY => default is themes +// Theme folder on the filesystem => default is themes define('THEME_DIRECTORY', 'themes'); +// Theme URL path => default is themes +define('THEME_URL_PATH', 'themes'); + // SESSION_SAVE_PATH => default is empty (used to store session files in a custom directory) define('SESSION_SAVE_PATH', ''); diff --git a/docs/config.markdown b/docs/config.markdown index f05584d..f0bb7bd 100644 --- a/docs/config.markdown +++ b/docs/config.markdown @@ -82,9 +82,12 @@ define('DEBUG_MODE', false); // DEBUG_FILENAME => default is data/debug.log define('DEBUG_FILENAME', DATA_DIRECTORY.'/debug.log'); -// THEME_DIRECTORY => default is themes +// Theme folder on the filesystem => default is themes define('THEME_DIRECTORY', 'themes'); +// Theme URL path => default is themes +define('THEME_URL_PATH', 'themes'); + // SESSION_SAVE_PATH => default is empty (used to store session files in a custom directory) define('SESSION_SAVE_PATH', '');