From d285ffdb132952064f91089129f08c9f7a6e39ca Mon Sep 17 00:00:00 2001
From: Charlie Marshall <charlie0440@gmail.com>
Date: Fri, 22 Nov 2013 11:50:15 +0000
Subject: [PATCH] fix traffic shaper progress bars not displaying

---
 usr/local/www/themes/pfsense_ng_fs/loader.js | 27 +++++++++++---------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/usr/local/www/themes/pfsense_ng_fs/loader.js b/usr/local/www/themes/pfsense_ng_fs/loader.js
index 0531780fb0..1f7fc319a2 100644
--- a/usr/local/www/themes/pfsense_ng_fs/loader.js
+++ b/usr/local/www/themes/pfsense_ng_fs/loader.js
@@ -228,21 +228,24 @@ jQuery(document).ready(function ()
     ///////////////////////////////////////////
     // jQuery code for columns / widgets part 2    
     ///////////////////////////////////////////
-
-    // correct the css for column 2
-    jQuery('#col2').css("float","left");
-
+    
     // insert add/delete column buttons
     jQuery('<br/><br/><div id=\"columnModifier\"><div style=\"float:left\"><div id =\"addCol\" style=\"float:left\"><img src=\"./themes/pfsense_ng_fs/images/icons/icon_plus.gif\" style=\"cursor:pointer\" alt=\"Click here to add a column\"/></div>&nbsp;Add column&nbsp;</div><div style=\"float:left\"><div id =\"delCol\" style=\"float:left\"><img src=\"./themes/pfsense_ng_fs/images/icons/icon_x.gif\" style=\"cursor:pointer\" alt=\"Click here to delete a column\"/></div>&nbsp;Delete column</div><div id=\"columnWarningText\" style=\"float:left; margin-left:5em\"></div><br/><br/>').insertBefore('#niftyOutter.fakeClass');
-	
-    // Make a copy of the current state of columns on page load
-    for ( var i = 1; i <= noCols; i = i + 1 )
-    {
-	var contents = jQuery('#col' + i ).html();
-	existing.push( contents );
-    }  
     
-    finishedResizing(); // on page load correct display of columns to fit
+    if ( jQuery('#columnModifier').length > 0 ) // only perform resizing on the dashboard page
+    {
+        // correct the css for column 2
+        jQuery('#col2').css("float","left");
+
+        // Make a copy of the current state of columns on page load
+        for ( var i = 1; i <= noCols; i = i + 1 )
+        {
+	    var contents = jQuery('#col' + i ).html();
+	    existing.push( contents );
+        }  
+    
+        finishedResizing(); // on page load correct display of columns to fit
+    }
     
     // on click add a new column and change column widths
     jQuery('#addCol').click(function()