Index: branches/5.2.x/admin_templates/discounts/gift_certificate_edit.tpl
===================================================================
diff -u -N -r13845 -r14089
--- branches/5.2.x/admin_templates/discounts/gift_certificate_edit.tpl	(.../gift_certificate_edit.tpl)	(revision 13845)
+++ branches/5.2.x/admin_templates/discounts/gift_certificate_edit.tpl	(.../gift_certificate_edit.tpl)	(revision 14089)
@@ -77,51 +77,38 @@
 }
 </script>
 
-<inp2:m_DefineElement name="inp_edit_box_generate" class="" onblur="" maxlength="" is_last="0">
-	<inp2:m_if check="{$prefix}_FieldVisible" field="$field">
-		<tr class="<inp2:m_odd_even odd='edit-form-odd' even='edit-form-even'/>">
-			<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title" is_last="$is_last"/>
-			<td class="control-cell">
-				<input type="text" name="<inp2:{$prefix}_InputName field='$field'/>" id="<inp2:{$prefix}_InputName field='$field'/>" value="<inp2:{$prefix}_Field field='$field'/>" tabindex="<inp2:m_get param='tab_index'/>" size="<inp2:m_param name='size'/>">
-				<input type="button" class="button" onClick="generateRandomCode('<inp2:{$prefix}_InputName field='$field'/>')" value="<inp2:m_Phrase label='la_GenerateCode' />" />
-			</td>
-			<inp2:m_RenderElement name="inp_edit_error" pass_params="1"/>
-		</tr>
-	</inp2:m_if>
-</inp2:m_DefineElement>
-
 <inp2:gc_SaveWarning name="grid_save_warning"/>
 <inp2:gc_ErrorWarning name="form_error_warning"/>
 
 <div id="scroll_container">
 	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" title="!la_section_General!"/>
+		<inp2:m_RenderElement name="subsection" title="la_section_General"/>
 			<inp2:m_RenderElement name="inp_id_label" prefix="gc" field="GiftCertificateId" title="la_fld_Id"/>
 
 			<inp2:m_if check="gc_HasOrder">
-				<inp2:m_RenderElement name="inp_label" prefix="gc" field="Purchaser" title="!la_fld_SenderName!" size="35"/>
-				<inp2:m_RenderElement name="inp_label" prefix="gc" field="Recipient" title="!la_fld_RecipientName!" size="35"/>
-				<inp2:m_RenderElement name="inp_label" prefix="gc" field="Message" title="!la_fld_MessageText!" cols="35" rows="7"/>
-				<inp2:m_RenderElement name="inp_label" prefix="gc" field="Amount" title="!la_fld_Amount!" size="7"/>
+				<inp2:m_RenderElement name="inp_label" prefix="gc" field="Purchaser" title="la_fld_SenderName" size="35"/>
+				<inp2:m_RenderElement name="inp_label" prefix="gc" field="Recipient" title="la_fld_RecipientName" size="35"/>
+				<inp2:m_RenderElement name="inp_label" prefix="gc" field="Message" title="la_fld_MessageText" cols="35" rows="7"/>
+				<inp2:m_RenderElement name="inp_label" prefix="gc" field="Amount" title="la_fld_Amount" size="7"/>
 
-				<inp2:m_RenderElement name="inp_label" prefix="gc" field="SendVia" title="!la_fld_DeliveryMethod!"/>
+				<inp2:m_RenderElement name="inp_label" prefix="gc" field="SendVia" title="la_fld_DeliveryMethod"/>
 			<inp2:m_else/>
-				<inp2:m_RenderElement name="inp_edit_box" prefix="gc" field="Purchaser" title="!la_fld_SenderName!" size="35"/>
-				<inp2:m_RenderElement name="inp_edit_box" prefix="gc" field="Recipient" title="!la_fld_RecipientName!" size="35"/>
-				<inp2:m_RenderElement name="inp_edit_textarea" prefix="gc" field="Message" title="!la_fld_MessageText!" cols="35" rows="7"/>
-				<inp2:m_RenderElement name="inp_edit_box" prefix="gc" field="Amount" title="!la_fld_Amount!" size="7"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="gc" field="Purchaser" title="la_fld_SenderName" size="35"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="gc" field="Recipient" title="la_fld_RecipientName" size="35"/>
+				<inp2:m_RenderElement name="inp_edit_textarea" prefix="gc" field="Message" title="la_fld_MessageText" cols="35" rows="7"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="gc" field="Amount" title="la_fld_Amount" size="7"/>
 
-				<inp2:m_RenderElement name="inp_edit_radio" prefix="gc" field="SendVia" title="!la_fld_DeliveryMethod!"/>
+				<inp2:m_RenderElement name="inp_edit_radio" prefix="gc" field="SendVia" title="la_fld_DeliveryMethod"/>
 			</inp2:m_if>
 
-		<inp2:m_RenderElement name="subsection" title="!la_section_EmailDelivery!"/>
+		<inp2:m_RenderElement name="subsection" title="la_section_EmailDelivery"/>
 			<inp2:m_if check="gc_HasOrder">
-				<inp2:m_RenderElement name="inp_label" prefix="gc" field="RecipientEmail" title="!la_fld_Email!" size="35"/>
+				<inp2:m_RenderElement name="inp_label" prefix="gc" field="RecipientEmail" title="la_fld_Email" size="35"/>
 			<inp2:m_else/>
-				<inp2:m_RenderElement name="inp_edit_box" prefix="gc" field="RecipientEmail" title="!la_fld_Email!" size="35"/>
+				<inp2:m_RenderElement name="inp_edit_box" prefix="gc" field="RecipientEmail" title="la_fld_Email" size="35"/>
 			</inp2:m_if>
 
-		<inp2:m_RenderElement name="subsection" title="!la_section_PostalDelivery!"/>
+		<inp2:m_RenderElement name="subsection" title="la_section_PostalDelivery"/>
 			<inp2:m_if check="gc_HasOrder">
 				<inp2:m_RenderElement name="inp_label" prefix="gc" field="RecipientFirstname" title="la_fld_FirstName" size="35"/>
 				<inp2:m_RenderElement name="inp_label" prefix="gc" field="RecipientLastname" title="la_fld_LastName" size="35"/>
@@ -145,24 +132,30 @@
 			</inp2:m_if>
 
 		<inp2:m_RenderElement name="subsection" title="la_section_Properties"/>
-			<inp2:m_RenderElement name="inp_edit_radio" prefix="gc" field="Status" title="!la_fld_Status!"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="gc" field="Status" title="la_fld_Status"/>
 
 			<inp2:m_if check="gc_HasOrder">
 				<inp2:m_RenderElement name="inp_label" prefix="gc" field="AddDate" title="la_fld_CreatedOn"/>
-				<inp2:m_RenderElement name="inp_label" prefix="gc" field="Code" title="!la_fld_Code!" size="35"/>
+				<inp2:m_RenderElement name="inp_label" prefix="gc" field="Code" title="la_fld_Code" size="35"/>
 			<inp2:m_else/>
 				<inp2:m_RenderElement name="inp_edit_date_time" prefix="gc" field="AddDate" title="la_fld_CreatedOn"/>
-				<inp2:m_RenderElement name="inp_edit_box_generate" prefix="gc" field="Code" title="!la_fld_Code!" size="35"/>
+
+				<inp2:m_RenderElement design="form_row" prefix="gc" field="Code" title="la_fld_Code" size="35">
+					<td class="control-cell">
+						<input type="text" name="<inp2:{$prefix}_InputName field='$field'/>" id="<inp2:{$prefix}_InputName field='$field'/>" value="<inp2:{$prefix}_Field field='$field'/>" tabindex="<inp2:m_get param='tab_index'/>" size="<inp2:m_param name='size'/>">
+						<input type="button" class="button" onClick="generateRandomCode('<inp2:{$prefix}_InputName field='$field'/>')" value="<inp2:m_Phrase label='la_GenerateCode' />" />
+					</td>
+				</inp2:m_RenderElement>
 			</inp2:m_if>
 
 			<inp2:m_if check="gc_IsNewItem" inverse="inverse">
-				<inp2:m_RenderElement name="inp_label" prefix="gc" field="Debit" title="!la_fld_RemainingAmount!" size="7"/>
+				<inp2:m_RenderElement name="inp_label" prefix="gc" field="Debit" title="la_fld_RemainingAmount" size="7"/>
 			</inp2:m_if>
 
 			<inp2:m_if check="gc_HasOrder">
-				<inp2:m_RenderElement name="inp_label" prefix="gc" field="Expiration" title="!la_fld_Expiration!" size="10"/>
+				<inp2:m_RenderElement name="inp_label" prefix="gc" field="Expiration" title="la_fld_Expiration" size="10"/>
 			<inp2:m_else/>
-				<inp2:m_RenderElement name="inp_edit_date_time" prefix="gc" field="Expiration" title="!la_fld_Expiration!" size="10"/>
+				<inp2:m_RenderElement name="inp_edit_date_time" prefix="gc" field="Expiration" title="la_fld_Expiration" size="10"/>
 			</inp2:m_if>
 		<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>