2.1.5 widescreen patch - multiple columns on dashboard

[Guest]

WOW! It's Sunday, peace everywhere! I'm bowing deeply, opensource at its best!

[doktornotor]

@charlie0440:

If you are determined to undo the changes from the patch. You can replace the modified index.php with the default 2.1.5 index.php which can be found here:

https://raw.githubusercontent.com/pfsense/pfsense/RELENG_2_1/usr/local/www/index.php

Diff for use in System Patches or similar:

--- /usr/local/www/index.php.orig	2014-08-31 09:45:39.000000000 +0200
+++ /usr/local/www/index.php	2014-08-18 23:20:02.000000000 +0200
@@ -466,7 +466,7 @@

@@ -545,7 +545,7 @@

 		" />

-
+
 	 	$totalwidgets = count($widgetfiles);
 	$halftotal = $totalwidgets / 2 - 2;
@@ -554,7 +554,7 @@
 	$printed = false;
 	$firstprint = false;
 	?>
-	
+	

 	foreach($widgetlist as $widget) {
@@ -631,22 +631,42 @@
 			}
 		}

-		if ($config['widgets'] && $pconfig['sequence'] != ""){
-			if ($colpos[$widgetcounter] == "col2" && $printed == false)
-			{
+		if( substr($g['theme'], -3) != "_fs") {
+			if ($config['widgets'] && $pconfig['sequence'] != ""){
+				if ($colpos[$widgetcounter] == "col2" && $printed == false)
+				{
+					$printed = true;
+					?>
+					
+					
+					+				}
+			}
+			else if ($widgetcounter >= $halftotal && $printed == false){
 				$printed = true;
 				?>

-				
+				
 				 			}
 		}
-		else if ($widgetcounter >= $halftotal && $printed == false){
-			$printed = true;
-			?>
-			
-			
-			+		else {
+			if ($config['widgets'] && $pconfig['sequence'] != "") {
+				if ($colpos[$widgetcounter] == "col2" && $printed == false)
+				{
+					$printed = true;
+					?>
+					
+					
+					+				}
+				else { ?>
+					 
+				+			}		
 		}

 		?>
@@ -721,8 +741,7 @@
 // 	jQuery(document).ready(function(in_event)
 	{
-			jQuery('#col1').sortable({connectWith: '#col2', dropOnEmpty: true, handle: '.widgetheader', change: showSave});
-			jQuery('#col2').sortable({connectWith: '#col1', dropOnEmpty: true, handle: '.widgetheader', change: showSave});
+			jQuery('.ui-sortable').sortable({connectWith: '.ui-sortable', dropOnEmpty: true, handle: '.widgetheader', change: showSave});

 			hideAllWidgets();

Also, repacked the tarball with proper permissions (root:wheel, 644/755 for files/dirs):
https://mega.co.nz/#!4AFVjBIb!UTDERxRhdLNi9SafMDLuRrfs87ydEsoGJLAT1q-EVwM

[charlie0440]

If you want the diffs, view it on github here: https://github.com/CharlieMarshall/pfsense/tree/RELENG_2_1

[haddock]

Wonderful.

Thanks to both of you.

[KOM]

Yes, thank you very much for this patch.

As a suggestion, would it be easy to move the Add column / Delete column buttons so that they are inline with the other buttons?

[charlie0440]

if you want to.

line 111 of the "/usr/local/www/themes/pfsense_ng_fs/loader.js"

jQuery('

![](\"./themes/pfsense_ng_fs/images/icons/icon_plus.gif\"/) Add column ![](\"./themes/pfsense_ng_fs/images/icons/icon_x.gif\"/) Delete column

 ').insertBefore('#niftyOutter.fakeClass');

try removing the

at the begining of the line.

jQuery('![](\"./themes/pfsense_ng_fs/images/icons/icon_plus.gif\"/) Add column ![](\"./themes/pfsense_ng_fs/images/icons/icon_x.gif\"/) Delete column

 ').insertBefore('#niftyOutter.fakeClass');

[Supermule]

Does this

[charlie0440]

Had a quick fiddle. No obvious way. Could put them infront and inline of the other 2 icons. But that isn't straight forward either

[KOM]

Thanks for your effort anyway.

[kcallis]

I have tried it and I am still getting an issue where the Help tab is right below the System tab. Is there any way that I could just remove help for the time being? This is preventing me from accessing option on the System menu.


[Supermule]

Just change the font in your browser to Tahoma or change the default size to .9

[kcallis]

Thanks, that fixed that problem…

[Supermule]

Youre welcome!

[charlie0440]

@kcallis

Go to system > patches and apply this commit:

https://github.com/CharlieMarshall/pfsense/commit/2b5c16b9c6ee3dcb9a1333b44949f48024eb3cd0

[kcallis]

It has been added…

[AhnHEL]

Charlie, is there a way to fix the picture widget using a 4 column dashboard?  Using a picture that is 350 x 350, but the picture doesnt fill up the width of the column.  Using a larger or smaller pic just causes the pic to zoom in or out respectively without filling up the column width.

This is only with 2.1.5.  On my 2.2 Alpha box, the picture fills up the width of the column properly.

[charlie0440]

Yes. As I said in my opening post. I have not included all he changes here which are in 2.2. If I have some spare time today, I'll back port the fix to 2.1.5 and upload it here

[Supermule]

AWESOME!

[charlie0440]

@AhnHEL - Was a super simple fix:

Apply via:

• System patches using commit:
  https://github.com/CharlieMarshall/pfsense/commit/7a775e8bf1a4771ee8d0217a2f66d415f9abc302

• Or make the necessary changes yourself via GUI > edit file

• Or paste the whole file into the broswer via GUI > edit file: https://raw.githubusercontent.com/CharlieMarshall/pfsense/7a775e8bf1a4771ee8d0217a2f66d415f9abc302/usr/local/www/widgets/widgets/picture.widget.php

Edit: You are not limited to 350 x 350, all images should hopefully now scale

[Supermule]

Would it be possible to get this a package for 2.1.5 since its ready and works fine??

Could it be done easily?