Index: branches/unlabeled/unlabeled-1.5.2/core/admin_templates/incs/custom_blocks.tpl
===================================================================
diff -u -r5725 -r6219
--- branches/unlabeled/unlabeled-1.5.2/core/admin_templates/incs/custom_blocks.tpl	(.../custom_blocks.tpl)	(revision 5725)
+++ branches/unlabeled/unlabeled-1.5.2/core/admin_templates/incs/custom_blocks.tpl	(.../custom_blocks.tpl)	(revision 6219)
@@ -9,18 +9,18 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="config_edit_option">
-		<option value="<inp2:m_param name="key"/>"<inp2:m_param name="selected"/>><inp2:m_param name="option"/></option>	
+		<option value="<inp2:m_param name="key"/>"<inp2:m_param name="selected"/>><inp2:m_param name="option"/></option>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="config_edit_select">
 	<select name="<inp2:CustomInputName/>">
-		<inp2:PredefinedOptions field="$field" tabindex="$pass_tabindex" block="config_edit_option" selected="selected"/>
+		<inp2:PredefinedOptions field="$field" block="config_edit_option" selected="selected"/>
 	</select>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="config_edit_checkbox">
 	<input type="hidden" id="<inp2:CustomInputName/>" name="<inp2:CustomInputName/>" value="<inp2:Field field="$field" db="db"/>">
-	<input tabindex="<inp2:m_get param="tab_index"/>" type="checkbox" id="_cb_<inp2:m_param name="field"/>" name="_cb_<inp2:m_param name="field"/>" <inp2:Field field="$field" checked="checked" db="db"/> class="<inp2:m_param name="field_class"/>" onclick="update_checkbox(this, document.getElementById('<inp2:CustomInputName/>'))">
+	<input tabindex="<inp2:m_get param="tab_index"/>" type="checkbox" id="_cb_<inp2:m_param name="field"/>" name="_cb_<inp2:m_param name="field"/>" <inp2:Field field="$field" checked="checked" db="db"/> onclick="update_checkbox(this, document.getElementById('<inp2:CustomInputName/>'))">
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="config_edit_textarea">
@@ -32,23 +32,55 @@
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="config_edit_radio">
-			<inp2:PredefinedOptions field="$field" tabindex="$pass_tabindex" block="config_radio_item" selected="checked"/>
+			<inp2:PredefinedOptions field="$field" 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">
-			<td colspan="5">
+			<td colspan="3">
 				<inp2:Field name="Heading" as_label="1"/>
 			</td>
+			<inp2:m_if check="{$SourcePrefix}_DisplayOriginal" pass_params="1">
+				<td><inp2:m_phrase name="$original_title"/></td>
+			</inp2:m_if>
 		</tr>
 	</inp2:m_if>
 	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>" >
 		<inp2:m_ParseBlock name="grid_data_label_ml_td" grid="$grid" SourcePrefix="$SourcePrefix" value_field="$value_field" ElementTypeField="ElementType" field="Prompt" PrefixSpecial="$PrefixSpecial"/>
 		<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>
+		<inp2:m_if check="{$SourcePrefix}_DisplayOriginal" pass_params="1">
+			<inp2:m_RenderElement prefix="$SourcePrefix" field="$field" name="inp_original_label"/>
+		</inp2:m_if>
 	</tr>
 </inp2:m_DefineElement>
 
@@ -58,6 +90,11 @@
 	</td>
 </inp2:m_DefineElement>
 
+
+<inp2:m_block name="grid_original_td" />
+	<td valign="top" class="text"><inp2:Field field="$field" grid="$grid"/></td>
+<inp2:m_blockend />
+
 <!--<inp2:m_DefineElement name="edit_custom_td">
 	<td valign="top" class="text">
 		<input type="hidden" name="<inp2:InputName field="ResourceId"/>" id="<inp2:InputName field="ResourceId"/>" value="<inp2:Field field="ResourceId" grid="$grid"/>">