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

2 files changed, 41 insertions, 4 deletions

diff --git a/admin/configuration.php b/admin/configuration.php
index de9c3b162..fabc6b189 100644
--- a/admin/configuration.php
+++ b/admin/configuration.php
@@ -49,13 +49,16 @@ else
 }
 
 $general_checkboxes = array(
-    'log',
-    'history_admin',
-    'history_guest',
     'email_admin_on_new_user',
     'allow_user_registration',
    );
 
+$history_checkboxes = array(
+    'log',
+    'history_admin',
+    'history_guest'
+   );
+
 $comments_checkboxes = array(
     'comments_forall',
     'comments_validation',
@@ -81,6 +84,14 @@ if (isset($_POST['submit']) and !is_adviser())
       }
       break;
     }
+    case 'history' :
+    {
+      foreach( $history_checkboxes as $checkbox)
+      {
+        $_POST[$checkbox] = empty($_POST[$checkbox])?'false':'true';
+      }
+      break;
+    }
     case 'comments' :
     {
       // 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'),
     'url' => $conf_link.'general'
    ),
+  'history' => array
+   (
+    'caption' => l10n('conf_history_title'),
+    'url' => $conf_link.'history'
+   ),
   'comments' => array
    (
     'caption' => l10n('conf_comments_title'),
@@ -235,6 +251,22 @@ switch ($page['section'])
     }
     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' :
   {
     $template->assign_block_vars(
diff --git a/admin/intro.php b/admin/intro.php
index 5e8e83f9a..6ff2470ed 100644
--- a/admin/intro.php
+++ b/admin/intro.php
@@ -184,6 +184,9 @@ SELECT COUNT(*)
 ;';
 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(
   array(
     'PWG_VERSION' => PHPWG_VERSION,
@@ -205,7 +208,9 @@ $template->assign_vars(
     'DB_GROUPS' => sprintf(l10n('%d groups'), $nb_groups),
     'DB_COMMENTS' => sprintf(l10n('%d comments'), $nb_comments),
     '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,
     )
   );