Index: branches/5.3.x/core/admin_templates/tools/sql_query.tpl
===================================================================
diff -u -N -r15677 -r15690
--- branches/5.3.x/core/admin_templates/tools/sql_query.tpl	(.../sql_query.tpl)	(revision 15677)
+++ branches/5.3.x/core/admin_templates/tools/sql_query.tpl	(.../sql_query.tpl)	(revision 15690)
@@ -5,19 +5,20 @@
 <table class="toolbar" height="30" cellspacing="0" cellpadding="0" width="100%" border="0">
 <tbody>
 	<tr>
-  	<td>
-  		<script type="text/javascript">
+  		<td>
+  			<script type="text/javascript">
 				a_toolbar = new ToolBar();
-				a_toolbar.AddButton( new ToolBarButton('query_database', '<inp2:m_phrase label="la_ToolTip_RunSQL" escape="1"/>', function() {
-					submit_event('adm','OnSqlQuery');
+
+				a_toolbar.AddButton(
+					new ToolBarButton(
+						'query_database',
+						'<inp2:m_phrase label="la_ToolTip_RunSQL" escape="1"/>',
+						function() {
+							submit_event('adm','OnSqlQuery');
 						}
-					) );
-			<!--##
-				a_toolbar.AddButton( new ToolBarButton('cancel', '<inp2:m_phrase label="la_ToolTip_Cancel" escape="1"/>', function() {
-					location.href = '<inp2:m_Link t="sections_list" pass="m" section="in-portal:tools" module="In-Portal" no_amp="1"/>';
-						}
-					) );
-			##-->
+					)
+				);
+
 				a_toolbar.Render();
 			</script>
 		</td>
@@ -26,33 +27,53 @@
 </table>
 
 <table width="100%" border="0" cellspacing="0" cellpadding="4" class="bordered">
-<inp2:m_RenderElement name="subsection" title="la_prompt_sqlquery_header"/>
-<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
-<td colspan="3">
-	<inp2:m_inc param="tab_index" by="1"/>
-	<span class="hint"><img src="img/smicon7.gif" align="absmiddle" height="14" width="14">
-		<inp2:m_Phrase label="la_text_db_warning"/>
-	</span>
-</td>
-</tr>
-<tr class="<inp2:m_odd_even odd="table-color1" even="table-color2"/>">
-	<inp2:m_inc param="tab_index" by="1"/>
-  <td valign="top" width="100"><span class="text" ID="prompt_sql_query"><inp2:m_Phrase label="la_prompt_sqlquery"/><br />
+	<inp2:m_RenderElement name="subsection" title="la_prompt_sqlquery_header"/>
 
-</td>
-  <td valign="top" width="400"><span class="text">
-  <TEXTAREA ValidationType="exists" name="sql" cols="100" rows=10><inp2:m_Get var="sql"/></TEXTAREA>
-  </td>
-  <td align="left" valign="top"><span class="text">
-  <inp2:m_if check="m_Get" var="query_status">
-  		<inp2:m_Phrase label="la_SQLRuntime"/>:&nbsp;<inp2:m_Get var="sql_time"/> sec.<br />
-  	<inp2:m_if check="m_Get" var="sql_has_affected">
-		<br /><inp2:m_Phrase label="la_SQLAffectedRows"/>: <inp2:m_Get var="sql_affected"/>
-	</inp2:m_if>
-  </inp2:m_if>
+	<tr class="<inp2:m_odd_even odd='table-color1' even='table-color2'/>">
+		<td colspan="3">
+			<inp2:m_inc param="tab_index" by="1"/>
+			<span class="hint"><img src="img/smicon7.gif" align="absmiddle" height="14" width="14">
+				<inp2:m_Phrase label="la_text_db_warning"/>
+			</span>
+		</td>
+	</tr>
 
-  </span></td>
-</tr>
+	<tr class="<inp2:m_odd_even odd='table-color1' even='table-color2'/>">
+		<inp2:m_inc param="tab_index" by="1"/>
+  		<td valign="top" style="width:100px;">
+			<span class="text" ID="prompt_sql_query"><inp2:m_Phrase label="la_prompt_sqlquery"/>
+  		</td>
+		<td valign="top" width="400" style="width:auto">
+			<style type="text/css">
+				.CodeMirror {
+					background-color: white;
+				}
+			</style>
+
+			<textarea name="sql" cols="100" rows="10"><inp2:m_Get var="sql"/></textarea>
+			<script src="<inp2:m_TemplatesBase/>/incs/code_mirror/lib/codemirror.js"></script>
+			<link rel="stylesheet" href="<inp2:m_TemplatesBase/>/incs/code_mirror/lib/codemirror.css">
+
+			<inp2:adm_IncludeCodeMirrorFilesByLanguage language="mysql" render_as="code_mirror_resource"/>
+
+			<script type="text/javascript">
+				var $editor = CodeMirror.fromTextArea(document.kernel_form.sql, {mode: "mysql", tabindex: <inp2:m_Get name="tab_index"/>, indentWithTabs: true, indentUnit: 4, lineWrapping: true, lineNumbers: true});
+				$editor.setSize(null, 155);
+			</script>
+		</td>
+  		<td align="left" valign="top" style="width:250px">
+			<span class="text">
+				<inp2:m_if check="m_Get" var="query_status">
+					<inp2:m_Phrase label="la_SQLRuntime"/>:&nbsp;<inp2:m_Get var="sql_time"/> sec.<br />
+
+					<inp2:m_if check="m_Get" var="sql_has_affected">
+						<br /><inp2:m_Phrase label="la_SQLAffectedRows"/>: <inp2:m_Get var="sql_affected"/>
+					</inp2:m_if>
+				</inp2:m_if>
+
+  			</span>
+		</td>
+	</tr>
 </table>
 
 <inp2:m_if check="m_Get" var="query_status">