12 files changed, 93 insertions, 16 deletions

diff --git a/admin.php b/admin.php
index 4373de70b..94af4adfc 100644
--- a/admin.php
+++ b/admin.php
@@ -92,8 +92,7 @@ $template->assign_vars(
     'U_MOVE'=> $link_start.'cat_move',
     'U_CAT_OPTIONS'=> $link_start.'cat_options',
     'U_CAT_UPDATE'=> $link_start.'site_update&site=1',
-    'U_WAITING'=> $link_start.'waiting',
-    'U_COMMENTS'=> $link_start.'comments',
+    'U_WAITING'=> $link_start.'comments',
     'U_RATING'=> $link_start.'rating',
     'U_CADDIE'=> $link_start.'element_set&cat=caddie',
     'U_TAGS'=> $link_start.'tags',
diff --git a/admin/cat_modify.php b/admin/cat_modify.php
index 52521995d..6eccb305d 100644
--- a/admin/cat_modify.php
+++ b/admin/cat_modify.php
@@ -566,6 +566,7 @@ SELECT id, file, path, tn_ext
     $_POST['group'],
     get_str_email_format(true), /* TODO add a checkbox in order to choose format*/
     get_l10n_args('Come to visit %s', $category['name']),
+    'admin',
     'cat_group_info',
     array
     (
diff --git a/admin/comments.php b/admin/comments.php
index 1ca8fc617..70642065d 100644
--- a/admin/comments.php
+++ b/admin/comments.php
@@ -2,10 +2,9 @@
 // +-----------------------------------------------------------------------+
 // | PhpWebGallery - a PHP based picture gallery                           |
 // | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net |
-// | Copyright (C) 2003-2005 PhpWebGallery Team - http://phpwebgallery.net |
+// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net |
 // +-----------------------------------------------------------------------+
-// | branch        : BSF (Best So Far)
-// | file          : $RCSfile$
+// | file          : $Id$
 // | last update   : $Date$
 // | last modifier : $Author$
 // | revision      : $Revision$
@@ -31,6 +30,7 @@ if (!defined('PHPWG_ROOT_PATH'))
 }
 
 include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
+include_once(PHPWG_ROOT_PATH.'admin/include/functions_waiting.inc.php');
 
 // +-----------------------------------------------------------------------+
 // | Check Access and exit when user status is not ok                      |
@@ -121,6 +121,9 @@ DELETE
 
 $template->set_filenames(array('comments'=>'admin/comments.tpl'));
 
+// TabSheet initialization
+waiting_tabsheet();
+
 $template->assign_vars(
   array(
     'F_ACTION' => PHPWG_ROOT_PATH.'admin.php?page=comments'
diff --git a/admin/include/functions_waiting.inc.php b/admin/include/functions_waiting.inc.php
new file mode 100644
index 000000000..640991c00
--- /dev/null
+++ b/admin/include/functions_waiting.inc.php
@@ -0,0 +1,54 @@
+<?php
+// +-----------------------------------------------------------------------+
+// | 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 |
+// +-----------------------------------------------------------------------+
+// | file          : $Id$
+// | last update   : $Date$
+// | last modifier : $Author$
+// | revision      : $Revision$
+// +-----------------------------------------------------------------------+
+// | This program is free software; you can redistribute it and/or modify  |
+// | it under the terms of the GNU General Public License as published by  |
+// | the Free Software Foundation                                          |
+// |                                                                       |
+// | This program is distributed in the hope that it will be useful, but   |
+// | WITHOUT ANY WARRANTY; without even the implied warranty of            |
+// | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU      |
+// | General Public License for more details.                              |
+// |                                                                       |
+// | You should have received a copy of the GNU General Public License     |
+// | along with this program; if not, write to the Free Software           |
+// | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
+// | USA.                                                                  |
+// +-----------------------------------------------------------------------+
+
+include_once(PHPWG_ROOT_PATH.'admin/include/functions_tabsheet.inc.php');
+
+function waiting_tabsheet()
+{
+  global $page, $link_start;
+
+  // TabSheet initialization
+  $page['tabsheet'] = array
+  (
+    'comments' => array
+     (
+      'caption' => l10n('comments'),
+      'url' => $link_start.'comments'
+     ),
+    'upload' => array
+     (
+      'caption' => l10n('upload_pictures'),
+      'url' => $link_start.'upload'
+     )
+  );
+
+  $page['tabsheet'][$page['page']]['selected'] = true;
+
+  // Assign tabsheet to template
+  template_assign_tabsheet();
+}
+
+?>
diff --git a/admin/waiting.php b/admin/upload.php
index 30bd6f37c..9bc0f5067 100644
--- a/admin/waiting.php
+++ b/admin/upload.php
@@ -23,12 +23,14 @@
 // | Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
 // | USA.                                                                  |
 // +-----------------------------------------------------------------------+
+
 if( !defined("PHPWG_ROOT_PATH") )
 {
   die ("Hacking attempt!");
 }
 
 include_once(PHPWG_ROOT_PATH.'admin/include/functions.php');
+include_once(PHPWG_ROOT_PATH.'admin/include/functions_waiting.inc.php');
 
 // +-----------------------------------------------------------------------+
 // | Check Access and exit when user status is not ok                      |
@@ -136,7 +138,11 @@ DELETE
 }
 
 //----------------------------------------------------- template initialization
-$template->set_filenames(array('waiting'=>'admin/waiting.tpl'));
+$template->set_filenames(array('upload'=>'admin/upload.tpl'));
+
+// TabSheet initialization
+waiting_tabsheet();
+
 $template->assign_vars(array(
   'F_ACTION'=>str_replace( '&', '&amp;', $_SERVER['REQUEST_URI'])
   ));
@@ -214,5 +220,5 @@ $template->assign_vars(
   );
 
 //----------------------------------------------------------- sending html code
-$template->assign_var_from_handle('ADMIN_CONTENT', 'waiting');
+$template->assign_var_from_handle('ADMIN_CONTENT', 'upload');
 ?>
diff --git a/include/functions_mail.inc.php b/include/functions_mail.inc.php
index 07764f006..92d5ead6a 100644
--- a/include/functions_mail.inc.php
+++ b/include/functions_mail.inc.php
@@ -327,7 +327,8 @@ order by
  *   - group_id: mail are sent to group with this Id

  *   - email_format: mail format

  *   - keyargs_subject: mail subject on l10n_args format

- *   - tpl_shortname: short template name without extension

+ *   - dirname: short name of directory including template
+ *   - tpl_shortname: short template name without extension
  *   - assign_vars: array used to assign_vars to mail template

  *   - language_selected: send mail only to user with this selected language

  *
@@ -335,7 +336,8 @@ order by
  */
 function pwg_mail_group(

   $group_id, $email_format, $keyargs_subject, 

-  $tpl_shortname, $assign_vars = array(), $language_selected = '')
+  $dirname, $tpl_shortname,
+  $assign_vars = array(), $language_selected = '')
 {
   global $conf;
   $return = true;
@@ -407,7 +409,7 @@ WHERE
 
         $mail_template = get_mail_template($email_format, $elem);
         $mail_template->set_filename($tpl_shortname, 

-          (IN_ADMIN ? 'admin/' : '').$tpl_shortname.'.tpl');
+          (empty($dirname) ? '' : $dirname.'/').$tpl_shortname.'.tpl');
         $mail_template->assign_vars($assign_vars);
 
         $return = pwg_mail
diff --git a/language/en_UK.iso-8859-1/admin.lang.php b/language/en_UK.iso-8859-1/admin.lang.php
index 43895ce78..7bed53f74 100644
--- a/language/en_UK.iso-8859-1/admin.lang.php
+++ b/language/en_UK.iso-8859-1/admin.lang.php
@@ -425,7 +425,7 @@ $lang['title_liste_users'] = 'Users list';
 $lang['title_picmod'] = 'Modify informations about a picture';
 $lang['title_thumbnails'] = 'Thumbnail creation';
 $lang['title_update'] = 'Database synchronization with files';
-$lang['title_waiting'] = 'Pictures waiting for validation';
+$lang['title_upload'] = 'Pictures waiting for validation';
 $lang['tn_all'] = 'all';
 $lang['tn_alone_title'] = 'pictures without thumbnail (jpeg and png only)';
 $lang['tn_dirs_alone'] = 'pictures without thumbnail';
@@ -492,6 +492,7 @@ $lang['update_used_metadata'] = 'Used metadata';
 $lang['update_wrong_dirname_info'] = 'The name of directories and files must be composed of letters, figures, "-", "_" or "."';
 $lang['update_wrong_dirname_short'] = 'wrong filename';
 $lang['upload'] = 'Upload';
+$lang['upload_pictures'] = 'Pictures';
 $lang['user "%s" added'] = 'user "%s" added';
 $lang['user_status'] = 'User status';
 $lang['user_status_admin'] = 'Administrator';
diff --git a/language/fr_FR.iso-8859-1/admin.lang.php b/language/fr_FR.iso-8859-1/admin.lang.php
index a791b78a0..e8b4d7e54 100644
--- a/language/fr_FR.iso-8859-1/admin.lang.php
+++ b/language/fr_FR.iso-8859-1/admin.lang.php
@@ -425,7 +425,7 @@ $lang['title_liste_users'] = 'Liste des utilisateurs';
 $lang['title_picmod'] = 'Modifier les informations d\'une image';
 $lang['title_thumbnails'] = 'Création des miniatures';
 $lang['title_update'] = 'Synchronisation de la base de données à partir des fichiers';
-$lang['title_waiting'] = 'Images en attente de validation';
+$lang['title_upload'] = 'Images en attente de validation';
 $lang['tn_all'] = 'tout';
 $lang['tn_alone_title'] = 'image sans miniature (jpeg et png uniquement)';
 $lang['tn_dirs_alone'] = 'images sans miniature';
@@ -492,6 +492,7 @@ $lang['update_used_metadata'] = 'Méta-données employées';
 $lang['update_wrong_dirname_info'] = 'Le nom des répertoires et des fichiers ne doit être constitué que de lettres, de chiffres, de "-", "_" et "."';
 $lang['update_wrong_dirname_short'] = 'nom de fichier erroné';
 $lang['upload'] = 'Ajout';
+$lang['upload_pictures'] = 'Images';
 $lang['user "%s" added'] = 'utilisateur "%s" ajouté';
 $lang['user_status'] = 'Statut de l\'utilisateur';
 $lang['user_status_admin'] = 'Administrateur';
diff --git a/template/yoga/admin.tpl b/template/yoga/admin.tpl
index 88975544c..0ee8804b7 100644
--- a/template/yoga/admin.tpl
+++ b/template/yoga/admin.tpl
@@ -38,7 +38,6 @@
       <ul>
         <li><a href="{U_WAITING}">{lang:waiting}</a></li>
         <li><a href="{U_THUMBNAILS}">{lang:thumbnails}</a></li>
-        <li><a href="{U_COMMENTS}">{lang:comments}</a></li>
         <li><a href="{U_RATING}">{lang:Rating}</a></li>
         <li><a href="{U_TAGS}">{lang:Tags}</a></li>
         <li><a href="{U_CADDIE}">{lang:Caddie}</a></li>
diff --git a/template/yoga/admin/comments.tpl b/template/yoga/admin/comments.tpl
index 39c18bd5c..88c86bd88 100644
--- a/template/yoga/admin/comments.tpl
+++ b/template/yoga/admin/comments.tpl
@@ -1,4 +1,10 @@
-<h2>{lang:User comments validation}</h2>
+<!-- $Id$ -->
+<div class="titrePage">
+  <h2>{lang:waiting} {TABSHEET_TITLE}</h2>
+  {TABSHEET}
+</div>
+
+<h3>{lang:User comments validation}</h3>
 
 <form method="post" action="{F_ACTION}">
   <!-- BEGIN comment -->
diff --git a/template/yoga/admin/waiting.tpl b/template/yoga/admin/upload.tpl
index 2732ad621..3bba80602 100644
--- a/template/yoga/admin/waiting.tpl
+++ b/template/yoga/admin/upload.tpl
@@ -1,5 +1,10 @@
 <!-- $Id$ -->
-<h2>{lang:title_waiting}</h2>
+<div class="titrePage">
+  <h2>{lang:waiting} {TABSHEET_TITLE}</h2>
+  {TABSHEET}
+</div>
+
+<h3>{lang:title_upload}</h3>
 
 <form action="{F_ACTION}" method="post" id="waiting">
   <table style="width:100%;" >
diff --git a/upload.php b/upload.php
index 48d36d793..e304af70f 100644
--- a/upload.php
+++ b/upload.php
@@ -227,7 +227,7 @@ if ( isset( $_POST['submit'] ) and !isset( $_GET['waiting_id'] ) )
     {
       include_once(PHPWG_ROOT_PATH.'include/functions_mail.inc.php');
 
-      $waiting_url = get_absolute_root_url().'admin.php?page=waiting';
+      $waiting_url = get_absolute_root_url().'admin.php?page=upload';
 
       $keyargs_content = array
       (