From 446569ecb9f5d4a24152e7a1cf1c8600d52c9e8f Mon Sep 17 00:00:00 2001
From: Quitta <devnull@localhost>
Date: Tue, 18 Jun 2013 16:27:57 +0200
Subject: [PATCH] show error message + tooltips while registering

---
 .../ryzom_ams/ams_lib/translations/en.ini     |  2 +-
 .../ryzom_ams/www/html/templates/register.tpl | 44 +++++++++++++++++--
 2 files changed, 41 insertions(+), 5 deletions(-)

diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/translations/en.ini b/code/ryzom/tools/server/ryzom_ams/ams_lib/translations/en.ini
index a1ad8d461..af9f29d05 100644
--- a/code/ryzom/tools/server/ryzom_ams/ams_lib/translations/en.ini
+++ b/code/ryzom/tools/server/ryzom_ams/ams_lib/translations/en.ini
@@ -14,7 +14,7 @@ username_tooltip = "5-12 lower-case characters and numbers. The login (username)
 username_default = "Username"
 
 password_tag = "Desired Password"
-password_tooltip = "Pick a hard to guess password (5-20 characters)."
+password_tooltip = "Pick a hard to guess password (it must be 5-20 characters)."
 password_message = "Password must be 5-20 characters."
 password_default = "Password"
 
diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/templates/register.tpl b/code/ryzom/tools/server/ryzom_ams/www/html/templates/register.tpl
index 33543a3bf..2ebdd67a9 100644
--- a/code/ryzom/tools/server/ryzom_ams/www/html/templates/register.tpl
+++ b/code/ryzom/tools/server/ryzom_ams/www/html/templates/register.tpl
@@ -21,7 +21,7 @@
 				<div class="controls">
 				    <div class="input-prepend">
 					<span class="add-on"><i class="icon-user"></i></span>
-						<input type="text" class="input-xlarge" id="Username" name="Username" placeholder="{$username_default}" {if isset($Username)}value="{$Username}"{/if}>
+						<input type="text" class="input-xlarge" id="Username" name="Username" placeholder="{$username_default}" {if isset($Username)}value="{$Username}"{/if} rel="popover" data-content="{$username_tooltip}" data-original-title="{$username_default}">
 					</div>
 				</div>
 			</div>
@@ -33,7 +33,7 @@
 				<div class="controls">
 				    <div class="input-prepend">
 					<span class="add-on"><i class="icon-lock"></i></span>
-						<input type="Password" id="Password" class="input-xlarge" name="Password" placeholder="{$password_default}"  {if isset($Password)}value="{$Password}"{/if}>
+						<input type="Password" id="Password" class="input-xlarge" name="Password" placeholder="{$password_default}"  {if isset($Password)}value="{$Password}"{/if} rel="popover" data-content="{$password_tooltip}" data-original-title="{$password_default}">
 					</div>
 				</div>
 			</div>
@@ -44,7 +44,7 @@
 				<div class="controls">
 				    <div class="input-prepend">
 					<span class="add-on"><i class="icon-lock"></i></span>
-						<input type="Password" id="ConfirmPass" class="input-xlarge" name="ConfirmPass" placeholder="{$cpassword_default}"  {if isset($ConfirmPass)}value="{$ConfirmPass}"{/if}>
+						<input type="Password" id="ConfirmPass" class="input-xlarge" name="ConfirmPass" placeholder="{$cpassword_default}"  {if isset($ConfirmPass)}value="{$ConfirmPass}"{/if} rel="popover" data-content="{$cpassword_tooltip}" data-original-title="{$cpassword_default}">
 					</div>
 				</div>
 			</div>
@@ -55,7 +55,7 @@
 				<div class="controls">
 				    <div class="input-prepend">
 					<span class="add-on"><i class="icon-envelope"></i></span>
-						<input type="text" class="input-xlarge" id="Email" name="Email" placeholder="{$email_default}" {if isset($Email)}value="{$Email}"{/if}>
+						<input type="text" class="input-xlarge" id="Email" name="Email" placeholder="{$email_default}" {if isset($Email)}value="{$Email}"{/if} rel="popover" data-content="{$email_tooltip}" data-original-title="{$email_default}">
 					</div>
 				</div>
 			</div>
@@ -69,6 +69,42 @@
 					</div>
 				</div>
 			</div>
+			
+			{if isset($USERNAME_ERROR) and $USERNAME_ERROR eq "TRUE"}
+			<div class="alert alert-error">
+				<button type="button" class="close" data-dismiss="alert">×</button>
+				<strong>Username Error</strong> {$USERNAME}
+			</div>
+			{/if}
+			
+			{if isset($PASSWORD_ERROR) and $PASSWORD_ERROR eq "TRUE"}
+			<div class="alert alert-error">
+				<button type="button" class="close" data-dismiss="alert">×</button>
+				<strong>Password Error</strong> {$PASSWORD}
+			</div>
+			{/if}
+			
+			{if isset($CPASSWORD_ERROR) and $CPASSWORD_ERROR eq "TRUE"}
+			<div class="alert alert-error">
+				<button type="button" class="close" data-dismiss="alert">×</button>
+				<strong>Confirmation Password Error</strong> {$CPASSWORD}
+			</div>
+			{/if}
+			
+			{if isset($EMAIL_ERROR) and $EMAIL_ERROR eq "TRUE"}
+			<div class="alert alert-error">
+				<button type="button" class="close" data-dismiss="alert">×</button>
+				<strong>Email Error</strong> {$EMAIL}
+			</div>
+			{/if}
+			
+			{if isset($TAC_ERROR) and $TAC_ERROR eq "TRUE"}
+			<div class="alert alert-error">
+				<button type="button" class="close" data-dismiss="alert">×</button>
+				<strong>Terms of Service Error</strong> {$tac_message}
+			</div>
+			{/if}
+			
 			 <input type="hidden" name="function" value="add_user">
 			 <input type="hidden" name="callBack" value="register">
 			<div class="control-group">