From ab2668981c1dbada57e037b3031303f9d3d7ff85 Mon Sep 17 00:00:00 2001 From: Tom Laermans Date: Tue, 18 Oct 2011 14:27:21 +0000 Subject: [PATCH] Add page title changing infrastructure, do it for device tabs already git-svn-id: http://www.observium.org/svn/observer/trunk@2690 61d68cd4-352d-0410-923a-c4978735b2b8 --- html/index.php | 10 ++++++++++ html/pages/device.inc.php | 2 ++ html/pages/device/apps.inc.php | 2 ++ html/pages/device/collectd.inc.php | 1 + html/pages/device/edit.inc.php | 2 ++ html/pages/device/edit/snmp.inc.php | 2 +- html/pages/device/entphysical.inc.php | 2 ++ html/pages/device/events.inc.php | 2 ++ html/pages/device/graphs.inc.php | 2 ++ html/pages/device/health.inc.php | 2 ++ html/pages/device/hrdevice.inc.php | 2 ++ html/pages/device/latency.inc.php | 2 ++ html/pages/device/map.inc.php | 4 ++++ html/pages/device/nfsen.inc.php | 2 ++ html/pages/device/ports.inc.php | 2 ++ html/pages/device/routing.inc.php | 2 ++ html/pages/device/services.inc.php | 2 ++ html/pages/device/showconfig.inc.php | 3 +++ html/pages/device/syslog.inc.php | 2 ++ html/pages/device/toner.inc.php | 2 ++ html/pages/device/vlans.inc.php | 2 ++ html/pages/device/vm.inc.php | 2 ++ 22 files changed, 53 insertions(+), 1 deletion(-) diff --git a/html/index.php b/html/index.php index 0bb01ddf2..426f0df10 100755 --- a/html/index.php +++ b/html/index.php @@ -312,7 +312,17 @@ $('INPUT.auto-hint, TEXTAREA.auto-hint').focus(function() { $(this).removeClass('auto-hint'); } }); + +\ndocument.title = '$title';\n"); +} +?> + diff --git a/html/pages/device.inc.php b/html/pages/device.inc.php index 3ad68db12..071ea40ff 100644 --- a/html/pages/device.inc.php +++ b/html/pages/device.inc.php @@ -22,6 +22,8 @@ if (device_permitted($vars['device']) || $check_device == $vars['device']) $device = device_by_id_cache($vars['device']); $attribs = get_dev_attribs($device['device_id']); + $pagetitle[] = $device['hostname']; + if ($config['os'][$device['os']]['group']) { $device['os_group'] = $config['os'][$device['os']]['group']; } echo(''); diff --git a/html/pages/device/apps.inc.php b/html/pages/device/apps.inc.php index 7324f9aac..14a73083c 100644 --- a/html/pages/device/apps.inc.php +++ b/html/pages/device/apps.inc.php @@ -37,4 +37,6 @@ if (is_file("pages/device/apps/".mres($vars['app']).".inc.php")) include("pages/device/apps/".mres($vars['app']).".inc.php"); } +$pagetitle[] = "Apps"; + ?> diff --git a/html/pages/device/collectd.inc.php b/html/pages/device/collectd.inc.php index ff078d0ef..1dfa88e0f 100644 --- a/html/pages/device/collectd.inc.php +++ b/html/pages/device/collectd.inc.php @@ -108,4 +108,5 @@ print_optionbar_end(); } +$pagetitle[] = "CollectD"; ?> diff --git a/html/pages/device/edit.inc.php b/html/pages/device/edit.inc.php index 04b53e2a7..74a43b220 100644 --- a/html/pages/device/edit.inc.php +++ b/html/pages/device/edit.inc.php @@ -53,4 +53,6 @@ if ($_SESSION['userlevel'] < '7') } } +$pagetitle[] = "Settings"; + ?> diff --git a/html/pages/device/edit/snmp.inc.php b/html/pages/device/edit/snmp.inc.php index 65a541e0d..f0c893cef 100644 --- a/html/pages/device/edit/snmp.inc.php +++ b/html/pages/device/edit/snmp.inc.php @@ -13,7 +13,7 @@ if ($_POST['editing']) #FIXME needs more sanity checking! and better feedback $update = array('community' => $_POST['community'], 'snmpver' => $_POST['snmpver'], 'port' => $_POST['port']); if ($_POST['timeout']) { $update['timeout'] = $_POST['timeout']; } else { $update['timeout'] = array('NULL'); } - if ($_POST['retries']) { $update['retries'] = $_POST['retries']; } else { $update['retries'] = array('NULL'); } + if ($_POST['retries']) { $update['retries'] = $_POST['retries']; } else { $update['retries'] = array('NULL'); } $rows_updated = dbUpdate($update, 'devices', '`device_id` = ?',array($device['device_id'])); diff --git a/html/pages/device/entphysical.inc.php b/html/pages/device/entphysical.inc.php index c3f1f4b1a..dc34aae56 100644 --- a/html/pages/device/entphysical.inc.php +++ b/html/pages/device/entphysical.inc.php @@ -87,4 +87,6 @@ $ent['entPhysicalIndex'] = "0"; printEntPhysical($ent['entPhysicalIndex'], $level, "liOpen"); echo(""); +$pagetitle = "Inventory"; + ?> diff --git a/html/pages/device/events.inc.php b/html/pages/device/events.inc.php index 281010242..486f9a71f 100644 --- a/html/pages/device/events.inc.php +++ b/html/pages/device/events.inc.php @@ -10,4 +10,6 @@ foreach ($entries as $entry) echo('
'); +$pagetitle[] = "Events"; + ?> diff --git a/html/pages/device/graphs.inc.php b/html/pages/device/graphs.inc.php index c9d13383f..70b684616 100644 --- a/html/pages/device/graphs.inc.php +++ b/html/pages/device/graphs.inc.php @@ -60,4 +60,6 @@ foreach ($config['graph_types']['device'] as $graph => $entry) } } +$pagetitle[] = "Graphs"; + ?> diff --git a/html/pages/device/health.inc.php b/html/pages/device/health.inc.php index b510438b0..a0e61b34f 100644 --- a/html/pages/device/health.inc.php +++ b/html/pages/device/health.inc.php @@ -79,4 +79,6 @@ if (is_file("pages/device/health/".mres($vars['metric']).".inc.php")) } } +$pagetitle[] = "Health"; + ?> diff --git a/html/pages/device/hrdevice.inc.php b/html/pages/device/hrdevice.inc.php index a668e0bdf..2d1ee8d59 100644 --- a/html/pages/device/hrdevice.inc.php +++ b/html/pages/device/hrdevice.inc.php @@ -63,4 +63,6 @@ foreach (dbFetchRows("SELECT * FROM `hrDevice` WHERE `device_id` = ? ORDER BY `h echo(''); +$pagetitle[] = "Inventory"; + ?> diff --git a/html/pages/device/latency.inc.php b/html/pages/device/latency.inc.php index 5d26d870b..d2d93e12c 100644 --- a/html/pages/device/latency.inc.php +++ b/html/pages/device/latency.inc.php @@ -56,4 +56,6 @@ if($vars['view'] == "incoming") } +$pagetitle[] = "Latency"; + ?> diff --git a/html/pages/device/map.inc.php b/html/pages/device/map.inc.php index 2a85f8b64..0e6ae3ed5 100644 --- a/html/pages/device/map.inc.php +++ b/html/pages/device/map.inc.php @@ -2,3 +2,7 @@ + + \ No newline at end of file diff --git a/html/pages/device/nfsen.inc.php b/html/pages/device/nfsen.inc.php index 1ea3a83a2..a42b79a72 100644 --- a/html/pages/device/nfsen.inc.php +++ b/html/pages/device/nfsen.inc.php @@ -13,4 +13,6 @@ foreach ($datas as $name=>$type) include("includes/print-device-graph.php"); } +$pagetitle[] = "Netflow"; + ?> diff --git a/html/pages/device/ports.inc.php b/html/pages/device/ports.inc.php index e45a38991..95897c6c3 100644 --- a/html/pages/device/ports.inc.php +++ b/html/pages/device/ports.inc.php @@ -113,4 +113,6 @@ if ($vars['view'] == 'minigraphs') echo(""); } +$pagetitle[] = "Ports"; + ?> diff --git a/html/pages/device/routing.inc.php b/html/pages/device/routing.inc.php index e1456c899..f097226b8 100644 --- a/html/pages/device/routing.inc.php +++ b/html/pages/device/routing.inc.php @@ -13,6 +13,8 @@ $type_text['vrf'] = "VRFs"; print_optionbar_start(); +$pagetitle[] = "Routing"; + echo("Routing » "); unset($sep); diff --git a/html/pages/device/services.inc.php b/html/pages/device/services.inc.php index a029bbfac..4da2e840b 100644 --- a/html/pages/device/services.inc.php +++ b/html/pages/device/services.inc.php @@ -62,4 +62,6 @@ else echo("No Services"); } +$pagetitle[] = "Services"; + ?> diff --git a/html/pages/device/showconfig.inc.php b/html/pages/device/showconfig.inc.php index 477848edb..ba2912e72 100644 --- a/html/pages/device/showconfig.inc.php +++ b/html/pages/device/showconfig.inc.php @@ -86,4 +86,7 @@ if ($_SESSION['userlevel'] >= "7") #$geshi->set_line_style('color: #999999'); echo($geshi->parse_code()); } + +$pagetitle[] = "Config"; + ?> diff --git a/html/pages/device/syslog.inc.php b/html/pages/device/syslog.inc.php index 2655eb259..ef823130e 100644 --- a/html/pages/device/syslog.inc.php +++ b/html/pages/device/syslog.inc.php @@ -49,4 +49,6 @@ echo(""); foreach (dbFetchRows($sql, $param) as $entry) { include("includes/print-syslog.inc.php"); } echo("
"); +$pagetitle[] = "Syslog"; + ?> diff --git a/html/pages/device/toner.inc.php b/html/pages/device/toner.inc.php index 904c12db9..c4eb8b0ba 100644 --- a/html/pages/device/toner.inc.php +++ b/html/pages/device/toner.inc.php @@ -4,5 +4,7 @@ $graph_title = "Toner"; $graph_type = "device_toner"; include("includes/print-device-graph.php"); +$pagetitle[] = "Toner"; + ?> diff --git a/html/pages/device/vlans.inc.php b/html/pages/device/vlans.inc.php index 6e33b4dd1..f386bef64 100644 --- a/html/pages/device/vlans.inc.php +++ b/html/pages/device/vlans.inc.php @@ -68,4 +68,6 @@ foreach (dbFetchRows("SELECT * FROM `vlans` WHERE `device_id` = ? ORDER BY 'vlan echo(""); +$pagetitle[] = "VLANs"; + ?> diff --git a/html/pages/device/vm.inc.php b/html/pages/device/vm.inc.php index 5b275d502..7510abb0a 100644 --- a/html/pages/device/vm.inc.php +++ b/html/pages/device/vm.inc.php @@ -12,4 +12,6 @@ foreach (dbFetchRows("SELECT * FROM vminfo WHERE device_id = ? ORDER BY vmwVmDis echo(""); +$pagetitle[] = "Virtual Machines"; + ?>