From 9249ee2e7209b1f6b5da9ecee75408cb545c1647 Mon Sep 17 00:00:00 2001
From: Henry Sudhof <kellanved@phpbb.com>
Date: Tue, 30 Jun 2009 08:11:32 +0000
Subject: [PATCH] #47615 - move the panel for the conifrm box to the captcha
 template

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9705 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 .../prosilver/template/captcha_default.html    | 16 +++++++++++++++-
 .../prosilver/template/captcha_recaptcha.html  | 16 +++++++++++++++-
 .../prosilver/template/ucp_register.html       | 18 +++++-------------
 3 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/phpBB/styles/prosilver/template/captcha_default.html b/phpBB/styles/prosilver/template/captcha_default.html
index 00d901825a..7b36718225 100644
--- a/phpBB/styles/prosilver/template/captcha_default.html
+++ b/phpBB/styles/prosilver/template/captcha_default.html
@@ -1,4 +1,13 @@
+<!-- IF S_TYPE == 0 -->
+<div class="panel">
+	<div class="inner"><span class="corners-top"><span></span></span>
 
+	<h3>{L_CONFIRMATION}</h3>
+	<p>{L_CONFIRM_EXPLAIN}</p>
+
+	<fieldset class="fields2">
+
+<!-- ENDIF -->
 	<dl>
 		<dt><label for="confirm_code">{L_CONFIRM_CODE}:</label></dt>
 		<dd><img src="{CONFIRM_IMAGE_LINK}" alt="{L_CONFIRM_CODE}" /></dd>
@@ -6,4 +15,9 @@
 		<!-- 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
+	</dl>
+<!-- IF S_TYPE == 0 -->
+	</fieldset>
+	<span class="corners-bottom"><span></span></span></div>
+</div>
+<!-- ENDIF -->
\ 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 0cb43cf01f..486124c844 100644
--- a/phpBB/styles/prosilver/template/captcha_recaptcha.html
+++ b/phpBB/styles/prosilver/template/captcha_recaptcha.html
@@ -1,3 +1,13 @@
+<!-- IF S_TYPE == 0 -->
+<div class="panel">
+	<div class="inner"><span class="corners-top"><span></span></span>
+
+	<h3>{L_CONFIRMATION}</h3>
+	<p>{L_CONFIRM_EXPLAIN}</p>
+
+	<fieldset class="fields2">
+
+<!-- ENDIF -->
 <!-- IF S_RECAPTCHA_AVAILABLE -->
 	<dl>
 	<dd>
@@ -22,4 +32,8 @@
 	</dl>
 <!-- ELSE -->
 {L_RECAPTCHA_NOT_AVAILABLE}
-<!-- ENDIF -->
\ No newline at end of file
+<!-- ENDIF -->
+<!-- IF S_TYPE == 0 -->
+
+<!-- ENDIF -->
+	
diff --git a/phpBB/styles/prosilver/template/ucp_register.html b/phpBB/styles/prosilver/template/ucp_register.html
index f35b5c9810..578808e6bb 100644
--- a/phpBB/styles/prosilver/template/ucp_register.html
+++ b/phpBB/styles/prosilver/template/ucp_register.html
@@ -71,17 +71,9 @@
 		</dl>
 	<!-- END profile_fields -->
 	</fieldset>
-<!-- IF CAPTCHA_TEMPLATE -->
 	<span class="corners-bottom"><span></span></span></div>
 </div>
-
-<div class="panel">
-	<div class="inner"><span class="corners-top"><span></span></span>
-
-	<h3>{L_CONFIRMATION}</h3>
-	<p>{L_CONFIRM_EXPLAIN}</p>
-
-	<fieldset class="fields2">
+<!-- IF CAPTCHA_TEMPLATE -->
 
 		<!-- INCLUDE {CAPTCHA_TEMPLATE} -->
 	
@@ -89,8 +81,7 @@
 
 <!-- ENDIF -->
 <!-- IF S_COPPA -->
-	<span class="corners-bottom"><span></span></span></div>
-</div>
+
 
 <div class="panel">
 	<div class="inner"><span class="corners-top"><span></span></span>
@@ -98,10 +89,11 @@
 	<h4>{L_COPPA_COMPLIANCE}</h4>
 
 	<p>{L_COPPA_EXPLAIN}</p>
-<!-- ENDIF -->
-
 	<span class="corners-bottom"><span></span></span></div>
 </div>
+<!-- ENDIF -->
+
+
 
 <div class="panel">
 	<div class="inner"><span class="corners-top"><span></span></span>