Index: branches/RC/core/admin_templates/incs/custom_blocks.tpl
===================================================================
diff -u -N -r10537 -r11368
--- branches/RC/core/admin_templates/incs/custom_blocks.tpl	(.../custom_blocks.tpl)	(revision 10537)
+++ branches/RC/core/admin_templates/incs/custom_blocks.tpl	(.../custom_blocks.tpl)	(revision 11368)
@@ -1,5 +1,5 @@
 <inp2:m_DefineElement name="config_edit_text">
-	<input type="text" name="<inp2:CustomInputName/>" value="<inp2:Field field="$field"/>" <inp2:m_param name="field_params" />/>
+	<input type="text" name="<inp2:CustomInputName/>" id="<inp2:CustomInputName/>" value="<inp2:Field field="$field"/>" <inp2:m_param name="field_params" />/>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="config_edit_password">
@@ -43,68 +43,104 @@
 </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="js/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>
+	<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;
+	<img src="img/calendar_icon.gif" id="cal_img_<inp2:CustomInputName/>"
+					     style="cursor: pointer; margin-right: 5px"
+					     title="Date selector"
+					/>
+	<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"/>");
+		Calendar.setup({
+	        inputField		:	"<inp2:CustomInputName append="_date"/>",
+	        ifFormat		:	Calendar.phpDateFormat("<inp2:CustomFormat append="_date" input_format="1"/>"),
+	        button			:	"cal_img_<inp2:CustomInputName/>",
+	        align			:	"br",
+	        singleClick		:	true,
+	        showsTime		:	true,
+	        weekNumbers		:	false,
+	        firstDay		:	<inp2:m_GetConfig var="FirstDayOfWeek"/>,
+	        onUpdate	:	function(cal) {
+	        	runOnChange('<inp2:CustomInputName append="_date"/>');
+	       	}
+		});
 	</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="js/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>
+	<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;
+	<img src="img/calendar_icon.gif" id="cal_img_<inp2:CustomInputName/>"
+					     style="cursor: pointer; margin-right: 5px"
+					     title="Date selector"
+					/>
+	<span class="small">(<inp2:CustomFormat append="_date" input_format="1" human="true"/>)</span>
+	<input type="hidden" id="full_date_<inp2:CustomInputName/>" value="<inp2:CustomField format=""/>" />
 	<script type="text/javascript">
-		initCalendar("<inp2:CustomInputName append="_date"/>", "<inp2:CustomFormat append="_date" input_format="1"/>");
+		Calendar.setup({
+	        inputField	:	"full_date_<inp2:CustomInputName/>",
+	        ifFormat	:	Calendar.phpDateFormat("<inp2:CustomFormat input_format="1"/>"),
+	        button		:	"cal_img_<inp2:CustomInputName/>",
+	        align		:	"br",
+	        singleClick	:	true,
+	        showsTime	:	true,
+	        weekNumbers	:	false,
+	        firstDay	:	<inp2:m_GetConfig var="FirstDayOfWeek"/>,
+	        onUpdate	:	function(cal) {
+	        	document.getElementById('<inp2:CustomInputName append="_date"/>').value = cal.date.print( Calendar.phpDateFormat("<inp2:CustomFormat append="_date" input_format="1"/>") );
+	        	document.getElementById('<inp2:CustomInputName append="_time"/>').value = cal.date.print( Calendar.phpDateFormat("<inp2:CustomFormat append="_time" 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="3">
+			<td colspan="4">
 				<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_RenderElement name="grid_data_label_ml_td" grid="$grid" SourcePrefix="$SourcePrefix" virtual_field="$virtual_field" value_field="$value_field" ElementTypeField="ElementType" field="Prompt" PrefixSpecial="$PrefixSpecial"/>
-		<td valign="top" class="text">
+
+	<tr class="<inp2:m_odd_even odd="edit-form-odd" even="edit-form-even"/>">
+		<inp2:m_inc param="tab_index" by="1"/>
+		<td class="label-cell" onmouseover="show_form_error('<inp2:m_Param name="SourcePrefix" js_escape="1"/>', '<inp2:m_Param name="virtual_field" js_escape="1"/>')" onmouseout="hide_form_error('<inp2:m_Param name="SourcePrefix" js_escape="1"/>')">
+			<inp2:m_RenderElement name="grid_data_label_ml_td" grid="$grid" SourcePrefix="$SourcePrefix" virtual_field="$virtual_field" value_field="$value_field" ElementTypeField="ElementType" field="Prompt" PrefixSpecial="$PrefixSpecial"/>
+		</td>
+		<td class="control-mid">&nbsp;</td>
+		<script type="text/javascript">
+			if (typeof(fields['<inp2:m_Param name="SourcePrefix" js_escape="1"/>']) == 'undefined') {
+				fields['<inp2:m_Param name="SourcePrefix" js_escape="1"/>'] = new Object();
+			}
+
+			fields['<inp2:m_Param name="SourcePrefix" js_escape="1"/>']['<inp2:m_Param name="virtual_field" js_escape="1"/>'] = '<inp2:{$PrefixSpecial}_Field field="Prompt" grid="$grid" as_label="1" no_special="no_special" js_escape="1"/>'
+		</script>
+
+		<td class="control-cell" valign="top">
 			<inp2:ConfigFormElement field="Value" blocks_prefix="config_edit_" element_type_field="ElementType" value_list_field="ValueList" />
 		</td>
-		<td class="error"><inp2:$SourcePrefix_Error field="$virtual_field"/>&nbsp;</td>
+		<inp2:m_RenderElement name="inp_edit_error" prefix="$SourcePrefix" field="$virtual_field"/>
 		<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>
 
 <inp2:m_DefineElement name="edit_custom_td">
-	<td valign="top" class="text">
-		<inp2:ConfigFormElement field="Value" blocks_prefix="config_edit_" element_type_field="ElementType" value_list_field="ValueList" />
-	</td>
+	<inp2:ConfigFormElement field="Value" blocks_prefix="config_edit_" element_type_field="ElementType" value_list_field="ValueList" />
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="custom_error_td">
-	<td valign="top" class="error">
-		<inp2:$SourcePrefix_Error field="$virtual_field"/>
-	</td>
+	<inp2:$SourcePrefix_Error field="$virtual_field"/>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="grid_original_td" >
-	<td valign="top" class="text"><inp2:Field field="$field" grid="$grid"/></td>
+	<inp2:Field field="$field" grid="$grid"/>
 </inp2:m_DefineElement>
 
 <!--<inp2:m_DefineElement name="edit_custom_td">