Index: branches/5.2.x/core/admin_templates/agents/agent_edit.tpl
===================================================================
diff -u -N -r14670 -r14879
--- branches/5.2.x/core/admin_templates/agents/agent_edit.tpl	(.../agent_edit.tpl)	(revision 14670)
+++ branches/5.2.x/core/admin_templates/agents/agent_edit.tpl	(.../agent_edit.tpl)	(revision 14879)
@@ -1,7 +1,7 @@
 <inp2:adm_SetPopupSize width="750" height="600"/>
 <inp2:m_include t="incs/header"/>
 
-<inp2:m_RenderElement name="combined_header" section="in-portal:agents" prefix="agent" title_preset="agent_edit"/>
+<inp2:m_RenderElement name="combined_header" section="in-portal:scheduled_tasks" prefix="scheduled-task" title_preset="scheduled_task_edit"/>
 
 <!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
@@ -11,43 +11,43 @@
   		<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('agent', '<inp2:agent_SaveEvent/>');
+							submit_event('scheduled-task', '<inp2:scheduled-task_SaveEvent/>');
 						}
 					) );
 				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
-							cancel_edit('agent', 'OnCancelEdit','<inp2:agent_SaveEvent/>','<inp2:m_Phrase label="la_FormCancelConfirmation" escape="1"/>');
+							cancel_edit('scheduled-task', 'OnCancelEdit','<inp2:scheduled-task_SaveEvent/>','<inp2:m_Phrase label="la_FormCancelConfirmation" escape="1"/>');
 						}
 				 ) );
 
 			 a_toolbar.AddButton( new ToolBarButton('reset_edit', '<inp2:m_phrase label="la_ToolTip_Reset" escape="1"/>', function() {
-						reset_form('agent', 'OnReset', '<inp2:m_Phrase label="la_FormResetConfirmation" escape="1"/>');
+						reset_form('scheduled-task', 'OnReset', '<inp2:m_Phrase label="la_FormResetConfirmation" escape="1"/>');
 					}
 			 	) );
 
 				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
 
 				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
-							go_to_id('agent', '<inp2:agent_PrevId/>');
+							go_to_id('scheduled-task', '<inp2:scheduled-task_PrevId/>');
 						}
 				 ) );
 				a_toolbar.AddButton( new ToolBarButton('next', '<inp2:m_phrase label="la_ToolTip_Next" escape="1"/>', function() {
-							go_to_id('agent', '<inp2:agent_NextId/>');
+							go_to_id('scheduled-task', '<inp2:scheduled-task_NextId/>');
 						}
 				 ) );
 
 
 
 				a_toolbar.Render();
 
-				<inp2:m_if check="agent_IsSingle" >
+				<inp2:m_if check="scheduled-task_IsSingle">
 					a_toolbar.HideButton('prev');
 					a_toolbar.HideButton('next');
 					a_toolbar.HideButton('sep1');
 				<inp2:m_else/>
-					<inp2:m_if check="agent_IsLast" >
+					<inp2:m_if check="scheduled-task_IsLast">
 						a_toolbar.DisableButton('next');
 					</inp2:m_if>
-					<inp2:m_if check="agent_IsFirst" >
+					<inp2:m_if check="scheduled-task_IsFirst">
 						a_toolbar.DisableButton('prev');
 					</inp2:m_if>
 				</inp2:m_if>
@@ -57,38 +57,38 @@
 </tbody>
 </table>
 
-<inp2:agent_SaveWarning name="grid_save_warning"/>
-<inp2:agent_ErrorWarning name="form_error_warning"/>
+<inp2:scheduled-task_SaveWarning name="grid_save_warning"/>
+<inp2:scheduled-task_ErrorWarning name="form_error_warning"/>
 
 <div id="scroll_container">
 	<table class="edit-form">
-		<inp2:m_RenderElement name="inp_id_label" prefix="agent" field="AgentId" title="la_fld_Id"/>
+		<inp2:m_RenderElement name="inp_id_label" prefix="scheduled-task" field="ScheduledTaskId" title="la_fld_Id"/>
 
-		<inp2:m_if check="agent_Field" name="AgentType" equals_to="1" db="db">
-			<inp2:m_RenderElement name="inp_edit_box" prefix="agent" field="AgentName" title="la_fld_Name"/>
-			<inp2:m_RenderElement name="inp_label" prefix="agent" field="AgentType" title="la_fld_Type" has_empty="1"/>
-			<inp2:m_RenderElement name="inp_edit_radio" prefix="agent" field="Status" has_empty="1"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="agent" field="Event"/>
+		<inp2:m_if check="scheduled-task_Field" name="Type" equals_to="1" db="db">
+			<inp2:m_RenderElement name="inp_edit_box" prefix="scheduled-task" field="Name"/>
+			<inp2:m_RenderElement name="inp_label" prefix="scheduled-task" field="Type" has_empty="1"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="scheduled-task" field="Status" has_empty="1"/>
+			<inp2:m_RenderElement name="inp_edit_box" prefix="scheduled-task" field="Event"/>
 		<inp2:m_else/>
-			<inp2:m_RenderElement name="inp_label" prefix="agent" field="AgentName" title="la_fld_Name"/>
-			<inp2:m_RenderElement name="inp_label" prefix="agent" field="AgentType" title="la_fld_Type" has_empty="1"/>
-			<inp2:m_RenderElement name="inp_edit_radio" prefix="agent" field="Status" has_empty="1"/>
-			<inp2:m_RenderElement name="inp_label" prefix="agent" field="Event"/>
+			<inp2:m_RenderElement name="inp_label" prefix="scheduled-task" field="Name"/>
+			<inp2:m_RenderElement name="inp_label" prefix="scheduled-task" field="Type" has_empty="1"/>
+			<inp2:m_RenderElement name="inp_edit_radio" prefix="scheduled-task" field="Status" has_empty="1"/>
+			<inp2:m_RenderElement name="inp_label" prefix="scheduled-task" field="Event"/>
 		</inp2:m_if>
 
-		<inp2:m_RenderElement name="inp_edit_box" prefix="agent" field="RunInterval"/>
-		<inp2:m_RenderElement name="inp_edit_options" prefix="agent" field="RunMode" has_empty="1"/>
-		<inp2:m_RenderElement name="inp_label" prefix="agent" field="LastRunOn"/>
-		<inp2:m_RenderElement name="inp_label" prefix="agent" field="LastRunStatus"/>
-		<inp2:m_RenderElement name="inp_edit_date_time" prefix="agent" field="NextRunOn"/>
-		<inp2:m_RenderElement name="inp_label" prefix="agent" field="RunTime"/>
-		<inp2:m_RenderElement name="inp_edit_box" prefix="agent" field="Timeout" style="width: 50px"/>
+		<inp2:m_RenderElement name="inp_edit_box" prefix="scheduled-task" field="RunInterval"/>
+		<inp2:m_RenderElement name="inp_edit_options" prefix="scheduled-task" field="RunMode" has_empty="1"/>
+		<inp2:m_RenderElement name="inp_label" prefix="scheduled-task" field="LastRunOn"/>
+		<inp2:m_RenderElement name="inp_label" prefix="scheduled-task" field="LastRunStatus"/>
+		<inp2:m_RenderElement name="inp_edit_date_time" prefix="scheduled-task" field="NextRunOn"/>
+		<inp2:m_RenderElement name="inp_label" prefix="scheduled-task" field="RunTime"/>
+		<inp2:m_RenderElement name="inp_edit_box" prefix="scheduled-task" field="Timeout" style="width: 50px"/>
 
-		<inp2:m_if check="agent_Field" name="LastTimeoutOn" db="db">
-			<inp2:m_RenderElement name="inp_label" prefix="agent" field="LastTimeoutOn"/>
+		<inp2:m_if check="scheduled-task_Field" name="LastTimeoutOn" db="db">
+			<inp2:m_RenderElement name="inp_label" prefix="scheduled-task" field="LastTimeoutOn"/>
 		</inp2:m_if>
 
-		<inp2:m_RenderElement name="inp_edit_checkboxes" prefix="agent" field="SiteDomainLimitation"/>
+		<inp2:m_RenderElement name="inp_edit_checkboxes" prefix="scheduled-task" field="SiteDomainLimitation"/>
 
 		<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>