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

merge r2061 from branch 1.7 to trunk

Browse Source 
feature 719 : Split purge history link into Purge summary and Purge details.
- add a confirmation box when purging history

git-svn-id: http://piwigo.org/svn/trunk@2062 68402e56-0260-453c-a942-63ccdbb3a9ee
This commit is contained in:
rvelices
2007-07-10 22:00:36 +00:00
parent bbd2ddd142
commit 71d516d1f2
4 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin/maintenance.php
+12 -7
View File
@@ -59,16 +59,20 @@ switch ($action)
update_average_rate();
break;
}
case 'history' :
case 'history_detail' :
{
$query = '
DELETE
FROM '.HISTORY_TABLE.'
;';
pwg_query($query);
break;
}
case 'history_summary' :
{
$query = '
DELETE
FROM '.HISTORY_SUMMARY_TABLE.'
;';
pwg_query($query);
$query = '
DELETE
FROM '.HISTORY_TABLE.'
;';
pwg_query($query);
break;
@@ -111,7 +115,8 @@ $template->assign_vars(
array(
'U_MAINT_CATEGORIES' => $start_url.'categories',
'U_MAINT_IMAGES' => $start_url.'images',
'U_MAINT_HISTORY' => $start_url.'history',
'U_MAINT_HISTORY_DETAIL' => $start_url.'history_detail',
'U_MAINT_HISTORY_SUMMARY' => $start_url.'history_summary',
'U_MAINT_SESSIONS' => $start_url.'sessions',
'U_MAINT_FEEDS' => $start_url.'feeds',
'U_MAINT_DATABASE' => $start_url.'database',
language/en_UK.iso-8859-1/admin.lang.php
+2 -1
View File
@@ -367,7 +367,8 @@ $lang['permuser_info'] = 'Only private categories are listed. Private/Public cat
$lang['private'] = 'private';
$lang['properties'] = 'Properties';
$lang['public'] = 'public';
$lang['purge history'] = 'purge history';
$lang['purge history detail'] = 'purge history detail';
$lang['purge history summary'] = 'purge history summary';
$lang['purge never used notification feeds'] = 'purge never used notification feeds';
$lang['purge sessions'] = 'purge sessions';
$lang['randomly represented'] = 'randomly represented';
language/fr_FR.iso-8859-1/admin.lang.php
+3 -1
View File
@@ -367,7 +367,9 @@ $lang['permuser_info'] = 'Seules les cat
$lang['private'] = 'privé';
$lang['properties'] = 'Propriétés';
$lang['public'] = 'public';
$lang['purge history'] = 'purger l\'historique';
$lang['purge history'] = '';
$lang['purge history detail'] = 'purger le detail de l\'historique';
$lang['purge history summary'] = 'purger le sommaire de l\'historique';
$lang['purge never used notification feeds'] = 'purger les flux de notification jamais utilisés';
$lang['purge sessions'] = 'purger les sessions';
$lang['randomly represented'] = 'représentant au hasard';
template/yoga/admin/maintenance.tpl
+7 -3
View File
@@ -9,8 +9,12 @@
<ul>
<li><a href="{U_MAINT_CATEGORIES}" {TAG_INPUT_ENABLED}>{lang:update categories informations}</a></li>
<li><a href="{U_MAINT_IMAGES}" {TAG_INPUT_ENABLED}>{lang:update images informations}</a></li>
<li><a href="{U_MAINT_HISTORY}" {TAG_INPUT_ENABLED}>{lang:purge history}</a></li>
<li><a href="{U_MAINT_SESSIONS}" {TAG_INPUT_ENABLED}>{lang:purge sessions}</a></li>
<li><a href="{U_MAINT_FEEDS}" {TAG_INPUT_ENABLED}>{lang:purge never used notification feeds}</a></li>
<li><a href="{U_MAINT_DATABASE}" {TAG_INPUT_ENABLED}>{lang:repair and optimize database}</a></li>
</ul>
<ul>
<li><a href="{U_MAINT_HISTORY_DETAIL}" onclick="return confirm('{lang:Are you sure?}');" {TAG_INPUT_ENABLED}>{lang:purge history detail}</a></li>
<li><a href="{U_MAINT_HISTORY_SUMMARY}" onclick="return confirm('{lang:Are you sure?}');" {TAG_INPUT_ENABLED}>{lang:purge history summary}</a></li>
<li><a href="{U_MAINT_SESSIONS}" {TAG_INPUT_ENABLED}>{lang:purge sessions}</a></li>
<li><a href="{U_MAINT_FEEDS}" {TAG_INPUT_ENABLED}>{lang:purge never used notification feeds}</a></li>
</ul>