Changeset 876

Timestamp:

Sep 25, 2005, 8:31:55 PM (19 years ago)

Author:

plg

Message:

• bug fixed: HTML error on nested UL in categories menu.

• bug 161 fixed: guest_id not taken into account for history table insert.

• bug 164 fixed: category inserted in history table becomes too long if HTML tags are kept.

Location:

trunk

Files:

• doc/ChangeLog (modified) (1 diff)
• include/functions.inc.php (modified) (2 diffs)
• 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/menubar.css (modified) (1 diff)

trunk/doc/ChangeLog

@@ -1 @@
-2005-09-21 Pierrick LE GALL
+2005-09-24 Pierrick LE GALL
+
+        * bug fixed: HTML error on nested UL in categories menu.
+
+        * bug 161 fixed: guest_id not taken into account for history table
+        insert.
+
+        * bug 164 fixed: category inserted in history table becomes too
+        long if HTML tags are kept.
+
+2005-09-24 Pierrick LE GALL
 
         * bug 162 fixed: division by zero when trying to view "all" items
         in admin/element_set_(global|unit)
+
+        * bug 156 fixed: error when selection is empty was not catched.
         
 2005-09-21 Pierrick LE GALL

trunk/include/functions.inc.php

@@ -355 +355 @@
   if ($conf['log'])
   {
+    $login = ($user['id'] == $conf['guest_id'])
+      ? 'guest' : addslashes($user['username']);
+    
     $query = '
 INSERT INTO '.HISTORY_TABLE.'
@@ -360 +363 @@
   VALUES
   (NOW(),
-  \''.(($user['id'] == 2) ? 'guest' : addslashes($user['username'])).'\',
+  \''.$login.'\',
   \''.$_SERVER['REMOTE_ADDR'].'\',
   \''.addslashes($file).'\',
-  \''.addslashes($category).'\',
+  \''.addslashes(strip_tags($category)).'\',
   \''.addslashes($picture).'\')
 ;';

trunk/include/functions_html.inc.php

@@ -340 +340 @@
 
   $ref_level = 0;
-  $menu = '
-             <ul class="menu">';
+  $menu = '';
   
   foreach ($categories as $category)
   {
-    $level = substr_count($category['global_rank'], '.');
+    $level = substr_count($category['global_rank'], '.') + 1;
     if ($level > $ref_level)
     {
       $menu.= '
-             <ul class="menu">';
+             <ul>';
+    }
+    else if ($level == $ref_level)
+    {
+      $menu.= '
+             </li>';
     }
     else if ($level < $ref_level)
@@ -355 +359 @@
       // we may have to close more than one level at the same time...
       $menu.= str_repeat("\n</ul>",($ref_level-$level));
+      $menu.= "\n</li>";
     }
     $ref_level = $level;
@@ -383 +388 @@
       $menu.= get_icon($category['date_last']);
     }
-
-    $menu.= '
-           </li>';
-  }
-  
-  $menu.= '
+  }
+  
+  $menu.= '</li>
              </ul>';
   

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

@@ -116 +116 @@
 $lang['Represents'] = 'Represents';
 $lang['Save order'] = 'Save order';
+$lang['Select at least one picture'] = 'Select at least one picture';
 $lang['Select at least one user'] = 'Select at least one user';
 $lang['Show info'] = 'Show info';

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

@@ -116 +116 @@
 $lang['Represents'] = 'Représente';
 $lang['Save order'] = 'Sauvegarder l\'ordre';
+$lang['Select at least one picture'] = 'Sélectionner au moins une image';
 $lang['Select at least one user'] = 'Séléctionner au moins un utilisateur';
 $lang['Show info'] = 'Montrer les informations';

trunk/template/yoga/menubar.css

@@ -50 +50 @@
     margin-top: 0;
 }
-#menubar LI.selected {
-    font-weight: bold;
+
+#menubar LI.selected A {
+  font-weight: bold;
 }
+
+#menubar LI.selected LI A {
+  font-weight: normal;
+}
+
 #menubar HR {
     display: block;