From 79e7b18bc8158b64c5293066ef59700b456d33b7 Mon Sep 17 00:00:00 2001 From: Quitta 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 @@ {/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 @@
{$welcome_message}
- - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
{$username_tag} - - {if isset($Username)}{$Username}{/if}
{$password_tag} - - {if isset($PASSWORD_ERROR) && $PASSWORD_ERROR eq "TRUE"}{$Password}{/if}
{$cpassword_tag} - {if isset($CPASSWORD_ERROR) && $CPASSWORD_ERROR eq "TRUE"}{$ConfirmPass}{/if}
{$email_tag} - - {if isset($EMAIL_ERROR) && $EMAIL_ERROR eq "TRUE"}{$Email}{/if}
{$tac_tag}
{$tac_message}
- -
- -
- -
- -
- -
-
- {$username_tooltip} -
-
- -
-
- {$password_message} +
+ Register Account + +
+ +
+
+ + +
+
-
-
-
- {$cpassword_message} -
-
-
-
- {$email_message} +
+ +
+
+ + +
+
-
+
+ +
+
+ + +
+
+
+ +
+ +
+
+ + +
+
+
+ +
+
+
+ {$tac_tag} +
+
+
+ +
+ +
+ + +
+ +
+ +
{/block} + +