Index: branches/5.1.x/core/admin_templates/regional/phrases_edit.tpl
===================================================================
diff -u -N -r12127 -r12657
--- branches/5.1.x/core/admin_templates/regional/phrases_edit.tpl	(.../phrases_edit.tpl)	(revision 12127)
+++ branches/5.1.x/core/admin_templates/regional/phrases_edit.tpl	(.../phrases_edit.tpl)	(revision 12657)
@@ -1,5 +1,4 @@
 <inp2:adm_SetPopupSize width="888" height="415"/>
-
 <inp2:m_include t="incs/header"/>
 <inp2:m_RenderElement name="combined_header" prefix="lang" section="in-portal:configure_lang" title_preset="phrase_edit"/>
 
@@ -14,10 +13,20 @@
 							submit_event('phrases','<inp2:phrases_SaveEvent/>');
 						}
 					) );
-				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
-						submit_event('phrases','OnCancel');
+
+				a_toolbar.AddButton(
+					new ToolBarButton(
+						'cancel',
+						'<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>',
+						function() {
+							<inp2:m_if check="phrases_UseQuickFormCancel">
+								window_close();
+							<inp2:m_else/>
+								cancel_edit('phrases', 'OnCancel', '<inp2:phrases_SaveEvent/>', '<inp2:m_Phrase label="la_FormCancelConfirmation" js_escape="1"/>');
+							</inp2:m_if>
 						}
-				 ) );
+					)
+				);
 
 				a_toolbar.AddButton( new ToolBarButton('reset_edit', '<inp2:m_phrase label="la_ToolTip_Reset" escape="1"/>', function() {
 						reset_form('phrases', 'OnReset', '<inp2:m_Phrase label="la_FormResetConfirmation" escape="1"/>');
@@ -51,33 +60,45 @@
 <inp2:phrases_SaveWarning name="grid_save_warning"/>
 <inp2:phrases_ErrorWarning name="form_error_warning"/>
 
-<div id="scroll_container">
-	<table class="edit-form">
-		<input type="hidden" id="phrases_label" name="phrases_label" value="<inp2:m_get name="phrases_label"/>">
-		<inp2:m_DefineElement name="phrase_element">
-			<tr class="subsectiontitle">
-				<td colspan="3"><inp2:phrases_Field name="Phrase"/></td>
-			</tr>
+<input type="hidden" name="simple_mode" value="<inp2:m_Get name='simple_mode'/>"/>
+<input type="hidden" id="phrases_label" name="phrases_label" value="<inp2:m_Get name='phrases_label'/>"/>
 
-			<inp2:m_if check="m_Get" name="phrases_label">
-				<inp2:m_RenderElement name="inp_edit_options" prefix="phrases" field="LanguageId" title="la_fld_LanguageId" has_empty="1"/>
-			<inp2:m_else/>
-				<inp2:m_RenderElement name="inp_edit_hidden" prefix="phrases" field="LanguageId"/>
-			</inp2:m_if>
+<inp2:m_if check="phrases_ShowHiddenLanguage">
+	<inp2:m_RenderElement name="inp_edit_hidden" prefix="phrases" field="LanguageId" db="db"/>
+</inp2:m_if>
 
-			<inp2:m_RenderElement name="inp_label" prefix="phrases" field="PrimaryTranslation" title="!la_fld_PrimaryTranslation!"/>
-			<inp2:m_RenderElement name="inp_edit_box" prefix="phrases" field="Phrase" title="!la_fld_Phrase!" size="60"/>
-			<inp2:m_RenderElement name="inp_edit_textarea" prefix="phrases" field="Translation" title="!la_fld_Translation!" rows="7" cols="50" allow_html="0"/>
+<inp2:m_if check="m_Get" name="simple_mode">
+	<inp2:m_RenderElement name="inp_edit_hidden" prefix="phrases" field="Phrase"/>
+</inp2:m_if>
 
-			<inp2:m_RenderElement name="inp_edit_radio" prefix="phrases" field="PhraseType" title="!la_fld_PhraseType!"/>
-			<inp2:m_RenderElement name="inp_edit_options" prefix="phrases" field="Module" title="!la_fld_Module!"/>
-		</inp2:m_DefineElement>
+<inp2:m_DefineElement name="phrase_element">
+	<inp2:m_if check="m_Get" name="simple_mode">
+		<inp2:m_RenderElement name="inp_edit_textarea" prefix="phrases" field="Translation" title="!la_fld_Translation!" rows="7" cols="50" allow_html="0"/>
+	<inp2:m_else/>
+		<tr class="subsectiontitle">
+			<td colspan="3"><inp2:phrases_Field name="Phrase"/></td>
+		</tr>
 
-		<inp2:m_if check="m_GetEquals" name="phrases_label" value="ALEX, FIX IT!">
+		<inp2:m_if check="m_Get" name="phrases_label">
+			<inp2:m_RenderElement name="inp_edit_options" prefix="phrases" field="LanguageId" title="la_fld_LanguageId" has_empty="1"/>
+		</inp2:m_if>
+
+		<inp2:m_RenderElement name="inp_label" prefix="phrases" field="PrimaryTranslation" title="!la_fld_PrimaryTranslation!"/>
+		<inp2:m_RenderElement name="inp_edit_box" prefix="phrases" field="Phrase" title="!la_fld_Phrase!" size="60"/>
+		<inp2:m_RenderElement name="inp_edit_textarea" prefix="phrases" field="Translation" title="!la_fld_Translation!" rows="7" cols="50" allow_html="0"/>
+
+		<inp2:m_RenderElement name="inp_edit_radio" prefix="phrases" field="PhraseType" title="!la_fld_PhraseType!"/>
+		<inp2:m_RenderElement name="inp_edit_options" prefix="phrases" field="Module" title="!la_fld_Module!"/>
+	</inp2:m_if>
+</inp2:m_DefineElement>
+
+<div id="scroll_container">
+	<table class="edit-form">
+		<!--##<inp2:m_if check="m_GetEquals" name="phrases_label" value="ALEX, FIX IT!">
 			<inp2:phrases_MultipleEditing render_as="phrase_element"/>
-		<inp2:m_else/>
+		<inp2:m_else/>##-->
 			<inp2:m_RenderElement name="phrase_element"/>
-		</inp2:m_if>
+		<!--##</inp2:m_if>##-->
 
 		<inp2:m_RenderElement name="inp_edit_filler"/>
 	</table>