diff options
author | Renato Botelho <garga@FreeBSD.org> | 2014-12-11 07:39:13 -0200 |
---|---|---|
committer | Renato Botelho <garga@FreeBSD.org> | 2014-12-11 07:39:13 -0200 |
commit | 8d5be861fbdc7c11fe0b9cffe07cec4beeae9b7c (patch) | |
tree | 12e8e811bab0b5a8092d4e52d60164230bce5e49 /usr | |
parent | 21e7104418a16af2a3bdaa23d0d718d85f05f59e (diff) | |
parent | 2cc10e2cdee54d72921a0f5e1dc527b436eff0f0 (diff) | |
download | pfsense-8d5be861fbdc7c11fe0b9cffe07cec4beeae9b7c.zip pfsense-8d5be861fbdc7c11fe0b9cffe07cec4beeae9b7c.tar.gz |
Merge pull request #1378 from phil-davis/patch-10
Diffstat (limited to 'usr')
-rw-r--r-- | usr/local/www/includes/functions.inc.php | 4 | ||||
-rw-r--r-- | usr/local/www/javascript/index/ajax.js | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/usr/local/www/includes/functions.inc.php b/usr/local/www/includes/functions.inc.php index e8203f6..f2d8cf0 100644 --- a/usr/local/www/includes/functions.inc.php +++ b/usr/local/www/includes/functions.inc.php @@ -42,7 +42,7 @@ function get_gatewaystats() { $isfirst = false; $data .= $gw['name'] . ","; if ($gateways_status[$gname]) { - $data .= lookup_gateway_ip_by_name($gname) . ","; + $data .= "<b>" . lookup_gateway_ip_by_name($gname) . "</b>,"; $gws = $gateways_status[$gname]; switch(strtolower($gws['status'])) { case "none": @@ -73,7 +73,7 @@ function get_gatewaystats() { $bgcolor = "#ADD8E6"; // lightblue } $data .= ($online == "Pending") ? "{$online},{$online}," : "{$gws['delay']},{$gws['loss']},"; - $data .= "{$online}/{$bgcolor}"; + $data .= "{$online}^{$bgcolor}"; } return $data; } diff --git a/usr/local/www/javascript/index/ajax.js b/usr/local/www/javascript/index/ajax.js index 5b62e12..47c1ee7 100644 --- a/usr/local/www/javascript/index/ajax.js +++ b/usr/local/www/javascript/index/ajax.js @@ -111,7 +111,7 @@ function updateGatewayStats(x){ if (widgetActive("gateways")){ gateways_split = x.split(","); for (var y=0; y<gateways_split.length; y++){ - gateways_field_split = gateways_split[y].split("/"); + gateways_field_split = gateways_split[y].split("^"); if(jQuery('#gateway' + (y + 1))) { jQuery('#gateway' + (y + 1)).html(gateways_field_split[0]); if(gateways_field_split[1]) { |