diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2009-07-19 22:21:50 +0000 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2009-07-19 22:21:50 +0000 |
| commit | e7a17a34295106391cb1803070dccb9e7a419d86 (patch) | |
| tree | 67edbfedd37d8ee5283698bbdf6468e121de40ca /phpBB | |
| parent | 76508b59d71f5c9943256045a4677888aca2464c (diff) | |
| download | forums-e7a17a34295106391cb1803070dccb9e7a419d86.tar forums-e7a17a34295106391cb1803070dccb9e7a419d86.tar.gz forums-e7a17a34295106391cb1803070dccb9e7a419d86.tar.bz2 forums-e7a17a34295106391cb1803070dccb9e7a419d86.tar.xz forums-e7a17a34295106391cb1803070dccb9e7a419d86.zip | |
Set some svn properties. Cleanup.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9799 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/adm/style/captcha_default_acp_demo.html | 3 | ||||
| -rw-r--r-- | phpBB/adm/style/captcha_qa_acp_demo.html | 4 | ||||
| -rw-r--r-- | phpBB/adm/style/captcha_recaptcha.html | 22 | ||||
| -rw-r--r-- | phpBB/language/en/captcha_qa.php | 6 | ||||
| -rw-r--r-- | phpBB/language/en/recaptcha.php | 3 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/captcha_qa.html | 4 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/captcha_recaptcha.html | 25 | ||||
| -rw-r--r-- | phpBB/styles/prosilver/template/quickreply_editor.html | 1 |
8 files changed, 30 insertions, 38 deletions
diff --git a/phpBB/adm/style/captcha_default_acp_demo.html b/phpBB/adm/style/captcha_default_acp_demo.html index a714386e51..0b1434f7e0 100644 --- a/phpBB/adm/style/captcha_default_acp_demo.html +++ b/phpBB/adm/style/captcha_default_acp_demo.html @@ -1,5 +1,4 @@ - <dl> <dt><label for="captcha_preview">{L_PREVIEW}:</label><br /><span>{L_CAPTCHA_PREVIEW_EXPLAIN}</span></dt> <dd><img src="{CONFIRM_IMAGE}" alt="{L_PREVIEW}" width="360" height="96" id="captcha_preview" /></dd> -</dl>
\ No newline at end of file +</dl> diff --git a/phpBB/adm/style/captcha_qa_acp_demo.html b/phpBB/adm/style/captcha_qa_acp_demo.html index 919d4d48d5..474dfc58ea 100644 --- a/phpBB/adm/style/captcha_qa_acp_demo.html +++ b/phpBB/adm/style/captcha_qa_acp_demo.html @@ -1,7 +1,7 @@ <dl> <dt><label for="answer">{L_CONFIRM_QUESTION}:</label><br /><span>{L_CONFIRM_QUESTION_EXPLAIN}</span></dt> -
+ <dd> - <input type="text" tabindex="10" name="answer" id="answer" size="45" class="inputbox autowidth" title="{L_ANSWER}" />
+ <input type="text" tabindex="10" name="answer" id="answer" size="45" class="inputbox autowidth" title="{L_ANSWER}" /> </dd> </dl> diff --git a/phpBB/adm/style/captcha_recaptcha.html b/phpBB/adm/style/captcha_recaptcha.html index 0cb43cf01f..93fc6e7499 100644 --- a/phpBB/adm/style/captcha_recaptcha.html +++ b/phpBB/adm/style/captcha_recaptcha.html @@ -1,5 +1,5 @@ <!-- IF S_RECAPTCHA_AVAILABLE --> - <dl>
+ <dl> <dd> <script type="text/javascript" src="{RECAPTCHA_SERVER}/challenge?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}"> // <![CDATA[ @@ -8,18 +8,18 @@ }; // ]]> </script> - - - <noscript>
- <div>
- <object data="{RECAPTCHA_SERVER}/noscript?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}" type="text/html" height="300" width="500"></object><br /> - <textarea name="recaptcha_challenge_field" rows="3" cols="40"></textarea> - <input type="hidden" name="recaptcha_response_field" value="manual_challenge" /> - </div>
+ + + <noscript> + <div> + <object data="{RECAPTCHA_SERVER}/noscript?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}" type="text/html" height="300" width="500"></object><br /> + <textarea name="recaptcha_challenge_field" rows="3" cols="40"></textarea> + <input type="hidden" name="recaptcha_response_field" value="manual_challenge" /> + </div> </noscript> -
+ </dd> </dl> <!-- ELSE --> {L_RECAPTCHA_NOT_AVAILABLE} -<!-- ENDIF -->
\ No newline at end of file +<!-- ENDIF --> diff --git a/phpBB/language/en/captcha_qa.php b/phpBB/language/en/captcha_qa.php index 1eee68fb96..ac1aa4ab1c 100644 --- a/phpBB/language/en/captcha_qa.php +++ b/phpBB/language/en/captcha_qa.php @@ -4,8 +4,8 @@ * recaptcha [English] * * @package language -* @version $Id: recaptcha.php 9709 2009-06-30 14:23:16Z Kellanved $ -* @copyright (c) 2008 phpBB Group +* @version $Id$ +* @copyright (c) 2009 phpBB Group * @license http://opensource.org/licenses/gpl-license.php GNU Public License * */ @@ -57,8 +57,6 @@ $lang = array_merge($lang, array( 'QUESTION_TEXT_EXPLAIN' => 'The question that will be asked on registration.', 'QA_ERROR_MSG' => 'Please fill out all fields and enter at least one answer.', - - )); ?>
\ No newline at end of file diff --git a/phpBB/language/en/recaptcha.php b/phpBB/language/en/recaptcha.php index e0c3db98b7..25802d3a9f 100644 --- a/phpBB/language/en/recaptcha.php +++ b/phpBB/language/en/recaptcha.php @@ -5,7 +5,7 @@ * * @package language * @version $Id$ -* @copyright (c) 2008 phpBB Group +* @copyright (c) 2009 phpBB Group * @license http://opensource.org/licenses/gpl-license.php GNU Public License * */ @@ -47,7 +47,6 @@ $lang = array_merge($lang, array( 'RECAPTCHA_PRIVATE_EXPLAIN' => 'Your private reCaptcha key. You can obtain keys from <a href="http://recaptcha.net">reCaptcha.net</a>.', 'RECAPTCHA_EXPLAIN' => 'To avoid spam postings, please enter the two words shown in the picture into the text field underneath.', - )); ?>
\ No newline at end of file diff --git a/phpBB/styles/prosilver/template/captcha_qa.html b/phpBB/styles/prosilver/template/captcha_qa.html index 52df6fac4a..e363ee008d 100644 --- a/phpBB/styles/prosilver/template/captcha_qa.html +++ b/phpBB/styles/prosilver/template/captcha_qa.html @@ -4,11 +4,10 @@ <h3>{L_CONFIRMATION}</h3> <fieldset class="fields2"> - <!-- ENDIF --> <dl> - <dt><label>{CONFIRM_QUESTION}</label>:<br /><span>{L_CONFIRM_QUESTION_EXPLAIN}</span></dt>
+ <dt><label>{CONFIRM_QUESTION}</label>:<br /><span>{L_CONFIRM_QUESTION_EXPLAIN}</span></dt> <dd> <input type="text" tabindex="10" name="answer" id="answer" size="45" class="inputbox autowidth" title="{L_ANSWER}" /> <input type="hidden" name="confirm_id" id="confirm_id" value="{CONFIRM_ID}" /> @@ -20,4 +19,3 @@ <span class="corners-bottom"><span></span></span></div> </div> <!-- ENDIF --> - diff --git a/phpBB/styles/prosilver/template/captcha_recaptcha.html b/phpBB/styles/prosilver/template/captcha_recaptcha.html index 431124a210..510a1d3124 100644 --- a/phpBB/styles/prosilver/template/captcha_recaptcha.html +++ b/phpBB/styles/prosilver/template/captcha_recaptcha.html @@ -6,13 +6,13 @@ <p>{L_CONFIRM_EXPLAIN}</p> <fieldset class="fields2"> - <!-- ENDIF --> + <!-- IF S_RECAPTCHA_AVAILABLE --> <dl> - <dt><label>{L_CONFIRM_CODE}</label>:<br /><span>{L_RECAPTCHA_EXPLAIN}</span></dt>
+ <dt><label>{L_CONFIRM_CODE}</label>:<br /><span>{L_RECAPTCHA_EXPLAIN}</span></dt> <dd> - + <script type="text/javascript" src="{RECAPTCHA_SERVER}/challenge?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}"> // <![CDATA[ var RecaptchaOptions = { @@ -20,24 +20,23 @@ }; // ]]> </script> - - - <noscript>
- <div>
- <object data="{RECAPTCHA_SERVER}/noscript?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}" type="text/html" height="300" width="500"></object><br /> - <textarea name="recaptcha_challenge_field" rows="3" cols="40"></textarea> - <input type="hidden" name="recaptcha_response_field" value="manual_challenge" /> - </div>
+ + <noscript> + <div> + <object data="{RECAPTCHA_SERVER}/noscript?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}" type="text/html" height="300" width="500"></object><br /> + <textarea name="recaptcha_challenge_field" rows="3" cols="40"></textarea> + <input type="hidden" name="recaptcha_response_field" value="manual_challenge" /> + </div> </noscript> -
+ </dd> </dl> <!-- ELSE --> {L_RECAPTCHA_NOT_AVAILABLE} <!-- ENDIF --> + <!-- IF S_TYPE == 1 --> </fieldset> <span class="corners-bottom"><span></span></span></div> </div> <!-- ENDIF --> - diff --git a/phpBB/styles/prosilver/template/quickreply_editor.html b/phpBB/styles/prosilver/template/quickreply_editor.html index 22d90cdd90..4fca4b0dfd 100644 --- a/phpBB/styles/prosilver/template/quickreply_editor.html +++ b/phpBB/styles/prosilver/template/quickreply_editor.html @@ -11,7 +11,6 @@ // ]]> </script> <form method="post" action="{U_QR_ACTION}"> - <div class="panel" id="qr_editor_div"> <div class="inner"><span class="corners-top"><span></span></span> <div class="content"> |