mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-10-11 13:04:28 +02:00
Code Issues Releases Wiki Activity

Front-end header work - load oder changed, js manager support (CSS files render).

Browse Source
This commit is contained in:
secretr
2010-02-01 17:15:59 +00:00
parent 797928071a
commit a91d82a398
3 changed files with 209 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
e107_admin/header.php
View File

@@ -9,8 +9,8 @@
* Admin Header
*
* $Source: /cvs_backup/e107_0.8/e107_admin/header.php,v $
* $Revision: 1.56 $
* $Date: 2010-01-12 07:38:29 $
* $Revision: 1.57 $
* $Date: 2010-02-01 17:15:59 $
* $Author: secretr $
*/
@@ -109,19 +109,30 @@ echo "<title>".LAN_head_4.(defined("e_PAGETITLE") ? " - ".e_PAGETITLE : (defined
//
echo "<!-- *CSS* -->\n";
$e_js = e107::getJs();
if (isset($eplug_css) && $eplug_css)
{
//echo "\n<!-- eplug_css -->\n";
//echo "<link rel='stylesheet' href='{$eplug_css}' type='text/css' />\n";
$e_js->otherCSS('{e_FILE}e107.css');
}
// Core CSS - XXX awaiting for path changes
if (!isset($no_core_css) || !$no_core_css)
{
//echo "<link rel='stylesheet' href='".e_FILE_ABS."e107.css' type='text/css' />\n";
$e_js->otherCSS('{e_FILE}e107.css');
}
// Register Plugin specific CSS
// DEPRECATED, use $e_js->pluginCSS('myplug', 'style/myplug.css'[, $media = 'all|screen|...']);
if (isset($eplug_css) && $eplug_css)
{
if(!is_array($eplug_css))
{
$eplug_css = array($eplug_css);
}
foreach($eplug_css as $kcss)
{
// echo ($kcss[0] == "<") ? $kcss : "<link rel='stylesheet' href='{$kcss}' type='text/css' />\n";
$e_js->otherCSS($kcss);
}
}
//NEW - Iframe mod
if (!defsettrue('e_IFRAME') && isset($pref['admincss']) && $pref['admincss'])
{
@@ -177,13 +188,6 @@ echo "\n<!-- footer_theme_css -->\n";
$e_js->renderJs('inline_css', false, 'css', false);
echo "\n<!-- footer_inline_css -->\n";
//
// Unobtrusive JS via CSS, prevent 3rd party code overload
//
require_once(e_FILE."/e_css.php");
//iepngfix - IE6 only
if ((isset($pref['enable_png_image_fix']) && $pref['enable_png_image_fix'] == true) || (isset($sleight) && $sleight == true))
{
@@ -357,6 +361,11 @@ echo "
e107::getJs()->renderJs('header', 5);
e107::getJs()->renderJs('header_inline', 5);
//
// Unobtrusive JS via CSS, prevent 3rd party code overload
//
require_once(e_FILE."/e_css.php");
/*
* Fire Event e107:loaded
* TODO - remove it from here, should be registered to e_jsmanager