mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-03 13:17:24 +02:00
Code Issues Releases Wiki Activity

added ability to switch off include of core javascript file and cleaned up head output

Browse Source
This commit is contained in:
sweetas
2007-07-11 13:50:49 +00:00
parent 16d398b69d
commit d4ff8f0b68
1 changed files with 13 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
e107_themes/templates/header_default.php
View File

@@ -6,9 +6,9 @@
| Released under the terms and conditions of the GNU General Public License (http://gnu.org). | Released under the terms and conditions of the GNU General Public License (http://gnu.org).
| |
| $Source: /cvs_backup/e107_0.8/e107_themes/templates/header_default.php,v $ | $Source: /cvs_backup/e107_0.8/e107_themes/templates/header_default.php,v $
| $Revision: 1.8 $ | $Revision: 1.9 $
| $Date: 2007-07-03 03:24:35 $ | $Date: 2007-07-11 13:50:49 $
| $Author: e107coders $ | $Author: sweetas $
+-----------------------------------------------------------------------------------------------+ +-----------------------------------------------------------------------------------------------+
*/ */
@@ -82,12 +82,11 @@ echo (defined("STANDARDS_MODE") ? "" : "<?xml version='1.0' encoding='".CHARSET.
echo "<html xmlns='http://www.w3.org/1999/xhtml'".(defined("TEXTDIRECTION") ? " dir='".TEXTDIRECTION."'" : "").(defined("CORE_LC") ? " xml:lang=\"".CORE_LC."\"" : "")."> echo "<html xmlns='http://www.w3.org/1999/xhtml'".(defined("TEXTDIRECTION") ? " dir='".TEXTDIRECTION."'" : "").(defined("CORE_LC") ? " xml:lang=\"".CORE_LC."\"" : "").">
<head> <head>
<title>".SITENAME.(defined("e_PAGETITLE") ? ": ".e_PAGETITLE : (defined("PAGE_NAME") ? ": ".PAGE_NAME : ""))."</title>\n"; <title>".SITENAME.(defined("e_PAGETITLE") ? ": ".e_PAGETITLE : (defined("PAGE_NAME") ? ": ".PAGE_NAME : ""))."</title>\n\n";
// //
// D: Send JS // D: Send JS
// //
echo "<!-- *JS* -->\n";
// Wysiwyg JS support on or off. // Wysiwyg JS support on or off.
if (varset($pref['wysiwyg'],FALSE) && check_class($pref['post_html']) && varset($e_wysiwyg) != "") { if (varset($pref['wysiwyg'],FALSE) && check_class($pref['post_html']) && varset($e_wysiwyg) != "") {
@@ -99,13 +98,14 @@ if (varset($pref['wysiwyg'],FALSE) && check_class($pref['post_html']) && varset(
if (isset($theme_js_php) && $theme_js_php) { if (isset($theme_js_php) && $theme_js_php) {
echo "<link rel='stylesheet' href='".THEME_ABS."theme-js.php' type='text/css />"; echo "<link rel='stylesheet' href='".THEME_ABS."theme-js.php' type='text/css />";
} else { } else {
echo "<script type='text/javascript' src='".e_FILE_ABS."e107.js'></script>\n"; if (!isset($no_core_js) || !$no_core_js) {
echo "<script type='text/javascript' src='".e_FILE_ABS."e107.js'></script>\n";
}
if (file_exists(THEME.'theme.js')) { echo "<script type='text/javascript' src='".THEME_ABS."theme.js'></script>\n"; } if (file_exists(THEME.'theme.js')) { echo "<script type='text/javascript' src='".THEME_ABS."theme.js'></script>\n"; }
if (filesize(e_FILE.'user.js')) { echo "<script type='text/javascript' src='".e_FILE_ABS."user.js'></script>\n"; } if (filesize(e_FILE.'user.js')) { echo "<script type='text/javascript' src='".e_FILE_ABS."user.js'></script>\n"; }
} }
if (isset($eplug_js) && $eplug_js) { if (isset($eplug_js) && $eplug_js) {
echo "\n<!-- eplug_js -->\n";
if(is_array($eplug_js)) if(is_array($eplug_js))
{ {
foreach($eplug_js as $kjs) foreach($eplug_js as $kjs)
@@ -121,7 +121,7 @@ if (isset($eplug_js) && $eplug_js) {
} }
if((isset($pref['enable_png_image_fix']) && $pref['enable_png_image_fix'] == true) || (isset($sleight) && $sleight == true)) { if((isset($pref['enable_png_image_fix']) && $pref['enable_png_image_fix'] == true) || (isset($sleight) && $sleight == true)) {
echo "<script type='text/javascript' src='".e_FILE_ABS."sleight_js.php'></script>\n"; echo "<script type='text/javascript' src='".e_FILE_ABS."sleight_js.php'></script>\n\n";
} }
if (function_exists('headerjs')){echo headerjs(); } if (function_exists('headerjs')){echo headerjs(); }
@@ -129,10 +129,8 @@ if (function_exists('headerjs')){echo headerjs(); }
// //
// E: Send CSS // E: Send CSS
// //
echo "<!-- *CSS* -->\n";
if (isset($eplug_css) && $eplug_css) { if (isset($eplug_css) && $eplug_css) {
echo "\n<!-- eplug_css -->\n";
if(is_array($eplug_css)) if(is_array($eplug_css))
{ {
foreach($eplug_css as $kcss) foreach($eplug_css as $kcss)
@@ -147,7 +145,6 @@ if (isset($eplug_css) && $eplug_css) {
} }
echo "<!-- Theme css -->\n";
if(defined("PREVIEWTHEME")) { if(defined("PREVIEWTHEME")) {
echo "<link rel='stylesheet' href='".PREVIEWTHEME."style.css' type='text/css' />\n"; echo "<link rel='stylesheet' href='".PREVIEWTHEME."style.css' type='text/css' />\n";
} else { } else {
@@ -198,14 +195,13 @@ if(function_exists('core_head')){ echo core_head(); }
// //
// F: Send Meta Tags and Icon links // F: Send Meta Tags and Icon links
// //
echo "<!-- *META* -->\n";
// Multi-Language meta-tags with merge and override option. // Multi-Language meta-tags with merge and override option.
echo "<meta http-equiv='content-type' content='text/html; charset=".CHARSET."' /> echo "\n<meta http-equiv='content-type' content='text/html; charset=".CHARSET."' />
<meta http-equiv='content-style-type' content='text/css' />\n"; <meta http-equiv='content-style-type' content='text/css' />\n";
echo (defined("CORE_LC")) ? "<meta http-equiv='content-language' content='".CORE_LC."' />\n" : ""; echo (defined("CORE_LC")) ? "<meta http-equiv='content-language' content='".CORE_LC."' />\n\n" : "";
// --- Load plugin Meta files and eplug_ before others -------- // --- Load plugin Meta files and eplug_ before others --------
if (is_array($pref['e_meta_list'])) if (is_array($pref['e_meta_list']))
@@ -214,7 +210,6 @@ foreach($pref['e_meta_list'] as $val)
{ {
if(is_readable(e_PLUGIN.$val."/e_meta.php")) if(is_readable(e_PLUGIN.$val."/e_meta.php"))
{ {
echo "<!-- $val meta -->\n";
require_once(e_PLUGIN.$val."/e_meta.php"); require_once(e_PLUGIN.$val."/e_meta.php");
} }
} }
@@ -240,9 +235,8 @@ function render_meta($type)
} }
} }
echo "\n<!-- Core Meta Tags -->\n"; echo (defined("META_DESCRIPTION")) ? "\n<meta name=\"description\" content=\"".$diz_merge.META_DESCRIPTION."\" />\n" : render_meta('description');
echo (defined("META_DESCRIPTION")) ? "<meta name=\"description\" content=\"".$diz_merge.META_DESCRIPTION."\" />\n" : render_meta('description'); echo (defined("META_KEYWORDS")) ? "\n<meta name=\"keywords\" content=\"".$key_merge.META_KEYWORDS."\" />\n" : render_meta('keywords');
echo (defined("META_KEYWORDS")) ? "<meta name=\"keywords\" content=\"".$key_merge.META_KEYWORDS."\" />\n" : render_meta('keywords');
echo render_meta('copyright'); echo render_meta('copyright');
echo render_meta('author'); echo render_meta('author');
echo render_meta('tag'); echo render_meta('tag');
@@ -262,7 +256,6 @@ if (file_exists(THEME."favicon.ico")) {
if(function_exists('theme_head')){ if(function_exists('theme_head')){
echo "\n<!-- *THEME HEAD* -->\n";
echo theme_head(); echo theme_head();
} }
@@ -270,7 +263,7 @@ if(function_exists('theme_head')){
// //
// H: Generate JS for image preloads // H: Generate JS for image preloads
// //
echo "\n<!-- *PRELOAD* -->\n";
if ($pref['image_preload']) { if ($pref['image_preload']) {
$ejs_listpics = ''; $ejs_listpics = '';
$handle=opendir(THEME.'images'); $handle=opendir(THEME.'images');