Index: branches/5.3.x/core/admin_templates/promo_blocks/promo_block_edit.tpl
===================================================================
diff -u -N -r15690 -r16531
--- branches/5.3.x/core/admin_templates/promo_blocks/promo_block_edit.tpl	(.../promo_block_edit.tpl)	(revision 15690)
+++ branches/5.3.x/core/admin_templates/promo_blocks/promo_block_edit.tpl	(.../promo_block_edit.tpl)	(revision 16531)
@@ -66,12 +66,6 @@
 	</label>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="date_field_caption_element">
-	<label for="<inp2:m_param name='NamePrefix'/><inp2:{$prefix}_InputName field='$field'/>">
-		<span class="<inp2:m_if check='{$prefix}_HasError' field='$field'>error-cell</inp2:m_if>"><inp2:m_if check="m_Param" name="title"><inp2:m_phrase label="$title"/></inp2:m_else/><inp2:m_Param name="title_text"/></inp2:m_if> <span class="small">(<inp2:promo-block_Format field="ScheduleFromDate_date" input_format="1" human="true"/>)</span></span></span><inp2:m_if check="{$prefix}_IsRequired" field="$field"><span class="field-required">&nbsp;*</span></inp2:m_if>:<inp2:m_if check="m_Param" name="hint_label"><span>&nbsp;<img src="<inp2:m_TemplatesBase/>/img/hint_icon.png" width="12" height="13" title="<inp2:m_Phrase label='$hint_label' html_escape='1'/>" alt="<inp2:m_Phrase label='$hint_label' html_escape='1'/>"/></inp2:m_if>
-	</label>
-</inp2:m_DefineElement>
-
 <inp2:promo-block_SaveWarning name="grid_save_warning"/>
 <inp2:promo-block_ErrorWarning name="form_error_warning"/>
 
@@ -98,61 +92,8 @@
 		<inp2:m_RenderElement name="inp_edit_options" prefix="promo-block" field="CategoryId" title="la_fld_Category" style="width: 400px;" has_empty="1"/>
 		<inp2:m_RenderElement name="inp_edit_box" prefix="promo-block" field="ExternalLink"/>
 		<inp2:m_RenderElement name="inp_edit_checkbox" prefix="promo-block" field="OpenInNewWindow"/>
-
-		<inp2:m_RenderElement design="form_row" caption_render_as="date_field_caption_element" prefix="promo-block" field="ScheduleFromDate" title="la_fld_ScheduleDate" to_field="ScheduleToDate">
-			<td class="control-cell">
-				<inp2:m_Phrase label="la_From"/>
-				<input type="text" name="<inp2:{$prefix}_InputName field="{$field}_date"/>" id="<inp2:{$prefix}_InputName field="{$field}_date"/>" value="<inp2:{$prefix}_Field field="{$field}_date" format="_regional_InputDateFormat"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:{$prefix}_Format field="{$field}_date" input_format="1" edit_size="edit_size"/>" datepickerIcon="<inp2:m_ProjectBase/>core/admin_templates/img/calendar_icon.gif">&nbsp;
-				<img src="img/calendar_icon.gif" id="cal_img_<inp2:{$prefix}_InputName field="{$field}"/>"
-						     style="cursor: pointer; margin-right: 5px"
-						     title="Date selector"
-						/>
-
-				<script type="text/javascript">
-					Calendar.setup({
-				        inputField		:	"<inp2:{$prefix}_InputName field="{$field}_date"/>",
-				        ifFormat		:	Calendar.phpDateFormat("<inp2:{$prefix}_Format field="{$field}_date" input_format="1"/>"),
-				        button			:	"cal_img_<inp2:{$prefix}_InputName field="{$field}"/>",
-				        align			:	"br",
-				        singleClick		:	true,
-				        showsTime		:	true,
-				        weekNumbers		:	false,
-				        firstDay		:	<inp2:m_GetConfig var="FirstDayOfWeek"/>,
-				        onUpdate	:	function(cal) {
-				        	runOnChange('<inp2:$prefix_InputName field="{$field}_date"/>');
-				       	}
-					});
-				</script>
-				<input type="hidden" name="<inp2:{$prefix}_InputName field="{$field}_time"/>" id="<inp2:{$prefix}_InputName field="{$field}_time" input_format="1"/>" value="">
-
-
-				<inp2:m_Phrase label="la_To"/>
-				<input type="text" name="<inp2:{$prefix}_InputName field="{$to_field}_date"/>" id="<inp2:{$prefix}_InputName field="{$to_field}_date"/>" value="<inp2:{$prefix}_Field field="{$to_field}_date" format="_regional_InputDateFormat"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:{$prefix}_Format field="{$to_field}_date" input_format="1" edit_size="edit_size"/>" datepickerIcon="<inp2:m_ProjectBase/>core/admin_templates/img/calendar_icon.gif">&nbsp;
-				<img src="img/calendar_icon.gif" id="cal_img_<inp2:{$prefix}_InputName field="{$to_field}"/>"
-						     style="cursor: pointer; margin-right: 5px"
-						     title="Date selector"
-						/>
-
-				<script type="text/javascript">
-					Calendar.setup({
-				        inputField		:	"<inp2:{$prefix}_InputName field="{$to_field}_date"/>",
-				        ifFormat		:	Calendar.phpDateFormat("<inp2:{$prefix}_Format field="{$to_field}_date" input_format="1"/>"),
-				        button			:	"cal_img_<inp2:{$prefix}_InputName field="{$to_field}"/>",
-				        align			:	"br",
-				        singleClick		:	true,
-				        showsTime		:	true,
-				        weekNumbers		:	false,
-				        firstDay		:	<inp2:m_GetConfig var="FirstDayOfWeek"/>,
-				        onUpdate	:	function(cal) {
-				        	runOnChange('<inp2:$prefix_InputName field="{$to_field}_date"/>');
-				       	}
-					});
-				</script>
-				<input type="hidden" name="<inp2:{$prefix}_InputName field="{$to_field}_time"/>" id="<inp2:{$prefix}_InputName field="{$to_field}_time" input_format="1"/>" value="">
-
-			</td>
-		</inp2:m_RenderElement>
-
+		<inp2:m_RenderElement name="inp_edit_date_time" prefix="promo-block" field="ScheduleFromDate"/>
+		<inp2:m_RenderElement name="inp_edit_date_time" prefix="promo-block" field="ScheduleToDate"/>
 		<inp2:m_RenderElement name="inp_edit_checkbox" prefix="promo-block" field="Sticky"/>
 
 		<inp2:m_ifnot check="promo-block_IsNewItem">