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
This commit is contained in:
rub 2007-03-08 22:14:14 +00:00
parent eab3d5e20e
commit f266c3b4cb
13 changed files with 124 additions and 30 deletions

View file

@ -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',

View file

@ -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'];

View file

@ -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';

View file

@ -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: functions_history.inc.php 1874 2007-03-06 02:07:15Z rub $
// | last update : $Date: 2007-03-06 03:07:15 +0100 (mar., 06 mars 2007) $
// | last modifier : $Author: rub $
// | revision : $Revision: 1874 $
// +-----------------------------------------------------------------------+
// | 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 history_tabsheet()
{
global $page, $link_start;
// TabSheet initialization
$page['tabsheet'] = array
(
'stats' => 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();
}
?>

View file

@ -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(

View file

@ -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';

View file

@ -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';

View file

@ -15,7 +15,6 @@
<dd>
<ul>
<li><a href="{U_CONFIG_GENERAL}">{lang:general}</a></li>
<li><a href="{U_CONFIG_COMMENTS}">{lang:comments}</a></li>
<li><a href="{U_CONFIG_DISPLAY}">{lang:conf_default}</a></li>
</ul>
</dd>
@ -60,13 +59,7 @@
<dt>{lang:special_admin_menu}</dt>
<dd>
<ul>
<li>
{lang:history}
<ul>
<li><a href="{U_HISTORY_STAT}">{lang:Statistics}</a></li>
<li><a href="{U_HISTORY_SEARCH}">{lang:Search}</a></li>
</ul>
</li>
<li><a href="{U_HISTORY_STAT}">{lang:history}</a></li>
<li><a href="{U_MAINTENANCE}">{lang:Maintenance}</a></li>
<li><a href="{U_ADVANCED_FEATURE}">{lang:Advanced_features}</a></li>
<!-- BEGIN web_services -->

View file

@ -3,15 +3,14 @@
<ul class="categoryActions">
<li><a href="{U_HELP}" onclick="popuphelp(this.href); return false;" title="{lang:Help}"><img src="{themeconf:icon_dir}/help.png" class="button" alt="(?)"></a></li>
</ul>
<h2>{lang:title_configuration}</h2>
<h2>{lang:title_configuration} {TABSHEET_TITLE}</h2>
{TABSHEET}
</div>
<form method="post" action="{F_ACTION}" class="properties">
<!-- BEGIN general -->
<fieldset id="generalConf">
<legend>{lang:conf_general_title}</legend>
<ul>
<li>
<span class="property">
@ -91,8 +90,6 @@
<!-- BEGIN comments -->
<fieldset id="commentsConf">
<legend>{lang:conf_comments_title}</legend>
<ul>
<li>
<label>
@ -135,8 +132,6 @@
<!-- END comments -->
<!-- BEGIN default -->
<fieldset id="commentsConf">
<legend>{lang:conf_default_title}</legend>
<ul>
<li>
<span class="property">

View file

@ -160,6 +160,7 @@ FIELDSET#generalConf TEXTAREA.description {
margin-left: auto; margin-right: auto;
text-decoration : none;
background: transparent;
border-bottom: 1px solid #fff;
}
.tabsheet li {
@ -167,10 +168,13 @@ FIELDSET#generalConf TEXTAREA.description {
text-align: center;
margin: 0 6px;
color: white;
font-size: 120%;
font-size: 110%;
font-weight: bold;
padding: 4px 8px;
border: 1px solid #fff;
border-radius: 6px 6px 0px 0px; /* round corners with CSS3 compliant browsers */
-moz-border-radius: 6px 6px 0px 0px; /* round corners with CSS3 compliant browsers */
padding: 5px 2em 2px 2em;
}
/* Tabsheet */

View file

@ -10,7 +10,8 @@
</a>
</li>
</ul>
<h2>{lang:History}</h2>
<h2>{lang:History} {TABSHEET_TITLE}</h2>
{TABSHEET}
</div>
<form class="filter" method="post" name="filter" action="{F_ACTION}">

View file

@ -1,5 +1,19 @@
<!-- $Id$ -->
<h2>{lang:title_history}</h2>
<div class="titrePage">
<ul class="categoryActions">
<li>
<a
href="{U_HELP}"
onclick="popuphelp(this.href); return false;"
title="{lang:Help}"
>
<img src="{themeconf:icon_dir}/help.png" class="button" alt="(?)">
</a>
</li>
</ul>
<h2>{lang:History} {TABSHEET_TITLE}</h2>
{TABSHEET}
</div>
<h3>{L_STAT_TITLE}</h3>

View file

@ -277,14 +277,14 @@ input.submit:active {
.qsearch { font-size: 80%; font-style: italic; }
* { outline: none; }
.tabsheet { border-bottom: 1px solid #369; }
.tabsheet {
border-bottom: 1px solid #369;
}
.tabsheet li {
background: #369;
color: white;
border: 1px solid #fff;
border-radius: 6px 6px 0px 0px; /* round corners with CSS3 compliant browsers */
-moz-border-radius: 6px 6px 0px 0px; /* round corners with CSS3 compliant browsers */
padding: 5px 2em 2px 2em;
}
.tabsheet a {