Add four-column support in PDFs

src/helper/Helper_Field_Container.php

@@ -71,11 +71,15 @@ class Helper_Field_Container {
 	 * @since 4.0
 	 */
 	private $class_map = [
-		'gf_left_half'    => 50,
-		'gf_right_half'   => 50,
-		'gf_left_third'   => 33.3,
-		'gf_middle_third' => 33.3,
-		'gf_right_third'  => 33.3,
+		'gf_left_half'      => 50,
+		'gf_right_half'     => 50,
+		'gf_left_third'     => 33.3,
+		'gf_middle_third'   => 33.3,
+		'gf_right_third'    => 33.3,
+		'gf_first_quarter'  => 25,
+		'gf_second_quarter' => 25,
+		'gf_third_quarter'  => 25,
+		'gf_fourth_quarter' => 25,
 	];
 
 	/**

src/templates/blank-slate.php

@@ -43,12 +43,14 @@
 
     .gf_left_half,
     .gf_left_third, .gf_middle_third,
+    .gf_first_quarter, .gf_second_quarter, .gf_third_quarter,
     .gf_list_2col li, .gf_list_3col li, .gf_list_4col li, .gf_list_5col li {
         float: left;
     }
 
     .gf_right_half,
-    .gf_right_third {
+    .gf_right_third,
+    .gf_fourth_quarter {
         float: right;
     }
 
@@ -62,6 +64,10 @@
         width: 32.3%;
     }
 
+    .gf_first_quarter, .gf_second_quarter, .gf_third_quarter, .gf_fourth_quarter {
+        width: 24%;
+    }
+
     .gf_list_4col li {
         width: 24%;
     }
@@ -78,7 +84,11 @@
         padding-right: 1.505%;
     }
 
-    .gf_right_half, .gf_right_third {
+    .gf_first_quarter, .gf_second_quarter, .gf_third_quarter, .gf_fourth_quarter {
+        padding-right: 1.333%;
+    }
+
+    .gf_right_half, .gf_right_third, .gf_fourth_quarter {
         padding-right: 0;
     }
 

src/templates/focus-gravity.php

@@ -50,16 +50,19 @@
     /* Handle Gravity Forms CSS Ready Classes */
     .row-separator {
         clear: both;
+        padding: 1.25mm 0;
     }
 
     .gf_left_half,
     .gf_left_third, .gf_middle_third,
+    .gf_first_quarter, .gf_second_quarter, .gf_third_quarter,
     .gf_list_2col li, .gf_list_3col li, .gf_list_4col li, .gf_list_5col li {
         float: left;
     }
 
     .gf_right_half,
-    .gf_right_third {
+    .gf_right_third,
+    .gf_fourth_quarter {
         float: right;
     }
 
@@ -73,6 +76,10 @@
         width: 32.3%;
     }
 
+    .gf_first_quarter, .gf_second_quarter, .gf_third_quarter, .gf_fourth_quarter {
+        width: 24%;
+    }
+
     .gf_list_4col li {
         width: 24%;
     }
@@ -89,7 +96,11 @@
         padding-right: 1.505%;
     }
 
-    .gf_right_half, .gf_right_third {
+    .gf_first_quarter, .gf_second_quarter, .gf_third_quarter, .gf_fourth_quarter {
+        padding-right: 1.333%;
+    }
+
+    .gf_right_half, .gf_right_third, .gf_fourth_quarter {
         padding-right: 0;
     }
 

src/templates/rubix.php

@@ -47,16 +47,19 @@
     /* Handle Gravity Forms CSS Ready Classes */
     .row-separator {
         clear: both;
+        padding: 1.25mm 0;
     }
 
     .gf_left_half,
     .gf_left_third, .gf_middle_third,
+    .gf_first_quarter, .gf_second_quarter, .gf_third_quarter,
     .gf_list_2col li, .gf_list_3col li, .gf_list_4col li, .gf_list_5col li {
         float: left;
     }
 
     .gf_right_half,
-    .gf_right_third {
+    .gf_right_third,
+    .gf_fourth_quarter {
         float: right;
     }
 
@@ -70,6 +73,10 @@
         width: 32.3%;
     }
 
+    .gf_first_quarter, .gf_second_quarter, .gf_third_quarter, .gf_fourth_quarter {
+        width: 24%;
+    }
+
     .gf_list_4col li {
         width: 24%;
     }
@@ -86,7 +93,11 @@
         padding-right: 1.505%;
     }
 
-    .gf_right_half, .gf_right_third {
+    .gf_first_quarter, .gf_second_quarter, .gf_third_quarter, .gf_fourth_quarter {
+        padding-right: 1.333%;
+    }
+
+    .gf_right_half, .gf_right_third, .gf_fourth_quarter {
         padding-right: 0;
     }
 

src/templates/zadani.php

@@ -48,12 +48,14 @@
 
     .gf_left_half,
     .gf_left_third, .gf_middle_third,
+    .gf_first_quarter, .gf_second_quarter, .gf_third_quarter,
     .gf_list_2col li, .gf_list_3col li, .gf_list_4col li, .gf_list_5col li {
         float: left;
     }
 
     .gf_right_half,
-    .gf_right_third {
+    .gf_right_third,
+    .gf_fourth_quarter {
         float: right;
     }
 
@@ -67,6 +69,10 @@
         width: 32.3%;
     }
 
+    .gf_first_quarter, .gf_second_quarter, .gf_third_quarter, .gf_fourth_quarter {
+        width: 24%;
+    }
+
     .gf_list_4col li {
         width: 24%;
     }
@@ -83,7 +89,11 @@
         padding-right: 1.505%;
     }
 
-    .gf_right_half, .gf_right_third {
+    .gf_first_quarter, .gf_second_quarter, .gf_third_quarter, .gf_fourth_quarter {
+        padding-right: 1.333%;
+    }
+
+    .gf_right_half, .gf_right_third, .gf_fourth_quarter {
         padding-right: 0;
     }
 

tests/phpunit/unit-tests/test-field-container.php

@@ -191,6 +191,44 @@ public function test_three_columns() {
 		$this->assertEquals( '</div>', $this->close() );
 	}
 
+	/**
+	 * Check that four-columns give the correct output
+	 *
+	 * @since 4.1
+	 */
+	public function test_four_columns() {
+
+		$field           = new GF_Field();
+		$field->cssClass = 'gf_first_quarter';
+
+		/* Check it opens correctly */
+		$this->assertEquals( '<div class="row-separator odd">', $this->generate( $field ) );
+
+		$field           = new GF_Field();
+		$field->cssClass = 'gf_second_quarter';
+
+		/* Check it does nothing */
+		$this->assertEquals( '', $this->generate( $field ) );
+
+		$field           = new GF_Field();
+		$field->cssClass = 'gf_third_quarter';
+
+		/* Check it does nothing */
+		$this->assertEquals( '', $this->generate( $field ) );
+
+		$field           = new GF_Field();
+		$field->cssClass = 'gf_fourth_quarter';
+
+		/* Check it does nothing */
+		$this->assertEquals( '', $this->generate( $field ) );
+
+		/* Check the row closes / opens new row correctly */
+		$this->assertEquals( '</div><div class="row-separator even">', $this->generate( $field ) );
+
+		/* Check it now closes correctly */
+		$this->assertEquals( '</div>', $this->close() );
+	}
+
 	/**
 	 * Check that two and three column layouts can intermingle
 	 *