diff --git a/source/nut/usr/local/emhttp/plugins/nut/NUTsettings.page b/source/nut/usr/local/emhttp/plugins/nut/NUTsettings.page index dc3992ca..fa536f90 100755 --- a/source/nut/usr/local/emhttp/plugins/nut/NUTsettings.page +++ b/source/nut/usr/local/emhttp/plugins/nut/NUTsettings.page @@ -377,11 +377,15 @@ require_once '/usr/local/emhttp/plugins/nut/include/nut_config.php'; ?>
+
+

Tooltip disabled on Minimal style.

+
+
Display Page Refresh:
diff --git a/source/nut/usr/local/emhttp/plugins/nut/include/nut_footer.php b/source/nut/usr/local/emhttp/plugins/nut/include/nut_footer.php index ff5659de..5f448d4d 100644 --- a/source/nut/usr/local/emhttp/plugins/nut/include/nut_footer.php +++ b/source/nut/usr/local/emhttp/plugins/nut/include/nut_footer.php @@ -98,9 +98,10 @@ function format_time($seconds) { $fa_icon = "fa-battery-empty"; $online['fulltext'][] = 'Battery status unknown'; } - $tooltipData = '[' . $nut_name . '] ' . implode(' - ', $online['fulltext']); + if ($config['FOOTER_STYLE'] == 0) + $statusTooltipData = ' data="[' . $nut_name . '] ' . implode(' - ', $online['fulltext']) . '"'; - $status[0] = " " . $batteryText . ""; + $status[0] = " " . $batteryText . ""; # ups.power.nominal (in VA) or compute from load and ups.power.nominal $apparentPower = $powerNominal > 0 && $load ? round($powerNominal * $load * 0.01) : -1; @@ -115,15 +116,18 @@ function format_time($seconds) { $powerTooltipData = ''; if ($realPower >= 0 && $apparentPower >= 0) { $powerText = "{$realPower} W ({$apparentPower} VA)"; - $powerTooltipData = "[{$nut_name}] Load: $load % - Real power: $realPower W - Apparent power: $apparentPower VA"; + $powerTooltipData = "Load: $load % - Real power: $realPower W - Apparent power: $apparentPower VA"; } else if ($realPower >= 0 && $load) { $powerText = "{$realPower} W"; - $powerTooltipData = "[{$nut_name}] Load: $load % - Real power: $realPower W"; + $powerTooltipData = "Load: $load % - Real power: $realPower W"; } else if ($apparentPower >= 0) { $powerText = "{$apparentPower} VA"; - $powerTooltipData = "[{$nut_name}] Load: $load % - Apparent power: $apparentPower VA"; + $powerTooltipData = "Load: $load % - Apparent power: $apparentPower VA"; } - $status[1] = " {$powerText}"; + if ($config['FOOTER_STYLE'] == 0) + $powerTooltipData = " data='[{$nut_name}] " . $powerTooltipData . "'"; + + $status[1] = " " . $powerText . ""; echo "".implode('', $status).""; } else { diff --git a/source/nut/usr/local/emhttp/plugins/nut/nutFooter.page b/source/nut/usr/local/emhttp/plugins/nut/nutFooter.page index e9885176..fcb178ab 100644 --- a/source/nut/usr/local/emhttp/plugins/nut/nutFooter.page +++ b/source/nut/usr/local/emhttp/plugins/nut/nutFooter.page @@ -101,6 +101,15 @@ EOT; -webkit-animation:ring 3s ease infinite; animation:ring 3s ease infinite } +#nut_footer { + float: right; + margin-right: 6px; +} +#nut_footer.minimal { + font-family: bitstream; + font-size: 1.1rem; + padding-right: 10px; +}