diff options
| author | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-01-07 13:29:16 +0000 |
|---|---|---|
| committer | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-01-07 13:29:16 +0000 |
| commit | d82f4f660f480ecbc7eaf5e7fd42140803908cfb (patch) | |
| tree | b930c8c59d2e26f3304da5a234a5c8ca78f58458 /frontends/php/include/js.inc.php | |
| parent | 5bbc8ab6911eeeb79bc6f88dab5f53394de3b630 (diff) | |
| download | zabbix-d82f4f660f480ecbc7eaf5e7fd42140803908cfb.tar.gz zabbix-d82f4f660f480ecbc7eaf5e7fd42140803908cfb.tar.xz zabbix-d82f4f660f480ecbc7eaf5e7fd42140803908cfb.zip | |
- [ZBX-246] fixed header error in Monitoring->slideshows (Artem)
- added history view in ackowledge screen (Artem)
git-svn-id: svn://svn.zabbix.com/trunk@5231 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/include/js.inc.php')
| -rw-r--r-- | frontends/php/include/js.inc.php | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/frontends/php/include/js.inc.php b/frontends/php/include/js.inc.php index e7f27d43..2d2879f3 100644 --- a/frontends/php/include/js.inc.php +++ b/frontends/php/include/js.inc.php @@ -115,7 +115,7 @@ function insert_showhint_javascript(){ echo '<script type="text/javascript" src="js/showhint.js"></script>'; } -function Redirect($url,$timeout=null){ +function redirect($url,$timeout=null){ zbx_flush_post_cookies(); echo '<script language="JavaScript" type="text/javascript">'; @@ -128,6 +128,17 @@ function Redirect($url,$timeout=null){ echo '</script>'; } +function simple_js_redirect($url,$timeout=null){ + echo '<script language="JavaScript" type="text/javascript">'; + if( is_numeric($timeout) ) { + echo 'setTimeout(\'window.location="'.$url.'"\','.($timeout*1000).')'; + } + else { + echo 'window.location = "'.$url.'";'; + } + echo '</script>'; +} + function play_sound($filename){ echo '<script language="javascript" type="text/javascript"> |