summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorStephen Beaver <sbeaver@netgate.com>2015-10-08 17:32:44 -0400
committerStephen Beaver <sbeaver@netgate.com>2015-10-08 17:32:44 -0400
commit1e682717e76a6cbe5a67f9ef119f02c0409ae643 (patch)
treec8a6348b3a7a3f6f2720ec3c0a39ddd12378c4cd /src
parent155d30f8f9f34146160cb36b84389df5f6f7ba97 (diff)
downloadpfsense-1e682717e76a6cbe5a67f9ef119f02c0409ae643.zip
pfsense-1e682717e76a6cbe5a67f9ef119f02c0409ae643.tar.gz
Further update for #5287
Diffstat (limited to 'src')
-rw-r--r--src/usr/local/www/bootstrap/css/pfSense.css5
-rw-r--r--src/usr/local/www/widgets/widgets/system_information.widget.php4
2 files changed, 7 insertions, 2 deletions
diff --git a/src/usr/local/www/bootstrap/css/pfSense.css b/src/usr/local/www/bootstrap/css/pfSense.css
index a60066a..a5328d0 100644
--- a/src/usr/local/www/bootstrap/css/pfSense.css
+++ b/src/usr/local/www/bootstrap/css/pfSense.css
@@ -281,3 +281,8 @@ form .btn + .btn {
position: absolute;
width: 1px;
}
+
+/** Override hte bootstrap progress bar margins */
+.progress {
+ margin-bottom: 0px;
+} \ No newline at end of file
diff --git a/src/usr/local/www/widgets/widgets/system_information.widget.php b/src/usr/local/www/widgets/widgets/system_information.widget.php
index 4d3b0c3..1f2e7ea 100644
--- a/src/usr/local/www/widgets/widgets/system_information.widget.php
+++ b/src/usr/local/www/widgets/widgets/system_information.widget.php
@@ -202,7 +202,7 @@ $filesystems = get_mounted_filesystems();
<div id="statePB" class="progress-bar progress-bar-striped" role="progressbar" aria-valuenow="<?=$pfstateusage?>" aria-valuemin="0" aria-valuemax="100" style="width: <?=$pfstateusage?>%">
</div>
</div>
- <span id="pfstateusagemeter"><?=$pfstateusage?>%</span> (<?= htmlspecialchars($pfstatetext)?>)<span>. <a href="diag_dump_states.php"><?=gettext("Show states");?></a></span>
+ <span id="pfstateusagemeter"><?=$pfstateusage?>%</span>&nbsp;<span id="pfstate">(<?= htmlspecialchars($pfstatetext)?>)</span>&nbsp;<span><a href="diag_dump_states.php"><?=gettext("Show states");?></a></span>
</td>
</tr>
<tr>
@@ -418,7 +418,7 @@ function updateUptime(x) {
function updateState(x) {
if(jQuery('#pfstate'))
- jQuery("#pfstate").html(x);
+ jQuery("#pfstate").html('(' + x + ')');
}
function updateStateMeter(x) {
OpenPOWER on IntegriCloud