From 505163bc6181c5420f359ab0c82fead6e4f69511 Mon Sep 17 00:00:00 2001 From: cajus Date: Fri, 20 May 2005 13:38:32 +0000 Subject: [PATCH] Updated error handler to display small message, only git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@293 594d385d-05f5-0310-b6e9-bd551577e9d8 --- TODO | 2 ++ html/include/focus.js | 41 +++++++++++++++++++++++++++++++++++++++++ html/index.php | 2 +- html/main.php | 2 +- include/class_tabs.inc | 4 ++-- include/functions.inc | 2 +- 6 files changed, 48 insertions(+), 5 deletions(-) diff --git a/TODO b/TODO index 5a1b11351..4f1c575b4 100644 --- a/TODO +++ b/TODO @@ -7,6 +7,8 @@ Things to fix before 2.4: * Make it "barrierefrei" +* FAX report -> search_result undefined + Target for 2.5: =============== diff --git a/html/include/focus.js b/html/include/focus.js index 9802726e6..48f7e738e 100644 --- a/html/include/focus.js +++ b/html/include/focus.js @@ -1,3 +1,9 @@ +var browserType; + +if (document.layers) {browserType = "nn4"} +if (document.all) {browserType = "ie"} +if (window.navigator.userAgent.toLowerCase().match("gecko")) {browserType= "gecko"} + netscape = ""; ver= navigator.appVersion; len = ver.length; @@ -38,3 +44,38 @@ if (netscape){ document.captureEvents(Event.KEYDOWN|Event.KEYUP); } +function hide(element) { + if (browserType == "gecko" ) + document.poppedLayer = document.getElementById(element); + else if (browserType == "ie") + document.poppedLayer = document.all[element]; + else + document.poppedLayer = document.layers[element]; + document.poppedLayer.style.visibility = "hidden"; +} + +function show(element) { + if (browserType == "gecko" ) + document.poppedLayer = document.getElementById(element); + else if (browserType == "ie") + document.poppedLayer = document.all[element]; + else + document.poppedLayer = document.layers[element]; + document.poppedLayer.style.visibility = "visible"; +} + +function toggle(element) { + if (browserType == "gecko" ) + document.poppedLayer = document.getElementById(element); + else if (browserType == "ie") + document.poppedLayer = document.all[element]; + else + document.poppedLayer = document.layers[element]; + + if (document.poppedLayer.style.visibility == "visible") + hide (element); + else + show (element); + +} + diff --git a/html/index.php b/html/index.php index d218040f2..90a6a4814 100644 --- a/html/index.php +++ b/html/index.php @@ -236,7 +236,7 @@ $smarty->assign ("PHPSESSID", session_id()); if (isset($_SESSION['errors'])){ $smarty->assign("errors", $_SESSION['errors']); } -$smarty->assign("php_error", $error_collector); +$smarty->assign("php_error", $error_collector.""); $smarty->display (get_template_path('login.tpl')); // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler: diff --git a/html/main.php b/html/main.php index 02e89d1d6..8bf8414dd 100644 --- a/html/main.php +++ b/html/main.php @@ -268,7 +268,7 @@ $smarty->assign("contents", $display); if (isset($_SESSION['errors'])){ $smarty->assign("errors", $_SESSION['errors']); } -$smarty->assign("php_errors", $error_collector); +$smarty->assign("php_errors", $error_collector.""); $smarty->display(get_template_path('framework.tpl')); $_SESSION['plist']= $plist; diff --git a/include/class_tabs.inc b/include/class_tabs.inc index a8608b061..94a9dd1f3 100644 --- a/include/class_tabs.inc +++ b/include/class_tabs.inc @@ -140,8 +140,8 @@ class tabs /* Shorten string if its too long for the tab headers*/ $title= _($name); - if (mb_strlen($title, 'UTF-8') > 13){ - $title= mb_substr($title,0, 11, 'UTF-8')."..."; + if (mb_strlen($title, 'UTF-8') > 14){ + $title= mb_substr($title,0, 12, 'UTF-8')."..."; } if ($_SESSION['js']==FALSE){ diff --git a/include/functions.inc b/include/functions.inc index 8f2868882..0b25c020b 100644 --- a/include/functions.inc +++ b/include/functions.inc @@ -1525,7 +1525,7 @@ function gosaRaiseError($errno, $errstr, $errfile, $errline) /* Create header as needed */ if ($error_collector == ""){ - $error_collector= "

 "._("Generating this page caused the PHP interpreter to rise some errors!")."

["._("Send report")."] ["._("Toggle information")."]
"; + $error_collector= "

 "._("Generating this page caused the PHP interpreter to rise some errors!")."