Index: branches/RC/core/admin_templates/incs/grid_blocks.tpl
===================================================================
diff -u -N -r9359 -r9857
--- branches/RC/core/admin_templates/incs/grid_blocks.tpl	(.../grid_blocks.tpl)	(revision 9359)
+++ branches/RC/core/admin_templates/incs/grid_blocks.tpl	(.../grid_blocks.tpl)	(revision 9857)
@@ -171,6 +171,28 @@
 	<td valign="top" class="text"><input type="text" id="<inp2:{$PrefixSpecial}_InputName field="$field"/>" name="<inp2:{$PrefixSpecial}_InputName field="$field"/>" value="<inp2:{$PrefixSpecial}_field field="$field" grid="$grid" format="$format"/>"></td>
 </inp2:m_DefineElement>
 
+<inp2:m_DefineElement name="grid_options_td" format="">
+	<td valign="top" class="text">
+		<select name="<inp2:InputName field="$field"/>" id="<inp2:InputName field="$field"/>">
+			<inp2:m_if check="FieldOption" field="$field" option="use_phrases">
+				<inp2:PredefinedOptions field="$field" block="inp_option_phrase" selected="selected" has_empty="1" empty_value="0"/>
+			<inp2:m_else/>
+				<inp2:PredefinedOptions field="$field" block="inp_option_item" selected="selected" has_empty="1" empty_value="0"/>
+			</inp2:m_if>
+		</select>
+	</td>
+</inp2:m_DefineElement>
+
+<inp2:m_DefineElement name="grid_date_td" format="">
+	<td valign="top" class="text">
+		<input type="text" name="<inp2:InputName field="{$field}_date"/>" id="<inp2:InputName field="{$field}_date"/>" value="<inp2:Field field="{$field}_date" format="_regional_InputDateFormat"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:Format field="{$field}_date" input_format="1" edit_size="edit_size"/>" class="<inp2:m_param name="class"/>" datepickerIcon="<inp2:m_ProjectBase/>core/admin_templates/img/calendar_icon.gif">&nbsp;<span class="small">(<inp2:Format field="{$field}_date" input_format="1" human="true"/>)</span>
+		<script type="text/javascript">
+			initCalendar("<inp2:InputName field="{$field}_date"/>", "<inp2:Format field="{$field}_date" input_format="1"/>");
+		</script>
+		<input type="hidden" name="<inp2:InputName field="{$field}_time"/>" id="<inp2:InputName field="{$field}_time" input_format="1"/>" value="">
+	</td>
+</inp2:m_DefineElement>
+
 <inp2:m_DefineElement name="grid_data_label_td" >
 	<td valign="top" class="text"><inp2:{$PrefixSpecial}_field field="$field" grid="$grid" plus_or_as_label="1" no_special="no_special" format="$format"/></td>
 </inp2:m_DefineElement>
Index: branches/RC/core/kernel/utility/formatters/date_formatter.php
===================================================================
diff -u -N -r8929 -r9857
--- branches/RC/core/kernel/utility/formatters/date_formatter.php	(.../date_formatter.php)	(revision 8929)
+++ branches/RC/core/kernel/utility/formatters/date_formatter.php	(.../date_formatter.php)	(revision 9857)
@@ -120,6 +120,8 @@
 				$object->CalculatedFields = Array();
 			}
 			$object->CalculatedFields[$field_name.'_formatted'] = 'FROM_UNIXTIME('.'`%1$s`.'.$field_name.' + '.$this->Application->TimeZoneAdjustment().', \''.$this->SQLFormat($field_options['format']).'\')';
+			$object->CalculatedFields[$field_name.'_date'] = '%1$s.'.$field_name;
+			$object->CalculatedFields[$field_name.'_time'] = '%1$s.'.$field_name;
 			$opts['format'] = $field_options['format'];
 			$opts['required'] = 0;
 			unset($opts['master_field']);