From 66ecbd8545ace2f402eeed9c2c10405635efa8b3 Mon Sep 17 00:00:00 2001
From: PayBas <contact@paybas.com>
Date: Tue, 9 Sep 2014 22:30:37 +0200
Subject: [PATCH 1/3] [ticket/12530] Fix captcha challange image breaking
 responsive layout

PHPBB3-12530
---
 .../prosilver/template/captcha_default.html   |  2 +-
 .../styles/prosilver/template/captcha_qa.html |  2 +-
 .../prosilver/template/captcha_recaptcha.html |  2 +-
 phpBB/styles/prosilver/theme/responsive.css   | 19 +++++++++++++++++++
 4 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/phpBB/styles/prosilver/template/captcha_default.html b/phpBB/styles/prosilver/template/captcha_default.html
index 550962db67..9feb87a391 100644
--- a/phpBB/styles/prosilver/template/captcha_default.html
+++ b/phpBB/styles/prosilver/template/captcha_default.html
@@ -10,7 +10,7 @@
 
 	<dl>
 		<dt><label for="confirm_code">{L_CONFIRM_CODE}{L_COLON}</label></dt>
-		<dd><img src="{CONFIRM_IMAGE_LINK}" alt="{L_CONFIRM_CODE}" /></dd>
+		<dd class="captcha captcha-image"><img src="{CONFIRM_IMAGE_LINK}" alt="{L_CONFIRM_CODE}" /></dd>
 		<dd><input type="text" name="confirm_code" id="confirm_code" size="8" maxlength="8" tabindex="{$CAPTCHA_TAB_INDEX}" class="inputbox narrow" title="{L_CONFIRM_CODE}" />
 		<!-- 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>
diff --git a/phpBB/styles/prosilver/template/captcha_qa.html b/phpBB/styles/prosilver/template/captcha_qa.html
index 1671987f63..2962ca893b 100644
--- a/phpBB/styles/prosilver/template/captcha_qa.html
+++ b/phpBB/styles/prosilver/template/captcha_qa.html
@@ -8,7 +8,7 @@
 
 	<dl>
 	<dt><label>{QA_CONFIRM_QUESTION}{L_COLON}</label><br /><span>{L_CONFIRM_QUESTION_EXPLAIN}</span></dt>
-	<dd>
+	<dd class="captcha">
 		<input type="text" tabindex="{$CAPTCHA_TAB_INDEX}" name="qa_answer" id="answer" size="45"  class="inputbox autowidth" title="{L_ANSWER}" />
 		<input type="hidden" name="qa_confirm_id" id="qa_confirm_id" value="{QA_CONFIRM_ID}" />
 	</dd>
diff --git a/phpBB/styles/prosilver/template/captcha_recaptcha.html b/phpBB/styles/prosilver/template/captcha_recaptcha.html
index bde0c9df13..3b6ce29beb 100644
--- a/phpBB/styles/prosilver/template/captcha_recaptcha.html
+++ b/phpBB/styles/prosilver/template/captcha_recaptcha.html
@@ -11,7 +11,7 @@
 <!-- IF S_RECAPTCHA_AVAILABLE -->
 	<dl>
 	<dt><label>{L_CONFIRM_CODE}{L_COLON}</label><br /><span>{L_RECAPTCHA_EXPLAIN}</span></dt>
-	<dd>
+	<dd class="captcha">
 		<script type="text/javascript">
 		// <![CDATA[
 		var RecaptchaOptions = {
diff --git a/phpBB/styles/prosilver/theme/responsive.css b/phpBB/styles/prosilver/theme/responsive.css
index ed3ba61334..d15a3a5edc 100644
--- a/phpBB/styles/prosilver/theme/responsive.css
+++ b/phpBB/styles/prosilver/theme/responsive.css
@@ -350,6 +350,25 @@ fieldset.quick-login label[for="autologin"] {
 	select, .inputbox {
 		max-width: 260px;
 	}
+
+	dd.captcha {
+		margin-left: 0;
+	}
+
+	dd.captcha-image img {
+		width: 100%;
+	}
+
+	#recaptcha_challenge_image,
+	#recaptcha_response_field,
+	.recaptchatable #recaptcha_image {
+		margin: 0 !important;
+		width: 100% !important;
+		height: auto !important;
+	}
+	.recaptchatable #recaptcha_logo {
+		display: none !important;
+	}
 }
 
 @media only screen and (max-width: 430px), only screen and (max-device-width: 430px) {

From 757c67b7d8d4c978cc9da22b5fc4eb1c945a8090 Mon Sep 17 00:00:00 2001
From: PayBas <contact@paybas.com>
Date: Fri, 19 Sep 2014 11:57:20 +0200
Subject: [PATCH 2/3] [ticket/12530] Show logo and policy in responsive

PHPBB3-12530
---
 .../prosilver/template/captcha_default.html    |  2 +-
 .../styles/prosilver/template/captcha_qa.html  |  2 +-
 .../prosilver/template/captcha_recaptcha.html  | 18 ++++++------------
 phpBB/styles/prosilver/theme/responsive.css    | 16 +++++++++++-----
 4 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/phpBB/styles/prosilver/template/captcha_default.html b/phpBB/styles/prosilver/template/captcha_default.html
index 9feb87a391..02899bcafd 100644
--- a/phpBB/styles/prosilver/template/captcha_default.html
+++ b/phpBB/styles/prosilver/template/captcha_default.html
@@ -1,5 +1,5 @@
 <!-- IF S_TYPE == 1 -->
-<div class="panel">
+<div class="panel captcha-panel">
 	<div class="inner">
 
 	<h3 class="captcha-title">{L_CONFIRMATION}</h3>
diff --git a/phpBB/styles/prosilver/template/captcha_qa.html b/phpBB/styles/prosilver/template/captcha_qa.html
index 2962ca893b..b8c6678066 100644
--- a/phpBB/styles/prosilver/template/captcha_qa.html
+++ b/phpBB/styles/prosilver/template/captcha_qa.html
@@ -1,5 +1,5 @@
 <!-- IF S_TYPE == 1 -->
-<div class="panel">
+<div class="panel captcha-panel">
 	<div class="inner">
 
 	<h3 class="captcha-title">{L_CONFIRMATION}</h3>
diff --git a/phpBB/styles/prosilver/template/captcha_recaptcha.html b/phpBB/styles/prosilver/template/captcha_recaptcha.html
index 3b6ce29beb..dec999ad5d 100644
--- a/phpBB/styles/prosilver/template/captcha_recaptcha.html
+++ b/phpBB/styles/prosilver/template/captcha_recaptcha.html
@@ -1,5 +1,5 @@
 <!-- IF S_TYPE == 1 -->
-<div class="panel">
+<div class="panel captcha-panel">
 	<div class="inner">
 
 	<h3 class="captcha-title">{L_CONFIRMATION}</h3>
@@ -12,23 +12,15 @@
 	<dl>
 	<dt><label>{L_CONFIRM_CODE}{L_COLON}</label><br /><span>{L_RECAPTCHA_EXPLAIN}</span></dt>
 	<dd class="captcha">
-		<script type="text/javascript">
-		// <![CDATA[
+		<script>
 		var RecaptchaOptions = {
 			lang : '{LA_RECAPTCHA_LANG}',
 			theme : 'clean',
 			tabindex : <!-- IF $CAPTCHA_TAB_INDEX -->{$CAPTCHA_TAB_INDEX}<!-- ELSE -->10<!-- ENDIF -->
 		};
-		// ]]>
-		</script>
-		<script type="text/javascript" src="{RECAPTCHA_SERVER}/challenge?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}"></script>
-		<script type="text/javascript">
-		// <![CDATA[
-		<!-- IF S_CONTENT_DIRECTION eq 'rtl' -->
-			document.getElementById('recaptcha_table').style.direction = 'ltr';
-		<!-- ENDIF -->
-		// ]]>
 		</script>
+		<script src="{RECAPTCHA_SERVER}/challenge?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}"></script>
+
 		<noscript>
 		<div>
 			<object data="{RECAPTCHA_SERVER}/noscript?k={RECAPTCHA_PUBKEY}{RECAPTCHA_ERRORGET}" type="text/html" height="300" width="500"></object><br />
@@ -37,6 +29,8 @@
 		</div>
 		</noscript>
 
+		<img class="recaptcha-responsive" style="display: none" alt="" width="71" height="36" src="{RECAPTCHA_SERVER}/img/clean/logo.png">
+		<span class="recaptcha-responsive" style="display: none"><a href="http://www.google.com/intl/{LA_RECAPTCHA_LANG}/policies/" target="_blank">Privacy &amp; Terms</a></span>
 	</dd>
 	</dl>
 <!-- ELSE -->
diff --git a/phpBB/styles/prosilver/theme/responsive.css b/phpBB/styles/prosilver/theme/responsive.css
index d15a3a5edc..8653042a69 100644
--- a/phpBB/styles/prosilver/theme/responsive.css
+++ b/phpBB/styles/prosilver/theme/responsive.css
@@ -351,23 +351,29 @@ fieldset.quick-login label[for="autologin"] {
 		max-width: 260px;
 	}
 
-	dd.captcha {
+	.captcha-panel dd.captcha {
 		margin-left: 0;
 	}
 
-	dd.captcha-image img {
+	.captcha-panel dd.captcha-image img {
 		width: 100%;
 	}
 
 	#recaptcha_challenge_image,
 	#recaptcha_response_field,
 	.recaptchatable #recaptcha_image {
-		margin: 0 !important;
 		width: 100% !important;
 		height: auto !important;
 	}
-	.recaptchatable #recaptcha_logo {
-		display: none !important;
+
+	.recaptchatable tr td:last-child {
+		display: none;
+	}
+
+	.captcha-panel .recaptcha-responsive {
+		display: inline-block !important;
+		margin-top: 10px;
+		vertical-align: middle;
 	}
 }
 

From 965894a8757e35261d631ec886137432e89244cc Mon Sep 17 00:00:00 2001
From: PayBas <contact@paybas.com>
Date: Wed, 15 Oct 2014 12:08:55 +0200
Subject: [PATCH 3/3] [ticket/12530] Combine logo and TOS link into one

PHPBB3-12530
---
 phpBB/styles/prosilver/template/captcha_recaptcha.html | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/phpBB/styles/prosilver/template/captcha_recaptcha.html b/phpBB/styles/prosilver/template/captcha_recaptcha.html
index dec999ad5d..aa4c756dcb 100644
--- a/phpBB/styles/prosilver/template/captcha_recaptcha.html
+++ b/phpBB/styles/prosilver/template/captcha_recaptcha.html
@@ -29,8 +29,7 @@
 		</div>
 		</noscript>
 
-		<img class="recaptcha-responsive" style="display: none" alt="" width="71" height="36" src="{RECAPTCHA_SERVER}/img/clean/logo.png">
-		<span class="recaptcha-responsive" style="display: none"><a href="http://www.google.com/intl/{LA_RECAPTCHA_LANG}/policies/" target="_blank">Privacy &amp; Terms</a></span>
+		<a href="http://www.google.com/intl/{LA_RECAPTCHA_LANG}/policies/" target="_blank"><img class="recaptcha-responsive" style="display: none" alt="" width="71" height="36" src="{RECAPTCHA_SERVER}/img/clean/logo.png"></a>
 	</dd>
 	</dl>
 <!-- ELSE -->