diff options
| author | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-03-18 17:19:34 +0000 |
|---|---|---|
| committer | artem <artem@97f52cf1-0a1b-0410-bd0e-c28be96e8082> | 2008-03-18 17:19:34 +0000 |
| commit | 622eb08ad1c3d22932b77595a551225a9df2c69d (patch) | |
| tree | da0d7b12bc4e9e5f67f3ec558e1e230c4146ffdb /frontends/php/include | |
| parent | 1dfaaae64fde981456ac429c5074918a8effba7c (diff) | |
| download | zabbix-622eb08ad1c3d22932b77595a551225a9df2c69d.tar.gz zabbix-622eb08ad1c3d22932b77595a551225a9df2c69d.tar.xz zabbix-622eb08ad1c3d22932b77595a551225a9df2c69d.zip | |
- improvement to menu in maps (Artem)
git-svn-id: svn://svn.zabbix.com/trunk@5502 97f52cf1-0a1b-0410-bd0e-c28be96e8082
Diffstat (limited to 'frontends/php/include')
| -rw-r--r-- | frontends/php/include/maps.inc.php | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/frontends/php/include/maps.inc.php b/frontends/php/include/maps.inc.php index 4c65dfa2..ceb490d0 100644 --- a/frontends/php/include/maps.inc.php +++ b/frontends/php/include/maps.inc.php @@ -637,7 +637,7 @@ if($host["status"] != HOST_STATUS_MONITORED) continue; $scripts_by_hosts = get_accessible_scripts_by_hosts(array($db_element["elementid"])); - + if(empty($url)) $url='tr_status.php?hostid='.$db_element['elementid'].'&noactions=true&onlytrue=true&compact=true'; $alt = "Host: ".$host["host"]." ".$alt; @@ -682,7 +682,11 @@ if( (bccomp($host_nodeid ,$script_nodeid ) == 0)) $menus.= "['".$script['name']."',\"javascript: openWinCentered('scripts_exec.php?execute=1&hostid=".$db_element["elementid"]."&scriptid=".$script['scriptid']."','".S_TOOLS."',760,540,'titlebar=no, resizable=yes, scrollbars=yes, dialog=no');\", null,{'outer' : ['pum_o_item'],'inner' : ['pum_i_item']}],"; } - $menus.= "['".S_STATUS_OF_TRIGGERS."',\"javascript: Redirect('".$url."')\", null,{'outer' : ['pum_o_item'],'inner' : ['pum_i_item']}],"; + $menus.= "['".S_STATUS_OF_TRIGGERS."',\"javascript: Redirect('tr_status.php?hostid=".$db_element['elementid']."&noactions=true&onlytrue=true&compact=true')\", null,{'outer' : ['pum_o_item'],'inner' : ['pum_i_item']}],"; + + if(!empty($db_element["url"])){ + $menus.= "['".S_MAP.SPACE.S_URL."',\"javascript: Redirect('".$url."')\", null,{'outer' : ['pum_o_item'],'inner' : ['pum_i_item']}],"; + } $menus = trim($menus,','); $menus="show_popup_menu(event,[[".zbx_jsvalue(S_TOOLS).",null,null,{'outer' : ['pum_oheader'],'inner' : ['pum_iheader']}],".$menus."],180); cancelEvent(event);"; |