cleaned up templates and got languages working

--HG--
branch : rc-botanic-webdev

code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/helpers.php

@@ -4,21 +4,43 @@ class Helpers{
      public function loadTemplate( $template, $vars = array () )
     {
          global $AMS_LIB;
-         global $NELTOOL_SITEBASE;
+         global $SITEBASE;
+         global $AMS_TRANS;
          require_once $AMS_LIB . '/smarty/libs/Smarty.class.php';
          $smarty = new Smarty;
         
-         $smarty -> debugging = true;
+         // turn smarty debugging on/off
-         $smarty -> caching = true;
+        $smarty -> debugging = false;
+         // caching must be disabled for multi-language support
+        $smarty -> caching = false;
          $smarty -> cache_lifetime = 120;
          if ( !helpers :: check_if_game_client () ){
-             $smarty -> template_dir = $AMS_LIB . '/templates/';
+             $smarty -> template_dir = $AMS_LIB . '/ingame_templates/';
-             $smarty->setConfigDir($AMS_LIB .'/config');
+             $smarty -> setConfigDir( $AMS_LIB . '/configs' );
              }else{
-             $smarty -> template_dir = $NELTOOL_SITEBASE . '/templates/';
+             $smarty -> template_dir = $SITEBASE . '/templates/';
-             $smarty->setConfigDir($NELTOOL_SITEBASE .'/config');
+             $smarty -> setConfigDir( $SITEBASE . '/configs' );
+             }
+        
+         foreach ( $vars as $key => $value ){
+             $smarty -> assign( $key, $value );
+             }
+         if ( isset( $_GET["language"] ) ){
+             $language = $_GET["language"];
+             if ( file_exists( $AMS_TRANS . '/' . $language . '.ini' ) ){
+                
+                 }else{
+                 global $DEFAULT_LANGUAGE;
+                 $language = $DEFAULT_LANGUAGE;
+                 }
+             }else{
+             global $DEFAULT_LANGUAGE;
+             $language = $DEFAULT_LANGUAGE;
+             }
+         $variables = parse_ini_file( $AMS_TRANS . '/' . $language . '.ini', true );
+         foreach ( $variables[$template] as $key => $value ){
+             $smarty -> assign( $key, $value );
              }
-         $smarty -> assign( "option_selected", "NE" );
          $smarty -> display( $template . '.tpl' );
          }
     

code/ryzom/tools/server/ryzom_ams/ams_lib/configs/ams_lib.conf

@@ -1,5 +1,3 @@
 title = Welcome to Smarty!
 cutoff_size = 40
 
-[setup]
-bold = true

code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/register.phtml

@@ -5,7 +5,6 @@
   <div>
     <?php echo $WELCOME_MESSAGE; ?>
   </div>
-{The current date and time is {$smarty.now|date_format:"%Y-%m-%d %H:%M:%S"}
 
   <form name="Page1"
         method="post"

code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/register.tpl

@@ -1,9 +1,10 @@
+{config_load file="ams_lib.conf" section="setup"}
   <div class="title">
-    RYZOM CORE INGAME REGISTRATION
+    {$title} 
   </div>
 
   <div>
-    <?php echo $WELCOME_MESSAGE; ?>
+    {$welcome_message}
   </div>
 
   <form name="Page1"
@@ -11,18 +12,18 @@
         >
     <table>
       <tr>
-        <td width="33%" <?php if ($USERNAME_ERROR == "TRUE"){ echo 'class="error"';}?> id="caption-Username">Desired Username: </td>
+        <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=""
+               value="{if isset($Username)}{$Username}{/if}"
                maxlength="12"
                onfocus=
-               "javascript:showTooltip('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.', this);" />
+               "javascript:showTooltip('{$username_tooltip}', this);" />
         </td>
         
-        <td id="comment-Username" <?php if ($USERNAME_ERROR == "TRUE"){ echo 'class="error"';}?> width="42%"><?php if ($USERNAME_ERROR == "TRUE"){ echo $USERNAME;}?></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>
@@ -99,7 +100,8 @@
   <div id="tooltip-Username">
     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.
-  </div>
+  </div>
+
 
   <div id="tooltip-Password">
     5-20 characters.

code/ryzom/tools/server/ryzom_ams/ams_lib/translations/en.ini

@@ -0,0 +1,8 @@
+; This is a sample configuration file
+; Comments start with ';', as in php.ini
+
+[register]
+title = "RYZOM CORE INGAME REGISTRATION"
+welcome_message = "Welcome! Please fill in the following fields to get your new Ryzom Core account:"
+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."

code/ryzom/tools/server/ryzom_ams/ams_lib/translations/fr.ini

@@ -0,0 +1,8 @@
+; This is a sample configuration file
+; Comments start with ';', as in php.ini
+
+[register]
+title = "RYZOM base dans ENREGISTREMENT DU JEU"
+welcome_message = "Bienvenue! S'il vous plaît remplissez les champs ci-dessous pour obtenir votre nouveau compte de base de Ryzom:"
+username_tag = "Nom d'utilisateur désiré:"
+username_tooltip = "5-12 caractères et de chiffres minuscules. Le login (nom d'utilisateur) que vous créez ici sera votre nom de connexion. Le nom de vos personnages de jeu sera choisi plus tard."

code/ryzom/tools/server/ryzom_ams/www/config.php

@@ -30,7 +30,9 @@ $CREATE_RING = true ;
 
  // site paths definitions
 $AMS_LIB = dirname(dirname( __FILE__ )) . '/ams_lib';
-$NELTOOL_SITEBASE = dirname( __FILE__ ) . '/html/' ;
+$AMS_TRANS = $AMS_LIB . '/translations';
+$AMS_CACHEDIR = $AMS_LIB . '/cache';
+$SITEBASE = dirname( __FILE__ ) . '/html/' ;
  $NELTOOL_SYSTEMBASE = dirname( dirname( __FILE__ ) ) . '/admin/' ;
  $NELTOOL_LOGBASE = $NELTOOL_SYSTEMBASE . '/logs/' ;
  $NELTOOL_IMGBASE = $NELTOOL_SYSTEMBASE . '/imgs/' ;
@@ -38,7 +40,7 @@ $NELTOOL_SITEBASE = dirname( __FILE__ ) . '/html/' ;
  
  $NELTOOL_RRDTOOL = '/usr/bin/rrdtool' ;
  $NELTOOL_RRDSYSBASE = $NELTOOL_SYSTEMBASE . 'graphs_output/' ;
- $NELTOOL_RRDWEBBASE = $NELTOOL_SITEBASE . 'graphs_output/' ;
+ $NELTOOL_RRDWEBBASE = $SITEBASE . 'graphs_output/' ;
 
  // SQL table names
 $NELDB_PREFIX = 'neltool_' ;
@@ -79,7 +81,7 @@ $NELDB_CONFIG_TABLE = $NELDB_PREFIX . 'config';
  $HARDWARE_REFRESH = 600 ;
  $LOCK_TIMEOUT = 1800 ;
  $BG_IMG = 'imgs/bg_live.png' ;
- $GAME_NAME = 'Ryzom Core';
+
-$WELCOME_MESSAGE = 'Welcome! Please fill in the following fields to get your new '.$GAME_NAME.' account:';
+ $DEFAULT_LANGUAGE = 'en';
 
 $TEMPLATE_DIR = "";

code/ryzom/tools/server/ryzom_ams/www/html/index.php

@@ -16,5 +16,7 @@ $page = 'home';
 if (isset($_GET["page"])) {
     $page = $_GET["page"];  
 }
-
+$pageElements = array();
-helpers::loadTemplate( 'register' );
+$pageElements['USERNAME_ERROR'] = 'TRUE';
+$pageElements['Username'] = 'testuser';
+helpers::loadTemplate( 'register' , $pageElements);

code/ryzom/tools/server/ryzom_ams/www/html/templates/footer.phtml

@@ -1,4 +0,0 @@
-<hr />
-This is a footer
-</body>
-</html>

code/ryzom/tools/server/ryzom_ams/www/html/templates/footer.tpl

@@ -1,2 +0,0 @@
-</BODY>
-</HTML>

code/ryzom/tools/server/ryzom_ams/www/html/templates/header.phtml

@@ -1,11 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 3.2//EN">
-
-<html>
-<head>
-    <title></title>
-</head>
-
-<body>
-    This is a header
-    <div class="ryzomuserbar"><a href="?page=register">Register</a></div>
-    <hr />

code/ryzom/tools/server/ryzom_ams/www/html/templates/header.tpl

@@ -1,5 +0,0 @@
-<HTML>
-<HEAD>
-<TITLE>{$title} - {$Name}</TITLE>
-</HEAD>
-<BODY bgcolor="#ffffff">

code/ryzom/tools/server/ryzom_ams/www/html/templates/home.phtml

@@ -1 +0,0 @@
-mainpage welcome!

code/ryzom/tools/server/ryzom_ams/www/html/templates/index.tpl

@@ -1,82 +0,0 @@
-{config_load file="ams_lib.conf" section="setup"}
-{include file="header.tpl" title=foo}
-
-<PRE>
-
-{* bold and title are read from the config file *}
-{if #bold#}<b>{/if}
-{* capitalize the first letters of each word of the title *}
-Title: {#title#|capitalize}
-{if #bold#}</b>{/if}
-
-The current date and time is {$smarty.now|date_format:"%Y-%m-%d %H:%M:%S"}
-
-The value of global assigned variable $SCRIPT_NAME is {$SCRIPT_NAME}
-
-Example of accessing server environment variable SERVER_NAME: {$smarty.server.SERVER_NAME}
-
-The value of {ldelim}$Name{rdelim} is <b>{$Name}</b>
-
-variable modifier example of {ldelim}$Name|upper{rdelim}
-
-<b>{$Name|upper}</b>
-
-
-An example of a section loop:
-
-{section name=outer 
-loop=$FirstName}
-{if $smarty.section.outer.index is odd by 2}
-	{$smarty.section.outer.rownum} . {$FirstName[outer]} {$LastName[outer]}
-{else}
-	{$smarty.section.outer.rownum} * {$FirstName[outer]} {$LastName[outer]}
-{/if}
-{sectionelse}
-	none
-{/section}
-
-An example of section looped key values:
-
-{section name=sec1 loop=$contacts}
-	phone: {$contacts[sec1].phone}<br>
-	fax: {$contacts[sec1].fax}<br>
-	cell: {$contacts[sec1].cell}<br>
-{/section}
-<p>
-
-testing strip tags
-{strip}
-<table border=0>
-	<tr>
-		<td>
-			<A HREF="{$SCRIPT_NAME}">
-			<font color="red">This is a  test     </font>
-			</A>
-		</td>
-	</tr>
-</table>
-{/strip}
-
-</PRE>
-
-This is an example of the html_select_date function:
-
-<form>
-{html_select_date start_year=1998 end_year=2010}
-</form>
-
-This is an example of the html_select_time function:
-
-<form>
-{html_select_time use_24_hours=false}
-</form>
-
-This is an example of the html_options function:
-
-<form>
-<select name=states>
-{html_options values=$option_values selected=$option_selected output=$option_output}
-</select>
-</form>
-
-{include file="footer.tpl"}