Changeset 1884

Timestamp:

Mar 9, 2007, 11:52:22 PM (17 years ago)

Author:

rub

Message:

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)

Location:

trunk

Files:

• admin/configuration.php (modified) (4 diffs)
• admin/intro.php (modified) (2 diffs)
• include/category_cats.inc.php (modified) (1 diff)
• include/functions.inc.php (modified) (1 diff)
• include/functions_html.inc.php (modified) (3 diffs)
• language/en_UK.iso-8859-1/admin.lang.php (modified) (1 diff)
• language/fr_FR.iso-8859-1/admin.lang.php (modified) (1 diff)
• template/yoga/admin/configuration.tpl (modified) (1 diff)
• template/yoga/admin/intro.tpl (modified) (2 diffs)

trunk/admin/configuration.php

@@ -50 +50 @@
 
 $general_checkboxes = array(
+    'email_admin_on_new_user',
+    'allow_user_registration',
+   );
+
+$history_checkboxes = array(
     'log',
     'history_admin',
-    'history_guest',
-    'email_admin_on_new_user',
-    'allow_user_registration',
+    'history_guest'
    );
 
@@ -77 +80 @@
       }
       foreach( $general_checkboxes as $checkbox)
+      {
+        $_POST[$checkbox] = empty($_POST[$checkbox])?'false':'true';
+      }
+      break;
+    }
+    case 'history' :
+    {
+      foreach( $history_checkboxes as $checkbox)
       {
         $_POST[$checkbox] = empty($_POST[$checkbox])?'false':'true';
@@ -170 +181 @@
     'caption' => l10n('conf_general_title'),
     'url' => $conf_link.'general'
+   ),
+  'history' => array
+   (
+    'caption' => l10n('conf_history_title'),
+    'url' => $conf_link.'history'
    ),
   'comments' => array
@@ -229 +245 @@
       $template->merge_block_vars(
           'general',
+          array(
+            strtoupper($checkbox) => ($conf[$checkbox]==true)?$html_check:''
+            )
+        );
+    }
+    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:''

trunk/admin/intro.php

@@ -184 +184 @@
 ;';
 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(
@@ -206 +209 @@
     '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,
     )
   );

trunk/include/category_cats.inc.php

@@ -257 +257 @@
                                     $category['count_categories'],
                                     true,
-                                    '; '
+                                    ' / '
                                   ),
 

trunk/include/functions.inc.php

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

trunk/include/functions_html.inc.php

@@ -429 +429 @@
             );
 
+    $title = get_display_images_count
+                (
+                  $category['nb_images'],
+                  $category['count_images'],
+                  $category['count_categories'],
+                  false,
+                  ' / '
+                );
+
     $menu.= "\n".'<a href="'.$url.'"';
     if ($selected_category!=null
@@ -435 +444 @@
       $menu.= ' rel="up"';
     }
-    $menu.= '>'.$category['name'].'</a>';
+    $menu.= ' title=" '.$title.'">'.$category['name'].'</a>';
 
     if ( $category['count_images']>0 )
@@ -443 +452 @@
       $menu.= ($category['nb_images'] > 0 ? "menuInfoCat" 
                                           : "menuInfoCatByChild").'"';
-      $menu.= ' title="';
-      $menu.= ' '.get_display_images_count
-                  (
-                    $category['nb_images'],
-                    $category['count_images'],
-                    $category['count_categories'],
-                    false,
-                    ' / '
-                  ).'">';
+      $menu.= ' title=" '.$title.'">';
       // show total number of images
       $menu.= '['.$category['count_images'].']';

trunk/language/en_UK.iso-8859-1/admin.lang.php

@@ -227 +227 @@
 $lang['conf_default'] = '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_general_title'] = 'Main';

trunk/language/fr_FR.iso-8859-1/admin.lang.php

@@ -227 +227 @@
 $lang['conf_default'] = '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_general_title'] = 'Principale';

trunk/template/yoga/admin/configuration.tpl

@@ -65 +65 @@
       </label>
     </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>
 </fieldset>
 <!-- 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 -->

trunk/template/yoga/admin/intro.tpl

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