adam/Piwigo
1
0
Fork 0
mirror of https://github.com/Piwigo/Piwigo.git synced 2026-06-02 04:15:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
admin>photos>pending + admin>tools>pending comments.

git-svn-id: http://piwigo.org/svn/trunk@5997 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
plegall
2010-04-29 13:58:40 +00:00
parent a07188b3be
commit 884c9375f3
8 changed files with 6 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin.php
+2 -1
View File
@@ -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',
)
);
admin/comments.php
-4
View File
@@ -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'
admin/include/functions.php
+1 -1
View File
@@ -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':
admin/include/functions_waiting.inc.php
-41
View File
@@ -1,41 +0,0 @@
<?php
// +-----------------------------------------------------------------------+
// | Piwigo - a PHP based picture gallery |
// +-----------------------------------------------------------------------+
// | Copyright(C) 2008-2010 Piwigo Team http://piwigo.org |
// | Copyright(C) 2003-2008 PhpWebGallery Team http://phpwebgallery.net |
// | Copyright(C) 2002-2003 Pierrick LE GALL http://le-gall.net/pierrick |
// +-----------------------------------------------------------------------+
// | 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/tabsheet.class.php');
function waiting_tabsheet()
{
global $page, $link_start;
// TabSheet
$tabsheet = new tabsheet();
// TabSheet initialization
$tabsheet->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();
}
?>
admin/themes/default/template/admin.tpl
+1
View File
@@ -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>
admin/upload.php
-4
View File
@@ -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( '&', '&amp;', $_SERVER['REQUEST_URI'])
));
language/en_UK/admin.lang.php
+1
View File
@@ -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';
?>
language/fr_FR/admin.lang.php
+1
View File
@@ -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';
?>