diff --git a/phpgwapi/inc/class.egw_framework.inc.php b/phpgwapi/inc/class.egw_framework.inc.php index 8e201b5fb4..f97ef876b7 100644 --- a/phpgwapi/inc/class.egw_framework.inc.php +++ b/phpgwapi/inc/class.egw_framework.inc.php @@ -383,19 +383,6 @@ abstract class egw_framework } } - if(!$GLOBALS['egw_info']['user']['preferences']['common']['disable_slider_effects']) - { - $slider_effects_src = $GLOBALS['egw_info']['server']['webserver_url'] . '/phpgwapi/templates/idots/js/slidereffects.js'; - $slider_effects = ''; - } - else - { - $simple_show_hide_src = $GLOBALS['egw_info']['server']['webserver_url'] . '/phpgwapi/templates/idots/js/simple_show_hide.js'; - $simple_show_hide = ''; - } - if ($GLOBALS['egw_info']['flags']['app_header']) { $app = $GLOBALS['egw_info']['flags']['app_header']; @@ -426,8 +413,6 @@ abstract class egw_framework 'img_icon' => $var['favicon_file'], 'img_shortcut' => $var['favicon_file'], 'pngfix' => $pngfix, - 'slider_effects' => $slider_effects, - 'simple_show_hide' => $simple_show_hide, 'lang_code' => $lang_code, 'charset' => translation::charset(), 'website_title' => strip_tags($GLOBALS['egw_info']['server']['site_title']. ($app ? " [$app]" : '')), diff --git a/phpgwapi/templates/default/head.tpl b/phpgwapi/templates/default/head.tpl index 339941862c..882de96c3b 100644 --- a/phpgwapi/templates/default/head.tpl +++ b/phpgwapi/templates/default/head.tpl @@ -13,8 +13,6 @@ {meta_robots} - {slider_effects} - {simple_show_hide} {css_file} '; - d.write(strCSS); + jQuery('head').append(strCSS); // alert(strCSS); // this.load() diff --git a/phpgwapi/templates/idots/js/slidereffects.js b/phpgwapi/templates/idots/js/slidereffects.js index 4024681fa1..644d6e9493 100644 --- a/phpgwapi/templates/idots/js/slidereffects.js +++ b/phpgwapi/templates/idots/js/slidereffects.js @@ -62,7 +62,8 @@ function ypSlideOutMenu(id, dir, left, top, width, height,pos) strCSS += '}' strCSS += ''; - d.write(strCSS) + jQuery('head').append(strCSS); + this.load() } diff --git a/phpgwapi/templates/default/navbar.tpl b/phpgwapi/templates/idots/navbar.tpl similarity index 83% rename from phpgwapi/templates/default/navbar.tpl rename to phpgwapi/templates/idots/navbar.tpl index ad8b3c6a17..3e0cde3888 100644 --- a/phpgwapi/templates/default/navbar.tpl +++ b/phpgwapi/templates/idots/navbar.tpl @@ -2,15 +2,10 @@
- - -