diff options
| author |  Alexandre Alapetite <alexandre@alapetite.fr>
| 2017-05-26 14:00:52 +0200 |
|---|---|---|
| committer | Alexandre Alapetite <alexandre@alapetite.fr>
| 2017-05-26 14:00:52 +0200 |
| commit | 3a5427ea7f0269361264ea918db87ccbe501bce8 (patch) | |
| tree | c63e6264e249f82aaca47a843bbaf944b67858fc | |
| parent | 5cb72d32c36355cc7ca5b6c7d17151a98e17c935 (diff) | |
Change CSS load order to help CustomCSS extension
https://github.com/FreshRSS/Extensions/issues/13
| -rw-r--r-- | app/FreshRSS.php | 12 | ||||
| -rw-r--r-- | data/extensions-data/.gitignore | 1 | ||||
| -rw-r--r-- | data/extensions-data/index.html | 13 |
3 files changed, 20 insertions, 6 deletions
diff --git a/app/FreshRSS.php b/app/FreshRSS.php index 563393c90..90d6fae06 100644 --- a/app/FreshRSS.php +++ b/app/FreshRSS.php @@ -80,7 +80,7 @@ class FreshRSS extends Minz_FrontController { public static function loadStylesAndScripts() { $theme = FreshRSS_Themes::load(FreshRSS_Context::$user_conf->theme); if ($theme) { - foreach($theme['files'] as $file) { + foreach(array_reverse($theme['files']) as $file) { if ($file[0] === '_') { $theme_id = 'base-theme'; $filename = substr($file, 1); @@ -91,13 +91,13 @@ class FreshRSS extends Minz_FrontController { $filetime = @filemtime(PUBLIC_PATH . '/themes/' . $theme_id . '/' . $filename); $url = '/themes/' . $theme_id . '/' . $filename . '?' . $filetime; header('Link: <' . Minz_Url::display($url, '', 'root') . '>;rel=preload', false); //HTTP2 - Minz_View::appendStyle(Minz_Url::display($url)); + Minz_View::prependStyle(Minz_Url::display($url)); } } - - Minz_View::appendScript(Minz_Url::display('/scripts/jquery.min.js?' . @filemtime(PUBLIC_PATH . '/scripts/jquery.min.js'))); - Minz_View::appendScript(Minz_Url::display('/scripts/shortcut.js?' . @filemtime(PUBLIC_PATH . '/scripts/shortcut.js'))); - Minz_View::appendScript(Minz_Url::display('/scripts/main.js?' . @filemtime(PUBLIC_PATH . '/scripts/main.js'))); + //Use prepend to insert before extensions. Added in reverse order. + Minz_View::prependScript(Minz_Url::display('/scripts/main.js?' . @filemtime(PUBLIC_PATH . '/scripts/main.js'))); + Minz_View::prependScript(Minz_Url::display('/scripts/shortcut.js?' . @filemtime(PUBLIC_PATH . '/scripts/shortcut.js'))); + Minz_View::prependScript(Minz_Url::display('/scripts/jquery.min.js?' . @filemtime(PUBLIC_PATH . '/scripts/jquery.min.js'))); } private static function loadNotifications() { diff --git a/data/extensions-data/.gitignore b/data/extensions-data/.gitignore new file mode 100644 index 000000000..0a00d7014 --- /dev/null +++ b/data/extensions-data/.gitignore @@ -0,0 +1 @@ +*/
\ No newline at end of file diff --git a/data/extensions-data/index.html b/data/extensions-data/index.html new file mode 100644 index 000000000..85faaa37e --- /dev/null +++ b/data/extensions-data/index.html @@ -0,0 +1,13 @@ +<!DOCTYPE html> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-GB" lang="en-GB"> +<head> +<meta charset="UTF-8" /> +<meta http-equiv="Refresh" content="0; url=/" /> +<title>Redirection</title> +<meta name="robots" content="noindex" /> +</head> + +<body> +<p><a href="/">Redirection</a></p> +</body> +</html> |