From b776d02682492077a4fafd8835d7c4a17e50762d Mon Sep 17 00:00:00 2001 From: Henry Sudhof Date: Tue, 2 Jun 2009 14:12:23 +0000 Subject: Okay, a first ci of the new captcha plugins. We'll add dynamic template includes later, as well as documentation on how to use this. I'm prepared to get yelled at for bugs (oh, I know that there are plenty); but please blame spammers for broken styles and MODs. git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9524 89ea8834-ac86-4346-8a33-228a782c2dd0 --- .../styles/prosilver/template/captcha_default.html | 9 +++++++++ .../prosilver/template/captcha_recaptcha.html | 19 ++++++++++++++++++ phpBB/styles/prosilver/template/login_body.html | 10 +++------- .../styles/prosilver/template/posting_editor.html | 6 +----- phpBB/styles/prosilver/template/ucp_register.html | 14 ++++--------- .../subsilver2/template/captcha_default.html | 19 ++++++++++++++++++ .../subsilver2/template/captcha_recaptcha.html | 21 ++++++++++++++++++++ phpBB/styles/subsilver2/template/login_body.html | 23 +++++----------------- phpBB/styles/subsilver2/template/posting_body.html | 22 ++++----------------- phpBB/styles/subsilver2/template/ucp_register.html | 18 +++-------------- 10 files changed, 88 insertions(+), 73 deletions(-) create mode 100755 phpBB/styles/prosilver/template/captcha_default.html create mode 100644 phpBB/styles/prosilver/template/captcha_recaptcha.html create mode 100755 phpBB/styles/subsilver2/template/captcha_default.html create mode 100755 phpBB/styles/subsilver2/template/captcha_recaptcha.html (limited to 'phpBB/styles') diff --git a/phpBB/styles/prosilver/template/captcha_default.html b/phpBB/styles/prosilver/template/captcha_default.html new file mode 100755 index 0000000000..399c978898 --- /dev/null +++ b/phpBB/styles/prosilver/template/captcha_default.html @@ -0,0 +1,9 @@ + +
+
+
+
+ +
+
{L_CONFIRM_CODE_EXPLAIN}
+
\ No newline at end of file diff --git a/phpBB/styles/prosilver/template/captcha_recaptcha.html b/phpBB/styles/prosilver/template/captcha_recaptcha.html new file mode 100644 index 0000000000..f325c3727d --- /dev/null +++ b/phpBB/styles/prosilver/template/captcha_recaptcha.html @@ -0,0 +1,19 @@ + +
+ + + +
+ +{L_RECAPTCHA_NOT_AVAILABLE} + \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/login_body.html b/phpBB/styles/prosilver/template/login_body.html index ac7ada28c9..a32c2d1e42 100644 --- a/phpBB/styles/prosilver/template/login_body.html +++ b/phpBB/styles/prosilver/template/login_body.html @@ -21,21 +21,16 @@
{L_RESEND_ACTIVATION}
- -
-

{L_CONFIRM_CODE_EXPLAIN}
-
{CONFIRM_IMAGE}
-
-
+ {CONFIRM} -
+
 
{S_HIDDEN_FIELDS}
@@ -46,6 +41,7 @@ +
diff --git a/phpBB/styles/prosilver/template/posting_editor.html b/phpBB/styles/prosilver/template/posting_editor.html index 248d1ea72c..315fbaee2b 100644 --- a/phpBB/styles/prosilver/template/posting_editor.html +++ b/phpBB/styles/prosilver/template/posting_editor.html @@ -100,11 +100,7 @@
-
-

{L_CONFIRM_CODE_EXPLAIN}
-
{CONFIRM_IMAGE}
-
-
+ {CONFIRM} diff --git a/phpBB/styles/prosilver/template/ucp_register.html b/phpBB/styles/prosilver/template/ucp_register.html index 3aeb92a5b0..468b131c4b 100644 --- a/phpBB/styles/prosilver/template/ucp_register.html +++ b/phpBB/styles/prosilver/template/ucp_register.html @@ -71,8 +71,7 @@ - - + @@ -83,16 +82,11 @@

{L_CONFIRM_EXPLAIN}

-
-
-
{CONFIRM_IMG}
-
-
{L_CONFIRM_CODE_EXPLAIN} {L_VC_REFRESH_EXPLAIN}
-
-
+ {S_CAPTCHA} +
- + diff --git a/phpBB/styles/subsilver2/template/captcha_default.html b/phpBB/styles/subsilver2/template/captcha_default.html new file mode 100755 index 0000000000..a1bc6cd6dc --- /dev/null +++ b/phpBB/styles/subsilver2/template/captcha_default.html @@ -0,0 +1,19 @@ + + {L_CONFIRM_CODE} + + + {L_CONFIRM_CODE_EXPLAIN} + + + {L_CONFIRM_CODE} + + + + + {L_CONFIRM_CODE}:
{L_CONFIRM_CODE_EXPLAIN} + + + + + + diff --git a/phpBB/styles/subsilver2/template/captcha_recaptcha.html b/phpBB/styles/subsilver2/template/captcha_recaptcha.html new file mode 100755 index 0000000000..106a5cce2a --- /dev/null +++ b/phpBB/styles/subsilver2/template/captcha_recaptcha.html @@ -0,0 +1,21 @@ + + + // + + + + + +{L_RECAPTCHA_NOT_AVAILABLE} + + + \ 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 86eed2dfc6..406ab3a293 100644 --- a/phpBB/styles/subsilver2/template/login_body.html +++ b/phpBB/styles/subsilver2/template/login_body.html @@ -65,26 +65,13 @@ - + - - - - - - - - - - - - - - + + {S_CAPTCHA} + + diff --git a/phpBB/styles/subsilver2/template/posting_body.html b/phpBB/styles/subsilver2/template/posting_body.html index da1fbf4e30..162227b7e5 100644 --- a/phpBB/styles/subsilver2/template/posting_body.html +++ b/phpBB/styles/subsilver2/template/posting_body.html @@ -332,24 +332,10 @@ - - - - - - - - - - - - - - - + + {S_CAPTCHA} + + diff --git a/phpBB/styles/subsilver2/template/ucp_register.html b/phpBB/styles/subsilver2/template/ucp_register.html index fd987f2d73..dc47323836 100644 --- a/phpBB/styles/subsilver2/template/ucp_register.html +++ b/phpBB/styles/subsilver2/template/ucp_register.html @@ -77,21 +77,9 @@ - - - - - - - - - - - - - - - + + {S_CAPTCHA} + -- cgit v1.2.1
{L_LOGIN_CONFIRMATION}
{L_LOGIN_CONFIRM_EXPLAIN}
- - {CONFIRM_IMAGE} -
{L_CONFIRM_CODE}:
{L_CONFIRM_CODE_EXPLAIN}
colspan="2" align="center">{S_HIDDEN_FIELDS}
{L_POST_CONFIRMATION}
{L_POST_CONFIRM_EXPLAIN}
- - {CONFIRM_IMAGE} -
{L_CONFIRM_CODE}:
{L_CONFIRM_CODE_EXPLAIN}
{L_CONFIRMATION}
{L_CONFIRM_EXPLAIN}
{CONFIRM_IMG}
{L_CONFIRM_CODE}:
{L_CONFIRM_CODE_EXPLAIN} {L_VC_REFRESH_EXPLAIN}