Add DateTime on administration introduction page (Useful to help user on the forum, ...)

Move history configuration in a other tab.
Use translation on picture hint (Kb).
Show hint oh the menu text (not only on counter)

git-svn-id: http://piwigo.org/svn/trunk@1884 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rub 2007-03-09 22:52:22 +00:00
parent b0478ef330
commit 3495d30775
9 changed files with 82 additions and 38 deletions

View file

@ -49,13 +49,16 @@ else
} }
$general_checkboxes = array( $general_checkboxes = array(
'log',
'history_admin',
'history_guest',
'email_admin_on_new_user', 'email_admin_on_new_user',
'allow_user_registration', 'allow_user_registration',
); );
$history_checkboxes = array(
'log',
'history_admin',
'history_guest'
);
$comments_checkboxes = array( $comments_checkboxes = array(
'comments_forall', 'comments_forall',
'comments_validation', 'comments_validation',
@ -81,6 +84,14 @@ if (isset($_POST['submit']) and !is_adviser())
} }
break; break;
} }
case 'history' :
{
foreach( $history_checkboxes as $checkbox)
{
$_POST[$checkbox] = empty($_POST[$checkbox])?'false':'true';
}
break;
}
case 'comments' : case 'comments' :
{ {
// the number of comments per page must be an integer between 5 and 50 // the number of comments per page must be an integer between 5 and 50
@ -170,6 +181,11 @@ $page['tabsheet'] = array
'caption' => l10n('conf_general_title'), 'caption' => l10n('conf_general_title'),
'url' => $conf_link.'general' 'url' => $conf_link.'general'
), ),
'history' => array
(
'caption' => l10n('conf_history_title'),
'url' => $conf_link.'history'
),
'comments' => array 'comments' => array
( (
'caption' => l10n('conf_comments_title'), 'caption' => l10n('conf_comments_title'),
@ -235,6 +251,22 @@ switch ($page['section'])
} }
break; break;
} }
case 'history' :
{
//Necessary for merge_block_vars
$template->assign_block_vars('history', array());
foreach( $history_checkboxes as $checkbox)
{
$template->merge_block_vars(
'history',
array(
strtoupper($checkbox) => ($conf[$checkbox]==true)?$html_check:''
)
);
}
break;
}
case 'comments' : case 'comments' :
{ {
$template->assign_block_vars( $template->assign_block_vars(

View file

@ -184,6 +184,9 @@ SELECT COUNT(*)
;'; ;';
list($nb_comments) = mysql_fetch_row(pwg_query($query)); list($nb_comments) = mysql_fetch_row(pwg_query($query));
$php_current_timestamp = date("Y-m-d H:i:s");
list($db_current_timestamp) = mysql_fetch_row(pwg_query('SELECT CURRENT_TIMESTAMP;'));
$template->assign_vars( $template->assign_vars(
array( array(
'PWG_VERSION' => PHPWG_VERSION, 'PWG_VERSION' => PHPWG_VERSION,
@ -205,7 +208,9 @@ $template->assign_vars(
'DB_GROUPS' => sprintf(l10n('%d groups'), $nb_groups), 'DB_GROUPS' => sprintf(l10n('%d groups'), $nb_groups),
'DB_COMMENTS' => sprintf(l10n('%d comments'), $nb_comments), 'DB_COMMENTS' => sprintf(l10n('%d comments'), $nb_comments),
'U_CHECK_UPGRADE' => PHPWG_ROOT_PATH.'admin.php?action=check_upgrade', 'U_CHECK_UPGRADE' => PHPWG_ROOT_PATH.'admin.php?action=check_upgrade',
'U_PHPINFO' => PHPWG_ROOT_PATH.'admin.php?action=phpinfo' 'U_PHPINFO' => PHPWG_ROOT_PATH.'admin.php?action=phpinfo',
'PHP_DATATIME' => $php_current_timestamp,
'DB_DATATIME' => $db_current_timestamp,
) )
); );

View file

@ -256,7 +256,7 @@ if (count($categories) > 0)
$category['count_images'], $category['count_images'],
$category['count_categories'], $category['count_categories'],
true, true,
'; ' ' / '
), ),
'U_IMG_LINK' => make_index_url( 'U_IMG_LINK' => make_index_url(

View file

@ -840,7 +840,7 @@ function get_thumbnail_title($element_info)
if (!empty($element_info['filesize'])) if (!empty($element_info['filesize']))
{ {
$thumbnail_title .= ' : '.$element_info['filesize'].' KB'; $thumbnail_title .= ' : '.l10n_dec('%d Kb', '%d Kb', $element_info['filesize']);
} }
return $thumbnail_title; return $thumbnail_title;

View file

@ -428,13 +428,22 @@ function get_html_menu_category($categories, $selected_category)
) )
); );
$title = get_display_images_count
(
$category['nb_images'],
$category['count_images'],
$category['count_categories'],
false,
' / '
);
$menu.= "\n".'<a href="'.$url.'"'; $menu.= "\n".'<a href="'.$url.'"';
if ($selected_category!=null if ($selected_category!=null
and $category['id'] == $selected_category['id_uppercat']) and $category['id'] == $selected_category['id_uppercat'])
{ {
$menu.= ' rel="up"'; $menu.= ' rel="up"';
} }
$menu.= '>'.$category['name'].'</a>'; $menu.= ' title=" '.$title.'">'.$category['name'].'</a>';
if ( $category['count_images']>0 ) if ( $category['count_images']>0 )
{// at least one direct or indirect image {// at least one direct or indirect image
@ -442,15 +451,7 @@ function get_html_menu_category($categories, $selected_category)
// at least one image in this category -> class menuInfoCat // at least one image in this category -> class menuInfoCat
$menu.= ($category['nb_images'] > 0 ? "menuInfoCat" $menu.= ($category['nb_images'] > 0 ? "menuInfoCat"
: "menuInfoCatByChild").'"'; : "menuInfoCatByChild").'"';
$menu.= ' title="'; $menu.= ' title=" '.$title.'">';
$menu.= ' '.get_display_images_count
(
$category['nb_images'],
$category['count_images'],
$category['count_categories'],
false,
' / '
).'">';
// show total number of images // show total number of images
$menu.= '['.$category['count_images'].']'; $menu.= '['.$category['count_images'].']';
$menu.= '</span>'; $menu.= '</span>';

View file

@ -226,6 +226,7 @@ $lang['conf_comments_title'] = 'Comments';
$lang['conf_confirmation'] = 'Information data registered in database'; $lang['conf_confirmation'] = 'Information data registered in database';
$lang['conf_default'] = 'Default display'; $lang['conf_default'] = 'Default display';
$lang['conf_default_title'] = 'Default display'; $lang['conf_default_title'] = 'Default display';
$lang['conf_history_title'] = 'History';
$lang['conf_gallery_url_error'] = 'The gallery URL is not valid.'; $lang['conf_gallery_url_error'] = 'The gallery URL is not valid.';
$lang['conf_general_title'] = 'Main'; $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['conf_nb_comment_page_error'] = 'The number of comments a page must be between 5 and 50 included.';

View file

@ -226,6 +226,7 @@ $lang['conf_comments_title'] = 'Commentaires';
$lang['conf_confirmation'] = 'Informations enregistrées dans la base de données'; $lang['conf_confirmation'] = 'Informations enregistrées dans la base de données';
$lang['conf_default'] = 'Affichage par défaut'; $lang['conf_default'] = 'Affichage par défaut';
$lang['conf_default_title'] = 'Affichage par défaut'; $lang['conf_default_title'] = 'Affichage par défaut';
$lang['conf_history_title'] = 'Historique';
$lang['conf_gallery_url_error'] = 'L\'adresse de la galerie n\'est pas valide.'; $lang['conf_gallery_url_error'] = 'L\'adresse de la galerie n\'est pas valide.';
$lang['conf_general_title'] = '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['conf_nb_comment_page_error'] = 'Le nombre de commentaires d\'utilisateurs par page doit être compris entre 5 et 50.';

View file

@ -64,30 +64,28 @@
<input type="checkbox" name="allow_user_registration" id="allow_user_registration" {general.ALLOW_USER_REGISTRATION} /> <input type="checkbox" name="allow_user_registration" id="allow_user_registration" {general.ALLOW_USER_REGISTRATION} />
</label> </label>
</li> </li>
<br/>
<li>
<fieldset>
<legend>{lang:History}</legend>
<ul>
<li>
<label><span class="property">{lang:Users}</span><input type="checkbox" name="log" {general.LOG} /></label>
</li>
<li>
<label><span class="property">{lang:user_status_admin}</span><input type="checkbox" name="history_admin" {general.HISTORY_ADMIN} /></label>
</li>
<li>
<label><span class="property">{lang:Guests}</span><input type="checkbox" name="history_guest" {general.HISTORY_GUEST} /></label>
</li>
</ul>
</fieldset>
</li>
</ul> </ul>
</fieldset> </fieldset>
<!-- END general --> <!-- END general -->
<!-- BEGIN history -->
<fieldset id="historyConf">
<ul>
<li>
<label><span class="property">{lang:Users}</span><input type="checkbox" name="log" {history.LOG} /></label>
</li>
<li>
<label><span class="property">{lang:user_status_admin}</span><input type="checkbox" name="history_admin" {history.HISTORY_ADMIN} /></label>
</li>
<li>
<label><span class="property">{lang:Guests}</span><input type="checkbox" name="history_guest" {history.HISTORY_GUEST} /></label>
</li>
</ul>
</fieldset>
<!-- END history -->
<!-- BEGIN comments --> <!-- BEGIN comments -->
<fieldset id="commentsConf"> <fieldset id="commentsConf">
<ul> <ul>

View file

@ -24,8 +24,8 @@
<dd> <dd>
<ul> <ul>
<li>{lang:Operating system}: {OS}</li> <li>{lang:Operating system}: {OS}</li>
<li>PHP: {PHP_VERSION} (<a href="{U_PHPINFO}">{lang:Show info}</a>)</li> <li>PHP: {PHP_VERSION} (<a href="{U_PHPINFO}">{lang:Show info}</a>) [{PHP_DATATIME}]</li>
<li>MySQL: {MYSQL_VERSION}</li> <li>MySQL: {MYSQL_VERSION} [{DB_DATATIME}]</li>
</ul> </ul>
</dd> </dd>
@ -55,4 +55,10 @@
</ul> </ul>
</dd> </dd>
<dt>{lang:Clock}</dt>
<dd>
<ul>
</ul>
</dd>
</dl> </dl>