Set some svn properties. Cleanup.

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9799 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Andreas Fischer 2009-07-19 22:21:50 +00:00
parent 76508b59d7
commit e7a17a3429
8 changed files with 30 additions and 38 deletions

View file

@ -1,5 +1,4 @@
<dl> <dl>
<dt><label for="captcha_preview">{L_PREVIEW}:</label><br /><span>{L_CAPTCHA_PREVIEW_EXPLAIN}</span></dt> <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> <dd><img src="{CONFIRM_IMAGE}" alt="{L_PREVIEW}" width="360" height="96" id="captcha_preview" /></dd>
</dl> </dl>

View file

@ -1,7 +1,7 @@
<dl> <dl>
<dt><label for="answer">{L_CONFIRM_QUESTION}:</label><br /><span>{L_CONFIRM_QUESTION_EXPLAIN}</span></dt> <dt><label for="answer">{L_CONFIRM_QUESTION}:</label><br /><span>{L_CONFIRM_QUESTION_EXPLAIN}</span></dt>
<dd> <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> </dd>
</dl> </dl>

View file

@ -1,5 +1,5 @@
<!-- IF S_RECAPTCHA_AVAILABLE --> <!-- IF S_RECAPTCHA_AVAILABLE -->
<dl> <dl>
<dd> <dd>
<script type="text/javascript" src="{RECAPTCHA_SERVER}/challenge?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}"> <script type="text/javascript" src="{RECAPTCHA_SERVER}/challenge?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}">
// <![CDATA[ // <![CDATA[
@ -8,18 +8,18 @@
}; };
// ]]> // ]]>
</script> </script>
<noscript> <noscript>
<div> <div>
<object data="{RECAPTCHA_SERVER}/noscript?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}" type="text/html" height="300" width="500"></object><br /> <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> <textarea name="recaptcha_challenge_field" rows="3" cols="40"></textarea>
<input type="hidden" name="recaptcha_response_field" value="manual_challenge" /> <input type="hidden" name="recaptcha_response_field" value="manual_challenge" />
</div> </div>
</noscript> </noscript>
</dd> </dd>
</dl> </dl>
<!-- ELSE --> <!-- ELSE -->
{L_RECAPTCHA_NOT_AVAILABLE} {L_RECAPTCHA_NOT_AVAILABLE}
<!-- ENDIF --> <!-- ENDIF -->

View file

@ -4,8 +4,8 @@
* recaptcha [English] * recaptcha [English]
* *
* @package language * @package language
* @version $Id: recaptcha.php 9709 2009-06-30 14:23:16Z Kellanved $ * @version $Id$
* @copyright (c) 2008 phpBB Group * @copyright (c) 2009 phpBB Group
* @license http://opensource.org/licenses/gpl-license.php GNU Public License * @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.', '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.', 'QA_ERROR_MSG' => 'Please fill out all fields and enter at least one answer.',
)); ));
?> ?>

View file

@ -5,7 +5,7 @@
* *
* @package language * @package language
* @version $Id$ * @version $Id$
* @copyright (c) 2008 phpBB Group * @copyright (c) 2009 phpBB Group
* @license http://opensource.org/licenses/gpl-license.php GNU Public License * @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_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.', 'RECAPTCHA_EXPLAIN' => 'To avoid spam postings, please enter the two words shown in the picture into the text field underneath.',
)); ));
?> ?>

View file

@ -4,11 +4,10 @@
<h3>{L_CONFIRMATION}</h3> <h3>{L_CONFIRMATION}</h3>
<fieldset class="fields2"> <fieldset class="fields2">
<!-- ENDIF --> <!-- ENDIF -->
<dl> <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> <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}" />
<input type="hidden" name="confirm_id" id="confirm_id" value="{CONFIRM_ID}" /> <input type="hidden" name="confirm_id" id="confirm_id" value="{CONFIRM_ID}" />
@ -20,4 +19,3 @@
<span class="corners-bottom"><span></span></span></div> <span class="corners-bottom"><span></span></span></div>
</div> </div>
<!-- ENDIF --> <!-- ENDIF -->

View file

@ -6,13 +6,13 @@
<p>{L_CONFIRM_EXPLAIN}</p> <p>{L_CONFIRM_EXPLAIN}</p>
<fieldset class="fields2"> <fieldset class="fields2">
<!-- ENDIF --> <!-- ENDIF -->
<!-- IF S_RECAPTCHA_AVAILABLE --> <!-- IF S_RECAPTCHA_AVAILABLE -->
<dl> <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> <dd>
<script type="text/javascript" src="{RECAPTCHA_SERVER}/challenge?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}"> <script type="text/javascript" src="{RECAPTCHA_SERVER}/challenge?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}">
// <![CDATA[ // <![CDATA[
var RecaptchaOptions = { var RecaptchaOptions = {
@ -20,24 +20,23 @@
}; };
// ]]> // ]]>
</script> </script>
<noscript>
<noscript> <div>
<div> <object data="{RECAPTCHA_SERVER}/noscript?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}" type="text/html" height="300" width="500"></object><br />
<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>
<textarea name="recaptcha_challenge_field" rows="3" cols="40"></textarea> <input type="hidden" name="recaptcha_response_field" value="manual_challenge" />
<input type="hidden" name="recaptcha_response_field" value="manual_challenge" /> </div>
</div>
</noscript> </noscript>
</dd> </dd>
</dl> </dl>
<!-- ELSE --> <!-- ELSE -->
{L_RECAPTCHA_NOT_AVAILABLE} {L_RECAPTCHA_NOT_AVAILABLE}
<!-- ENDIF --> <!-- ENDIF -->
<!-- IF S_TYPE == 1 --> <!-- IF S_TYPE == 1 -->
</fieldset> </fieldset>
<span class="corners-bottom"><span></span></span></div> <span class="corners-bottom"><span></span></span></div>
</div> </div>
<!-- ENDIF --> <!-- ENDIF -->

View file

@ -11,7 +11,6 @@
// ]]> // ]]>
</script> </script>
<form method="post" action="{U_QR_ACTION}"> <form method="post" action="{U_QR_ACTION}">
<div class="panel" id="qr_editor_div"> <div class="panel" id="qr_editor_div">
<div class="inner"><span class="corners-top"><span></span></span> <div class="inner"><span class="corners-top"><span></span></span>
<div class="content"> <div class="content">