diff options
| author | Vjacheslav Trushkin <arty@phpbb.com> | 2012-03-31 00:22:04 +0300 |
|---|---|---|
| committer | Vjacheslav Trushkin <arty@phpbb.com> | 2012-03-31 00:22:04 +0300 |
| commit | f15167bcfaf891e56ced4d92bf189f03932ceb00 (patch) | |
| tree | 2e1e37d5b0ac25fc09db441dd0d3aa2ee2a15962 | |
| parent | 3d610e38720664750dbbf361b173766a4ac27cfc (diff) | |
| parent | cfb8f01040ca9fded20d8f3dd4620cd7477d60fc (diff) | |
| download | forums-f15167bcfaf891e56ced4d92bf189f03932ceb00.tar forums-f15167bcfaf891e56ced4d92bf189f03932ceb00.tar.gz forums-f15167bcfaf891e56ced4d92bf189f03932ceb00.tar.bz2 forums-f15167bcfaf891e56ced4d92bf189f03932ceb00.tar.xz forums-f15167bcfaf891e56ced4d92bf189f03932ceb00.zip | |
Merge remote-tracking branch 'imkingdavid/ticket/10727' into develop
* imkingdavid/ticket/10727:
[ticket/10727] Do not hide Quick Reply with javascript on prosilver
| -rw-r--r-- | phpBB/language/en/viewtopic.php | 2 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/quickreply_editor.html | 59 |
2 files changed, 1 insertions, 60 deletions
diff --git a/phpBB/language/en/viewtopic.php b/phpBB/language/en/viewtopic.php index 2b20938afe..f47f8a076b 100644 --- a/phpBB/language/en/viewtopic.php +++ b/phpBB/language/en/viewtopic.php @@ -47,7 +47,6 @@ $lang = array_merge($lang, array( 'BUMP_TOPIC' => 'Bump topic', 'CODE' => 'Code', - 'COLLAPSE_QR' => 'Hide Quick Reply', 'DELETE_TOPIC' => 'Delete topic', 'DOWNLOAD_NOTICE' => 'You do not have the required permissions to view the files attached to this post.', @@ -97,7 +96,6 @@ $lang = array_merge($lang, array( 'REPLY_TO_TOPIC' => 'Reply to topic', 'RETURN_POST' => '%sReturn to the post%s', - 'SHOW_QR' => 'Quick Reply', 'SUBMIT_VOTE' => 'Submit vote', 'TOTAL_VOTES' => 'Total votes', diff --git a/phpBB/styles/prosilver/template/quickreply_editor.html b/phpBB/styles/prosilver/template/quickreply_editor.html index ea07c2e6d8..f61cc49c0b 100644 --- a/phpBB/styles/prosilver/template/quickreply_editor.html +++ b/phpBB/styles/prosilver/template/quickreply_editor.html @@ -1,51 +1,5 @@ -<script type="text/javascript"> -// <![CDATA[ - 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() - { - dE('qr_showeditor_div'); - return true; - } - onload_functions.push('init_qr();'); - // ]]> -</script> -<noscript> - <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> - <h2>{L_QUICKREPLY}</h2> - <fieldset class="fields1"> - <dl style="clear: left;"> - <dt><label for="subject">{L_SUBJECT}:</label></dt> - <dd><input type="text" name="subject" id="subject-ns" size="45" maxlength="64" tabindex="2" value="{SUBJECT}" class="inputbox autowidth" /></dd> - </dl> - <div id="message-box-ns"> - <textarea style="height: 9em;" name="message" rows="7" cols="76" tabindex="3" class="inputbox"></textarea> - </div> - </fieldset> - <fieldset class="submit-buttons"> - {S_FORM_TOKEN} - {QR_HIDDEN_FIELDS} - <input type="submit" accesskey="s" tabindex="6" name="post" value="{L_SUBMIT}" class="button1" /> - <input type="submit" accesskey="f" tabindex="7" name="full_editor" value="{L_FULL_EDITOR}" class="button2" /> - </fieldset> - <span class="corners-bottom"><span></span></span></div> - </div> - </form> -</noscript> <form method="post" action="{U_QR_ACTION}"> - <div class="panel" style="display: none" id="qr_editor_div"> + <div class="panel"> <div class="inner"><span class="corners-top"><span></span></span> <h2>{L_QUICKREPLY}</h2> <fieldset class="fields1"> @@ -63,17 +17,6 @@ <input type="submit" accesskey="s" tabindex="6" name="post" value="{L_SUBMIT}" class="button1" /> <input type="submit" accesskey="f" tabindex="7" name="full_editor" value="{L_FULL_EDITOR}" class="button2" /> </fieldset> - <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" > - <div class="inner"><span class="corners-top"><span></span></span> - - <div class="content"> - <fieldset class="submit-buttons"> - <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> </div> </form> |