diff options
| author | Henry Sudhof <kellanved@phpbb.com> | 2009-06-17 13:29:26 +0000 |
|---|---|---|
| committer | Henry Sudhof <kellanved@phpbb.com> | 2009-06-17 13:29:26 +0000 |
| commit | c6c6841cfbc0b5e342fb2dc5cbdea1834c4b47e9 (patch) | |
| tree | 6229f2126144dbfe99ea39239dfb5ba2bd1510ea /phpBB/styles | |
| parent | 2a079ecb52305cdeaac046a0f1298b18b9f7bcb3 (diff) | |
| download | forums-c6c6841cfbc0b5e342fb2dc5cbdea1834c4b47e9.tar forums-c6c6841cfbc0b5e342fb2dc5cbdea1834c4b47e9.tar.gz forums-c6c6841cfbc0b5e342fb2dc5cbdea1834c4b47e9.tar.bz2 forums-c6c6841cfbc0b5e342fb2dc5cbdea1834c4b47e9.tar.xz forums-c6c6841cfbc0b5e342fb2dc5cbdea1834c4b47e9.zip | |
Use dynamic includes, fix some style bugs, make the old default captcha family backwards compatible to 3.0.5 styles
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9609 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/styles')
9 files changed, 25 insertions, 24 deletions
diff --git a/phpBB/styles/prosilver/template/captcha_default.html b/phpBB/styles/prosilver/template/captcha_default.html index 399c978898..00d901825a 100644 --- a/phpBB/styles/prosilver/template/captcha_default.html +++ b/phpBB/styles/prosilver/template/captcha_default.html @@ -1,9 +1,9 @@ <dl> <dt><label for="confirm_code">{L_CONFIRM_CODE}:</label></dt> - <dd><img src="{CONFIRM_IMAGE}" alt="" /></dd> + <dd><img src="{CONFIRM_IMAGE_LINK}" alt="{L_CONFIRM_CODE}" /></dd> <dd><input type="text" name="confirm_code" id="confirm_code" size="8" maxlength="8" class="inputbox narrow" title="{L_CONFIRM_CODE}" /> - <!-- IF S_REFRESH --><input type="submit" name="refresh_vc" id="refresh_vc" class="button2" value="{L_VC_REFRESH}" /><!-- ENDIF --> + <!-- IF S_CONFIRM_REFRESH --><input type="submit" name="refresh_vc" id="refresh_vc" class="button2" value="{L_VC_REFRESH}" /><!-- ENDIF --> <input type="hidden" name="confirm_id" id="confirm_id" value="{CONFIRM_ID}" /></dd> <dd>{L_CONFIRM_CODE_EXPLAIN}</dd> </dl>
\ No newline at end of file diff --git a/phpBB/styles/prosilver/template/captcha_recaptcha.html b/phpBB/styles/prosilver/template/captcha_recaptcha.html index f325c3727d..10f24b1d7a 100644 --- a/phpBB/styles/prosilver/template/captcha_recaptcha.html +++ b/phpBB/styles/prosilver/template/captcha_recaptcha.html @@ -9,10 +9,12 @@ </script> <noscript> - <iframe src="{RECAPTCHA_SERVER}/noscript?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}" height="300" width="500" frameborder="0"></iframe><br/> + <div> + <iframe src="{RECAPTCHA_SERVER}/noscript?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}" height="300" width="500" frameborder="0"></iframe><br /> <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" /> </noscript> + </div> </dl> <!-- ELSE --> {L_RECAPTCHA_NOT_AVAILABLE} diff --git a/phpBB/styles/prosilver/template/login_body.html b/phpBB/styles/prosilver/template/login_body.html index a32c2d1e42..a4cd990630 100644 --- a/phpBB/styles/prosilver/template/login_body.html +++ b/phpBB/styles/prosilver/template/login_body.html @@ -21,8 +21,8 @@ <!-- IF U_RESEND_ACTIVATION --><dd><a href="{U_RESEND_ACTIVATION}">{L_RESEND_ACTIVATION}</a></dd><!-- ENDIF --> <!-- ENDIF --> </dl> - <!-- IF S_CONFIRM_CODE --> - {CONFIRM} + <!-- IF CAPTCHA_TEMPLATE --> + <!-- INCLUDE {CAPTCHA_TEMPLATE} --> <!-- ENDIF --> <!-- IF S_DISPLAY_FULL_LOGIN --> <dl> diff --git a/phpBB/styles/prosilver/template/posting_editor.html b/phpBB/styles/prosilver/template/posting_editor.html index 315fbaee2b..8cd5fc60d5 100644 --- a/phpBB/styles/prosilver/template/posting_editor.html +++ b/phpBB/styles/prosilver/template/posting_editor.html @@ -100,7 +100,7 @@ <dd><input type="text" name="subject" id="subject" size="45" maxlength="<!-- IF S_NEW_MESSAGE -->60<!-- ELSE -->64<!-- ENDIF -->" tabindex="2" value="{SUBJECT}{DRAFT_SUBJECT}" class="inputbox autowidth" /></dd> </dl> <!-- IF S_CONFIRM_CODE --> - {CONFIRM} + <!-- INCLUDE {CAPTCHA_TEMPLATE} --> <!-- ENDIF --> <!-- ENDIF --> diff --git a/phpBB/styles/prosilver/template/ucp_register.html b/phpBB/styles/prosilver/template/ucp_register.html index 468b131c4b..f35b5c9810 100644 --- a/phpBB/styles/prosilver/template/ucp_register.html +++ b/phpBB/styles/prosilver/template/ucp_register.html @@ -71,7 +71,7 @@ </dl> <!-- END profile_fields --> </fieldset> -<!-- IF S_CAPTCHA --> +<!-- IF CAPTCHA_TEMPLATE --> <span class="corners-bottom"><span></span></span></div> </div> @@ -82,8 +82,9 @@ <p>{L_CONFIRM_EXPLAIN}</p> <fieldset class="fields2"> - {S_CAPTCHA} + <!-- INCLUDE {CAPTCHA_TEMPLATE} --> + </fieldset> <!-- ENDIF --> diff --git a/phpBB/styles/subsilver2/template/captcha_default.html b/phpBB/styles/subsilver2/template/captcha_default.html index a1bc6cd6dc..b0c36e89f1 100644 --- a/phpBB/styles/subsilver2/template/captcha_default.html +++ b/phpBB/styles/subsilver2/template/captcha_default.html @@ -2,18 +2,15 @@ <th colspan="2" valign="middle">{L_CONFIRM_CODE}</th> </tr> <tr> - <td class="row3" colspan="2"><span class="gensmall">{L_CONFIRM_CODE_EXPLAIN}</span></td> + <td class="row3" colspan="2"><span class="gensmall">{L_CONFIRM_EXPLAIN}</span></td> </tr> <tr> - <td class="row1" colspan="2" align="center"><img src="{CONFIRM_IMAGE}" alt="{L_CONFIRM_CODE}" /> - <input type="hidden" name="confirm_id" id="confirm_id" value="{CONFIRM_ID}" /></dd> -</td> + <td class="row1" colspan="2" align="center"><img src="{CONFIRM_IMAGE_LINK}" alt="{L_CONFIRM_CODE}" /> + <input type="hidden" name="confirm_id" id="confirm_id" value="{CONFIRM_ID}" /></td> </tr> <tr> <td class="row1"><b class="genmed">{L_CONFIRM_CODE}: </b><br /><span class="gensmall">{L_CONFIRM_CODE_EXPLAIN} </span></td> <td class="row2"><input class="post" type="text" name="confirm_code" size="8" maxlength="8" /> - <!-- IF S_REFRESH --><input type="submit" name="refresh_vc" id="refresh_vc" class="button2" value="{L_VC_REFRESH}" /><!-- ENDIF --></td> - </tr> - - + <!-- IF S_CONFIRM_REFRESH --><input type="submit" name="refresh_vc" id="refresh_vc" class="button2" value="{L_VC_REFRESH}" /><!-- ENDIF --></td> + </tr>
\ No newline at end of file diff --git a/phpBB/styles/subsilver2/template/login_body.html b/phpBB/styles/subsilver2/template/login_body.html index 406ab3a293..b8a789bfe7 100644 --- a/phpBB/styles/subsilver2/template/login_body.html +++ b/phpBB/styles/subsilver2/template/login_body.html @@ -65,12 +65,12 @@ </td> </tr> -<!-- IF S_CAPTCHA --> +<!-- IF S_CONFIRM_CODE --> </table> <table class="tablebg" width="100%" cellspacing="1"> - {S_CAPTCHA} - <!-- ENDIF --> + <!-- INCLUDE {CAPTCHA_TEMPLATE} --> +<!-- ENDIF --> <tr> <td class="cat" <!-- IF not S_ADMIN_AUTH or S_CONFIRM_CODE -->colspan="2"<!-- ENDIF --> align="center">{S_HIDDEN_FIELDS}<input type="submit" name="login" class="btnmain" value="{L_LOGIN}" tabindex="5" /></td> diff --git a/phpBB/styles/subsilver2/template/posting_body.html b/phpBB/styles/subsilver2/template/posting_body.html index 162227b7e5..356972f707 100644 --- a/phpBB/styles/subsilver2/template/posting_body.html +++ b/phpBB/styles/subsilver2/template/posting_body.html @@ -332,8 +332,8 @@ </tr> <!-- ENDIF --> - <!-- IF S_CAPTCHA --> - {S_CAPTCHA} + <!-- IF S_CONFIRM_CODE --> + <!-- INCLUDE {CAPTCHA_TEMPLATE} --> <!-- ENDIF --> diff --git a/phpBB/styles/subsilver2/template/ucp_register.html b/phpBB/styles/subsilver2/template/ucp_register.html index dc47323836..fc3e4c119f 100644 --- a/phpBB/styles/subsilver2/template/ucp_register.html +++ b/phpBB/styles/subsilver2/template/ucp_register.html @@ -75,10 +75,11 @@ </td> <td class="row2">{profile_fields.FIELD}<!-- IF profile_fields.ERROR --><br /><span class="gensmall error">{profile_fields.ERROR}</span><!-- ENDIF --></td> </tr> + <!-- END profile_fields --> - <!-- IF S_CAPTCHA --> - {S_CAPTCHA} + <!-- IF CAPTCHA_TEMPLATE --> + <!-- INCLUDE {CAPTCHA_TEMPLATE} --> <!-- ENDIF --> <!-- IF S_COPPA --> |