merge r2061 from branch 1.7 to trunk

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

4 files changed, 20 insertions, 8 deletions

diff --git a/admin/maintenance.php b/admin/maintenance.php
index 49d97d8ce..7ee5f84e5 100644
--- a/admin/maintenance.php
+++ b/admin/maintenance.php
@@ -59,16 +59,20 @@ switch ($action)
     update_average_rate();
     break;
   }
-  case 'history' :
+  case 'history_detail' :
   {
     $query = '
 DELETE
-  FROM '.HISTORY_SUMMARY_TABLE.'
+  FROM '.HISTORY_TABLE.'
 ;';
     pwg_query($query);
+    break;
+  }
+  case 'history_summary' :
+  {
     $query = '
 DELETE
-  FROM '.HISTORY_TABLE.'
+  FROM '.HISTORY_SUMMARY_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',
diff --git a/language/en_UK.iso-8859-1/admin.lang.php b/language/en_UK.iso-8859-1/admin.lang.php
index d73c92c5e..444b7ff1a 100644
--- a/language/en_UK.iso-8859-1/admin.lang.php
+++ b/language/en_UK.iso-8859-1/admin.lang.php
@@ -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';
diff --git a/language/fr_FR.iso-8859-1/admin.lang.php b/language/fr_FR.iso-8859-1/admin.lang.php
index 6a47b6398..466bdfd10 100644
--- a/language/fr_FR.iso-8859-1/admin.lang.php
+++ b/language/fr_FR.iso-8859-1/admin.lang.php
@@ -367,7 +367,9 @@ $lang['permuser_info'] = 'Seules les catégories privées sont listées.';
 $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';
diff --git a/template/yoga/admin/maintenance.tpl b/template/yoga/admin/maintenance.tpl
index 697e0954b..12d07732a 100644
--- a/template/yoga/admin/maintenance.tpl
+++ b/template/yoga/admin/maintenance.tpl
@@ -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_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>
-  <li><a href="{U_MAINT_DATABASE}" {TAG_INPUT_ENABLED}>{lang:repair and optimize database}</a></li>
 </ul>