From da7b9ca9b5e61e33d6c58c6a590ee6a58cb44dbe Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Mon, 6 Jan 2014 10:36:18 +0000 Subject: [PATCH] only add slider.js for framework (cd=yes), as it is not needed for iframes and gives javascript error --- pixelegg/inc/class.pixelegg_framework.inc.php | 18 +++++++++++++++ pixelegg/templates/pixelegg/head.tpl | 22 +++++++++---------- 2 files changed, 28 insertions(+), 12 deletions(-) diff --git a/pixelegg/inc/class.pixelegg_framework.inc.php b/pixelegg/inc/class.pixelegg_framework.inc.php index 4e8b26b774..a9e617f2ab 100755 --- a/pixelegg/inc/class.pixelegg_framework.inc.php +++ b/pixelegg/inc/class.pixelegg_framework.inc.php @@ -39,4 +39,22 @@ class pixelegg_framework extends jdots_framework { parent::__construct($template); // call the constructor of the extended class } + + /** + * Render header + * + * Overwritten to load our slider.js + * + * @param array $extra + * @return type + */ + function header(array $extra=array()) + { + // load our slider.js, but only if framework requested + if (!self::$header_done && $_GET['cd'] === 'yes') + { + self::validate_file('/pixelegg/js/slider.js'); + } + return parent::header($extra); + } } diff --git a/pixelegg/templates/pixelegg/head.tpl b/pixelegg/templates/pixelegg/head.tpl index accfc3a487..c71ac7faba 100644 --- a/pixelegg/templates/pixelegg/head.tpl +++ b/pixelegg/templates/pixelegg/head.tpl @@ -18,8 +18,6 @@ {app_css} {java_script} - - {include_wz_tooltip} @@ -30,15 +28,15 @@
- +
- +
{topmenu_items}
- +
-
- - +
+ +
{topmenu_info_items}
@@ -49,14 +47,14 @@
- +
- +
- +
- +