Index: branches/5.2.x/core/admin_templates/incs/form_blocks.tpl
===================================================================
diff -u -N -r14585 -r14621
--- branches/5.2.x/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 14585)
+++ branches/5.2.x/core/admin_templates/incs/form_blocks.tpl	(.../form_blocks.tpl)	(revision 14621)
@@ -381,6 +381,35 @@
 	</inp2:m_RenderElement>
 </inp2:m_DefineElement>
 
+<inp2:m_DefineElement name="inp_edit_date_time_combined" class="">
+	<inp2:m_RenderElement design="form_row" pass_params="1">
+		<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' format='_input_'/>" tabindex="<inp2:m_get param='tab_index'/>" size="<inp2:{$prefix}_Format field='$field' input_format='1' edit_size='edit_size'/>" class="<inp2:m_param name='class'/>" datepickerIcon="<inp2:m_ProjectBase/>core/admin_templates/img/calendar_icon.gif"/>
+
+			<img src="img/calendar_icon.gif" id="cal_img_<inp2:{$prefix}_InputName field="{$field}"/>"
+					     style="cursor: pointer; margin-right: 5px"
+					     title="Date selector"
+					/>
+				<span class="small">(<inp2:{$prefix}_Format field="$field" input_format="1" human="true"/>)</span>
+
+			<script type="text/javascript">
+				Calendar.setup({
+			        inputField	:	"<inp2:{$prefix}_InputName field='{$field}'/>",
+			        ifFormat	:	Calendar.phpDateFormat("<inp2:{$prefix}_Format field='{$field}' 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"/>
+				});
+			</script>
+
+			<input type="hidden" name="<inp2:{$prefix}_InputName field='{$field}_combined'/>" value="1"/>
+		</td>
+	</inp2:m_RenderElement>
+</inp2:m_DefineElement>
+
 <inp2:m_DefineElement name="textarea_field_caption_element">
 	<inp2:m_RenderElement name="default_field_caption_element" pass_params="1"/>