Index: trunk/themes/default2007/platform/elements/forms.tpl
===================================================================
diff -u -N -r8546 -r8639
--- trunk/themes/default2007/platform/elements/forms.tpl	(.../forms.tpl)	(revision 8546)
+++ trunk/themes/default2007/platform/elements/forms.tpl	(.../forms.tpl)	(revision 8639)
@@ -6,13 +6,23 @@
 			</td>
 			<td class="warning-cell">
 				<inp2:m_phrase name="lu_Warning"/>
-			</td>			
+			</td>
 		</tr>
 	</table>
 	<br />
 	<inp2:m_phrase name="lu_AProblemInForm"/><br />
 </inp2:m_DefineElement>
 
+<inp2:m_DefineElement name="inp_edit_field_separator">
+	<inp2:m_if check="m_ParamEquals" name="is_last" value="0">
+	<tr>
+		<td colspan="2">
+			<div class="hor-line"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="3" height="1" alt=""/><br /></div>
+		</td>
+	</tr>
+	</inp2:m_if>
+</inp2:m_DefineElement>
+
 <inp2:m_DefineElement name="inp_edit_field_caption">
 	<inp2:m_inc param="tab_index" by="1"/>
 	<td class="field-name">
@@ -23,17 +33,17 @@
 	</td>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_label" as_label="" currency="">
+<inp2:m_DefineElement name="inp_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"/>
 		</td>
-    	<td class="error"><inp2:$prefix_Error field="$field"/>&nbsp;</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="">
+<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"/>
 		<td class="field-value">
@@ -44,109 +54,106 @@
 			<inp2:m_if check="{$prefix}_HasParam" name="hint_label"><span class="small"><inp2:m_phrase label="$hint_label"/></span></inp2:m_if>
 		</td>
 	</tr>
-	<tr>
-		<td colspan="2">
-			<div class="hor-line"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="3" height="1" alt=""/><br /></div>
-		</td>
-	</tr>
+	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_password" style="">
+<inp2:m_DefineElement name="inp_edit_password" style="" 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 class="field-value">
 			<inp2:m_if check="{$prefix}_HasError" field="$field">
 				<span class="field-error"><inp2:$prefix_Error field="$field"/></span><br />
-			</inp2:m_if>			
+			</inp2:m_if>
 			<input type="password" class="input-text" name="<inp2:$prefix_InputName field="$field"/>" id="<inp2:$prefix_InputName field="$field"/>" value="" tabindex="<inp2:m_get param="tab_index"/>" style="<inp2:m_param name="style"/>" />
 			<inp2:m_if check="{$prefix}_HasParam" name="hint_label"><span class="small"><inp2:m_phrase label="$hint_label"/></span></inp2:m_if>
 		</td>
 	</tr>
-	<tr>
-		<td colspan="2">
-			<div class="hor-line"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="3" height="1" alt=""/><br /></div>
-		</td>
-	</tr>	
+	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_upload" style="">
+<inp2:m_DefineElement name="inp_edit_upload" style="" 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 class="field-value">
+			<inp2:m_if check="{$prefix}_HasError" field="$field">
+				<span class="field-error"><inp2:$prefix_Error field="$field"/></span><br />
+			</inp2:m_if>
 			<input type="file" name="<inp2:$prefix_InputName field="$field"/>" tabindex="<inp2:m_get param="tab_index"/>" style="<inp2:m_param name="style"/>">
 			<inp2:m_if check="{$prefix}_FieldEquals" name="$field" value="" inverse="inverse">
 				(<inp2:$prefix_Field field="$field"/>)
 			</inp2:m_if>
 			<input type="hidden" name="<inp2:$prefix_InputName field="$field"/>[upload]" value="<inp2:$prefix_Field field="$field"/>" />
 		</td>
-		<td class="error"><inp2:$prefix_Error field="$field"/>&nbsp;</td>
 	</tr>
+	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_edit_hidden" db="">
 	<input type="hidden" name="<inp2:$prefix_InputName field="$field"/>" value="<inp2:$prefix_Field field="$field" db="$db"/>" />
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_date" class="" is_last="">
+<inp2:m_DefineElement name="inp_edit_date" style="" 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 class="field-value">
 			<inp2:m_if check="{$prefix}_HasError" field="$field">
 				<span class="field-error"><inp2:$prefix_Error field="{$field}_date"/></span><br />
-			</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"/>" class="<inp2:m_param name="class"/>" datepickerIcon="<inp2:m_ProjectBase/>core/admin_templates/img/calendar_icon.gif">&nbsp;<span class="small">(<inp2:$prefix_Format field="{$field}_date" input_format="1" human="true"/>)</span>
+			</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"/>");
 			</script>
 			<input type="hidden" name="<inp2:$prefix_InputName field="{$field}_time"/>" id="<inp2:$prefix_InputName field="{$field}_time" input_format="1"/>" value="" />
 		</td>
 	</tr>
-	<tr>
-		<td colspan="2">
-			<div class="hor-line"><img src="<inp2:m_TemplatesBase module="In-Portal"/>img/s.gif" width="3" height="1" alt=""/><br /></div>
-		</td>
-	</tr>	
+	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_time" class="">
+<inp2:m_DefineElement name="inp_edit_time" style="" 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 class="field-value">
-			<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"/>" class="<inp2:m_param name="class"/>">&nbsp;
+			<inp2:m_if check="{$prefix}_HasError" field="$field">
+				<span class="field-error"><inp2:$prefix_Error field="$field"/></span><br />
+			</inp2:m_if>
+			<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"/>">&nbsp;
 			<span class="small">(<inp2:$prefix_Format field="{$field}_time" input_format="1" human="true"/>)</span>
-			
+
 			<input type="hidden" name="<inp2:$prefix_InputName field="{$field}_date"/>" id="<inp2:$prefix_InputName field="{$field}_date" input_format="1"/>" value="" />
 		</td>
-		<td class="error"><inp2:$prefix_Error field="{$field}_time"/>&nbsp;</td>
 	</tr>
+	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_date_time" class="" is_last="">
+<inp2:m_DefineElement name="inp_edit_date_time" style="" 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 class="field-value">
-			<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"/>" class="<inp2:m_param name="class"/>" datepickerIcon="<inp2:m_ProjectBase/>core/admin_templates/img/calendar_icon.gif">
+			<inp2:m_if check="{$prefix}_HasError" field="$field">
+				<span class="field-error"><inp2:$prefix_Error field="$field"/></span><br />
+			</inp2:m_if>
+			<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"/>");
 			</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"/>" class="<inp2:m_param name="class"/>"><span class="small"> (<inp2:$prefix_Format field="{$field}_time" input_format="1" human="true"/>)</span>
+			&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>
-		<td class="error"><inp2:$prefix_Error field="$field"/>&nbsp;</td>
 	</tr>
+	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_textarea" style="">
+<inp2:m_DefineElement name="inp_edit_textarea" style="" 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 class="field-value">		
+		<td class="field-value">
 			<inp2:m_if check="{$prefix}_HasError" field="$field">
 				<span class="field-error"><inp2:$prefix_Error field="$field"/></span><br />
 			</inp2:m_if>
 			<textarea class="input-textarea" tabindex="<inp2:m_get param="tab_index"/>" name="<inp2:$prefix_InputName field="$field"/>" cols="<inp2:m_param name="cols"/>" rows="<inp2:m_param name="rows"/>" style="<inp2:m_param name="style"/>"><inp2:$prefix_Field field="$field"/></textarea>
 		</td>
 	</tr>
+	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_option_item">
@@ -157,10 +164,13 @@
 	<option value="<inp2:m_param name="key"/>"<inp2:m_param name="selected"/>><inp2:m_phrase label="$option"/></option>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_options" style="" has_empty="0" empty_value="">
+<inp2:m_DefineElement name="inp_edit_options" style="" has_empty="0" empty_value="" 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 class="field-value">
+			<inp2:m_if check="{$prefix}_HasError" field="$field">
+				<span class="field-error"><inp2:$prefix_Error field="$field"/></span><br />
+			</inp2:m_if>
 			<select class="input-select" tabindex="<inp2:m_get param="tab_index"/>" name="<inp2:$prefix_InputName field="$field"/>" style="<inp2:m_param name="style"/>">
 				<inp2:m_if prefix="m" function="ParamEquals" name="use_phrases" value="1"/>
 					<inp2:$prefix_PredefinedOptions field="$field" block="inp_option_phrase" selected="selected" has_empty="$has_empty" empty_value="$empty_value"/>
@@ -169,11 +179,8 @@
 				<inp2:m_endif/>
 			</select>
 		</td>
-		<td class="error"><inp2:$prefix_Error field="$field"/>&nbsp;</td>
-		<inp2:m_if check="{$prefix}_DisplayOriginal" pass_params="1">
-			<inp2:m_RenderElement prefix="$prefix" field="$field" name="inp_original_label"/>
-		</inp2:m_if>
 	</tr>
+	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="inp_radio_item" onclick="">
@@ -184,28 +191,34 @@
 	<input type="radio" tabindex="<inp2:m_get param="tab_index"/>" style="<inp2:m_param name="style"/>" <inp2:m_param name="checked"/> name="<inp2:$prefix_InputName field="$field"/>" id="<inp2:$prefix_InputName field="$field"/>_<inp2:m_param name="key"/>" value="<inp2:m_param name="key"/>"><label for="<inp2:$prefix_InputName field="$field"/>_<inp2:m_param name="key"/>"><inp2:m_phrase label="$option"/></label>&nbsp;
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_radio" style="" pass_tabindex="" onclick="" onchange="" use_phrases="1">
+<inp2:m_DefineElement name="inp_edit_radio" style="" pass_tabindex="" onclick="" onchange="" use_phrases="1" 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 class="field-value">
+			<inp2:m_if check="{$prefix}_HasError" field="$field">
+				<span class="field-error"><inp2:$prefix_Error field="$field"/></span><br />
+			</inp2:m_if>
 			<inp2:m_if check="m_ParamEquals" name="use_phrases" value="1">
 				<inp2:$prefix_PredefinedOptions field="$field" block="inp_radio_phrase" selected="checked"/>
 			<inp2:m_else />
 				<inp2:$prefix_PredefinedOptions field="$field" block="inp_radio_item" selected="checked"/>
 			</inp2:m_if>
 		</td>
-		<td class="error"><inp2:$prefix_Error field="$field"/>&nbsp;</td>
 	</tr>
+	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
 </inp2:m_DefineElement>
 
-<inp2:m_DefineElement name="inp_edit_checkbox" style="">
+<inp2:m_DefineElement name="inp_edit_checkbox" style="" 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>
+			<inp2:m_if check="{$prefix}_HasError" field="$field">
+				<span class="field-error"><inp2:$prefix_Error field="$field"/></span><br />
+			</inp2:m_if>
 			<input type="hidden" id="<inp2:$prefix_InputName field="$field"/>" name="<inp2:$prefix_InputName field="$field"/>" value="<inp2:$prefix_Field field="$field" db="db"/>" />
 			<input tabindex="<inp2:m_get param="tab_index"/>" type="checkbox" id="_cb_<inp2:$prefix_InputName field="$field"/>" name="_cb_<inp2:$prefix_InputName field="$field"/>" <inp2:$prefix_Field field="$field" checked="checked" db="db"/> style="<inp2:m_param name="style"/>" onchange="update_checkbox(this, document.getElementById('<inp2:$prefix_InputName field="$field"/>'));">
 			<inp2:m_if check="{$prefix}_HasParam" name="hint_label"><inp2:m_phrase label="$hint_label"/></inp2:m_if>
 		</td>
-		<td class="error"><inp2:$prefix_Error field="$field"/>&nbsp;</td>
 	</tr>
+	<inp2:m_RenderElement name="inp_edit_field_separator" is_last="$is_last"/>
 </inp2:m_DefineElement>
\ No newline at end of file