Commit 686378d9 authored by Ad Schellevis's avatar Ad Schellevis

(dashboard, widgets) small style cleanups for legacy traffic graph

parent e8600035
<?php <?php
/* /*
Copyright (C) 2014 Deciso B.V. Copyright (C) 2014-2016 Deciso B.V.
Copyright 2007 Scott Dale Copyright 2007 Scott Dale
Copyright (C) 2004-2005 T. Lechat <dev@lechat.org>, Manuel Kasper <mk@neon1.net> Copyright (C) 2004-2005 T. Lechat <dev@lechat.org>, Manuel Kasper <mk@neon1.net>
and Jonathan Watt <jwatt@jwatt.org>. and Jonathan Watt <jwatt@jwatt.org>.
...@@ -29,16 +29,12 @@ ...@@ -29,16 +29,12 @@
POSSIBILITY OF SUCH DAMAGE. POSSIBILITY OF SUCH DAMAGE.
*/ */
$nocsrf = true;
require_once("guiconfig.inc"); require_once("guiconfig.inc");
require_once("pfsense-utils.inc"); require_once("pfsense-utils.inc");
require_once("interfaces.inc"); require_once("interfaces.inc");
$first_time = false;
if (!is_array($config["widgets"]["trafficgraphs"])) { if (!is_array($config["widgets"]["trafficgraphs"])) {
$first_time = true;
$config["widgets"]["trafficgraphs"] = array(); $config["widgets"]["trafficgraphs"] = array();
} }
$a_config = &$config["widgets"]["trafficgraphs"]; $a_config = &$config["widgets"]["trafficgraphs"];
...@@ -78,7 +74,7 @@ $shown = array(); ...@@ -78,7 +74,7 @@ $shown = array();
foreach ($a_config["shown"]["item"] as $if) { foreach ($a_config["shown"]["item"] as $if) {
$shown[$if] = true; $shown[$if] = true;
} }
if ($first_time) { if (count($config["widgets"]["trafficgraphs"])) {
$keys = array_keys($ifdescrs); $keys = array_keys($ifdescrs);
$shown[$keys[0]] = true; $shown[$keys[0]] = true;
} }
...@@ -96,25 +92,21 @@ if (isset($a_config["scale_type"])) { ...@@ -96,25 +92,21 @@ if (isset($a_config["scale_type"])) {
} }
?> ?>
<input type="hidden" id="traffic_graphs-config" name="traffic_graphs-config" value="" />
<div id="traffic_graphs-settings" class="widgetconfigdiv" style="display:none;"> <div id="traffic_graphs-settings" class="widgetconfigdiv" style="display:none;">
<form action="/widgets/widgets/traffic_graphs.widget.php" method="post" name="iform" id="iform"> <form action="/widgets/widgets/traffic_graphs.widget.php" method="post" name="iform" id="iform">
<?php foreach ($ifdescrs as $ifname => $ifdescr) { <?php
?> foreach ($ifdescrs as $ifname => $ifdescr):?>
<input type="hidden" name="shown[<?= $ifname ?>]" value="<?= $shown[$ifname] ? "show" : "hide" ?>" /> <input type="hidden" name="shown[<?= $ifname ?>]" value="<?= $shown[$ifname] ? "show" : "hide" ?>" />
<?php <?php
} ?> endforeach; ?>
<table class="table table-striped"> <table class="table table-striped">
<tbody> <tbody>
<tr> <tr>
<td> <td>
<?= gettext('Default AutoScale:') ?> <?= gettext('Default AutoScale:') ?>
</td> </td>
</tr> </tr>
<?php <?php
$scale_type_up='checked="checked"'; $scale_type_up='checked="checked"';
$scale_type_follow=""; $scale_type_follow="";
if (isset($config["widgets"]["trafficgraphs"]["scale_type"])) { if (isset($config["widgets"]["trafficgraphs"]["scale_type"])) {
...@@ -138,12 +130,13 @@ if (isset($a_config["scale_type"])) { ...@@ -138,12 +130,13 @@ if (isset($a_config["scale_type"])) {
<input name="scale_type" type="radio" id="scale_type_follow" value="follow" <?= $scale_type_follow; ?> /> <?= gettext('Scale follow')?><br /><br /> <input name="scale_type" type="radio" id="scale_type_follow" value="follow" <?= $scale_type_follow; ?> /> <?= gettext('Scale follow')?><br /><br />
<?= gettext('Refresh Interval:') ?> <?= gettext('Refresh Interval:') ?>
<select name="refreshinterval" class="formfld" id="refreshinterval" > <select name="refreshinterval" class="formfld" id="refreshinterval" >
<?php for ($i = 1; $i <= 10; $i += 1) { <?php
for ($i = 1; $i <= 10; $i += 1) {
?> ?>
<option value="<?= $i ?>" <?php if ($refreshinterval == $i) { <option value="<?= $i ?>" <?php if ($refreshinterval == $i) {
echo 'selected="selected"'; echo 'selected="selected"';
}?>><?= $i ?></option> }?>><?= $i ?></option>
<?php <?php
} ?> } ?>
</select>&nbsp; <?= gettext('Seconds') ?><br />&nbsp; &nbsp; &nbsp; <b><?= gettext('Note:') ?></b> <?= gettext('changing this setting will increase CPU utilization') ?><br /><br /> </select>&nbsp; <?= gettext('Seconds') ?><br />&nbsp; &nbsp; &nbsp; <b><?= gettext('Note:') ?></b> <?= gettext('changing this setting will increase CPU utilization') ?><br /><br />
</td> </td>
...@@ -168,7 +161,7 @@ if (isset($a_config["scale_type"])) { ...@@ -168,7 +161,7 @@ if (isset($a_config["scale_type"])) {
</script> </script>
<?php <?php
foreach ($ifdescrs as $ifname => $ifdescr) { foreach ($ifdescrs as $ifname => $ifdescr):
$ifinfo = get_interface_info($ifname); $ifinfo = get_interface_info($ifname);
if ($shown[$ifname]) { if ($shown[$ifname]) {
$mingraphbutton = "inline"; $mingraphbutton = "inline";
...@@ -181,35 +174,27 @@ foreach ($ifdescrs as $ifname => $ifdescr) { ...@@ -181,35 +174,27 @@ foreach ($ifdescrs as $ifname => $ifdescr) {
$graphdisplay = "none"; $graphdisplay = "none";
$interfacevalue = "hide"; $interfacevalue = "hide";
} }
if ($ifinfo['status'] != "down") { if ($ifinfo['status'] != "down"):
?> ?>
<div id="<?=$ifname;?>trafficdiv" style="padding: 5px"> <div id="<?=$ifname;?>trafficdiv" style="padding: 5px">
<div id="<?=$ifname;?>topic" class="widgetsubheader"> <div id="<?=$ifname;?>topic" class="widgetsubheader">
<div style="float:left;width:49%"> <div style="float:left;width:49%">
<span onclick="location.href='/status_graph.php?if=<?=$ifname; <span onclick="location.href='/status_graph.php?if=<?=$ifname;?>'" style="cursor:pointer"><?= sprintf(gettext('Current %s Traffic'),$ifdescr) ?></span>
?>'" style="cursor:pointer"><?= sprintf(gettext('Current %s Traffic'),$ifdescr) ?></span>
</div> </div>
<div align="right" style="float:right;width:49%"> <div align="right" style="float:right;width:49%">
<div id="<?=$ifname;?>graphdiv-min" onclick='return trafficminimizeDiv("<?= $ifname ?>", true);' <div id="<?=$ifname;?>graphdiv-min" onclick='return trafficminimizeDiv("<?= $ifname ?>", true);' style="display:<?=$mingraphbutton;?>; cursor:pointer" ><span class="glyphicon glyphicon-minus" alt="Minimize <?=$ifname;?> traffic graph" /></span></div>
style="display:<?php echo $mingraphbutton; <div id="<?=$ifname;?>graphdiv-open" onclick='return trafficshowDiv("<?= $ifname ?>", true);' style="display:<?=$showgraphbutton;?>; cursor:pointer" ><span class="glyphicon glyphicon-plus" alt="Show <?=$ifname;?> traffic graph" /></span></div>
?>; cursor:pointer" ><span class="glyphicon glyphicon-minus" alt="Minimize <?=$ifname;?> traffic graph" /></span></div>
<div id="<?=$ifname;?>graphdiv-open" onclick='return trafficshowDiv("<?= $ifname ?>", true);'
style="display:<?php echo $showgraphbutton;
?>; cursor:pointer" ><span class="glyphicon glyphicon-plus" alt="Show <?=$ifname;?> traffic graph" /></span></div>
</div> </div>
<div style="clear:both;"></div> <div style="clear:both;"></div>
</div> </div>
<div id="<?=$ifname;?>graphdiv" style="display:<?= $graphdisplay;?>"> <div id="<?=$ifname;?>graphdiv" style="display:<?= $graphdisplay;?>">
<object data="graph.php?ifnum=<?=$ifname; <object data="graph.php?ifnum=<?=$ifname;?>&amp;ifname=<?=rawurlencode($ifdescr);?>&amp;timeint=<?=$refreshinterval;?>&amp;initdelay=<?=($graphcounter+1) * 2;?>" height="100%" width="100%">
?>&amp;ifname=<?=rawurlencode($ifdescr);
?>&amp;timeint=<?=$refreshinterval;
?>&amp;initdelay=<?=($graphcounter+1) * 2;?>" height="100%" width="100%">
<param name="id" value="graph" /> <param name="id" value="graph" />
<param name="type" value="image/svg+xml" /> <param name="type" value="image/svg+xml" />
<param name="pluginspage" value="http://www.adobe.com/svg/viewer/install/auto" /> <param name="pluginspage" value="http://www.adobe.com/svg/viewer/install/auto" />
</object> </object>
</div> </div>
</div> </div>
<?php <?php
} endif;
} endforeach;
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment