diff options
| author | Igor Wiedler <igor@wiedler.ch> | 2012-04-07 18:27:30 +0200 |
|---|---|---|
| committer | Igor Wiedler <igor@wiedler.ch> | 2012-04-07 18:27:30 +0200 |
| commit | 24daef1aafb0a733c3428122d740fea17d4f34a0 (patch) | |
| tree | 19338a7c549089437f2f9cb708f6afb8a26e733a /phpBB/styles/prosilver/template/quickreply_editor.html | |
| parent | 3963b39634225a68687cf1b817a47ae1eeb6ac79 (diff) | |
| parent | 713e7129e2dfb1039f5198c03c8808c8410f434a (diff) | |
| download | forums-24daef1aafb0a733c3428122d740fea17d4f34a0.tar forums-24daef1aafb0a733c3428122d740fea17d4f34a0.tar.gz forums-24daef1aafb0a733c3428122d740fea17d4f34a0.tar.bz2 forums-24daef1aafb0a733c3428122d740fea17d4f34a0.tar.xz forums-24daef1aafb0a733c3428122d740fea17d4f34a0.zip | |
Merge branch 'develop' into feature/avatars
* develop: (335 commits)
[ticket/10575] Adding public visibility to the methods.
[ticket/10575] Fixing non-static access to static functions get_instance
[ticket/10547] User is not logged in as admin after installation
[ticket/10650] Revert merge of 'rahulr92/ticket/10650' into develop
[ticket/10650] Added checking for empty subjects
[ticket/10650] Corrected intendation
[ticket/10650]Added permission checking and utf8 functions
[ticket/10650] Cropped subject and inserted newline
[ticket/10650] Corrected space before true
[ticket/10650] Changed language files and forumlist
[ticket/10650] Added static sql files
[ticket/10650] Displaying last topic on forum list
[ticket/10760] Fix numbering in php fun facts.
[ticket/10760] Value must be quoted as it might be two words.
[ticket/10760] PHP is great. This commit is the proof.
[ticket/10760] Catch both versions of parse error output in php.
[ticket/10607] Added 'Powered by' translation string.
[ticket/10760] Account for display_errors=stderr in pre-commit hook.
[ticket/10760] Quote PHP_BIN when using it.
[ticket/10760] Use echo -e only if echo understands -e.
...
Diffstat (limited to 'phpBB/styles/prosilver/template/quickreply_editor.html')
| -rw-r--r-- | phpBB/styles/prosilver/template/quickreply_editor.html | 65 |
1 files changed, 4 insertions, 61 deletions
diff --git a/phpBB/styles/prosilver/template/quickreply_editor.html b/phpBB/styles/prosilver/template/quickreply_editor.html index ea07c2e6d8..a08b5dc3cc 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"> +<form method="post" action="{U_QR_ACTION}" id="qr_postform"> + <div class="panel"> <div class="inner"><span class="corners-top"><span></span></span> <h2>{L_QUICKREPLY}</h2> <fieldset class="fields1"> @@ -60,20 +14,9 @@ <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" /> + <input type="submit" accesskey="f" tabindex="6" name="preview" value="{L_FULL_EDITOR}" class="button2" data-ajax="false" id="qr_full_editor" /> + <input type="submit" accesskey="s" tabindex="7" name="post" value="{L_SUBMIT}" class="button1" /> </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> |