aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorrub <rub@piwigo.org>2007-03-16 18:49:19 +0000
committerrub <rub@piwigo.org>2007-03-16 18:49:19 +0000
commit1a3660405a6856bca55932900e18edd5b5e6d20b (patch)
tree6759a9129ed371803b7a9bfe8fb65671fe4c7e92 /admin
parent837138918295869327ea93d06d508d7c26c2ebea (diff)
Add the last (before 1.8) tabsheet on administration menu (Waiting elements).
Small change way mail function. git-svn-id: http://piwigo.org/svn/trunk@1915 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--admin.php3
-rw-r--r--admin/cat_modify.php1
-rw-r--r--admin/comments.php9
-rw-r--r--admin/include/functions_waiting.inc.php54
-rw-r--r--admin/upload.php (renamed from admin/waiting.php)10
5 files changed, 70 insertions, 7 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&amp;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&amp;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');
?>