From 884c9375f3e35578ad67b9d58a41b97fef04949c Mon Sep 17 00:00:00 2001 From: plegall Date: Thu, 29 Apr 2010 13:58:40 +0000 Subject: 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 --- admin.php | 3 ++- admin/comments.php | 4 ---- admin/include/functions.php | 2 +- admin/include/functions_waiting.inc.php | 41 --------------------------------- admin/themes/default/template/admin.tpl | 1 + admin/upload.php | 4 ---- language/en_UK/admin.lang.php | 1 + language/fr_FR/admin.lang.php | 1 + 8 files changed, 6 insertions(+), 51 deletions(-) delete mode 100644 admin/include/functions_waiting.inc.php diff --git a/admin.php b/admin.php index 21014e2e9..c80fa508c 100644 --- a/admin.php +++ b/admin.php @@ -118,7 +118,7 @@ $template->assign( '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.'comments', + 'U_WAITING'=> $link_start.'upload', 'U_RATING'=> $link_start.'rating', 'U_CADDIE'=> $link_start.'element_set&cat=caddie', 'U_RECENT_SET'=> $link_start.'element_set&cat=recent', @@ -133,6 +133,7 @@ $template->assign( '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 index 394825ec9..4bb4490ac 100644 --- a/admin/comments.php +++ b/admin/comments.php @@ -27,7 +27,6 @@ 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 | @@ -96,9 +95,6 @@ DELETE $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 index 618c65b99..d0ea59822 100644 --- 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 deleted file mode 100644 index ae27b97c2..000000000 --- a/admin/include/functions_waiting.inc.php +++ /dev/null @@ -1,41 +0,0 @@ -add('comments', l10n('Comments'), $link_start.'comments'); - $tabsheet->add('upload', l10n('Pictures'), $link_start.'upload'); - // TabSheet selection - $tabsheet->select($page['page']); - // Assign tabsheet to template - $tabsheet->assign(); -} - -?> diff --git a/admin/themes/default/template/admin.tpl b/admin/themes/default/template/admin.tpl index 380248870..0a3c5be70 100644 --- a/admin/themes/default/template/admin.tpl +++ b/admin/themes/default/template/admin.tpl @@ -73,6 +73,7 @@ jQuery().ready(function(){ldelim}
  • {'History'|@translate}
  • {'Thumbnails'|@translate}
  • {'Maintenance'|@translate}
    • +
  • {'Pending Comments'|@translate}
    • diff --git a/admin/upload.php b/admin/upload.php index b7790d4ac..e97198b18 100644 --- a/admin/upload.php +++ b/admin/upload.php @@ -27,7 +27,6 @@ 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 | @@ -137,9 +136,6 @@ DELETE //----------------------------------------------------- template initialization $template->set_filenames(array('upload'=>'upload.tpl')); -// TabSheet initialization -waiting_tabsheet(); - $template->assign(array( 'F_ACTION'=>str_replace( '&', '&', $_SERVER['REQUEST_URI']) )); diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php index 16c0556bb..472d6e28f 100644 --- a/language/en_UK/admin.lang.php +++ b/language/en_UK/admin.lang.php @@ -766,4 +766,5 @@ $lang['There is no other theme available.'] = 'There is no other theme available $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 index 28b31c006..ded4f38ab 100644 --- a/language/fr_FR/admin.lang.php +++ b/language/fr_FR/admin.lang.php @@ -771,4 +771,5 @@ $lang['delete'] = 'effacer'; $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'; ?> -- cgit v1.2.3