Index: trunk/core/admin_templates/regional/email_messages_edit.tpl
===================================================================
diff -u -N -r8397 -r8863
--- trunk/core/admin_templates/regional/email_messages_edit.tpl	(.../email_messages_edit.tpl)	(revision 8397)
+++ trunk/core/admin_templates/regional/email_messages_edit.tpl	(.../email_messages_edit.tpl)	(revision 8863)
@@ -1,9 +1,9 @@
 <inp2:adm_SetPopupSize width="827" height="400"/>
 <inp2:m_RequireLogin permissions="in-portal:configure_lang.view" system="1"/>
 <inp2:m_include t="incs/header"/>
-<inp2:m_ParseBlock name="section_header" icon="icon46_conf_regional" title="!la_title_Regional!"/>
+<inp2:m_RenderElement name="section_header" icon="icon46_conf_regional" title="!la_title_Regional!"/>
 
-<inp2:m_ParseBlock name="blue_bar" prefix="lang" title_preset="email_messages_edit" module="in-portal" icon="icon46_conf_regional"/>
+<inp2:m_RenderElement name="blue_bar" prefix="lang" title_preset="email_messages_edit" module="in-portal" icon="icon46_conf_regional"/>
 
 <!-- ToolBar --->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
@@ -13,7 +13,7 @@
   		<script type="text/javascript">
 				a_toolbar = new ToolBar();
 				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
-							submit_event('emailmessages','<inp2:m_if prefix="emailmessages" function="PropertyEquals" property="ID" value="0"/>OnCreate<inp2:m_else/>OnUpdate<inp2:m_endif/>');
+							submit_event('emailmessages','<inp2:m_if check="emailmessages_PropertyEquals" property="ID" value="0" >OnCreate<inp2:m_else/>OnUpdate</inp2:m_if>');
 						}
 					) );
 
@@ -32,15 +32,15 @@
 
 <inp2:lang_SaveWarning name="grid_save_warning"/>
 <table width="100%" border="0" cellspacing="0" cellpadding="4" class="bordered">
-	<inp2:m_ParseBlock name="subsection" title="!la_section_General!"/>
-		<inp2:m_ParseBlock name="inp_edit_hidden" prefix="emailmessages" field="LanguageId"/>
-		<inp2:m_ParseBlock name="inp_edit_hidden" prefix="emailmessages" field="EventId"/>
-		<!-- <inp2:m_ParseBlock name="inp_label" prefix="emailmessages" field="Type" title="!la_fld_EventType!"/> -->
-		<inp2:m_ParseBlock name="inp_edit_box" prefix="emailmessages" field="Subject" title="!la_fld_Subject!" size="60"/>
-		<inp2:m_ParseBlock name="inp_edit_radio" prefix="emailmessages" field="MessageType" title="!la_fld_MessageType!"/>
-		<inp2:m_ParseBlock name="inp_edit_textarea" prefix="emailmessages" field="Headers" title="!la_fld_ExtraHeaders!" rows="5" cols="60"/>
-	<inp2:m_ParseBlock name="subsection" title="!la_section_Message!"/>
-		<inp2:m_ParseBlock name="inp_edit_textarea" prefix="emailmessages" field="Body" title="!la_fld_MessageBody!" rows="20" cols="85"/>
+	<inp2:m_RenderElement name="subsection" title="!la_section_General!"/>
+		<inp2:m_RenderElement name="inp_edit_hidden" prefix="emailmessages" field="LanguageId"/>
+		<inp2:m_RenderElement name="inp_edit_hidden" prefix="emailmessages" field="EventId"/>
+		<!-- <inp2:m_RenderElement name="inp_label" prefix="emailmessages" field="Type" title="!la_fld_EventType!"/> -->
+		<inp2:m_RenderElement name="inp_edit_box" prefix="emailmessages" field="Subject" title="!la_fld_Subject!" size="60"/>
+		<inp2:m_RenderElement name="inp_edit_radio" prefix="emailmessages" field="MessageType" title="!la_fld_MessageType!"/>
+		<inp2:m_RenderElement name="inp_edit_textarea" prefix="emailmessages" field="Headers" title="!la_fld_ExtraHeaders!" rows="5" cols="60"/>
+	<inp2:m_RenderElement name="subsection" title="!la_section_Message!"/>
+		<inp2:m_RenderElement name="inp_edit_textarea" prefix="emailmessages" field="Body" title="!la_fld_MessageBody!" rows="20" cols="85"/>
 </table>
 
 <inp2:m_include t="incs/footer"/>