Index: trunk/themes/default2007/platform/elements/forms.tpl
===================================================================
diff -u -N -r8686 -r8693
--- trunk/themes/default2007/platform/elements/forms.tpl	(.../forms.tpl)	(revision 8686)
+++ trunk/themes/default2007/platform/elements/forms.tpl	(.../forms.tpl)	(revision 8693)
@@ -1,10 +1,10 @@
 <inp2:m_DefineElement name="error_message">
-	<table class="warning-cell fullwidth">
+	<table class="warning-message fullwidth">
 		<tr>
 			<td width="30">
 				<img src="<inp2:m_TemplatesBase module="In-Portal"/>img/warning_icon.gif" width="21" height="18" alt=""/>
 			</td>
-			<td class="warning-cell">
+			<td>
 				<inp2:m_phrase name="lu_Warning"/>
 			</td>
 		</tr>
@@ -27,7 +27,7 @@
 	<inp2:m_inc param="tab_index" by="1"/>
 	<td class="field-name">
 		<label for="<inp2:$prefix_InputName field="$field"/>">
-			<span class="field-caption <inp2:m_if check="{$prefix}_HasError" field="$field">error</inp2:m_if>">
+			<span <inp2:m_if check="{$prefix}_HasError" field="$field">class="field-required"</inp2:m_if>>
 			<inp2:m_phrase label="$title"/></span><inp2:m_if check="{$prefix}_IsRequired" field="$field"><span class="field-required"> *</span></inp2:m_if>:
 		</label>
 	</td>
@@ -43,6 +43,17 @@
 	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
 </inp2:m_DefineElement>
 
+<inp2:m_DefineElement name="inp_edit_label" as_label="" currency="" is_last="0">
+	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
+		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
+		<td valign="top" class="field-value">
+			<inp2:$prefix_Field field="$field" as_label="$as_label" currency="$currency"/>
+			<input type="hidden" name="<inp2:$prefix_InputName field="$field"/>" value="<inp2:$prefix_Field field="$field" db="db"/>" />
+		</td>
+	</tr>
+	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
+</inp2:m_DefineElement>
+
 <inp2:m_DefineElement name="inp_edit_box" style="" maxlength="" is_last="0">
 	<tr class="<inp2:m_odd_even odd="table_color1" even="table_color2"/>">
 		<inp2:m_RenderElement name="inp_edit_field_caption" prefix="$prefix" field="$field" title="$title"/>
@@ -121,7 +132,7 @@
 			</inp2:m_if>
 			<input type="text" class="input-text" name="<inp2:$prefix_InputName field="{$field}_date"/>" id="<inp2:$prefix_InputName field="{$field}_date"/>" value="<inp2:$prefix_Field field="{$field}_date" format="_regional_InputDateFormat"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:$prefix_Format field="{$field}_date" input_format="1" edit_size="edit_size"/>" style="<inp2:m_param name="style"/>" datepickerIcon="<inp2:m_TemplatesBase module="In-Portal"/>img/calendar_icon.gif">&nbsp;<span class="small">(<inp2:$prefix_Format field="{$field}_date" input_format="1" human="true"/>)</span>
 			<script type="text/javascript">
-				initCalendar("<inp2:$prefix_InputName field="{$field}_date"/>", "<inp2:$prefix_Format field="{$field}_date" input_format="1"/>");
+			initCalendar("<inp2:$prefix_InputName field="{$field}_date"/>", "<inp2:$prefix_Format field="{$field}_date" input_format="1"/>");
 			</script>
 			<input type="hidden" name="<inp2:$prefix_InputName field="{$field}_time"/>" id="<inp2:$prefix_InputName field="{$field}_time" input_format="1"/>" value="" />
 		</td>
@@ -155,7 +166,7 @@
 			<input type="text" name="<inp2:$prefix_InputName field="{$field}_date"/>" id="<inp2:$prefix_InputName field="{$field}_date"/>" value="<inp2:$prefix_Field field="{$field}_date" format="_regional_InputDateFormat"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:$prefix_Format field="{$field}_date" input_format="1" edit_size="edit_size"/>" style="<inp2:m_param name="style"/>" datepickerIcon="<inp2:m_ProjectBase/>core/admin_templates/img/calendar_icon.gif">
 				<span class="small">(<inp2:$prefix_Format field="{$field}_date" input_format="1" human="true"/>)</span>
 			<script type="text/javascript">
-				initCalendar("<inp2:$prefix_InputName field="{$field}_date"/>", "<inp2:$prefix_Format field="{$field}_date" input_format="1"/>");
+			initCalendar("<inp2:$prefix_InputName field="{$field}_date"/>", "<inp2:$prefix_Format field="{$field}_date" input_format="1"/>");
 			</script>
 			&nbsp;<input type="text" name="<inp2:$prefix_InputName field="{$field}_time"/>" id="<inp2:$prefix_InputName field="{$field}_time"/>" value="<inp2:$prefix_Field field="{$field}_time" format="_regional_InputTimeFormat"/>" tabindex="<inp2:m_get param="tab_index"/>" size="<inp2:$prefix_Format field="{$field}_time" input_format="1" edit_size="edit_size"/>" style="<inp2:m_param name="style"/>"><span class="small"> (<inp2:$prefix_Format field="{$field}_time" input_format="1" human="true"/>)</span>
 		</td>