From eb821e44cd74bcf26ec65976f495a6c6d2fdd486 Mon Sep 17 00:00:00 2001 From: artem Date: Thu, 23 Aug 2007 13:28:42 +0000 Subject: - merged rev. 4596:4597 of branches/1.4.j/ (Artem) [improved some javascripts, minor changes] git-svn-id: svn://svn.zabbix.com/trunk@4643 97f52cf1-0a1b-0410-bd0e-c28be96e8082 --- frontends/php/include/page_header.php | 26 ++++++++++++++------------ frontends/php/include/services.inc.php | 6 +----- 2 files changed, 15 insertions(+), 17 deletions(-) (limited to 'frontends/php/include') diff --git a/frontends/php/include/page_header.php b/frontends/php/include/page_header.php index 88038161..9d9a2caf 100644 --- a/frontends/php/include/page_header.php +++ b/frontends/php/include/page_header.php @@ -147,32 +147,34 @@ COpt::profiling_start("page"); "default_page_id" => 0, "forse_disable_subnodes"=> true, "pages"=>array( - array("url"=>"config.php" ,"label"=>S_GENERAL , + array("url"=>"config.php" ,"label"=>S_GENERAL, "sub_pages"=>array("image.php") ), - array("url"=>"httpconf.php" ,"label"=>S_WEB , + array("url"=>"httpconf.php" ,"label"=>S_WEB, "sub_pages"=>array("popup_httpstep.php") ), - array("url"=>"hosts.php" ,"label"=>S_HOSTS ), - array("url"=>"items.php" ,"label"=>S_ITEMS ), - array("url"=>"triggers.php" ,"label"=>S_TRIGGERS , + array("url"=>"hosts.php" ,"label"=>S_HOSTS), + array("url"=>"items.php" ,"label"=>S_ITEMS, + "sub_pages"=>array("tr_logform.php") + ), + array("url"=>"triggers.php" ,"label"=>S_TRIGGERS, "sub_pages"=>array("popup_trexpr.php") ), - array("url"=>"actionconf.php" ,"label"=>S_ACTIONS ), - array("url"=>"sysmaps.php" ,"label"=>S_MAPS , + array("url"=>"actionconf.php" ,"label"=>S_ACTIONS), + array("url"=>"sysmaps.php" ,"label"=>S_MAPS, "sub_pages"=>array("sysmap.php") ), - array("url"=>"graphs.php" ,"label"=>S_GRAPHS , + array("url"=>"graphs.php" ,"label"=>S_GRAPHS, "sub_pages"=>array("popup_gitem.php") ), - array("url"=>"screenconf.php" ,"label"=>S_SCREENS , + array("url"=>"screenconf.php" ,"label"=>S_SCREENS, "sub_pages"=>array("screenedit.php") ), - array("url"=>"services.php" ,"label"=>S_IT_SERVICES , + array("url"=>"services.php" ,"label"=>S_IT_SERVICES, "sub_pages"=>array("services_form.php") ), - array('url'=>'discoveryconf.php','label'=>S_DISCOVERY ), - array("url"=>"exp_imp.php" ,"label"=>S_EXPORT_IMPORT ), + array('url'=>'discoveryconf.php','label'=>S_DISCOVERY), + array("url"=>"exp_imp.php" ,"label"=>S_EXPORT_IMPORT), array("url"=>"popup.php") ) ), diff --git a/frontends/php/include/services.inc.php b/frontends/php/include/services.inc.php index c9be5f08..32367ce8 100644 --- a/frontends/php/include/services.inc.php +++ b/frontends/php/include/services.inc.php @@ -720,11 +720,7 @@ $dt = 0; } return ; } - - function closeform(){ - zbx_add_post_js('closeform();'); - } - + function del_empty_nodes($services){ do{ unset($retry); -- cgit