bug 1613 fixed: split the "pending" screen into 2 distinct sections :

admin>photos>pending + admin>tools>pending comments. git-svn-id: http://piwigo.org/svn/trunk@5997 68402e56-0260-453c-a942-63ccdbb3a9ee
Piwigo · Apr 29, 2010 · 884c937 · 884c937
1 parent a07188b
commit 884c937
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 51 deletions.
diff --git a/admin.php b/admin.php
@@ -118,7 +118,7 @@
     'U_MOVE'=> $link_start.'cat_move',
     'U_CAT_OPTIONS'=> $link_start.'cat_options',
     'U_CAT_UPDATE'=> $link_start.'site_update&amp;site=1',
-    'U_WAITING'=> $link_start.'comments',
+    'U_WAITING'=> $link_start.'upload',
     'U_RATING'=> $link_start.'rating',
     'U_CADDIE'=> $link_start.'element_set&amp;cat=caddie',
     'U_RECENT_SET'=> $link_start.'element_set&amp;cat=recent',
@@ -133,6 +133,7 @@
     'U_PLUGINS'=> $link_start.'plugins_list',
     'U_ADD_PHOTOS' => $link_start.'photos_add',
     'U_CHANGE_THEME' => PHPWG_ROOT_PATH.'admin.php?change_theme=1',
+    'U_PENDING_COMMENTS' => $link_start.'comments',
     )
   );
 

diff --git a/admin/comments.php b/admin/comments.php
@@ -27,7 +27,6 @@
 }
 
 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                      |
@@ -96,9 +95,6 @@
 
 $template->set_filenames(array('comments'=>'comments.tpl'));
 
-// TabSheet initialization
-waiting_tabsheet();
-
 $template->assign(
   array(
     'F_ACTION' => get_root_url().'admin.php?page=comments'

diff --git a/admin/include/functions.php b/admin/include/functions.php
@@ -1908,7 +1908,6 @@ function get_active_menu($menu_page)
   {
     case 'photos_add':
     case 'upload':
-    case 'comments': // really needs to be moved somewhere else
     case 'rating':
     case 'tags':
     case 'picture_modify':
@@ -1941,6 +1940,7 @@ function get_active_menu($menu_page)
     case 'history':
     case 'maintenance':
     case 'thumbnail':
+    case 'comments':
       return 4;
 
     case 'configuration':

diff --git a/admin/include/functions_waiting.inc.php b/admin/include/functions_waiting.inc.php
diff --git a/admin/themes/default/template/admin.tpl b/admin/themes/default/template/admin.tpl
@@ -73,6 +73,7 @@ jQuery().ready(function(){ldelim}
         <li><a href="{$U_HISTORY_STAT}">{'History'|@translate}</a></li>
         <li><a href="{$U_THUMBNAILS}">{'Thumbnails'|@translate}</a></li>
         <li><a href="{$U_MAINTENANCE}">{'Maintenance'|@translate}</a></li>
+        <li><a href="{$U_PENDING_COMMENTS}">{'Pending Comments'|@translate}</a></li>
       </ul>
     </dd>
   </dl>

diff --git a/admin/upload.php b/admin/upload.php
@@ -27,7 +27,6 @@
 }
 
 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                      |
@@ -137,9 +136,6 @@
 //----------------------------------------------------- template initialization
 $template->set_filenames(array('upload'=>'upload.tpl'));
 
-// TabSheet initialization
-waiting_tabsheet();
-
 $template->assign(array(
   'F_ACTION'=>str_replace( '&', '&amp;', $_SERVER['REQUEST_URI'])
   ));

diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php
@@ -766,4 +766,5 @@
 $lang['Add another set of photos'] = 'Add another set of photos';
 $lang['Order of menubar items has been updated successfully.'] = 'Order of menubar items has been updated successfully.';
 $lang['This theme was not designed to be directly activated'] = 'This theme was not designed to be directly activated';
+$lang['Pending Comments'] = 'Pending Comments';
 ?>
diff --git a/language/fr_FR/admin.lang.php b/language/fr_FR/admin.lang.php
@@ -771,4 +771,5 @@
 $lang['Add another set of photos'] = 'Ajouter d\'autres photos';
 $lang['Order of menubar items has been updated successfully.'] = 'L\'ordre des éléments du menu a été mis à jour avec succès.';
 $lang['This theme was not designed to be directly activated'] = 'Ce thème n\'est pas conçu pour être activé directement';
+$lang['Pending Comments'] = 'Commentaires en attente';
 ?>