- admin/notification_by_mail goes smarty - THE LAST ONE :-) :-)

- get rid of user_list warnings
- some code reorganisation in template class + explode modifier
- minor template and language changes in search.tpl and cat_modify.tpl

git-svn-id: http://piwigo.org/svn/trunk@2286 68402e56-0260-453c-a942-63ccdbb3a9ee

11 files changed, 227 insertions, 265 deletions

diff --git a/admin/cat_modify.php b/admin/cat_modify.php
index 7492633b1..b34868657 100644
--- a/admin/cat_modify.php
+++ b/admin/cat_modify.php
@@ -2,7 +2,7 @@
 // +-----------------------------------------------------------------------+
 // | PhpWebGallery - a PHP based picture gallery                           |
 // | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
+// | Copyright (C) 2003-2008 PhpWebGallery Team - http://phpwebgallery.net |
 // +-----------------------------------------------------------------------+
 // | file          : $Id$
 // | last update   : $Date$
@@ -208,19 +208,17 @@ $category['is_virtual'] = empty($category['dir']) ? true : false;
 
 
 // Navigation path
-$url = PHPWG_ROOT_PATH.'admin.php?page=cat_modify&cat_id=';
-
 $navigation = get_cat_display_name_cache(
   $category['uppercats'],
-  PHPWG_ROOT_PATH.'admin.php?page=cat_modify&cat_id='
+  get_root_url().'admin.php?page=cat_modify&cat_id='
   );
 
-$form_action = PHPWG_ROOT_PATH.'admin.php?page=cat_modify&cat_id='.$_GET['cat_id'];
+$form_action = get_root_url().'admin.php?page=cat_modify&cat_id='.$_GET['cat_id'];
 
 //----------------------------------------------------- template initialization
 $template->set_filename( 'categories', 'admin/cat_modify.tpl');
 
-$base_url = PHPWG_ROOT_PATH.'admin.php?page=';
+$base_url = get_root_url().'admin.php?page=';
 $cat_list_url = $base_url.'cat_list';
 
 $self_url = $cat_list_url;
@@ -236,8 +234,6 @@ $template->assign(
     'CAT_COMMENT'        => @htmlspecialchars($category['comment']),
 
     'status_values'     => array('public','private'),
-    'false_true'        => array('false', 'true'),
-    'no_yes'            => array('no','yes'),
 
     'CAT_STATUS'        => $category['status'],
     'CAT_VISIBLE'       => $category['visible'],
@@ -256,7 +252,7 @@ $template->assign(
     'MAIL_CONTENT' => empty($_POST['mail_content'])
         ? '' : stripslashes($_POST['mail_content']),
     'U_CHILDREN' => $cat_list_url.'&parent_id='.$category['id'],
-    'U_HELP' => PHPWG_ROOT_PATH.'popuphelp.php?page=cat_modify',
+    'U_HELP' => get_root_url().'popuphelp.php?page=cat_modify',
 
     'F_ACTION' => $form_action,
     )
@@ -367,7 +363,7 @@ SELECT id,tn_ext,path
 ;';
     $row = mysql_fetch_array(pwg_query($query));
     $src = get_thumbnail_url($row);
-    $url = PHPWG_ROOT_PATH.'admin.php?page=picture_modify';
+    $url = get_root_url().'admin.php?page=picture_modify';
     $url.= '&image_id='.$category['representative_picture_id'];
 
     $tpl_representant['picture'] =
diff --git a/admin/include/check_integrity.class.php b/admin/include/check_integrity.class.php
index 52c7f2642..db6584ade 100644
--- a/admin/include/check_integrity.class.php
+++ b/admin/include/check_integrity.class.php
@@ -259,14 +259,14 @@ class check_integrity
         {
           $submit_ignore = true;
         }
-        
+
         $template->append('c13y_list', $c13y_display);
       }
 
       $template->assign('c13y_show_submit_automatic_correction', $submit_automatic_correction);
       $template->assign('c13y_show_submit_ignore', $submit_ignore);
 
-      $template->concat_var('ADMIN_CONTENT', $template->parse('check_integrity', true));
+      $template->concat('ADMIN_CONTENT', $template->parse('check_integrity', true));
 
     }
   }
diff --git a/admin/notification_by_mail.php b/admin/notification_by_mail.php
index 9dae9b692..f728c69d0 100644
--- a/admin/notification_by_mail.php
+++ b/admin/notification_by_mail.php
@@ -582,7 +582,7 @@ $template->set_filenames
   )
 );
 
-$template->assign_vars
+$template->assign
 (
   array
   (
@@ -628,43 +628,30 @@ if ($must_repost)
     $repost_submit_name = 'send_submit';
   }
 
-  $template->assign_block_vars
-  (
-    'repost',
-      array
-      (
-        'REPOST_SUBMIT_NAME' => $repost_submit_name
-      )
-    );
+  $template->assign('REPOST_SUBMIT_NAME', $repost_submit_name);
 }
 
 switch ($page['mode'])
 {
   case 'param' :
   {
-    $template->assign_block_vars(
+    $template->assign(
       $page['mode'],
       array(
-        'SEND_HTML_MAIL_YES' => ($conf['nbm_send_html_mail'] ? 'checked="checked"' : ''),
-        'SEND_HTML_MAIL_NO' => (!$conf['nbm_send_html_mail'] ? 'checked="checked"' : ''),
+        'SEND_HTML_MAIL' => $conf['nbm_send_html_mail'],
         'SEND_MAIL_AS' => $conf['nbm_send_mail_as'],
-        'SEND_DETAILED_CONTENT_YES' => ($conf['nbm_send_detailed_content'] ? 'checked="checked"' : ''),
-        'SEND_DETAILED_CONTENT_NO' => (!$conf['nbm_send_detailed_content'] ? 'checked="checked"' : ''),
+        'SEND_DETAILED_CONTENT' => $conf['nbm_send_detailed_content'],
         'COMPLEMENTARY_MAIL_CONTENT' => $conf['nbm_complementary_mail_content'],
-        'SEND_RECENT_POST_DATES_YES' => ($conf['nbm_send_recent_post_dates'] ? 'checked="checked"' : ''),
-        'SEND_RECENT_POST_DATES_NO' => (!$conf['nbm_send_recent_post_dates'] ? 'checked="checked"' : '')
+        'SEND_RECENT_POST_DATES' => $conf['nbm_send_recent_post_dates'],
         ));
     break;
   }
 
   case 'subscribe' :
   {
-    $template->assign_block_vars(
-      $page['mode'],
-      array(
-        ));
+    $template->assign( $page['mode'], true );
 
-    $template->assign_vars(
+    $template->assign(
       array(
         'L_CAT_OPTIONS_TRUE' => l10n('nbm_subscribe_col'),
         'L_CAT_OPTIONS_FALSE' => l10n('nbm_unsubscribe_col')
@@ -700,41 +687,35 @@ switch ($page['mode'])
         'category_option_true'          => $opt_true,
         'category_option_true_selected' => $opt_true_selected,
         'category_option_false'         => $opt_false,
-        'category_option_true_selected' => $opt_false_selected,
+        'category_option_false_selected' => $opt_false_selected,
         )
     );
+    $template->assign_var_from_handle('DOUBLE_SELECT', 'double_select');
     break;
   }
 
   case 'send' :
   {
-    $template->assign_block_vars($page['mode'], array());
+    $tpl_var = array('users'=> array() );
 
     $data_users = do_action_send_mail_notification('list_to_send');
 
-    if  (count($data_users) == 0)
-    {
-      $template->assign_block_vars($page['mode'].'.send_empty', array());
-    }
-    else
-    {
-      $template->assign_block_vars(
-        $page['mode'].'.send_data',
-        array(
-          'CUSTOMIZE_MAIL_CONTENT' => isset($_POST['send_customize_mail_content']) ? stripslashes($_POST['send_customize_mail_content']) : $conf['nbm_complementary_mail_content']
-          ));
+    $tpl_var['CUSTOMIZE_MAIL_CONTENT'] = 
+      isset($_POST['send_customize_mail_content']) 
+        ? stripslashes($_POST['send_customize_mail_content']) 
+        : $conf['nbm_complementary_mail_content'];
 
-      foreach ($data_users as $num => $nbm_user)
+    if  (count($data_users))
+    {
+      foreach ($data_users as $nbm_user)
       {
         if (
             (!$must_repost) or // Not timeout, normal treatment
             (($must_repost) and in_array($nbm_user['check_key'], $_POST['send_selection']))  // Must be repost, show only user to send
             )
         {
-          $template->assign_block_vars(
-            $page['mode'].'.send_data.user_send_mail',
+          $tpl_var['users'][] = 
             array(
-              'CLASS' => ($num % 2 == 1) ? 'nbm_user2' : 'nbm_user1',
               'ID' => $nbm_user['check_key'],
               'CHECKED' =>  ( // not check if not selected,  on init select<all
                               isset($_POST['send_selection']) and // not init
@@ -743,11 +724,11 @@ switch ($page['mode'])
               'USERNAME'=> $nbm_user['username'],
               'EMAIL' => get_email_address_as_display_text($nbm_user['mail_address']),
               'LAST_SEND'=> $nbm_user['last_send']
-              ));
+              );
         }
       }
     }
-
+    $template->assign($page['mode'], $tpl_var);
     break;
   }
 }
@@ -755,7 +736,6 @@ switch ($page['mode'])
 // +-----------------------------------------------------------------------+
 // | Sending html code                                                     |
 // +-----------------------------------------------------------------------+
-$template->assign_var_from_handle('DOUBLE_SELECT', 'double_select');
 $template->assign_var_from_handle('ADMIN_CONTENT', 'notification_by_mail');
 
 ?>
\ No newline at end of file
diff --git a/admin/user_list.php b/admin/user_list.php
index 3b7194594..992e90c58 100644
--- a/admin/user_list.php
+++ b/admin/user_list.php
@@ -440,7 +440,7 @@ DELETE FROM '.USER_GROUP_TABLE.'
   }
 
   redirect(
-    PHPWG_ROOT_PATH.
+    get_root_url().
     'admin.php'.
     get_query_string_diff(array(), false)
     );
@@ -483,11 +483,11 @@ else
 
 $template->assign(
   array(
-    'U_HELP' => PHPWG_ROOT_PATH.'popuphelp.php?page=user_list',
+    'U_HELP' => get_root_url().'popuphelp.php?page=user_list',
 
     'F_ADD_ACTION' => $base_url,
     'F_USERNAME' => @htmlentities($_GET['username']),
-    'F_FILTER_ACTION' => PHPWG_ROOT_PATH.'admin.php'
+    'F_FILTER_ACTION' => get_root_url().'admin.php'
     ));
 
 // Hide radio-button if not allow to assign adviser
@@ -524,34 +524,13 @@ $template->assign('direction_selected',
 
 if (isset($_POST['pref_submit']))
 {
-//  echo '<pre>'; print_r($_POST); echo '</pre>';
   $template->assign(
     array(
-      'ADVISER_YES' => 'true' == (isset($_POST['adviser']) and $_POST['adviser']) ? 'checked="checked"' : '',
-      'ADVISER_NO' => 'false' == (isset($_POST['adviser']) and $_POST['adviser']) ? 'checked="checked"' : '',
       'NB_IMAGE_LINE' => $_POST['nb_image_line'],
       'NB_LINE_PAGE' => $_POST['nb_line_page'],
       'MAXWIDTH' => $_POST['maxwidth'],
       'MAXHEIGHT' => $_POST['maxheight'],
       'RECENT_PERIOD' => $_POST['recent_period'],
-      'EXPAND_YES' => 'true' == $_POST['expand'] ? 'checked="checked"' : '',
-      'EXPAND_NO' => 'false' == $_POST['expand'] ? 'checked="checked"' : '',
-      'SHOW_NB_COMMENTS_YES' => 'true' == $_POST['show_nb_comments'] ? 'checked="checked"' : '',
-      'SHOW_NB_COMMENTS_NO' => 'false' == $_POST['show_nb_comments'] ? 'checked="checked"' : '',
-      'SHOW_NB_HITS_YES' => 'true' == $_POST['show_nb_hits'] ? 'checked="checked"' : '',
-      'SHOW_NB_HITS_NO' => 'false' == $_POST['show_nb_hits'] ? 'checked="checked"' : '',
-      'ENABLED_HIGH_YES' => 'true' == $_POST['enabled_high'] ? 'checked="checked"' : '',
-      'ENABLED_HIGH_NO' => 'false' == $_POST['enabled_high'] ? 'checked="checked"' : '',
-      
-      'STATUS_ACTION_SET' => 'set' == $_POST['status_action'] ? 'checked="checked"' : '',
-      'LEVEL_ACTION_SET' => 'set' == $_POST['level_action'] ? 'checked="checked"' : '',
-      'NB_IMAGE_LINE_ACTION_SET' => 'set' == $_POST['nb_image_line_action'] ? 'checked="checked"' : '',
-      'NB_LINE_PAGE_ACTION_SET' => 'set' == $_POST['nb_line_page_action'] ? 'checked="checked"' : '',
-      'TEMPLATE_ACTION_SET' => 'set' == $_POST['template_action'] ? 'checked="checked"' : '',
-      'LANGUAGE_ACTION_SET' => 'set' == $_POST['language_action'] ? 'checked="checked"' : '',
-      'RECENT_PERIOD_ACTION_SET' => 'set' == $_POST['recent_period_action'] ? 'checked="checked"' : '',
-      'MAXWIDTH_ACTION_SET' => 'set' == $_POST['maxwidth_action'] ? 'checked="checked"' : '',
-      'MAXHEIGHT_ACTION_SET' => 'set' == $_POST['maxheight_action'] ? 'checked="checked"' : '',
       ));
 }
 else
@@ -645,9 +624,11 @@ foreach ($page['filtered_users'] as $num => $local_user)
   $visible_user_list[] = $local_user;
 }
 
+// allow plugins to fill template var plugin_user_list_column_titles and 
+// plugin_columns/plugin_actions for each user in the list
 $visible_user_list = trigger_event('loc_visible_user_list', $visible_user_list);
 
-foreach ($visible_user_list as $num => $local_user)
+foreach ($visible_user_list as $local_user)
 {
   $groups_string = preg_replace(
     '/(\d+)/e',
@@ -696,9 +677,10 @@ foreach ($visible_user_list as $num => $local_user)
       'EMAIL' => get_email_address_as_display_text($local_user['email']),
       'GROUPS' => $groups_string,
       'PROPERTIES' => implode( ', ', $properties),
+      'plugin_columns' => isset($local_user['plugin_columns']) ? $local_user['plugin_columns'] : array(),
+      'plugin_actions' => isset($local_user['plugin_actions']) ? $local_user['plugin_actions'] : array(),
       )
     );
-  trigger_action('loc_append_user_list', $local_user);
 }
 
 // +-----------------------------------------------------------------------+
diff --git a/include/page_tail.php b/include/page_tail.php
index 4e5f88074..df0aa59a8 100644
--- a/include/page_tail.php
+++ b/include/page_tail.php
@@ -27,7 +27,7 @@ $template->set_filenames(array('tail'=>'footer.tpl'));
 
 trigger_action('loc_begin_page_tail');
 
-$template->assign_vars(
+$template->assign(
   array(
     'VERSION' => $conf['show_version'] ? PHPWG_VERSION : '',
     'PHPWG_URL' => PHPWG_URL,
diff --git a/include/template.class.php b/include/template.class.php
index b35d02c13..d4f0ef680 100644
--- a/include/template.class.php
+++ b/include/template.class.php
@@ -78,10 +78,9 @@ class Template {
 
     $this->smarty->compile_dir = $compile_dir;
 
-    $this->smarty->register_function( 'lang', array('Template', 'fn_l10n') );
-
     $this->smarty->assign_by_ref( 'pwg', new PwgTemplateAdapter() );
     $this->smarty->register_modifier( 'translate', array('Template', 'mod_translate') );
+    $this->smarty->register_modifier( 'explode', array('Template', 'mod_explode') );
 
     if ( !empty($theme) )
     {
@@ -127,7 +126,6 @@ class Template {
       file_put_contents($this->smarty->compile_dir.'/index.htm', '');
   }
 
-  /** DEPRECATED */
   function get_themeconf($val)
   {
     $tc = $this->smarty->get_template_vars('themeconf');
@@ -183,18 +181,6 @@ class Template {
   }
 
   /**
-   * Inserts the uncompiled code for $handle as the value of $varname in the
-   * root-level. This can be used to effectively include a template in the
-   * middle of another template.
-   * This is equivalent to assign($varname, $this->parse($handle, true))
-   */
-  function assign_var_from_handle($varname, $handle)
-    {
-      $this->assign($varname, $this->parse($handle, true));
-      return true;
-    }
-
-  /**
    * DEPRECATED - backward compatibility only
    */
   function assign_block_vars($blockname, $vararray)
@@ -253,6 +239,66 @@ class Template {
     return true;
   }
 
+  /** see smarty assign http://www.smarty.net/manual/en/api.assign.php */
+  function assign($tpl_var, $value = null)
+  {
+    $this->smarty->assign( $tpl_var, $value );
+
+    if ( is_array($tpl_var) )
+      $this->_old->assign_vars( $tpl_var );
+    else
+      $this->_old->assign_var( $tpl_var, $value );
+  }
+  
+  /**
+   * Inserts the uncompiled code for $handle as the value of $varname in the
+   * root-level. This can be used to effectively include a template in the
+   * middle of another template.
+   * This is equivalent to assign($varname, $this->parse($handle, true))
+   */
+  function assign_var_from_handle($varname, $handle)
+  {
+    $this->assign($varname, $this->parse($handle, true));
+    return true;
+  }
+
+  /** see smarty append http://www.smarty.net/manual/en/api.append.php */
+  function append($tpl_var, $value=null, $merge=false)
+  {
+    $this->smarty->append( $tpl_var, $value, $merge );
+  }
+
+  /**
+   * Root-level variable concatenation. Appends a  string to an existing
+   * variable assignment with the same name.
+   */
+  function concat($tpl_var, $value)
+  {
+    $old_val = & $this->smarty->get_template_vars($tpl_var);
+    if ( isset($old_val) )
+    {
+      $old_val .= $value;
+      $this->_old->concat_var( $tpl_var, $value );
+    }
+    else
+    {
+      $this->assign($tpl_var, $value);
+    }
+  }
+
+  /** see smarty append http://www.smarty.net/manual/en/api.clear_assign.php */
+  function clear_assign($tpl_var)
+  {
+    $this->smarty->clear_assign( $tpl_var );
+  }
+
+  /** see smarty get_template_vars http://www.smarty.net/manual/en/api.get_template_vars.php */
+  function &get_template_vars($name=null)
+  {
+    return $this->smarty->get_template_vars( $name );
+  }
+
+
   /**
    * Load the file for the handle, eventually compile the file and run the compiled
    * code. This will add the output to the results or return the result if $return
@@ -330,64 +376,21 @@ class Template {
   }
 
   /**
-   * Root-level variable concatenation. Appends a  string to an existing
-   * variable assignment with the same name.
+   * translate variable modifier - translates a text to the currently loaded
+   * language
    */
-  function concat_var($tpl_var, $value)
-  {
-    $old_val = & $this->smarty->get_template_vars($tpl_var);
-    if ( isset($old_val) )
-    {
-      $old_val .= $value;
-      $this->_old->concat_var( $tpl_var, $value );
-    }
-    else
-    {
-      $this->assign($tpl_var, $value);
-    }
-  }
-
-  /** see smarty assign http://www.smarty.net/manual/en/api.assign.php */
-  function assign($tpl_var, $value = null)
-  {
-    $this->smarty->assign( $tpl_var, $value );
-
-    if ( is_array($tpl_var) )
-      $this->_old->assign_vars( $tpl_var );
-    else
-      $this->_old->assign_var( $tpl_var, $value );
-  }
-
-  /** see smarty append http://www.smarty.net/manual/en/api.append.php */
-  function append($tpl_var, $value=null, $merge=false)
-  {
-    $this->smarty->append( $tpl_var, $value, $merge );
-  }
-
-  /** see smarty get_template_vars http://www.smarty.net/manual/en/api.get_template_vars.php */
-  function &get_template_vars($name=null)
-  {
-    return $this->smarty->get_template_vars( $name );
-  }
-
-  /** see smarty append http://www.smarty.net/manual/en/api.clear_assign.php */
-  function clear_assign($tpl_var)
-  {
-    $this->smarty->clear_assign( $tpl_var );
-  }
-
-  /*static*/ function fn_l10n($params, &$smarty)
+  /*static*/ function mod_translate($text)
   {
-    return l10n($params['t']);
+    return l10n($text);
   }
 
   /**
-   * translate variable modifiers - translates a text to the currently loaded
-   * language
+   * explode variable modifier - similar to php explode
+   * 'Yes;No'|@explode:';' -> array('Yes', 'No')    
    */
-  /*static*/ function mod_translate($text)
+  /*static*/ function mod_explode($text, $delimiter=',')
   {
-    return l10n($text);
+    return explode($delimiter, $text);
   }
 }
 
diff --git a/plugins/language_switch/language_switch.inc.php b/plugins/language_switch/language_switch.inc.php
index 11a4c4ddd..f6fc135a3 100644
--- a/plugins/language_switch/language_switch.inc.php
+++ b/plugins/language_switch/language_switch.inc.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 // +-----------------------------------------------------------------------+
 // | PhpWebGallery - a PHP based picture gallery                           |
 // | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
@@ -30,13 +30,13 @@ function language_switch()
   $same = $user['language'];
   if ( isset( $_GET['lang']) )
   {
-    if ( !empty($_GET['lang'] ) and 
+    if ( !empty($_GET['lang'] ) and
       file_exists( PHPWG_ROOT_PATH.'language/'
       . $_GET['lang'].'/common.lang.php') )
     {
       if (is_a_guest() or is_generic())
       {
-        setcookie( 'pwg_lang_switch', $_GET['lang'], 
+        setcookie( 'pwg_lang_switch', $_GET['lang'],
           time()+60*60*24*30, cookie_path() );
       }
       else
@@ -54,11 +54,11 @@ function language_switch()
 // Guest or generic members will use their cookied language !
   if ((is_a_guest() or is_generic())
     and isset( $_COOKIE['pwg_lang_switch'] ) )
-  { 
-    $user['language'] = $_COOKIE['pwg_lang_switch']; 
+  {
+    $user['language'] = $_COOKIE['pwg_lang_switch'];
   }
 // Reload language only if it isn't the same one
-  if ( $same !== $user['language']) 
+  if ( $same !== $user['language'])
   {
     load_language('common.lang', '', $user['language']);
     load_language('local.lang', '', $user['language']);
@@ -70,7 +70,7 @@ function language_switch()
 }
 //if ( isset( $_GET['lang']) ) { redirect( make_index_url() ); }
 
-function Lang_flags() 
+function Lang_flags()
 {
   global $user, $template;
   $available_lang = get_languages();
@@ -79,15 +79,15 @@ function Lang_flags()
     $qlc_url = add_url_params( make_index_url(), array( 'lang' => $code ) );
     $qlc_alt = ucwords( $displayname );
     $qlc_title =  $qlc_alt;
-    $qlc_img =  PHPWG_PLUGINS_PATH.'language_switch/icons/'
+    $qlc_img =  'plugins/language_switch/icons/'
        . $code . '.gif';
-  
-    if ( $code !== $user['language'] and file_exists($qlc_img) )
+
+    if ( $code !== $user['language'] and file_exists(PHPWG_ROOT_PATH.$qlc_img) )
     {
-      $template -> concat_var( 'PLUGIN_INDEX_ACTIONS',
-        '<li><a href="' . $qlc_url . '" ><img src="' . $qlc_img . '" alt="'
+      $template->concat( 'PLUGIN_INDEX_ACTIONS',
+        '<li><a href="' . $qlc_url . '" ><img src="' . get_root_url().$qlc_img . '" alt="'
         . $qlc_alt . '" title="'
-        . $qlc_title . '" style="border: 1px solid #000000; ' 
+        . $qlc_title . '" style="border: 1px solid #000000; '
         . ' margin: 0px 2px;" /></a></li>');
     }
   }
diff --git a/template/yoga/admin/cat_modify.tpl b/template/yoga/admin/cat_modify.tpl
index dc9c98dc3..88e07e329 100644
--- a/template/yoga/admin/cat_modify.tpl
+++ b/template/yoga/admin/cat_modify.tpl
@@ -1,7 +1,7 @@
 {* $Id$ *}
 <div class="titrePage">
   <ul class="categoryActions">
-    <li><a href="{$U_HELP}" onclick="popuphelp(this.href); return false;" title="{'Help'|@translate}"><img src="{$themeconf.icon_dir}/help.png" class="button" alt="(?)"></a></li>
+    <li><a href="{$U_HELP}" onclick="popuphelp(this.href); return false;" title="{'Help'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/help.png" class="button" alt="(?)"></a></li>
   </ul>
   <h2>{'title_edit_cat'|@translate}</h2>
 </div>
@@ -11,14 +11,14 @@
 <ul class="categoryActions">
   <li><a href="{$U_JUMPTO}" title="{'jump to category'|@translate}"><img src="{$themeconf.icon_dir}/category_jump-to.png" class="button" alt="{'jump to category'|@translate}" /></a></li>
   {if isset($U_MANAGE_ELEMENTS) }
-  <li><a href="{$U_MANAGE_ELEMENTS}" title="{'manage category elements'|@translate}"><img src="{$themeconf.icon_dir}/category_elements.png" class="button" alt="{'elements'|@translate}" /></a></li>
+  <li><a href="{$U_MANAGE_ELEMENTS}" title="{'manage category elements'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/category_elements.png" class="button" alt="{'elements'|@translate}" /></a></li>
   {/if}
-  <li><a href="{$U_CHILDREN}" title="{'manage sub-categories'|@translate}"><img src="{$themeconf.icon_dir}/category_children.png" class="button" alt="{'sub-categories'|@translate}" /></a></li>
+  <li><a href="{$U_CHILDREN}" title="{'manage sub-categories'|@translate}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/category_children.png" class="button" alt="{'sub-categories'|@translate}" /></a></li>
   {if isset($U_MANAGE_PERMISSIONS) }
-  <li><a href="{$U_MANAGE_PERMISSIONS}" title="{'edit category permissions'|@translate}" ><img src="{$themeconf.icon_dir}/category_permissions.png" class="button" alt="{'permissions'|@translate}" /></a></li>
+  <li><a href="{$U_MANAGE_PERMISSIONS}" title="{'edit category permissions'|@translate}" ><img src="{$ROOT_URL}{$themeconf.icon_dir}/category_permissions.png" class="button" alt="{'permissions'|@translate}" /></a></li>
   {/if}
   {if isset($U_DELETE) }
-  <li><a href="{$U_DELETE}" title="{'delete category'|@translate}" onclick="return confirm('{'Are you sure?'|@translate|@escape:javascript}');"><img src="{$themeconf.icon_dir}/category_delete.png" class="button" alt="{'delete'|@translate}" /></a></li>
+  <li><a href="{$U_DELETE}" title="{'delete category'|@translate}" onclick="return confirm('{'Are you sure?'|@translate|@escape:'javascript'}');"><img src="{$ROOT_URL}{$themeconf.icon_dir}/category_delete.png" class="button" alt="{'delete'|@translate}" /></a></li>
   {/if}
 </ul>
 
@@ -73,20 +73,20 @@
     <tr>
       <td><strong>{'lock'|@translate}</strong>
       <td>
-        {html_radios name='visible' values=$false_true output=$no_yes|translate selected=$CAT_VISIBLE}
+        {html_radios name='visible' values='false,true'|@explode output='No,Yes'|@explode|translate selected=$CAT_VISIBLE}
       </td>
     </tr>
     <tr>
       <td><strong>{'comments'|@translate}</strong>
       <td>
-        {html_radios name='commentable' values=$false_true output=$no_yes|translate selected=$CAT_COMMENTABLE}
+        {html_radios name='commentable' values='false,true'|@explode output='No,Yes'|@explode|translate selected=$CAT_COMMENTABLE}
       </td>
     </tr>
     {if isset($SHOW_UPLOADABLE) }
     <tr>
       <td><strong>{'editcat_uploadable'|@translate}</strong>
       <td>
-        {html_radios name='uploadable' values=$false_true output=$no_yes|translate selected=$CAT_UPLOADABLE}
+        {html_radios name='uploadable' values='false,true'|@explode output='No,Yes'|@explode|translate selected=$CAT_UPLOADABLE}
       </td>
     </tr>
     {/if}
@@ -114,7 +114,7 @@
 </fieldset>
 
 <p style="text-align:center;">
-  <input class="submit" type="submit" value="{'submit'|@translate}" name="submit" {$TAG_INPUT_ENABLED}/>
+  <input class="submit" type="submit" value="{'Submit'|@translate}" name="submit" {$TAG_INPUT_ENABLED}/>
   <input class="submit" type="reset" value="{'Reset'|@translate}" name="reset" />
 </p>
 
@@ -127,7 +127,7 @@
         {if isset($representant.picture) }
         <a href="{$representant.picture.URL}"><img src="{$representant.picture.SRC}" alt="" class="miniature" /></a>
         {else}
-        <img src="{$themeconf.icon_dir}/category_representant_random.png" class="button" alt="{'Random picture'|@translate}" class="miniature" />
+        <img src="{$ROOT_URL}{$themeconf.icon_dir}/category_representant_random.png" class="button" alt="{'Random picture'|@translate}" class="miniature" />
         {/if}
       </td>
       <td>
diff --git a/template/yoga/admin/notification_by_mail.tpl b/template/yoga/admin/notification_by_mail.tpl
index 3afa4161b..eb5e2a0f9 100644
--- a/template/yoga/admin/notification_by_mail.tpl
+++ b/template/yoga/admin/notification_by_mail.tpl
@@ -1,125 +1,124 @@
-<!-- DEV TAG: not smarty migrated -->
-<!-- $Id: notification_by_mail.tpl Ruben ARNAUD -->
+{* $Id$ *}
+
 <div class="titrePage">
   <ul class="categoryActions">
-    <li><a href="{U_HELP}" onclick="popuphelp(this.href); return false;" title="{lang:Help}"><img src="{themeconf:icon_dir}/help.png" class="button" alt="(?)"></a></li>
+    <li><a href="{$U_HELP}" onclick="popuphelp(this.href); return false;" title="{'Help'|@translate}"><img src="{$themeconf.icon_dir}/help.png" class="button" alt="(?)"></a></li>
   </ul>
-  <h2>{lang:nbm_send_mail_to_users} {TABSHEET_TITLE}</h2>
-  {TABSHEET}
+  <h2>{'nbm_send_mail_to_users'|@translate} {$TABSHEET_TITLE}</h2>
+  {$TABSHEET}
 </div>
 
-<form method="post" name="notification_by_mail" id="notification_by_mail" action="{F_ACTION}">
-  <!-- BEGIN repost -->
+<form method="post" name="notification_by_mail" id="notification_by_mail" action="{$F_ACTION}">
+  {if isset($REPOST_SUBMIT_NAME)}
   <fieldset>
     <div class="infos">
-      <input class="submit" type="submit" value="{lang:nbm_repost_submit}" name="{repost.REPOST_SUBMIT_NAME}" {TAG_INPUT_ENABLED}/>
+      <input class="submit" type="submit" value="{'nbm_repost_submit'|@translate}" name="{$REPOST_SUBMIT_NAME}" {$TAG_INPUT_ENABLED}/>
     </div>
   </fieldset>
-  <!-- END repost -->
+  {/if}
 
-  <!-- BEGIN param -->
+  {if isset($param)}
   <fieldset>
-    <legend>{lang:nbm_title_param}</legend>
+    <legend>{'nbm_title_param'|@translate}</legend>
     <table>
       <tr>
-        <td><label>{lang:nbm_send_html_mail}</label></td>
+        <td><label>{'nbm_send_html_mail'|@translate}</label></td>
         <td>
-          <label><input type="radio" name="nbm_send_html_mail" value="true"  {param.SEND_HTML_MAIL_YES}/>{lang:Yes}</label>
-          <label><input type="radio" name="nbm_send_html_mail" value="false" {param.SEND_HTML_MAIL_NO}/>{lang:No}</label>
+          <label><input type="radio" name="nbm_send_html_mail" value="true"  {if $param.SEND_HTML_MAIL}checked="checked"{/if}/>{'Yes'|@translate}</label>
+          <label><input type="radio" name="nbm_send_html_mail" value="false" {if not $param.SEND_HTML_MAIL}checked="checked"{/if}/>{'No'|@translate}</label>
         </td>
       </tr>
       <tr>
         <td>
-          <label for="send_mail_as">{lang:nbm_send_mail_as}</label>
-          <br><i><small>{lang:nbm_info_send_mail_as}</small></i>
+          <label for="send_mail_as">{'nbm_send_mail_as'|@translate}</label>
+          <br/><i><small>{'nbm_info_send_mail_as'|@translate}</small></i>
         </td>
-        <td><input type="text" maxlength="35" size="35" name="nbm_send_mail_as" id="send_mail_as" value="{param.SEND_MAIL_AS}"/></td>
+        <td><input type="text" maxlength="35" size="35" name="nbm_send_mail_as" id="send_mail_as" value="{$param.SEND_MAIL_AS}"/></td>
       </tr>
       <tr>
-        <td><label>{lang:nbm_send_detailed_content}</label></td>
+        <td><label>{'nbm_send_detailed_content'|@translate}</label></td>
         <td>
-          <label><input type="radio" name="nbm_send_detailed_content" value="true"  {param.SEND_DETAILED_CONTENT_YES}/>{lang:Yes}</label>
-          <label><input type="radio" name="nbm_send_detailed_content" value="false" {param.SEND_DETAILED_CONTENT_NO}/>{lang:No}</label>
+          <label><input type="radio" name="nbm_send_detailed_content" value="true"  {if $param.SEND_DETAILED_CONTENT}checked="checked"{/if}/>{'Yes'|@translate}</label>
+          <label><input type="radio" name="nbm_send_detailed_content" value="false" {if not $param.SEND_DETAILED_CONTENT}checked="checked"{/if}/>{'No'|@translate}</label>
         </td>
       </tr>
      <tr>
-        <td><label for="complementary_mail_content">{lang:nbm_complementary_mail_content}</label></td>
-        <td><textarea cols="50" rows="5" name="nbm_complementary_mail_content" id="complementary_mail_content">{param.COMPLEMENTARY_MAIL_CONTENT}</textarea></td>
+        <td><label for="complementary_mail_content">{'nbm_complementary_mail_content'|@translate}</label></td>
+        <td><textarea cols="50" rows="5" name="nbm_complementary_mail_content" id="complementary_mail_content">{$param.COMPLEMENTARY_MAIL_CONTENT}</textarea></td>
       </tr>
       <tr>
         <td>
-          <label>{lang:nbm_send_recent_post_dates}</label>
-          <br><i><small>{lang:nbm_info_send_recent_post_dates}</small></i>
+          <label>{'nbm_send_recent_post_dates'|@translate}</label>
+          <br/><i><small>{'nbm_info_send_recent_post_dates'|@translate}</small></i>
         </td>
         <td>
-          <label><input type="radio" name="nbm_send_recent_post_dates" value="true"  {param.SEND_RECENT_POST_DATES_YES}/>{lang:Yes}</label>
-          <label><input type="radio" name="nbm_send_recent_post_dates" value="false" {param.SEND_RECENT_POST_DATES_NO}/>{lang:No}</label>
+          <label><input type="radio" name="nbm_send_recent_post_dates" value="true" {if $param.SEND_RECENT_POST_DATES}checked="checked"{/if}/>{'Yes'|@translate}</label>
+          <label><input type="radio" name="nbm_send_recent_post_dates" value="false" {if not $param.SEND_RECENT_POST_DATES}checked="checked"{/if}/>{'No'|@translate}</label>
         </td>
       </tr>
     </table>
   </fieldset>
 
   <p>
-    <input class="submit" type="submit" value="{lang:Submit}" name="param_submit" {TAG_INPUT_ENABLED}/>
-    <input class="submit" type="reset" value="{lang:Reset}" name="param_reset"/>
+    <input class="submit" type="submit" value="{'Submit'|@translate}" name="param_submit" {$TAG_INPUT_ENABLED}/>
+    <input class="submit" type="reset" value="{'Reset'|@translate}" name="param_reset"/>
   </p>
-  <!-- END param -->
+  {/if}{* isset $param*}
 
-  <!-- BEGIN subscribe -->
+  {if isset($subscribe)}
   <fieldset>
-    <legend>{lang:nbm_title_subscribe}</legend>
-    <p><i>{lang:nbm_warning_subscribe_unsubscribe}</i></p>
-    {DOUBLE_SELECT}
+    <legend>{'nbm_title_subscribe'|@translate}</legend>
+    <p><i>{'nbm_warning_subscribe_unsubscribe'|@translate}</i></p>
+    {$DOUBLE_SELECT}
   </fieldset>
-  <!-- END subscribe -->
+  {/if}{* isset $subscribe*}
 
-  <!-- BEGIN send -->
-    <!-- BEGIN send_empty -->
-    <p>{lang:nbm_no_user_available_to_send_L1}</p>
+  {if isset($send)}
+    {if empty($send.users)}
+    <p>{'nbm_no_user_available_to_send_L1'|@translate}</p>
     <p>
-    {lang:nbm_no_user_available_to_send_L2}<br>
-    {lang:nbm_no_user_available_to_send_L3}
+    {'nbm_no_user_available_to_send_L2'|@translate}<br>
+    {'nbm_no_user_available_to_send_L3'|@translate}
     </p>
-    <!-- END send_empty -->
-    <!-- BEGIN send_data -->
+    {else}
     <fieldset>
-      <legend>{lang:nbm_title_send}</legend>
+      <legend>{'nbm_title_send'|@translate}</legend>
       <table class="table2">
         <tr class="throw">
-          <th>{lang:nbm_col_user}</th>
-          <th>{lang:nbm_col_mail}</th>
-          <th>{lang:nbm_col_last_send}</th>
-          <th>{lang:nbm_col_check_user_send_mail}</th>
+          <th>{'nbm_col_user'|@translate}</th>
+          <th>{'nbm_col_mail'|@translate}</th>
+          <th>{'nbm_col_last_send'|@translate}</th>
+          <th>{'nbm_col_check_user_send_mail'|@translate}</th>
         </tr>
-        <!-- BEGIN user_send_mail -->
-        <tr class="{send.send_data.user_send_mail.CLASS}">
-          <td><label for="send_selection-{send.send_data.user_send_mail.ID}">{send.send_data.user_send_mail.USERNAME}</label></td>
-          <td><label for="send_selection-{send.send_data.user_send_mail.ID}">{send.send_data.user_send_mail.EMAIL}</label></td>
-          <td><label for="send_selection-{send.send_data.user_send_mail.ID}">{send.send_data.user_send_mail.LAST_SEND}</label></td>
-          <td><input type="checkbox" name="send_selection[]" value="{send.send_data.user_send_mail.ID}" {send.send_data.user_send_mail.CHECKED} id="send_selection-{send.send_data.user_send_mail.ID}"/></td>
+        {foreach from=$send.users item=u name=user_loop}
+        <tr class="{if $smarty.foreach.user_loop.index is odd}row1{else}row2{/if}">
+          <td><label for="send_selection-{$u.ID}">{$u.USERNAME}</label></td>
+          <td><label for="send_selection-{$u.ID}">{$u.EMAIL}</label></td>
+          <td><label for="send_selection-{$u.ID}">{$u.LAST_SEND}</label></td>
+          <td><input type="checkbox" name="send_selection[]" value="{$u.ID}" {$u.CHECKED} id="send_selection-{$u.ID}"/></td>
         </tr>
-        <!-- END user_send_mail -->
+        {/foreach}
       </table>
       <p>
-          <a href="#" onclick="SelectAll(document.getElementById('notification_by_mail')); return false;">{lang:Check all}</a>
-        / <a href="#" onclick="DeselectAll(document.getElementById('notification_by_mail')); return false;">{lang:Uncheck all}</a>
+          <a href="#" onclick="SelectAll(document.getElementById('notification_by_mail')); return false;">{'Check all'|@translate}</a>
+        / <a href="#" onclick="DeselectAll(document.getElementById('notification_by_mail')); return false;">{'Uncheck all'|@translate}</a>
       </p>
     </fieldset>
 
     <fieldset>
-      <legend>{lang:nbm_send_options}</legend>
+      <legend>{'nbm_send_options'|@translate}</legend>
       <table>
        <tr>
-          <td><label for="send_customize_mail_content">{lang:nbm_send_complementary_mail_content}</label></td>
-          <td><textarea cols="50" rows="5" name="send_customize_mail_content" id="send_customize_mail_content">{send.send_data.CUSTOMIZE_MAIL_CONTENT}</textarea></td>
+          <td><label for="send_customize_mail_content">{'nbm_send_complementary_mail_content'|@translate}</label></td>
+          <td><textarea cols="50" rows="5" name="send_customize_mail_content" id="send_customize_mail_content">{$send.CUSTOMIZE_MAIL_CONTENT}</textarea></td>
         </tr>
       </table>
     </fieldset>
 
     <p>
-      <input class="submit" type="submit" value="{lang:nbm_send_submit}" name="send_submit" {TAG_INPUT_ENABLED}/>
+      <input class="submit" type="submit" value="{'nbm_send_submit'|@translate}" name="send_submit" {$TAG_INPUT_ENABLED}/>
     </p>
-    <!-- END send_data -->
-  <!-- END send -->
+    {/if}
+  {/if}{* isset $send*}
 
 </form>
diff --git a/template/yoga/admin/user_list.tpl b/template/yoga/admin/user_list.tpl
index 25b0e705e..db67093f6 100644
--- a/template/yoga/admin/user_list.tpl
+++ b/template/yoga/admin/user_list.tpl
@@ -12,7 +12,7 @@
     <label>{'Username'|@translate} <input type="text" name="login" maxlength="50" size="20" /></label>
     <label>{'Password'|@translate} <input type="text" name="password" /></label>
     <label>{'Email address'|@translate} <input type="text" name="email" /></label>
-    <input class="submit" type="submit" name="submit_add" value="{'submit'|@translate}" {$TAG_INPUT_ENABLED} />
+    <input class="submit" type="submit" name="submit_add" value="{'Submit'|@translate}" {$TAG_INPUT_ENABLED} />
   </fieldset>
 </form>
 
@@ -43,13 +43,13 @@
   {html_options name=direction options=$direction_options selected=$direction_selected}
   </label>
 
-  <input class="submit" type="submit" value="{'submit'|@translate}" />
+  <input class="submit" type="submit" value="{'Submit'|@translate}" />
 
 </fieldset>
 
 </form>
 
-<form method="post" name="preferences" action="{$F_PREF_ACTION}">
+<form method="post" name="preferences" action="">
 
 <table class="table2">
   <tr class="throw">
@@ -59,9 +59,11 @@
     <th>{'Email address'|@translate}</th>
     <th>{'Groups'|@translate}</th>
     <th>{'properties'|@translate}</th>
-    {foreach from=$cpl_title_user item=title}
+    {if not empty($plugin_user_list_column_titles)}
+    {foreach from=$plugin_user_list_column_titles item=title}
     <th>{$title}</th>
     {/foreach}
+    {/if}
     <th>{'Actions'|@translate}</th>
   </tr>
   {foreach from=$users item=user name=users_loop}
@@ -72,13 +74,13 @@
     <td>{$user.EMAIL}</td>
     <td>{$user.GROUPS}</td>
     <td>{$user.PROPERTIES}</td>
-    {foreach from=$cpl_user[$smarty.foreach.users_loop.index] item=data}
+    {foreach from=$user.plugin_columns item=data}
     <td>{$data}</td>
     {/foreach}
     <td style="text-align:center;">
       <a href="{$user.U_PERM}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/permissions.png" class="button" style="border:none" alt="{'permissions'|@translate}" title="{'permissions'|@translate}" /></a>
       <a href="{$user.U_PROFILE}"><img src="{$ROOT_URL}{$themeconf.icon_dir}/edit_s.png" class="button" style="border:none" alt="{'Profile'|@translate}" title="{'Profile'|@translate}" /></a>
-      {foreach from=$cpl_link_user[$smarty.foreach.users_loop.index] item=data}
+      {foreach from=$user.plugin_actions item=data}
       {$data}
       {/foreach}
       </td>
@@ -103,8 +105,8 @@
       <td>{'Status'|@translate}</td>
       <td>
         <label><input type="radio" name="status_action" value="leave" checked="checked" /> {'leave'|@translate}</label>
-        <label><input type="radio" name="status_action" value="set" id="status_action_set" {$STATUS_ACTION_SET} /> {'set to'|@translate}</label>
-        <select onmousedown="document.getElementById('status_action_set').checked = true;" name="status" size="1">
+        <label><input type="radio" name="status_action" value="set" id="status_action_set" /> {'set to'|@translate}</label>
+        <select onchange="document.getElementById('status_action_set').checked = true;" name="status" size="1">
           {html_options options=$pref_status_options selected=$pref_status_selected}
         </select>
       </td>
@@ -116,8 +118,8 @@
       <td>
         <label><input type="radio" name="adviser" value="leave" checked="checked" /> {'leave'|@translate}</label>
         / {'set to'|@translate}
-        <label><input type="radio" name="adviser" value="true"  {$ADVISER_YES} />{'Yes'|@translate}</label>
-        <label><input type="radio" name="adviser" value="false" {$ADVISER_NO}  />{'No'|@translate}</label>
+        <label><input type="radio" name="adviser" value="true"  />{'Yes'|@translate}</label>
+        <label><input type="radio" name="adviser" value="false" />{'No'|@translate}</label>
       </td>
     </tr>
     {/if}
@@ -160,8 +162,8 @@
       <td>
         <label><input type="radio" name="enabled_high" value="leave" checked="checked" /> {'leave'|@translate}</label>
         / {'set to'|@translate}
-        <label><input type="radio" name="enabled_high" value="true"  {$ENABLED_HIGH_YES} />{'Yes'|@translate}</label>
-        <label><input type="radio" name="enabled_high" value="false" {$ENABLED_HIGH_NO}  />{'No'|@translate}</label>
+        <label><input type="radio" name="enabled_high" value="true"  />{'Yes'|@translate}</label>
+        <label><input type="radio" name="enabled_high" value="false" />{'No'|@translate}</label>
       </td>
     </tr>
 
@@ -169,8 +171,8 @@
 		<td>{'Privacy level'|@translate}</td>
 		<td>
 			<label><input type="radio" name="level_action" value="leave" checked="checked" />{'leave'|@translate}</label>
-			<label><input type="radio" name="level_action" value="set" id="level_action_set" {$LEVEL_ACTION_SET} />{'set to'|@translate}</label>
-			<select onmousedown="document.getElementById('level_action_set').checked = true;" name="level" size="1">
+			<label><input type="radio" name="level_action" value="set" id="level_action_set" />{'set to'|@translate}</label>
+			<select onchange="document.getElementById('level_action_set').checked = true;" name="level" size="1">
 			  {html_options options=$level_options selected=$level_selected}
 			</select>
 	  </td>
@@ -190,7 +192,7 @@
     <td>{'nb_image_per_row'|@translate}</td>
     <td>
       <label><input type="radio" name="nb_image_line_action" value="leave" checked="checked" /> {'leave'|@translate}</label>
-      <label><input type="radio" name="nb_image_line_action" value="set" id="nb_image_line_action_set" {$NB_IMAGE_LINE_ACTION_SET} /> {'set to'|@translate}</label>
+      <label><input type="radio" name="nb_image_line_action" value="set" id="nb_image_line_action_set"  /> {'set to'|@translate}</label>
       <input onmousedown="document.getElementById('nb_image_line_action_set').checked = true;"
              size="3" maxlength="2" type="text" name="nb_image_line" value="{$NB_IMAGE_LINE}" />
     </td>
@@ -200,7 +202,7 @@
     <td>{'nb_row_per_page'|@translate}</td>
     <td>
       <label><input type="radio" name="nb_line_page_action" value="leave" checked="checked" /> {'leave'|@translate}</label>
-      <label><input type="radio" name="nb_line_page_action" value="set" id="nb_line_page_action_set" {$NB_LINE_PAGE_ACTION_SET} /> {'set to'|@translate}</label>
+      <label><input type="radio" name="nb_line_page_action" value="set" id="nb_line_page_action_set" /> {'set to'|@translate}</label>
       <input onmousedown="document.getElementById('nb_line_page_action_set').checked = true;"
              size="3" maxlength="2" type="text" name="nb_line_page" value="{$NB_LINE_PAGE}" />
     <td>
@@ -210,8 +212,8 @@
     <td>{'theme'|@translate}</td>
     <td>
       <label><input type="radio" name="template_action" value="leave" checked="checked" /> {'leave'|@translate}</label>
-      <label><input type="radio" name="template_action" value="set" id="template_action_set" {$TEMPLATE_ACTION_SET} /> {'set to'|@translate}</label>
-      <select onmousedown="document.getElementById('template_action_set').checked = true;" name="template" size="1">
+      <label><input type="radio" name="template_action" value="set" id="template_action_set" /> {'set to'|@translate}</label>
+      <select onchange="document.getElementById('template_action_set').checked = true;" name="template" size="1">
         {html_options values=$template_options output=$template_options selected=$template_selected}
       </select>
     </td>
@@ -221,8 +223,8 @@
     <td>{'language'|@translate}</td>
     <td>
       <label><input type="radio" name="language_action" value="leave" checked="checked" /> {'leave'|@translate}</label>
-      <label><input type="radio" name="language_action" value="set" id="language_action_set" {$LANGUAGE_ACTION_SET} /> {'set to'|@translate}</label>
-      <select onmousedown="document.getElementById('language_action_set').checked = true;" name="language" size="1">
+      <label><input type="radio" name="language_action" value="set" id="language_action_set" /> {'set to'|@translate}</label>
+      <select onchange="document.getElementById('language_action_set').checked = true;" name="language" size="1">
         {html_options options=$language_options selected=$language_selected}
       </select>
     </td>
@@ -232,7 +234,7 @@
     <td>{'recent_period'|@translate}</td>
     <td>
       <label><input type="radio" name="recent_period_action" value="leave" checked="checked" /> {'leave'|@translate}</label>
-      <label><input type="radio" name="recent_period_action" value="set" id="recent_period_action_set" {$RECENT_PERIOD_ACTION_SET} /> {'set to'|@translate}</label>
+      <label><input type="radio" name="recent_period_action" value="set" id="recent_period_action_set"  /> {'set to'|@translate}</label>
       <input onmousedown="document.getElementById('recent_period_action_set').checked = true;"
              type="text" size="3" maxlength="2" name="recent_period" value="{$RECENT_PERIOD}" />
     </td>
@@ -243,8 +245,8 @@
     <td>
       <label><input type="radio" name="expand" value="leave" checked="checked" /> {'leave'|@translate}</label>
       / {'set to'|@translate}
-      <label><input type="radio" name="expand" value="true"  {$EXPAND_YES} />{'Yes'|@translate}</label>
-      <label><input type="radio" name="expand" value="false" {$EXPAND_NO}  />{'No'|@translate}</label>
+      <label><input type="radio" name="expand" value="true"  />{'Yes'|@translate}</label>
+      <label><input type="radio" name="expand" value="false" />{'No'|@translate}</label>
     </td>
   </tr>
 
@@ -253,8 +255,8 @@
     <td>
       <label><input type="radio" name="show_nb_comments" value="leave" checked="checked" /> {'leave'|@translate}</label>
       / {'set to'|@translate}
-      <label><input type="radio" name="show_nb_comments" value="true" {$SHOW_NB_COMMENTS_YES} />{'Yes'|@translate}</label>
-      <label><input type="radio" name="show_nb_comments" value="false" {$SHOW_NB_COMMENTS_NO} />{'No'|@translate}</label>
+      <label><input type="radio" name="show_nb_comments" value="true" />{'Yes'|@translate}</label>
+      <label><input type="radio" name="show_nb_comments" value="false" />{'No'|@translate}</label>
     </td>
   </tr>
 
@@ -263,8 +265,8 @@
     <td>
       <label><input type="radio" name="show_nb_hits" value="leave" checked="checked" /> {'leave'|@translate}</label>
       / {'set to'|@translate}
-      <label><input type="radio" name="show_nb_hits" value="true" {$SHOW_NB_HITS_YES} />{'Yes'|@translate}</label>
-      <label><input type="radio" name="show_nb_hits" value="false" {$SHOW_NB_HITS_NO} />{'No'|@translate}</label>
+      <label><input type="radio" name="show_nb_hits" value="true" />{'Yes'|@translate}</label>
+      <label><input type="radio" name="show_nb_hits" value="false" />{'No'|@translate}</label>
     </td>
   </tr>
 
@@ -273,7 +275,7 @@
     <td>
       <label><input type="radio" name="maxwidth_action" value="leave" checked="checked" /> {'leave'|@translate}</label>
       <label><input type="radio" name="maxwidth_action" value="unset" /> {'unset'|@translate}</label>
-      <label><input type="radio" name="maxwidth_action" value="set" id="maxwidth_action_set" {$MAXWIDTH_ACTION_SET} /> {'set to'|@translate}</label>
+      <label><input type="radio" name="maxwidth_action" value="set" id="maxwidth_action_set" /> {'set to'|@translate}</label>
       <input onmousedown="document.getElementById('maxwidth_action_set').checked = true;"
              type="text" size="4" maxlength="4" name="maxwidth" value="{$MAXWIDTH}" />
     </td>
@@ -285,7 +287,7 @@
     <td>
       <label><input type="radio" name="maxheight_action" value="leave" checked="checked" /> {'leave'|@translate}</label>
       <label><input type="radio" name="maxheight_action" value="unset" /> {'unset'|@translate}</label>
-      <label><input type="radio" name="maxheight_action" value="set" id="maxheight_action_set" {$MAXHEIGHT_ACTION_SET} /> {'set to'|@translate}</label>
+      <label><input type="radio" name="maxheight_action" value="set" id="maxheight_action_set" /> {'set to'|@translate}</label>
       <input onmousedown="document.getElementById('maxheight_action_set').checked = true;"
              type="text" size="4" maxlength="4" name="maxheight" value="{$MAXHEIGHT}" />
     </td>
diff --git a/template/yoga/search.tpl b/template/yoga/search.tpl
index dc22315a3..90fe76420 100644
--- a/template/yoga/search.tpl
+++ b/template/yoga/search.tpl
@@ -3,8 +3,8 @@
 
   <div class="titrePage">
     <ul class="categoryActions">
-      <li><a href="{$U_HELP}" onclick="popuphelp(this.href); return false;" title="{'Help'|@translate}" rel="nofollow"><img src="{$themeconf.icon_dir}/help.png" class="button" alt="(?)"></a></li>
-      <li><a href="{$U_HOME}" title="{'return to homepage'|@translate}" rel="home"><img src="{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}"/></a></li>
+      <li><a href="{$U_HELP}" onclick="popuphelp(this.href); return false;" title="{'Help'|@translate}" rel="nofollow"><img src="{$ROOT_URL}{$themeconf.icon_dir}/help.png" class="button" alt="(?)"></a></li>
+      <li><a href="{$U_HOME}" title="{'return to homepage'|@translate}" rel="home"><img src="{$ROOT_URL}{$themeconf.icon_dir}/home.png" class="button" alt="{'home'|@translate}"/></a></li>
     </ul>
     <h2>{'Search'|@translate}</h2>
   </div>
@@ -106,16 +106,16 @@
   <ul>
     <li><label>{'search_subcats_included'|@translate}</label></li>
     <li><label>
-      <input type="radio" name="subcats-included" value="1" checked="checked" />{'yes'|@translate}
+      <input type="radio" name="subcats-included" value="1" checked="checked" />{'Yes'|@translate}
     </label></li>
     <li><label>
-      <input type="radio" name="subcats-included" value="0" />{'no'|@translate}
+      <input type="radio" name="subcats-included" value="0" />{'No'|@translate}
     </label></li>
   </ul>
 </fieldset>
 <p>
-  <input class="submit" type="submit" name="submit" value="{'submit'|@translate}" />
-  <input class="submit" type="reset" value="{'reset'|@translate}" />
+  <input class="submit" type="submit" name="submit" value="{'Submit'|@translate}" />
+  <input class="submit" type="reset" value="{'Reset'|@translate}" />
 </p>
 </form>