Index: branches/5.1.x/core/admin_templates/submissions/submission_view.tpl
===================================================================
diff -u -N -r12657 -r13390
--- branches/5.1.x/core/admin_templates/submissions/submission_view.tpl	(.../submission_view.tpl)	(revision 12657)
+++ branches/5.1.x/core/admin_templates/submissions/submission_view.tpl	(.../submission_view.tpl)	(revision 13390)
@@ -1,8 +1,14 @@
-<inp2:m_include t="incs/header"/>
+<inp2:adm_SetPopupSize width="800" height="640"/>
 
+<inp2:m_include t="incs/header"/>
 <inp2:m_Get var="form_id" result_to_var="form_id"/>
-<inp2:m_RenderElement name="combined_header" section="in-portal:submissions:$form_id" prefix="formsubs" title_preset="formsubs_view"/>
 
+<inp2:m_if check="form_Field" name="EnableEmailCommunication" db="db">
+	<inp2:m_RenderElement name="combined_header" prefix="formsubs" section="in-portal:submissions:$form_id" title_preset="formsubs_view" tab_preset="Default"/>
+<inp2:m_else/>
+	<inp2:m_RenderElement name="combined_header" prefix="formsubs" section="in-portal:submissions:$form_id" title_preset="formsubs_view"/>
+</inp2:m_if>
+
 <!-- ToolBar -->
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
@@ -11,11 +17,16 @@
   		<script type="text/javascript">
 				a_toolbar = new ToolBar();
 
-				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
-							submit_event('formsubs','OnCancelEdit');
+				a_toolbar.AddButton( new ToolBarButton('select', '<inp2:m_phrase label="la_ToolTip_Save" escape="1"/>', function() {
+							submit_event('formsubs', '<inp2:formsubs_SaveEvent/>');
 						}
 				 ) );
 
+				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Close" escape="1"/>', function() {
+							submit_event('formsubs', 'OnGoBack');
+						}
+				 ) );
+
 				a_toolbar.AddButton( new ToolBarSeparator('sep1') );
 
 				a_toolbar.AddButton( new ToolBarButton('prev', '<inp2:m_phrase label="la_ToolTip_Prev" escape="1"/>', function() {
@@ -50,68 +61,104 @@
 </tbody>
 </table>
 
-<inp2:m_DefineElement name="form_field_text">
+<!--##<inp2:m_DefineElement name="form_field_text">
 	<inp2:m_if check="FieldEquals" field="Validation" value="1">
-		<a href="mailto:<inp2:SubmissionTag tag="Field"/>"><inp2:SubmissionTag tag="Field"/></a>
+		<a href="mailto:<inp2:SubmissionTag tag='Field'/>"><inp2:SubmissionTag tag="Field"/></a>
 	<inp2:m_else/>
 		<inp2:SubmissionTag tag="Field"/>
 	</inp2:m_if>
+</inp2:m_DefineElement>##-->
+
+<inp2:m_DefineElement name="form_field_text">
+	<input type="text" name="<inp2:CustomInputName/>" id="<inp2:CustomInputName/>" value="<inp2:SubmissionTag tag="Field"/>" <inp2:m_param name="field_params" />/>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="form_field_password">
-	<inp2:SubmissionTag tag="Field"/>
+	<input type="password" primarytype="password" name="<inp2:CustomInputName/>" id="<inp2:CustomInputName/>" value="" />
+	<input type="password" name="<inp2:CustomInputName verify='1'/>" id="verify_<inp2:CustomInputName verify='1'/>" value="" />
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="form_field_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="form_field_select">
-	<inp2:SubmissionTag tag="Field"/>
+	<select name="<inp2:CustomInputName/>" id="<inp2:CustomInputName/>">
+		<inp2:SubmissionTag tag="PredefinedOptions" field="$field" block="form_field_option" selected="selected"/>
+	</select>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="form_field_checkbox">
-	<input type="hidden" id="<inp2:CustomInputName/>" name="<inp2:CustomInputName/>" value="<inp2:SubmissionTag tag="Field" field="$field" db="db"/>">
-	<input disabled="disabled" tabindex="<inp2:m_get param="tab_index"/>" type="checkbox" id="_cb_<inp2:m_param name="field"/>" name="_cb_<inp2:m_param name="field"/>" <inp2:SubmissionTag tag="Field" checked="checked" db="db"/> class="<inp2:m_param name="field_class"/>" onclick="document.getElementById('<inp2:CustomInputName/>').value = this.checked ? 1:0">
+	<input type="hidden" id="<inp2:CustomInputName/>" name="<inp2:CustomInputName/>" value="<inp2:SubmissionTag tag='Field' field='$field' db='db'/>">
+	<input type="checkbox" id="_cb_<inp2:m_param name='field'/>" <inp2:SubmissionTag tag="Field" checked="checked" db="db"/> onchange="update_checkbox(this, document.getElementById('<inp2:CustomInputName/>'));">
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="form_field_textarea">
-	<inp2:SubmissionTag tag="Field" nl2br="1" no_special="1"/>
+	<textarea name="<inp2:CustomInputName/>" id="<inp2:CustomInputName/>" style="width: 100%;" <inp2:m_param name="field_params" />><inp2:SubmissionTag tag="Field" field="$field" /></textarea>
+
+	<script type="text/javascript">
+		Form.addControl('<inp2:CustomInputName/>', false);
+	</script>
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="form_radio_item">
-	<input disabled="disabled" type="radio" <inp2:m_param name="checked"/> name="<inp2:m_param name="field_name"/>" id="<inp2:m_param name="field_name"/>_<inp2:m_param name="key"/>" value="<inp2:m_param name="key"/>"><label for="<inp2:m_param name="field_name"/>_<inp2:m_param name="key"/>"><inp2:m_param name="option"/></label>&nbsp;
+	<input type="radio" <inp2:m_param name="checked"/> name="<inp2:m_param name="field_name"/>" id="<inp2:m_param name="field_name"/>_<inp2:m_param name="key"/>" value="<inp2:m_param name="key"/>"><label for="<inp2:m_param name="field_name"/>_<inp2:m_param name="key"/>"><inp2:m_param name="option"/></label>&nbsp;
 </inp2:m_DefineElement>
 
 <inp2:m_DefineElement name="form_field_radio">
-	<inp2:SubmissionTag tag="PredefinedOptions" field="$field" tabindex="$pass_tabindex" block="form_radio_item" selected="checked"/>
+	<inp2:SubmissionTag tag="PredefinedOptions" field="$field" block="form_radio_item" selected="checked"/>
 </inp2:m_DefineElement>
 
-
 <inp2:formsubs_SaveWarning name="grid_save_warning"/>
 <inp2:formsubs_ErrorWarning name="form_error_warning"/>
 
 <div id="scroll_container">
 	<table class="edit-form">
-		<inp2:m_RenderElement name="subsection" prefix="formsubs" fields="FormSubmissionId,SubmissionTime" title="!la_section_General!"/>
-			<inp2:m_RenderElement name="inp_id_label" prefix="formsubs" field="FormSubmissionId" title="!la_fld_Id!"/>
-			<inp2:m_RenderElement name="inp_edit_date_time" prefix="formsubs" field="SubmissionTime" title="!la_fld_SubmissionTime!" />
-		<inp2:m_RenderElement name="subsection" title="!la_section_Data!"/>
+		<inp2:m_RenderElement name="subsection" prefix="formsubs" fields="FormSubmissionId,SubmissionTime,IPAddress,ReferrerURL,LogStatus,LastUpdatedOn" title="la_section_General"/>
+			<inp2:m_RenderElement name="inp_id_label" prefix="formsubs" field="FormSubmissionId" title="la_fld_Id"/>
+			<inp2:m_RenderElement name="inp_label" prefix="formsubs" field="SubmissionTime" title="la_fld_SubmissionTime" />
+			<inp2:m_RenderElement name="inp_label" prefix="formsubs" field="IPAddress" title="la_fld_IPAddress" />
+			<inp2:m_RenderElement name="inp_label" prefix="formsubs" field="ReferrerURL" title="la_fld_ReferrerURL" />
 
-			<inp2:m_DefineElement name="form_field">
+			<inp2:m_if check="form_Field" name="EnableEmailCommunication" db="db">
+				<inp2:m_RenderElement name="inp_label" prefix="formsubs" field="LogStatus" title="la_fld_Status" />
+			<inp2:m_else/>
+				<inp2:m_RenderElement name="inp_edit_options" prefix="formsubs" field="LogStatus" title="la_fld_Status" has_empty="1"/>
+			</inp2:m_if>
+
+			<inp2:m_if check="formsubs_Field" name="LastUpdatedOn" db="db">
+				<inp2:m_RenderElement name="inp_label" prefix="formsubs" field="LastUpdatedOn" title="la_fld_LastUpdatedOn" />
+			</inp2:m_if>
+
+		<inp2:m_RenderElement name="subsection" title="la_section_Data"/>
+
+			<inp2:m_DefineElement name="form_field" prefix="formsubs">
 				<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">
-						<inp2:Field field="Prompt" plus_or_as_label="1" no_special="no_special"/>:
+					<td class="label-cell" onmouseover="show_form_error('<inp2:m_Param name='prefix' js_escape='1'/>', 'fld_<inp2:Field name='FormFieldId'/>')" onmouseout="hide_form_error('<inp2:m_Param name='prefix' js_escape='1'/>')">
+						<inp2:Field field="Prompt" plus_or_as_label="1" no_special="no_special"/><inp2:m_if check="Field" name="Required" db="db"><span class="field-required">&nbsp;*</span></inp2:m_if>:
 					</td>
 					<td class="control-mid">&nbsp;</td>
+					<script type="text/javascript">
+						if (typeof(fields['<inp2:m_Param name="prefix" js_escape="1"/>']) == 'undefined') {
+							fields['<inp2:m_Param name="prefix" js_escape="1"/>'] = new Object();
+						}
+						fields['<inp2:m_Param name="prefix" js_escape="1"/>']['fld_<inp2:Field name="FormFieldId"/>'] = '<inp2:Field field="Prompt" plus_or_as_label="1" no_special="no_special" js_escape="1"/>'
+					</script>
 					<td class="control-cell">
 						<inp2:ConfigFormElement field="Value" blocks_prefix="form_field_" element_type_field="ElementType" value_list_field="ValueList" /><br/>
 					</td>
 				</tr>
+				<script type="text/javascript">
+					add_form_error('<inp2:m_Param name="prefix" js_escape="1"/>', 'fld_<inp2:Field name="FormFieldId"/>', '<inp2:CustomInputName/>', '<inp2:SubmissionTag tag="Error" js_escape="1"/>')
+				</script>
 			</inp2:m_DefineElement>
 
 		<inp2:formflds_PrintList render_as="form_field" SourcePrefix="formsubs" per_page="-1"/>
+
+		<inp2:m_RenderElement name="subsection" prefix="formsubs" fields="Notes" title="la_section_SubmissionNotes"/>
+			<inp2:m_RenderElement name="inp_edit_textarea" prefix="formsubs" field="Notes" title="la_fld_Notes" />
+
 		<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>
 </div>