{formPrint} more compact output

Author: dg

src/Forms/Rendering/DefaultFormRenderer.php

@@ -239,7 +239,10 @@ private function doRenderErrors(array $errors, bool $control): string
 			}
 			$container->addHtml($item);
 		}
-		return "\n" . $container->render($control ? 1 : 0);
+
+		return $control
+			? "\n\t" . $container->render()
+			: "\n" . $container->render(0);
 	}
 
 

tests/Forms.Latte/Runtime.renderBlueprint.phpt

@@ -52,33 +52,21 @@ Assert::match(
 	<dt>{label name/}:</dt>
 
 	<dd>{input name}
-
-	<span class="error" n:ifcontent>
-		{inputError name}
-	</span>
-</dd>
+	<span class="error" n:ifcontent>{inputError name}</span></dd>
 
 
 
 	<dt>{label cont-name/}:</dt>
 
 	<dd class="odd">{input cont-name}
-
-	<span class="error" n:ifcontent>
-		{inputError cont-name}
-	</span>
-</dd>
+	<span class="error" n:ifcontent>{inputError cont-name}</span></dd>
 
 
 
 	<dt></dt>
 
 	<dd>{input agree}
-
-	<span class="error" n:ifcontent>
-		{inputError agree}
-	</span>
-</dd>
+	<span class="error" n:ifcontent>{inputError agree}</span></dd>
 
 </dl>
 

tests/Forms/Forms.renderer.1.expect

@@ -15,11 +15,7 @@
 	<th><label for="frm-age" class="required">Your age:</label></th>
 
 	<td><input type="number" name="age" min="10" max="100" id="frm-age" required data-nette-rules='[{"op":":filled","msg":"Enter your age"},{"op":":integer","msg":"Please enter a valid integer."},{"op":":range","msg":"Age must be in range from 10 to 100","arg":[10,100]}]' class="text">
-
-	<span class="error">
-		Enter your age
-	</span>
-</td>
+	<span class="error">Enter your age</span></td>
 </tr>
 
 <tr>
@@ -59,22 +55,14 @@
 	<th><label for="frm-city">City:</label></th>
 
 	<td><input type="text" name="city" id="frm-city" data-nette-rules='[{"op":":equal","rules":[{"op":":filled","msg":"Enter your shipping address"}],"control":"send","arg":true}]' class="text">
-
-	<span class="error">
-		Enter your shipping address
-	</span>
-</td>
+	<span class="error">Enter your shipping address</span></td>
 </tr>
 
 <tr>
 	<th><label for="frm-country">Country:</label></th>
 
 	<td><select name="country" id="frm-country" data-nette-rules='[{"op":":equal","rules":[{"op":":filled","msg":"Select your country"}],"control":"send","arg":true}]'><option value="">Select your country</option><optgroup label="Europe"><option value="CZ">Czech Republic</option><option value="SK">Slovakia</option><option value="GB">United Kingdom</option></optgroup><option value="CA">Canada</option><option value="US">United States</option><option value="?">other</option></select>
-
-	<span class="error">
-		Select your country
-	</span>
-</td>
+	<span class="error">Select your country</span></td>
 </tr>
 
 <tr>
@@ -94,11 +82,7 @@
 	<th><label for="frm-password" class="required">Choose password:</label></th>
 
 	<td><input type="password" name="password" id="frm-password" required data-nette-rules='[{"op":":filled","msg":"Choose your password"},{"op":":minLength","msg":"The password is too short: it must be at least 3 characters","arg":3}]' class="text"><input type="password" name="password2" id="frm-password2" data-nette-rules='[{"op":":valid","rules":[{"op":":filled","msg":"Reenter your password"},{"op":":equal","msg":"Passwords do not match","arg":{"control":"password"}}],"control":"password"}]' class="text"><input type="file" name="avatar" id="frm-avatar" data-nette-rules='[{"op":":fileSize","msg":"The size of the uploaded file can be up to %d% bytes.","arg":%d%},{"op":":filled","rules":[{"op":":image","msg":"Uploaded file is not image"}],"control":"avatar"}]' class="text">
-
-	<span class="error">
-		Reenter your password
-	</span>
-</td>
+	<span class="error">Reenter your password</span></td>
 </tr>
 
 <tr>

tests/Forms/Forms.renderer.2.expect

@@ -14,22 +14,14 @@
 	<dt><label for="frm-age" class="required">Your age:</label></dt>
 
 	<dd class="odd"><input type="number" name="age" min="10" max="100" id="frm-age" required data-nette-rules='[{"op":":filled","msg":"Enter your age"},{"op":":integer","msg":"Age must be numeric value"},{"op":":range","msg":"Age must be in range from 10 to 100","arg":[10,100]}]' value="9.9" class="text is-invalid"> •
-
-	<span class="error">
-		Age must be numeric value
-	</span>
-</dd>
+	<span class="error">Age must be numeric value</span></dd>
 
 
 
 	<dt><label for="frm-gender">Your gender:</label></dt>
 
 	<dd><select name="gender" id="frm-gender" class="is-invalid"><option style="color: #248bd3" value="m">male</option><option style="color: #e948d4" value="f">female</option></select>
-
-	<span class="error">
-		Please select a valid option.
-	</span>
-</dd>
+	<span class="error">Please select a valid option.</span></dd>
 
 
 
@@ -82,11 +74,7 @@
 	<dt><label for="frm-password" class="required">Choose password:</label></dt>
 
 	<dd class="multi"><input type="password" name="password" id="frm-password" required data-nette-rules='[{"op":":filled","msg":"Choose your password"},{"op":":minLength","msg":"The password is too short: it must be at least 3 characters","arg":3}]' class="text is-invalid"><input type="password" name="password2" id="frm-password2" data-nette-rules='[{"op":":valid","rules":[{"op":":filled","msg":"Reenter your password"},{"op":":equal","msg":"Passwords do not match","arg":{"control":"password"}}],"control":"password"}]' class="text"> • <small>(at least 3 characters)</small>
-
-	<span class="error">
-		The password is too short: it must be at least 3 characters
-	</span>
-</dd>
+	<span class="error">The password is too short: it must be at least 3 characters</span></dd>
 
 
 

tests/Forms/Forms.renderer.translate.expect

@@ -16,11 +16,7 @@
 	<th><label for="frm-password" class="required">PASSWORD</label></th>
 
 	<td><input type="password" name="password" id="frm-password" required data-nette-rules='[{"op":":filled","msg":"THIS FIELD IS REQUIRED."},{"op":":minLength","msg":"MINIMAL LENGTH IS %D CHARS","arg":8}]' class="text">
-
-	<span class="error">
-		WEAK PASSWORD
-	</span>
-</td>
+	<span class="error">WEAK PASSWORD</span></td>
 </tr>
 
 <tr>