From 79e7b18bc8158b64c5293066ef59700b456d33b7 Mon Sep 17 00:00:00 2001
From: Quitta <none@none>
Date: Mon, 17 Jun 2013 21:42:33 +0200
Subject: [PATCH] Changed register form + tried getting messages passed

--HG--
branch : quitta-gsoc-2013
---
 .../ryzom_ams/ams_lib/autoload/users.php      |   6 +-
 .../ryzom_ams/ams_lib/translations/en.ini     |  13 +-
 .../ryzom_ams/www/html/inc/add_user.php       |   6 +-
 .../ryzom_ams/www/html/templates/layout.tpl   |   2 +
 .../ryzom_ams/www/html/templates/register.tpl | 166 +++++++-----------
 5 files changed, 76 insertions(+), 117 deletions(-)

diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/users.php b/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/users.php
index ffac7bc8d..33873f0b7 100644
--- a/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/users.php
+++ b/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/users.php
@@ -27,13 +27,13 @@ class Users{
                  'status' => 1,
                  'access' => REQUEST_TIME
                  );
-             user_save( NULL, $edit );
+             //user_save( NULL, $edit );
              header( 'Location: email_sent.php' );
              exit;
              }else{
              $pageElements = array(
-                'GAME_NAME' => variable_get( 'ryzommanage_game-name', '' ),
-                 'WELCOME_MESSAGE' => variable_get( 'ryzommanage_register-welcome', '' ),
+                //'GAME_NAME' => variable_get( 'ryzommanage_game-name', '' ),
+                 //'WELCOME_MESSAGE' => variable_get( 'ryzommanage_register-welcome', '' ),
                  'USERNAME' => $user,
                  'PASSWORD' => $pass,
                  'CPASSWORD' => $cpass,
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 e25bfd88b..e8291b26b 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
@@ -7,18 +7,21 @@
 
 [register]
 title = "RYZOM CORE INGAME REGISTRATION"
-welcome_message = "Welcome! Please fill in the following fields to get your new Ryzom Core account:"
+welcome_message = "Welcome! Please fill in the following fields to get your new Ryzom Core account"
 
-username_tag = "Desired Username:"
+username_tag = "Desired Username"
 username_tooltip = "5-12 lower-case characters and numbers. The login (username) you create here will be your login name. The name of your game characters will be chosen later on."
 
-password_tag = "Desired Password:"
+password_tag = "Desired Password"
+password_tooltip = "Pick a hard to guess password (5-20 characters)."
 password_message = "Password must be 5-20 characters."
 
-cpassword_tag = "Confirm Password:"
+cpassword_tag = "Confirm Password"
+cpassword_tooltip = "Retype your Password"
 cpassword_message = "Retype your Password"
 
-email_tag = "Email Address (to which a confirmation email will be sent):"
+email_tag = "Email Address"
+email_tooltip = "Email Address to which a confirmation email will be sent."
 email_message = "Please verify that the e-mail address you enter here is valid and will remain valid in the future. It will only be used to manage your Ryzom Core account."
 
 tac_tag = "YES, I agree to the terms of service."
diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/inc/add_user.php b/code/ryzom/tools/server/ryzom_ams/www/html/inc/add_user.php
index 41284659e..3fb6d5fa3 100644
--- a/code/ryzom/tools/server/ryzom_ams/www/html/inc/add_user.php
+++ b/code/ryzom/tools/server/ryzom_ams/www/html/inc/add_user.php
@@ -1,8 +1,10 @@
 <?php
-function add_user(){
+require( '../../../ams_lib/libinclude.php' );
 
+
+function add_user(){
      // add user locally here
-    $return = users :: add_user();
+     $return = users :: add_user();
      return $return;
      }
 
diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/templates/layout.tpl b/code/ryzom/tools/server/ryzom_ams/www/html/templates/layout.tpl
index 95432a22b..5cbc80a2d 100644
--- a/code/ryzom/tools/server/ryzom_ams/www/html/templates/layout.tpl
+++ b/code/ryzom/tools/server/ryzom_ams/www/html/templates/layout.tpl
@@ -133,6 +133,8 @@
 			{/if}
 
 			{block name=content}{/block}
+			
+			
 			{if ! isset($no_visible_elements) or  $no_visible_elements eq "FALSE"}
 			</div><!--/#content.span10-->
 			{/if}
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 8649a7dc6..b1fa7cbf7 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
@@ -12,119 +12,71 @@
 		<div class="alert alert-info">
 			 {$welcome_message}
 		</div>
-
-
-		  <form name="Page1"method="post">
-		    <table>
-		      <tr>
-			<td width="33%" {if isset($USERNAME_ERROR) && $USERNAME_ERROR eq "TRUE"}class="error"{/if} id="caption-Username">{$username_tag} </td>
-
-			<td width="25%">
-			  <input type="text"
-			       name="Username"
-			       value="{if isset($Username)}{$Username}{/if}"
-			       maxlength="12"
-			       onfocus=
-			       "javascript:showTooltip('{$username_tooltip}', this);" />
-			</td>
-
-			<td id="comment-Username" {if isset($USERNAME_ERROR) && $USERNAME_ERROR eq "TRUE"}class="error"{/if} width="42%">{if isset($Username)}{$Username}{/if}</td>
-		      </tr>
-
-		      <tr>
-			<td width="33%" {if isset($PASSWORD_ERROR) && $PASSWORD_ERROR eq "TRUE"}class="error"{/if} id="caption-Password">{$password_tag}</td>
-
-			<td width="25%">
-			  <input type="password"
-			       name="Password"
-			       value=""
-			       maxlength="20"
-			       onkeyup=
-			       "testPassword(document.Page1.Password.value, 'comment-Password')"
-			       onfocus="javascript:showTooltip('{$password_message}', this);" />
-			</td>
-
-			<td id="comment-Password" {if isset($PASSWORD_ERROR) && $PASSWORD_ERROR eq "TRUE"}class="error"{/if} width="42%">{if isset($PASSWORD_ERROR) && $PASSWORD_ERROR eq "TRUE"}{$Password}{/if}</td>
-		      </tr>
-
-		      <tr>
-			<td width="33%" {if isset($CPASSWORD_ERROR) && $CPASSWORD_ERROR eq "TRUE"}class="error"{/if} id="caption-ConfirmPass">{$cpassword_tag}</td>
-
-			<td width="25%"><input type="password"
-			       name="ConfirmPass"
-			       value=""
-			       maxlength="20"
-			       onfocus="javascript:showTooltip('{$cpassword_message}', this);" />
-			</td>
-
-			<td id="comment-ConfirmPass" {if isset($CPASSWORD_ERROR) && $CPASSWORD_ERROR eq "TRUE"}class="error"{/if} width="42%">{if isset($CPASSWORD_ERROR) && $CPASSWORD_ERROR eq "TRUE"}{$ConfirmPass}{/if}</td>
-		      </tr>
-
-		      <tr>
-			<td width="33%" {if isset($CPASSWORD_ERROR) && $CPASSWORD_ERROR eq "TRUE"}class="error"{/if} id="caption-Email">{$email_tag}</td>
-
-			<td width="25%">
-			  <input type="text"
-			       name="Email"
-			       value=""
-			       maxlength="255"
-			       onfocus=
-			       "javascript:showTooltip('{$email_message}', this);" />
-			</td>
-
-			<td id="comment-Email" {if isset($EMAIL_ERROR) && $EMAIL_ERROR eq "TRUE"}class="error"{/if} width="42%">{if isset($EMAIL_ERROR) && $EMAIL_ERROR eq "TRUE"}{$Email}{/if}</td>
-		      </tr>
-
-		      <tr>
-			<td width=
-			"33%" {if isset($TAC_ERROR) && $TAC_ERROR eq "TRUE"}class="error"{/if}
-			    colspan="2"><input type="checkbox"
-			       name="TaC"
-			       value="1"
-			       onfocus="javascript:showTooltip('', this);" /><span id=
-			       "caption-TaC">{$tac_tag}</span></td>
-				                <td id="comment-TaC" {if isset($TAC_ERROR) && $TAC_ERROR eq "TRUE"}class="error"{/if} width="42%"><div class="alert alert-danger">{$tac_message}</div></td>
-
-		      </tr>
-		    </table>
-
-		    <div class="c1">
-		      <input type="submit"
-			   name="Submit"
-			   value="Continue" />
-		    </div>
-		    <input type="hidden" name="function" value="add_user">
-		  </form>
-
-		  <div id="signupTooltip"
-		       class="c2"
-		       inset=""></div>
-
-		  <div id="tooltip-Username">
-			<div class="alert alert-danger">
-		    		{$username_tooltip}
-		  	</div>
-		  </div>
-
-		  <div id="tooltip-Password">
-		  	<div class="alert alert-danger">
-		    		{$password_message}
+		<form id="signup" class="form-vertical" method="post" action="users::add_user()">
+			<legend>Register Account</legend>
+			
+			<div class="control-group">
+			<label class="control-label">Username</label>
+				<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">
+					</div>
+				</div>
 			</div>
-		  </div>
 
-		  <div id="tooltip-ConfirmPass">
-		     	<div class="alert alert-danger">
-		    		{$cpassword_message}
-			</div>
-		  </div>
 
-		  <div id="tooltip-Email">
-			<div class="alert alert-danger">
-		    		{$email_message}
+			<div class="control-group">
+			<label class="control-label">Password</label>
+				<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">
+					</div>
+				</div>
 			</div>
-		  </div>
+			<div class="control-group">
+			<label class="control-label">Confirm Password</label>
+				<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="Re-enter Password">
+					</div>
+				</div>
+			</div>
+			
+			<div class="control-group">
+			<label class="control-label">Email</label>
+				<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">
+					</div>
+				</div>
+			</div>
+			
+			<div class="control-group">
+				<div class="controls">
+				    <div class="input-prepend">
+						<input type="checkbox" class="input-xlarge" id="TaC" name="TaC" placeholder="Email">{$tac_tag}
+					</div>
+				</div>
+			</div>
+			
+			<div class="control-group">
+			<label class="control-label"></label>
+		      <div class="controls">
+		       <button type="submit" class="btn btn-large btn-primary" >Create My Account</button>
+	
+		      </div>
+	
+		</div>
+	
+		</form>
 
 
 	</div><!--/span-->
 </div><!--/row-->
 {/block}
+
+