From 07abd206ce999247d0f34ed46c94cdc0023ff2cf Mon Sep 17 00:00:00 2001
From: patdenice <patdenice@piwigo.org>
Date: Mon, 3 Mar 2008 17:49:52 +0000
Subject: Register goes smarty. Correction in profile.php (forgotten
 assign_var)

git-svn-id: http://piwigo.org/svn/trunk@2247 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 profile.php                |  2 +-
 register.php               | 10 +++-------
 template/yoga/register.tpl | 38 +++++++++++++++++++-------------------
 3 files changed, 23 insertions(+), 27 deletions(-)

diff --git a/profile.php b/profile.php
index 3cd387e22..a74ca42de 100644
--- a/profile.php
+++ b/profile.php
@@ -54,7 +54,7 @@ if (!defined('PHPWG_ROOT_PATH'))
     make_index_url(), // for redirect
     $userdata );
 
-  $template->assign_var('U_HOME', make_index_url() );
+  $template->assign('U_HOME', make_index_url());
 
   // +-----------------------------------------------------------------------+
   // |                             errors display                            |
diff --git a/register.php b/register.php
index 5eb1d5b5d..fc9122bd3 100644
--- a/register.php
+++ b/register.php
@@ -75,7 +75,7 @@ $page['body_id'] = 'theRegisterPage';
 include(PHPWG_ROOT_PATH.'include/page_header.php');
 
 $template->set_filenames( array('register'=>'register.tpl') );
-$template->assign_vars(array(
+$template->assign(array(
   'U_HOME' => make_index_url(),
 
   'F_ACTION' => 'register.php',
@@ -84,13 +84,9 @@ $template->assign_vars(array(
   ));
 
 //-------------------------------------------------------------- errors display
-if ( sizeof( $errors ) != 0 )
+if (count($errors) != 0)
 {
-  $template->assign_block_vars('errors',array());
-  for ( $i = 0; $i < sizeof( $errors ); $i++ )
-  {
-    $template->assign_block_vars('errors.error',array('ERROR'=>$errors[$i]));
-  }
+  $template->assign('errors', $errors);
 }
 
 $template->parse('register');
diff --git a/template/yoga/register.tpl b/template/yoga/register.tpl
index 724c85b3e..1bce58afd 100644
--- a/template/yoga/register.tpl
+++ b/template/yoga/register.tpl
@@ -1,62 +1,62 @@
-<!-- DEV TAG: not smarty migrated -->
+{* $Id$ *}
 <div id="registerPage">
 
 <div id="content">
 
   <div class="titrePage">
     <ul class="categoryActions">
-      <li><a href="{U_HOME}" title="{lang:return to homepage}"><img src="{themeconf:icon_dir}/home.png" class="button" alt="{lang:home}"/></a></li>
+      <li><a href="{$U_HOME}" title="{'return to homepage'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}"/></a></li>
     </ul>
-    <h2>{lang:Registration}</h2>
+    <h2>{'Registration'|@translate}</h2>
   </div>
 
-  <!-- BEGIN errors -->
+{if isset($errors)}
   <div class="errors">
     <ul>
-      <!-- BEGIN error -->
-      <li>{errors.error.ERROR}</li>
-      <!-- END error -->
+      {foreach from=$errors item=error}
+      <li>{$error}</li>
+      {/foreach}
     </ul>
   </div>
-  <!-- END errors -->
+{/if}
 
-<form method="post" action="{F_ACTION}" class="properties" name="register_form">
+<form method="post" action="{$F_ACTION}" class="properties" name="register_form">
   <fieldset>
-    <legend>{lang:Enter your personnal informations}</legend>
+    <legend>{'Enter your personnal informations'|@translate}</legend>
 
     <ul>
       <li>
         <span class="property">
-          <label for="login">* {lang:Username}</label>
+          <label for="login">* {'Username'|@translate}</label>
         </span>
-        <input type="text" name="login" id="login" value="{F_LOGIN}" >
+        <input type="text" name="login" id="login" value="{$F_LOGIN}" >
       </li>
       <li>
         <span class="property">
-          <label for="password">* {lang:Password}</label>
+          <label for="password">* {'Password'|@translate}</label>
         </span>
         <input type="password" name="password" id="password" >
       </li>
       <li>
         <span class="property">
-          <label for="password_conf">* {lang:Confirm Password}</label>
+          <label for="password_conf">* {'Confirm Password'|@translate}</label>
         </span>
         <input type="password" name="password_conf" id="password_conf" >
       </li>
       <li>
         <span class="property">
-          <label for="mail_address">{lang:Mail address}</label>
+          <label for="mail_address">{'Mail address'|@translate}</label>
         </span>
-        <input type="text" name="mail_address" id="mail_address" value="{F_EMAIL}" >
-        ({lang:useful when password forgotten})
+        <input type="text" name="mail_address" id="mail_address" value="{$F_EMAIL}" >
+        ({'useful when password forgotten'|@translate})
       </li>
     </ul>
 
   </fieldset>
 
   <p class="bottomButtons">
-    <input class="submit" type="submit" name="submit" value="{lang:Register}">
-    <input class="submit" type="reset" value="{lang:Reset}">
+    <input class="submit" type="submit" name="submit" value="{'Register'|@translate}">
+    <input class="submit" type="reset" value="{'Reset'|@translate}">
   </p>
 
 </form>
-- 
cgit v1.2.3