Index: branches/unlabeled/unlabeled-1.7.2/kernel/admin_templates/incs/custom_blocks.tpl
===================================================================
diff -u -r5521 -r5727
--- branches/unlabeled/unlabeled-1.7.2/kernel/admin_templates/incs/custom_blocks.tpl	(.../custom_blocks.tpl)	(revision 5521)
+++ branches/unlabeled/unlabeled-1.7.2/kernel/admin_templates/incs/custom_blocks.tpl	(.../custom_blocks.tpl)	(revision 5727)
@@ -35,6 +35,32 @@
 			<inp2:PredefinedOptions field="$field" tabindex="$pass_tabindex" block="config_radio_item" selected="checked"/>
 </inp2:m_DefineElement>
 
+<inp2:m_DefineElement name="config_edit_date">
+	<inp2:m_if check="m_GetEquals" name="calendar_included" value="1" inverse="inverse">
+		<script type="text/javascript" src="incs/calendar.js"></script>
+		<inp2:m_set calendar_included="1"/>
+	</inp2:m_if>
+	
+	<input type="text" name="<inp2:CustomInputName append="_date"/>" id="<inp2:CustomInputName append="_date"/>" value="<inp2:CustomField append="_date" format="_regional_InputDateFormat"/>" size="<inp2:CustomFormat append="_date" input_format="1" edit_size="edit_size"/>" datepickerIcon="<inp2:m_ProjectBase/>admin/images/ddarrow.gif">&nbsp;<span class="small">(<inp2:CustomFormat append="_date" input_format="1" human="true"/>)</span>
+	<script type="text/javascript">
+		initCalendar("<inp2:CustomInputName append="_date"/>", "<inp2:CustomFormat append="_date" input_format="1"/>");
+	</script>
+	<input type="hidden" name="<inp2:CustomInputName append="_time"/>" value="">
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="config_edit_datetime">
+	<inp2:m_if check="m_GetEquals" name="calendar_included" value="1" inverse="inverse">
+		<script type="text/javascript" src="incs/calendar.js"></script>
+		<inp2:m_set calendar_included="1"/>
+	</inp2:m_if>
+	
+	<input type="text" name="<inp2:CustomInputName append="_date"/>" id="<inp2:CustomInputName append="_date"/>" value="<inp2:CustomField append="_date" format="_regional_InputDateFormat"/>" size="<inp2:CustomFormat append="_date" input_format="1" edit_size="edit_size"/>" datepickerIcon="<inp2:m_ProjectBase/>admin/images/ddarrow.gif">&nbsp;<span class="small">(<inp2:CustomFormat append="_date" input_format="1" human="true"/>)</span>
+	<script type="text/javascript">
+		initCalendar("<inp2:CustomInputName append="_date"/>", "<inp2:CustomFormat append="_date" input_format="1"/>");
+	</script>
+	&nbsp;<input type="text" name="<inp2:CustomInputName append="_time"/>" id="<inp2:CustomInputName append="_time"/>" value="<inp2:CustomField append="_time" format="_regional_InputTimeFormat"/>" size="<inp2:CustomFormat append="_time" input_format="1" edit_size="edit_size"/>"><span class="small"> (<inp2:CustomFormat append="_time" input_format="1" human="true"/>)</span>
+</inp2:m_DefineElement>
+
 <inp2:m_DefineElement name="cv_row_block">
 	<inp2:m_if check="m_ParamEquals" name="show_heading" value="1">
 		<tr class="subsectiontitle">
@@ -48,7 +74,7 @@
 		<td valign="top" class="text">
 			<inp2:ConfigFormElement field="Value" blocks_prefix="config_edit_" element_type_field="ElementType" value_list_field="ValueList" />
 		</td>
-		<td class="error">&nbsp;</td>
+		<td class="error"><inp2:CustomError/>&nbsp;</td>
 	</tr>
 </inp2:m_DefineElement>