From f266c3b4cb4dd517eb4ccf7aa4e5a46936e5ccff Mon Sep 17 00:00:00 2001 From: rub Date: Thu, 8 Mar 2007 22:14:14 +0000 Subject: Add tabsheet on administration pages. Step 3: Tabsheet for configuration & history Change css tabsheet to do like p0w0 for all themes git-svn-id: http://piwigo.org/svn/trunk@1881 68402e56-0260-453c-a942-63ccdbb3a9ee --- admin.php | 1 - admin/configuration.php | 28 ++++++++++++++++- admin/history.php | 6 +++- admin/include/functions_history.inc.php | 54 ++++++++++++++++++++++++++++++++ admin/stats.php | 6 +++- language/en_UK.iso-8859-1/admin.lang.php | 4 +-- language/fr_FR.iso-8859-1/admin.lang.php | 4 +-- template/yoga/admin.tpl | 9 +----- template/yoga/admin/configuration.tpl | 9 ++---- template/yoga/admin/default-layout.css | 6 +++- template/yoga/admin/history.tpl | 3 +- template/yoga/admin/stats.tpl | 16 +++++++++- template/yoga/theme/p0w0/theme.css | 8 ++--- 13 files changed, 124 insertions(+), 30 deletions(-) create mode 100644 admin/include/functions_history.inc.php diff --git a/admin.php b/admin.php index f443bcd23..5505cb1c9 100644 --- a/admin.php +++ b/admin.php @@ -81,7 +81,6 @@ $template->assign_vars( array( 'U_SITE_MANAGER'=> $link_start.'site_manager', 'U_HISTORY_STAT'=> $link_start.'stats', - 'U_HISTORY_SEARCH'=> $link_start.'history', 'U_FAQ'=> $link_start.'help', 'U_SITES'=> $link_start.'remote_site', 'U_MAINTENANCE'=> $link_start.'maintenance', diff --git a/admin/configuration.php b/admin/configuration.php index 12235cce6..de9c3b162 100644 --- a/admin/configuration.php +++ b/admin/configuration.php @@ -31,6 +31,7 @@ if( !defined("PHPWG_ROOT_PATH") ) } include_once(PHPWG_ROOT_PATH.'admin/include/functions.php'); +include_once(PHPWG_ROOT_PATH.'admin/include/functions_tabsheet.inc.php'); // +-----------------------------------------------------------------------+ // | Check Access and exit when user status is not ok | @@ -159,7 +160,32 @@ UPDATE '.CONFIG_TABLE.' } //----------------------------------------------------- template initialization -$template->set_filenames( array('config'=>'admin/configuration.tpl') ); +$template->set_filename('config', 'admin/configuration.tpl'); + +// TabSheet initialization +$page['tabsheet'] = array +( + 'general' => array + ( + 'caption' => l10n('conf_general_title'), + 'url' => $conf_link.'general' + ), + 'comments' => array + ( + 'caption' => l10n('conf_comments_title'), + 'url' => $conf_link.'comments' + ), + 'default' => array + ( + 'caption' => l10n('conf_default'), + 'url' => $conf_link.'default' + ) +); + +$page['tabsheet'][$page['section']]['selected'] = true; + +// Assign tabsheet to template +template_assign_tabsheet(); $action = PHPWG_ROOT_PATH.'admin.php?page=configuration'; $action.= '&section='.$page['section']; diff --git a/admin/history.php b/admin/history.php index 146737f7d..9a0a521e5 100644 --- a/admin/history.php +++ b/admin/history.php @@ -48,6 +48,7 @@ if (!defined('PHPWG_ROOT_PATH')) } include_once(PHPWG_ROOT_PATH.'admin/include/functions.php'); +include_once(PHPWG_ROOT_PATH.'admin/include/functions_history.inc.php'); if (isset($_GET['start']) and is_numeric($_GET['start'])) { @@ -128,7 +129,10 @@ INSERT INTO '.SEARCH_TABLE.' // | template init | // +-----------------------------------------------------------------------+ -$template->set_filenames(array('history'=>'admin/history.tpl')); +$template->set_filename('history', 'admin/history.tpl'); + +// TabSheet initialization +history_tabsheet(); $base_url = PHPWG_ROOT_PATH.'admin.php?page=history'; diff --git a/admin/include/functions_history.inc.php b/admin/include/functions_history.inc.php new file mode 100644 index 000000000..1bdd96992 --- /dev/null +++ b/admin/include/functions_history.inc.php @@ -0,0 +1,54 @@ + array + ( + 'caption' => l10n('Statistics'), + 'url' => $link_start.'stats' + ), + 'history' => array + ( + 'caption' => l10n('Search'), + 'url' => $link_start.'history' + ) + ); + + $page['tabsheet'][$page['page']]['selected'] = true; + + // Assign tabsheet to template + template_assign_tabsheet(); +} + +?> diff --git a/admin/stats.php b/admin/stats.php index a6386b1b9..707ed83d8 100644 --- a/admin/stats.php +++ b/admin/stats.php @@ -31,6 +31,7 @@ if (!defined("PHPWG_ROOT_PATH")) } include_once(PHPWG_ROOT_PATH.'admin/include/functions.php'); +include_once(PHPWG_ROOT_PATH.'admin/include/functions_history.inc.php'); // +-----------------------------------------------------------------------+ // | Functions | @@ -383,7 +384,10 @@ if (isset($page['day'])) $period_label = l10n('Hour'); } -$template->set_filenames(array('stats'=>'admin/stats.tpl')); +$template->set_filename('stats', 'admin/stats.tpl'); + +// TabSheet initialization +history_tabsheet(); $template->assign_vars( array( diff --git a/language/en_UK.iso-8859-1/admin.lang.php b/language/en_UK.iso-8859-1/admin.lang.php index b9f4cd98f..c4f173372 100644 --- a/language/en_UK.iso-8859-1/admin.lang.php +++ b/language/en_UK.iso-8859-1/admin.lang.php @@ -222,12 +222,12 @@ $lang['cat_virtual_added'] = 'Virtual category added'; $lang['cat_virtual_deleted'] = 'Virtual category deleted'; $lang['category'] = 'category'; $lang['conf_access'] = 'Access type'; -$lang['conf_comments_title'] = 'Users comments'; +$lang['conf_comments_title'] = 'Comments'; $lang['conf_confirmation'] = 'Information data registered in database'; $lang['conf_default'] = 'Default display'; $lang['conf_default_title'] = 'Default display'; $lang['conf_gallery_url_error'] = 'The gallery URL is not valid.'; -$lang['conf_general_title'] = 'Main configuration'; +$lang['conf_general_title'] = 'Main'; $lang['conf_nb_comment_page_error'] = 'The number of comments a page must be between 5 and 50 included.'; $lang['config'] = 'Configuration'; $lang['confirm'] = 'confirm'; diff --git a/language/fr_FR.iso-8859-1/admin.lang.php b/language/fr_FR.iso-8859-1/admin.lang.php index 25c371e2a..535acac0f 100644 --- a/language/fr_FR.iso-8859-1/admin.lang.php +++ b/language/fr_FR.iso-8859-1/admin.lang.php @@ -222,12 +222,12 @@ $lang['cat_virtual_added'] = 'Cat $lang['cat_virtual_deleted'] = 'Catégorie virtuelle supprimée'; $lang['category'] = 'catégorie'; $lang['conf_access'] = 'Type d\'accès'; -$lang['conf_comments_title'] = 'Commentaires d\'utilisateurs'; +$lang['conf_comments_title'] = 'Commentaires'; $lang['conf_confirmation'] = 'Informations enregistrées dans la base de données'; $lang['conf_default'] = 'Affichage par défaut'; $lang['conf_default_title'] = 'Affichage par défaut'; $lang['conf_gallery_url_error'] = 'L\'adresse de la galerie n\'est pas valide.'; -$lang['conf_general_title'] = 'Configuration principale'; +$lang['conf_general_title'] = 'Principale'; $lang['conf_nb_comment_page_error'] = 'Le nombre de commentaires d\'utilisateurs par page doit être compris entre 5 et 50.'; $lang['config'] = 'Configuration'; $lang['confirm'] = 'confirmer'; diff --git a/template/yoga/admin.tpl b/template/yoga/admin.tpl index 47d6ecf95..c95eb014e 100644 --- a/template/yoga/admin.tpl +++ b/template/yoga/admin.tpl @@ -15,7 +15,6 @@
@@ -60,13 +59,7 @@
{lang:special_admin_menu}