From 9f6349843cd9be094166aab88334735b497e1143 Mon Sep 17 00:00:00 2001 From: Quitta Date: Sun, 16 Jun 2013 01:40:13 +0200 Subject: [PATCH] Fixed layout for register.tpl and login.tpl, it now uses also layout.tpl but with a parameter 'no_visible_elements' => 'TRUE' --HG-- branch : quitta-gsoc-2013 --- .../ryzom_ams/ams_lib/autoload/helpers.php | 3 +- .../server/ryzom_ams/www/html/index_old.php | 4 +- .../ryzom_ams/www/html/templates/layout.tpl | 13 +- .../ryzom_ams/www/html/templates/register.tpl | 201 ++++++++++-------- 4 files changed, 120 insertions(+), 101 deletions(-) diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/helpers.php b/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/helpers.php index 09cec04e9..ec3e55284 100644 --- a/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/helpers.php +++ b/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/helpers.php @@ -49,7 +49,8 @@ class Helpers{ }else{ $inherited = "layout_user.tpl"; } - $smarty -> display( 'extends:' . $inherited .'|home.tpl' ); + //extends:' . $inherited .'|register.tpl + $smarty -> display( 'register.tpl' ); } public function create_folders(){ diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/index_old.php b/code/ryzom/tools/server/ryzom_ams/www/html/index_old.php index b8be452dd..b9f7990ce 100644 --- a/code/ryzom/tools/server/ryzom_ams/www/html/index_old.php +++ b/code/ryzom/tools/server/ryzom_ams/www/html/index_old.php @@ -17,6 +17,6 @@ if ( isset( $_GET["page"] ) ){ $page = $_GET["page"]; } //temporary set permission to 1 which = admin mode -$return = array('permission' => 1); +$return = array('permission' => 1, 'no_visible_elements' => 'TRUE'); -helpers :: loadTemplate( 'home' , $return ); +helpers :: loadTemplate( 'register' , $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 0c1c3655b..3cda0b11b 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 @@ -55,6 +55,7 @@ + {if ! isset($no_visible_elements) or $no_visible_elements eq "FALSE"} + {/if}
- + {if ! isset($no_visible_elements) or $no_visible_elements eq "FALSE"} -
- - - +
+
- - - + +
{$username_tag} - - {if isset($Username)}{$Username}{/if}
+ + - - + + + + - + + - - + - - + + - + + - - + - - + + - + + - - + - - - + + - -
{$username_tag}
{$password_tag} + + {if isset($Username)}{$Username}{/if}
- -
{$password_tag}{if isset($PASSWORD_ERROR) && $PASSWORD_ERROR eq "TRUE"}{$Password}{/if}
+ +
{$cpassword_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($CPASSWORD_ERROR) && $CPASSWORD_ERROR eq "TRUE"}{$ConfirmPass}{/if}
- -
{$email_tag}{if isset($EMAIL_ERROR) && $EMAIL_ERROR eq "TRUE"}{$Email}{/if}
+ +
{$tac_tag}{$tac_message}{if isset($EMAIL_ERROR) && $EMAIL_ERROR eq "TRUE"}{$Email}{/if}
+ + {$tac_tag} +
{$tac_message}
-
- -
- -
+ + -
+
+ +
+ + -
- {$username_tooltip} -
+
+
+
+ {$username_tooltip} +
+
-
- {$password_message} -
+
+
+ {$password_message} +
+
-
- {$cpassword_message} -
+
+
+ {$cpassword_message} +
+
-
- {$email_message} -
+
+
+ {$email_message} +
+
-
\ No newline at end of file + +
+
+{/block}