Changeset 876


Ignore:
Timestamp:
09/25/05 20:31:55 (15 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:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/doc/ChangeLog

    r875 r876  
    1 2005-09-21 Pierrick LE GALL 
     12005-09-24 Pierrick LE GALL 
     2 
     3        * bug fixed: HTML error on nested UL in categories menu. 
     4 
     5        * bug 161 fixed: guest_id not taken into account for history table 
     6        insert. 
     7 
     8        * bug 164 fixed: category inserted in history table becomes too 
     9        long if HTML tags are kept. 
     10 
     112005-09-24 Pierrick LE GALL 
    212 
    313        * bug 162 fixed: division by zero when trying to view "all" items 
    414        in admin/element_set_(global|unit) 
     15 
     16        * bug 156 fixed: error when selection is empty was not catched. 
    517         
    6182005-09-21 Pierrick LE GALL 
  • trunk/include/functions.inc.php

    r868 r876  
    355355  if ($conf['log']) 
    356356  { 
     357    $login = ($user['id'] == $conf['guest_id']) 
     358      ? 'guest' : addslashes($user['username']); 
     359     
    357360    $query = ' 
    358361INSERT INTO '.HISTORY_TABLE.' 
     
    360363  VALUES 
    361364  (NOW(), 
    362   \''.(($user['id'] == 2) ? 'guest' : addslashes($user['username'])).'\', 
     365  \''.$login.'\', 
    363366  \''.$_SERVER['REMOTE_ADDR'].'\', 
    364367  \''.addslashes($file).'\', 
    365   \''.addslashes($category).'\', 
     368  \''.addslashes(strip_tags($category)).'\', 
    366369  \''.addslashes($picture).'\') 
    367370;'; 
  • trunk/include/functions_html.inc.php

    r862 r876  
    340340 
    341341  $ref_level = 0; 
    342   $menu = ' 
    343              <ul class="menu">'; 
     342  $menu = ''; 
    344343   
    345344  foreach ($categories as $category) 
    346345  { 
    347     $level = substr_count($category['global_rank'], '.'); 
     346    $level = substr_count($category['global_rank'], '.') + 1; 
    348347    if ($level > $ref_level) 
    349348    { 
    350349      $menu.= ' 
    351              <ul class="menu">'; 
     350             <ul>'; 
     351    } 
     352    else if ($level == $ref_level) 
     353    { 
     354      $menu.= ' 
     355             </li>'; 
    352356    } 
    353357    else if ($level < $ref_level) 
     
    355359      // we may have to close more than one level at the same time... 
    356360      $menu.= str_repeat("\n</ul>",($ref_level-$level)); 
     361      $menu.= "\n</li>"; 
    357362    } 
    358363    $ref_level = $level; 
     
    383388      $menu.= get_icon($category['date_last']); 
    384389    } 
    385  
    386     $menu.= ' 
    387            </li>'; 
    388   } 
    389    
    390   $menu.= ' 
     390  } 
     391   
     392  $menu.= '</li> 
    391393             </ul>'; 
    392394   
  • trunk/language/en_UK.iso-8859-1/admin.lang.php

    r868 r876  
    116116$lang['Represents'] = 'Represents'; 
    117117$lang['Save order'] = 'Save order'; 
     118$lang['Select at least one picture'] = 'Select at least one picture'; 
    118119$lang['Select at least one user'] = 'Select at least one user'; 
    119120$lang['Show info'] = 'Show info'; 
  • trunk/language/fr_FR.iso-8859-1/admin.lang.php

    r868 r876  
    116116$lang['Represents'] = 'Représente'; 
    117117$lang['Save order'] = 'Sauvegarder l\'ordre'; 
     118$lang['Select at least one picture'] = 'Sélectionner au moins une image'; 
    118119$lang['Select at least one user'] = 'Séléctionner au moins un utilisateur'; 
    119120$lang['Show info'] = 'Montrer les informations'; 
  • trunk/template/yoga/menubar.css

    r859 r876  
    5050    margin-top: 0; 
    5151} 
    52 #menubar LI.selected { 
    53     font-weight: bold; 
     52 
     53#menubar LI.selected A { 
     54  font-weight: bold; 
    5455} 
     56 
     57#menubar LI.selected LI A { 
     58  font-weight: normal; 
     59} 
     60 
    5561#menubar HR { 
    5662    display: block; 
Note: See TracChangeset for help on using the changeset viewer.