From b68de2323d6444b4b3685a98bbcb9500a38e45cb Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Wed, 16 Dec 2009 15:48:23 +0000
Subject: merge changes from 3.0.x branch

git-svn-id: file:///svn/phpbb/trunk@10342 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/styles/prosilver/template/quickreply_editor.html | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'phpBB/styles/prosilver/template/quickreply_editor.html')

diff --git a/phpBB/styles/prosilver/template/quickreply_editor.html b/phpBB/styles/prosilver/template/quickreply_editor.html
index 1ec8e2b643..8a5b8aeb16 100644
--- a/phpBB/styles/prosilver/template/quickreply_editor.html
+++ b/phpBB/styles/prosilver/template/quickreply_editor.html
@@ -1,12 +1,16 @@
 <script type="text/javascript">
 // <![CDATA[
-	function hide_qr()
+	function hide_qr(show)
 	{
 		dE('qr_editor_div');
 		dE('qr_showeditor_div');
+		if (show && document.getElementById('qr_editor_div').style.display != 'none')
+		{
+			document.getElementsByName('message')[0].focus();
+		}
 		return true;
 	}
-	
+
 
 	function init_qr()
 	{
@@ -20,7 +24,6 @@
 	<form method="post" action="{U_QR_ACTION}">
 		<div class="panel" id="qr_ns_editor_div">
 			<div class="inner"><span class="corners-top"><span></span></span>
-				<div class="content">
 					<h2>{L_QUICKREPLY}</h2>
 					<fieldset class="fields1">
 						<dl style="clear: left;">
@@ -37,7 +40,6 @@
 						<input type="submit" accesskey="s" tabindex="6" name="post" value="{L_SUBMIT}" class="button1" />&nbsp;
 						<input type="submit" accesskey="f" tabindex="7" name="full_editor" value="{L_FULL_EDITOR}" class="button2" />&nbsp;
 					</fieldset>
-				</div>
 			<span class="corners-bottom"><span></span></span></div>
 		</div>
 	</form>
@@ -45,7 +47,6 @@
 <form method="post" action="{U_QR_ACTION}">
 	<div class="panel" style="display: none" id="qr_editor_div">
 		<div class="inner"><span class="corners-top"><span></span></span>
-			<div class="content">
 				<h2>{L_QUICKREPLY}</h2>
 				<fieldset class="fields1">
 					<dl style="clear: left;">
@@ -62,8 +63,7 @@
 					<input type="submit" accesskey="s" tabindex="6" name="post" value="{L_SUBMIT}" class="button1" />&nbsp;
 					<input type="submit" accesskey="f" tabindex="6" name="full_editor" value="{L_FULL_EDITOR}" class="button2" />&nbsp;
 				</fieldset>
-				<a href="" class="right-box up" onclick="hide_qr(); return false;" title="{L_COLLAPSE_QR}">{L_COLLAPSE_QR}</a>
-			</div>
+				<a href="" class="right-box up" onclick="hide_qr(false); return false;" title="{L_COLLAPSE_QR}">{L_COLLAPSE_QR}</a>
 		<span class="corners-bottom"><span></span></span></div>
 	</div>
 	<div class="panel" style="display: none" id="qr_showeditor_div" >
@@ -71,7 +71,7 @@
 
 			<div class="content">
 				<fieldset class="submit-buttons">
-					<input type="submit" name="show_qr" tabindex="1" class="button2" value="{L_SHOW_QR}" onclick="hide_qr();return false;"/>
+					<input type="submit" name="show_qr" tabindex="1" class="button2" value="{L_SHOW_QR}" onclick="hide_qr(true);return false;"/>
 				</fieldset>
 			</div>
 		<span class="corners-bottom"><span></span></span></div>
-- 
cgit v1.2.1