mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-01 12:20:44 +02:00
Code Issues Releases Wiki Activity

Load Plugin CSS after Theme CSS when in admin area.

Browse Source
This commit is contained in:
Cameron
2016-11-04 19:36:16 -07:00
parent cf5bc2b359
commit c7fc923736
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
e107_admin/header.php
View File

@@ -295,15 +295,17 @@ echo "\n<!-- footer_other_css -->\n";
$e_js->renderJs('core_css', false, 'css', false); $e_js->renderJs('core_css', false, 'css', false);
echo "\n<!-- footer_core_css -->\n"; echo "\n<!-- footer_core_css -->\n";
// Plugin CSS
$e_js->renderJs('plugin_css', false, 'css', false);
echo "\n<!-- footer_plugin_css -->\n";
// Theme CSS // Theme CSS
//echo "<!-- Theme css -->\n"; //echo "<!-- Theme css -->\n";
$e_js->renderJs('theme_css', false, 'css', false); $e_js->renderJs('theme_css', false, 'css', false);
echo "\n<!-- footer_theme_css -->\n"; echo "\n<!-- footer_theme_css -->\n";
// Plugin CSS
$e_js->renderJs('plugin_css', false, 'css', false);
echo "\n<!-- footer_plugin_css -->\n";
// Inline CSS - not sure if this should stay at all! // Inline CSS - not sure if this should stay at all!
$e_js->renderJs('inline_css', false, 'css', false); $e_js->renderJs('inline_css', false, 'css', false);
echo "\n<!-- footer_inline_css -->\n"; echo "\n<!-- footer_inline_css -->\n";

8
e107_handlers/js_manager.php
View File

@@ -991,11 +991,15 @@ class e_jsmanager
break; break;
case 'plugin_css': case 'plugin_css':
$file_path = explode(':', $file_path); $pfile_path = explode(':', $file_path,2);
$file_path = $runtime_location.$this->_sep.'{e_PLUGIN}'.$file_path[0].'/'.trim($file_path[1], '/').$this->_sep.$pre.$this->_sep.$post; $plugfile_path = $runtime_location.$this->_sep.'{e_PLUGIN}'.$pfile_path[0].'/'.trim($pfile_path[1], '/').$this->_sep.$pre.$this->_sep.$post;
// allow for URLs to be attributed to plugins. (loads after theme css in admin area header)
$file_path = ((strpos($pfile_path[1], 'http') !== 0 && strpos($pfile_path[1], '//') !== 0)) ? $plugfile_path : 'all'.$this->_sep.$pfile_path[1].$this->_sep.$pre.$this->_sep.$post;;
if(!isset($this->_e_css['plugin'])) $this->_e_css['plugin'] = array(); if(!isset($this->_e_css['plugin'])) $this->_e_css['plugin'] = array();
$registry = &$this->_e_css['plugin']; $registry = &$this->_e_css['plugin'];
$runtime = true; $runtime = true;
break; break;
case 'theme_css': case 'theme_css':