summaryrefslogtreecommitdiffstats
path: root/src/usr
diff options
context:
space:
mode:
authorStephen Beaver <sbeaver@netgate.com>2016-03-05 18:00:53 -0500
committerStephen Beaver <sbeaver@netgate.com>2016-03-05 18:00:53 -0500
commit801d55590e6499471f21095d3f9807189a841bd7 (patch)
tree33e09a4dfac811bcb122989c2e630550920d743b /src/usr
parent68219e9a41efaae8703122cd370a2803c52e131c (diff)
parentad51eb90ca6f5bb34bbd80bf35a001ed388e43f3 (diff)
downloadpfsense-801d55590e6499471f21095d3f9807189a841bd7.zip
pfsense-801d55590e6499471f21095d3f9807189a841bd7.tar.gz
Merge pull request #2708 from phil-davis/patch-3
Diffstat (limited to 'src/usr')
-rw-r--r--src/usr/local/www/index.php6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/usr/local/www/index.php b/src/usr/local/www/index.php
index 77a35e6..e534ac2 100644
--- a/src/usr/local/www/index.php
+++ b/src/usr/local/www/index.php
@@ -252,6 +252,7 @@ if ($fd) {
##build widget saved list information
if ($config['widgets'] && $config['widgets']['sequence'] != "") {
+ $dashboardcolumns = isset($config['system']['webgui']['dashboardcolumns']) ? $config['system']['webgui']['dashboardcolumns'] : 2;
$pconfig['sequence'] = $config['widgets']['sequence'];
$widgetsfromconfig = array();
@@ -269,6 +270,11 @@ if ($config['widgets'] && $config['widgets']['sequence'] != "") {
}
}
+ // Limit the column to the current dashboard columns.
+ if (substr($col, 3) > $dashboardcolumns) {
+ $col = "col" . $dashboardcolumns;
+ }
+
$offset = strpos($file, '-container');
if (false !== $offset) {
$file = substr($file, 0, $offset);
OpenPOWER on IntegriCloud