Index: branches/1.2.x/in-commerce/elements/forms.elm.tpl
===================================================================
diff -u -N -r14274 -r14593
--- branches/1.2.x/in-commerce/elements/forms.elm.tpl	(.../forms.elm.tpl)	(revision 14274)
+++ branches/1.2.x/in-commerce/elements/forms.elm.tpl	(.../forms.elm.tpl)	(revision 14593)
@@ -1,44 +1,14 @@
-<inp2:m_DefineElement name="inp_affiliate_caption" style="" valign="top" title="" required="0">
-	<td class="field-name" valign="<inp2:m_Param name="valign"/>" style="<inp2:m_Param name="style"/>">
-		<inp2:m_phrase label="$title"/><inp2:m_if check="m_ParamEquals" name="required" value="1"><span class="field-required"> *</span></inp2:m_if>:
-	</td>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="inp_affiliate_box" is_last="0" style="" required="0">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-		<inp2:m_inc param="tab_index" by="1"/>
-		<inp2:m_RenderElement name="inp_affiliate_caption" style="$style" title="$title" required="$required"/>
-		<td class="field-value" nowrap>
-			<inp2:m_if check="m_GetEquals" var="{$field}RequiredError" value="1">
-				<span class="field-error"><inp2:m_Phrase label="la_err_required" /></span><br />
-			</inp2:m_if>
-			<input type="text" class="input-text" name="<inp2:m_Param name="field"/>" value="<inp2:m_Get var="$field" />" tabindex="<inp2:m_get param="tab_index"/>"/>
-		</td>
-	</tr>
-	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
-</inp2:m_DefineElement>
-
-<inp2:m_DefineElement name="inp_affiliate_textarea" is_last="0" required="0">
-	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-		<inp2:m_inc param="tab_index" by="1"/>
-		<inp2:m_RenderElement name="inp_affiliate_caption" style="$style" title="$title" required="$required"/>
-		<td class="field-value">
-			<textarea class="input-textarea" tabindex="<inp2:m_get param="tab_index"/>" name="<inp2:m_param name="field"/>" cols="<inp2:m_param name="cols"/>" rows="<inp2:m_param name="rows"/>"><inp2:m_Get var="$field" /></textarea>
-		</td>
-	</tr>
-	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
-</inp2:m_DefineElement>
-
 <inp2:m_DefineElement name="affiliate_payment_type_element">
 	<tr>
 		<td valign="top" nowrap>
-			<input type="radio" name="<inp2:m_Param name="field"/>" id="<inp2:m_Param name="field"/>_<inp2:Field name="PaymentTypeId" />" value="<inp2:Field name="$field" />" <inp2:m_if check="u_AffiliatePaymentTypeChecked">checked</inp2:m_if>/>
+			<input type="radio" name="<inp2:$prefix_InputName name='$field'/>" id="<inp2:$prefix_InputName name='$field'/>_<inp2:Field name='PaymentTypeId'/>" value="<inp2:Field name='PaymentTypeId'/>"<inp2:m_if check="Checked" prefix="$prefix" field="$field"> checked</inp2:m_if>/>
 		</td>
 		<td>
-			<label for="<inp2:m_Param name="field"/>_<inp2:Field name="$field" />">
-				<inp2:Field name="Name" /><br />
+			<label for="<inp2:$prefix_InputName name='$field'/>_<inp2:Field name='PaymentTypeId'/>">
+				<inp2:Field name="Name" />
+
 				<inp2:m_if check="Field" name="Description">
-					<inp2:Field name="Description" />
+					<br /><inp2:Field name="Description" />
 				</inp2:m_if>
 			</label>
 		</td>
@@ -47,30 +17,34 @@
 
 <inp2:m_DefineElement name="inp_affiliate_payment_types" is_last="0" required="0">
 	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-		<inp2:m_inc param="tab_index" by="1"/>
-		<inp2:m_RenderElement name="inp_affiliate_caption" style="$style" title="$title" required="$required"/>
+		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
 		<td class="field-value">
+			<inp2:m_if check="{$prefix}_HasError" field="$field">
+				<span class="field-error"><inp2:{$prefix}_Error field="$field"/></span><br />
+			</inp2:m_if>
+
 			<table>
-				<inp2:u_ListAffiliatesPaymentTypes render_as="affiliate_payment_type_element" field="$field"/>
+				<inp2:apt_PrintList render_as="affiliate_payment_type_element" prefix="$prefix" field="$field"/>
 			</table>
 		</td>
 	</tr>
+	
 	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_affiliate_terms_checkbox" is_last="0">
+<inp2:m_DefineElement name="inp_affiliate_terms_checkbox" title="" is_last="0">
 	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
-		<td class="field-name" nowrap>
-			&nbsp;
-		</td>
-		<td class="field-value">
-			<inp2:m_if check="m_GetEquals" var="MustAgreeToTerms" value="1">
-				<span class="field-error"><inp2:m_Phrase label="lu_comm_MustAgreeAffiliateTermsError" /></span><br />
+		<td class="field-name" nowrap>&nbsp;</td>
+		<td>
+			<inp2:m_if check="{$prefix}_HasError" field="$field">
+				<span class="field-error"><inp2:{$prefix}_Error field="$field"/></span><br />
 			</inp2:m_if>
-			<input type="checkbox" name="AgreeToAffiliateTerms"/>
-			<inp2:m_Phrase label="lu_comm_IAgreeTo" />
+
+			<input tabindex="<inp2:m_get param='tab_index'/>" type="checkbox" id="<inp2:{$prefix}_InputName field='$field'/>" name="<inp2:{$prefix}_InputName field='$field'/>" <inp2:{$prefix}_Field field="$field" checked="checked" db="db"/> value="1"/>
+
+			<label for="<inp2:$prefix_InputName field='$field'/>"><inp2:m_Phrase label="lu_comm_IAgreeTo" /></label>
 			<a href="javascript:showAffiliateAgreement()"><inp2:m_Phrase label="lu_comm_AffiliateAgreement" /></a>
-			<inp2:m_Phrase label="lu_comm_TermsAndConditions" />
+			<label for="<inp2:$prefix_InputName field='$field'/>"><inp2:m_Phrase label="lu_comm_TermsAndConditions" /></label>
 		</td>
 	</tr>