summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Fleming <cj_fleming@sky.com>2015-12-19 22:29:14 +0000
committerColin Fleming <cj_fleming@sky.com>2015-12-19 22:29:14 +0000
commitb77cef66ac057d84804c60e9df9cf5c4561c0465 (patch)
tree210446baacf5dc2790560df2f887b43627bbabb7
parent72eaefaf1fc991d5949daadbac5ae50ed1d3ad5f (diff)
downloadpfsense-b77cef66ac057d84804c60e9df9cf5c4561c0465.zip
pfsense-b77cef66ac057d84804c60e9df9cf5c4561c0465.tar.gz
Use Bootstraps text alignment classes
As per "http://getbootstrap.com/css/#type-alignment", use CLASS statement instead in inline STYLE statement (much tidier)
-rwxr-xr-xsrc/usr/local/www/diag_reboot.php2
-rw-r--r--src/usr/local/www/guiconfig.inc4
-rwxr-xr-xsrc/usr/local/www/pkg.php2
-rw-r--r--src/usr/local/www/pkg_mgr_install.php2
-rwxr-xr-xsrc/usr/local/www/status_logs.php6
-rw-r--r--src/usr/local/www/status_logs_filter.php10
-rw-r--r--src/usr/local/www/widgets/widgets/thermal_sensors.widget.php28
-rw-r--r--src/usr/local/www/widgets/widgets/wake_on_lan.widget.php8
-rw-r--r--src/usr/local/www/wizard.php2
9 files changed, 32 insertions, 32 deletions
diff --git a/src/usr/local/www/diag_reboot.php b/src/usr/local/www/diag_reboot.php
index f8f3a4e..b53fc9b 100755
--- a/src/usr/local/www/diag_reboot.php
+++ b/src/usr/local/www/diag_reboot.php
@@ -88,7 +88,7 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST') {
?>
-<div id="countdown" style="text-align: center;"></div>
+<div id="countdown" class="text-center"></div>
<script type="text/javascript">
//<![CDATA[
diff --git a/src/usr/local/www/guiconfig.inc b/src/usr/local/www/guiconfig.inc
index b251d20..a30696e 100644
--- a/src/usr/local/www/guiconfig.inc
+++ b/src/usr/local/www/guiconfig.inc
@@ -330,7 +330,7 @@ function print_info_box_np_undo($msg, $name = "apply", $value = "Apply changes",
global $g;
if (stristr($msg, "apply") != false || stristr($msg, "save") != false || stristr($msg, "create") != false) {
- $savebutton = "<td class=\"infoboxsave nowrap\">";
+ $savebutton = "<td class=\"infoboxsave text-nowrap\">";
$savebutton .= "<input type=\"button\" value=\"". gettext("Undo") . "\" onclick=\"document.location='{$undo}'\" />";
$savebutton .= "<input name=\"{$name}\" type=\"submit\" class=\"formbtn\" id=\"${name}\" value=\"{$value}\" />";
$savebutton .= "</td>";
@@ -637,7 +637,7 @@ function dump_clog($logfile, $tail, $withorig = true, $grepfor = "", $grepinvert
$entry_date_time = htmlspecialchars(join(" ", array_slice($logent, 0, 3)));
$entry_text = ($logent[3] == $config['system']['hostname']) ? "" : $logent[3] . " ";
$entry_text .= htmlspecialchars($logent[4] . " " . $logent[5]);
- echo "<td style=\"white-space:nowrap;\">{$entry_date_time}</td>\n";
+ echo "<td class=\"text-nowrap\">{$entry_date_time}</td>\n";
echo "<td style=\"word-wrap:break-word; word-break:break-all; white-space:normal\">{$entry_text}</td>\n";
} else {
echo "<td>" . htmlspecialchars($logent[5]) . "</td>\n";
diff --git a/src/usr/local/www/pkg.php b/src/usr/local/www/pkg.php
index 7e4d6b0..f84f435 100755
--- a/src/usr/local/www/pkg.php
+++ b/src/usr/local/www/pkg.php
@@ -522,7 +522,7 @@ if ($savemsg) {
} // foreach columnitem
} // if columnitem
?>
- <td valign="middle" class="list nowrap">
+ <td valign="middle" class="list text-nowrap">
<table border="0" cellspacing="0" cellpadding="1" summary="icons">
<tr>
<?php
diff --git a/src/usr/local/www/pkg_mgr_install.php b/src/usr/local/www/pkg_mgr_install.php
index e6da9f9..d702beb 100644
--- a/src/usr/local/www/pkg_mgr_install.php
+++ b/src/usr/local/www/pkg_mgr_install.php
@@ -397,7 +397,7 @@ if (!empty($_POST['id']) || $_POST['mode'] == "reinstallall"):
<input type="hidden" name="mode" value="<?=htmlspecialchars($_POST['mode'])?>" />
<input type="hidden" name="completed" value="true" />
- <div id="countdown" style="text-align: center;"></div>
+ <div id="countdown" class="text-center"></div>
<div class="progress" style="display: none;">
<div id="progressbar" class="progress-bar progress-bar-striped" role="progressbar" aria-valuemin="0" aria-valuemax="100" style="width: 1%"></div>
diff --git a/src/usr/local/www/status_logs.php b/src/usr/local/www/status_logs.php
index f0acd4b..9b069f0 100755
--- a/src/usr/local/www/status_logs.php
+++ b/src/usr/local/www/status_logs.php
@@ -431,7 +431,7 @@ if (!$rawfilter) {
<div class="table-responsive">
<table class="table table-striped table-hover table-condensed sortable-theme-bootstrap" data-sortable>
<thead>
- <tr style="white-space:nowrap;">
+ <tr class="text-nowrap">
<th><?=gettext("Time")?></th>
<th><?=gettext("Process")?></th>
<th><?=gettext("PID")?></th>
@@ -442,7 +442,7 @@ if (!$rawfilter) {
<?php
foreach ($filterlog as $filterent) {
?>
- <tr style="white-space:nowrap;">
+ <tr class="text-nowrap">
<td>
<?=htmlspecialchars($filterent['time'])?>
</td>
@@ -477,7 +477,7 @@ if (!$rawfilter) {
<div class="table table-responsive">
<table class="table table-striped table-hover table-condensed sortable-theme-bootstrap" data-sortable>
<thead>
- <tr style="white-space:nowrap;">
+ <tr class="text-nowrap">
<th><?=gettext("Time")?></th>
<th style="width:100%"><?=gettext("Message")?></th>
</tr>
diff --git a/src/usr/local/www/status_logs_filter.php b/src/usr/local/www/status_logs_filter.php
index d3101f7..60432eb 100644
--- a/src/usr/local/www/status_logs_filter.php
+++ b/src/usr/local/www/status_logs_filter.php
@@ -578,7 +578,7 @@ if (!$rawfilter) {
<div class="table-responsive">
<table class="table table-striped table-hover table-condensed sortable-theme-bootstrap" data-sortable>
<thead>
- <tr style="white-space:nowrap;">
+ <tr class="text-nowrap">
<th><?=gettext("Act")?></th>
<th><?=gettext("Time")?></th>
<th><?=gettext("IF")?></th>
@@ -604,7 +604,7 @@ if (!$rawfilter) {
foreach ($filterlog as $filterent) {
?>
- <tr style="white-space:nowrap;">
+ <tr class="text-nowrap">
<td>
<?php
if ($filterent['act'] == "block") {
@@ -662,7 +662,7 @@ if (!$rawfilter) {
$dststr = $filterent['dstip'] . get_port_with_service($filterent['dstport'], $proto);
$dst_htmlclass = str_replace(array('.', ':'), '-', $filterent['dstip']);
?>
- <td style="white-space:nowrap;">
+ <td class="text-nowrap">
<i class="fa fa-info icon-pointer icon-primary" onclick="javascript:resolve_with_ajax('<?="{$filterent['srcip']}"; ?>');" title="<?=gettext("Click to resolve")?>">
</i>
@@ -671,7 +671,7 @@ if (!$rawfilter) {
<?=$srcstr . '<span class="RESOLVE-' . $src_htmlclass . '"></span>'?>
</td>
- <td style="white-space:nowrap;">
+ <td class="text-nowrap">
<i class="fa fa-info icon-pointer icon-primary; ICON-<?= $dst_htmlclass; ?>" onclick="javascript:resolve_with_ajax('<?="{$filterent['dstip']}"; ?>');" title="<?=gettext("Click to resolve")?>">
</i>
@@ -719,7 +719,7 @@ if (!$rawfilter) {
<div class="table table-responsive">
<table class="table table-striped table-hover table-condensed sortable-theme-bootstrap" data-sortable>
<thead>
- <tr style="white-space:nowrap;">
+ <tr class="text-nowrap">
<th><?=gettext("Time")?></th>
<th style="width:100%"><?=gettext("Message")?></th>
</tr>
diff --git a/src/usr/local/www/widgets/widgets/thermal_sensors.widget.php b/src/usr/local/www/widgets/widgets/thermal_sensors.widget.php
index 522dcd3..dabf983 100644
--- a/src/usr/local/www/widgets/widgets/thermal_sensors.widget.php
+++ b/src/usr/local/www/widgets/widgets/thermal_sensors.widget.php
@@ -195,15 +195,15 @@ function getBoolValueFromConfig(&$configArray, $valueKey, $defaultValue) {
<form action="/widgets/widgets/thermal_sensors.widget.php" method="post" id="iform_thermal_sensors_settings" name="iform_thermal_sensors_settings">
<table>
<tr>
- <td style="text-align:left" colspan="2">
- <span style="font-weight: bold" >Thresholds in &deg;C (1 to 100):</span>
+ <td class="text-left" colspan="2">
+ <strong>Thresholds in &deg;C (1 to 100):</strong>
</td>
- <td style="text-align:right" colspan="1">
- <span style="font-weight: bold" >Display settings:</span>
+ <td class="text-right" colspan="1">
+ <strong>Display settings:</strong>
</td>
</tr>
<tr>
- <td style="text-align:right">
+ <td class="text-right">
Zone Warning:
</td>
<td>
@@ -212,7 +212,7 @@ function getBoolValueFromConfig(&$configArray, $valueKey, $defaultValue) {
id="thermal_sensors_widget_zone_warning_threshold"
value="<?= $thermal_sensors_widget_zoneWarningTempThreshold; ?>" />
</td>
- <td style="text-align:right">
+ <td class="text-right">
<label for="thermal_sensors_widget_show_raw_output">Show raw output (no graph): </label>
<input type="checkbox"
id="thermal_sensors_widget_show_raw_output"
@@ -221,7 +221,7 @@ function getBoolValueFromConfig(&$configArray, $valueKey, $defaultValue) {
</td>
</tr>
<tr>
- <td style="text-align:right">
+ <td class="text-right">
Zone Critical:
</td>
<td>
@@ -230,7 +230,7 @@ function getBoolValueFromConfig(&$configArray, $valueKey, $defaultValue) {
id="thermal_sensors_widget_zone_critical_threshold"
value="<?= $thermal_sensors_widget_zoneCriticalTempThreshold; ?>" />
</td>
- <td style="text-align:right">
+ <td class="text-right">
<label for="thermal_sensors_widget_show_full_sensor_name">Show full sensor name: </label>
<input type="checkbox"
id="thermal_sensors_widget_show_full_sensor_name"
@@ -239,7 +239,7 @@ function getBoolValueFromConfig(&$configArray, $valueKey, $defaultValue) {
</td>
</tr>
<tr>
- <td style="text-align:right">
+ <td class="text-right">
Core Warning:
</td>
<td>
@@ -248,12 +248,12 @@ function getBoolValueFromConfig(&$configArray, $valueKey, $defaultValue) {
id="thermal_sensors_widget_core_warning_threshold"
value="<?= $thermal_sensors_widget_coreWarningTempThreshold ?>" />
</td>
- <td style="text-align:right">
+ <td class="text-right">
</td>
</tr>
<tr>
- <td style="text-align:right">
+ <td class="text-right">
Core Critical:
</td>
<td>
@@ -262,17 +262,17 @@ function getBoolValueFromConfig(&$configArray, $valueKey, $defaultValue) {
id="thermal_sensors_widget_core_critical_threshold"
value="<?= $thermal_sensors_widget_coreCriticalTempThreshold ?>" />
</td>
- <td style="text-align:right">
+ <td class="text-right">
</td>
</tr>
<tr>
- <td style="text-align:right" colspan="3">
+ <td class="text-right" colspan="3">
<input type="submit" id="thermal_sensors_widget_submit" name="thermal_sensors_widget_submit" class="formbtn" value="Save" />
</td>
</tr>
<tr>
- <td style="text-align:left" colspan="3">
+ <td class="text-left" colspan="3">
<span>* You can configure a proper Thermal Sensor / Module under <br />
&nbsp;&nbsp;&nbsp;<a href="system_advanced_misc.php">System &gt; Advanced &gt; Miscellaneous : Thermal Sensors section</a>.</span>
</td>
diff --git a/src/usr/local/www/widgets/widgets/wake_on_lan.widget.php b/src/usr/local/www/widgets/widgets/wake_on_lan.widget.php
index b087bd9..164e7ce 100644
--- a/src/usr/local/www/widgets/widgets/wake_on_lan.widget.php
+++ b/src/usr/local/www/widgets/widgets/wake_on_lan.widget.php
@@ -90,10 +90,10 @@ if (count($wolcomputers) > 0) {
if ($status == 'expires') {
echo '<i class="fa fa-arrow-right" data-toggle="tooltip" title="' . gettext("Online") . '"></i>';
} else if ($status == 'permanent') {
- echo '<td style="text-align:center">' . "\n";
+ echo '<td class="text-center">' . "\n";
echo '<i class="fa fa-arrow-right" data-toggle="tooltip" title="' . gettext("Static ARP") . '"></i>';
} else {
- echo '<td" style="text-align:center">' . "\n";
+ echo '<td" class="text-center">' . "\n";
echo '<i class="fa fa-ban" data-toggle="tooltip" title="' . gettext("Offline") . '"></i>';
}
@@ -103,10 +103,10 @@ if (count($wolcomputers) > 0) {
echo "</td></tr>\n";
}
} else {
- echo "<tr><td colspan=\"4\" style=\"text-align:center\">" . gettext("No saved WoL addresses") . ".</td></tr>\n";
+ echo "<tr><td colspan=\"4\" class=\"text-center\">" . gettext("No saved WoL addresses") . ".</td></tr>\n";
}
?>
</tbody>
</table>
-<p style="text-align:center"><a href="status_dhcp_leases.php" class="navlink">DHCP Leases Status</a></p>
+<p class="text-center"><a href="status_dhcp_leases.php" class="navlink">DHCP Leases Status</a></p>
</div>
diff --git a/src/usr/local/www/wizard.php b/src/usr/local/www/wizard.php
index a1f0381..8729030 100644
--- a/src/usr/local/www/wizard.php
+++ b/src/usr/local/www/wizard.php
@@ -454,7 +454,7 @@ $completion = ($stepid == 0) ? 0:($stepid * 100) / ($totalsteps -1);
?>
<!-- Present the pfSense logo -->
-<div style="text-align:center"><p><a href="<?=$ip?>"><img border="0" src="logo-black.png" alt="logo-black" align="middle" height="45" width="180" /></a></p></div><br /><br/>
+<div class="text-center"><p><a href="<?=$ip?>"><img border="0" src="logo-black.png" alt="logo-black" align="middle" height="45" width="180" /></a></p></div><br /><br/>
<!-- Draw a progress bar to show step progress -->
<div class="progress">
OpenPOWER on IntegriCloud