Index: branches/5.1.x/core/admin_templates/incs/config_blocks.tpl
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/admin_templates/incs/config_blocks.tpl	(.../config_blocks.tpl)	(revision 12127)
+++ branches/5.1.x/core/admin_templates/incs/config_blocks.tpl	(.../config_blocks.tpl)	(revision 12657)
@@ -1,5 +1,5 @@
 <inp2:m_DefineElement name="config_edit_text">
-	<input type="text" tabindex="<inp2:m_get param="tab_index"/>" name="<inp2:InputName field="$field"/>" value="<inp2:Field field="$field" />" <inp2:m_param name="field_params" />/>
+	<input type="text" tabindex="<inp2:m_get param="tab_index"/>" name="<inp2:InputName field="$field"/>" value="<inp2:Field field="$field" />"<inp2:m_if check="m_Param" name="field_params"> <inp2:m_Param name="field_params"/><inp2:m_else/> style="width:100%"</inp2:m_if>/>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="config_edit_password">
@@ -58,16 +58,19 @@
 	<inp2:m_if check="m_ParamEquals" name="show_heading" value="1">
 		<tr class="subsectiontitle">
 			<td colspan="2">
-	    		<inp2:Field name="heading" as_label="1"/>
+				<inp2:Field name="heading" as_label="1"/>
 	   		</td>
 	   		<td align="right">
 	   			<a class="config-header" href="javascript:toggle_section('<inp2:Field name="heading"/>');" id="toggle_mark[<inp2:Field name="heading"/>]" title="Collapse/Expand Section">[-]</a>
 	   		</td>
 		</tr>
 	</inp2:m_if>
 	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>" id="<inp2:m_param name="PrefixSpecial"/>_<inp2:field field="$IdField"/>" header_label="<inp2:Field name="heading"/>">
-		<td>
-			<inp2:Field field="prompt" as_label="1" />
+		<td style="width:500px;">
+			<inp2:Field name="VariableName" result_to_var="error_field"/>
+			<span class="<inp2:m_if check='HasError' field='$error_field' id_field='VariableName'>error-cell</inp2:m_if>">
+			<inp2:Field field="prompt" as_label="1" /></span><inp2:m_if check="IsRequired"><span class="field-required">&nbsp;*</span></inp2:m_if>:
+
 			<inp2:m_if check="m_IsDebugMode">
 				<br/><small style="color: gray;">[<inp2:Field field="DisplayOrder"/>] <inp2:Field field="VariableName"/></small>
 			</inp2:m_if>
@@ -95,7 +98,10 @@
 	</inp2:m_if>
 	<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>" id="<inp2:m_param name="PrefixSpecial"/>_<inp2:Field field="$IdField"/>" header_label="<inp2:Field name="heading"/>">
 		<td>
-			<inp2:Field field="prompt" as_label="1" />
+			<inp2:Field name="VariableName" result_to_var="error_field"/>
+			<span class="<inp2:m_if check='HasError' field='$error_field' id_field='VariableName'>error-cell</inp2:m_if>">
+			<inp2:Field field="prompt" as_label="1" /></span><inp2:m_if check="IsRequired"><span class="field-required">&nbsp;*</span></inp2:m_if>:
+
 			<inp2:m_if check="m_IsDebugMode">
 				<br/><small style="color: gray;">[<inp2:Field field="DisplayOrder"/>] <inp2:Field field="VariableName"/></small>
 			</inp2:m_if>