Changeset 3217 for branches


Ignore:
Timestamp:
Mar 19, 2009, 10:39:38 PM (15 years ago)
Author:
nikrou
Message:

merge r3216 from trunk to branch 2.0

feature_948_accordion feature 948 : fix problem with incorrect submenu open in admin use a new variable (U_ACTIVE_MENU) and use default position defined in selected_admin_menu if not exists

Location:
branches/2.0/admin
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/2.0/admin/advanced_feature.php

    r3046 r3217  
    9393  array
    9494  (
    95     'U_HELP' => get_root_url().'popuphelp.php?page=advanced_feature'
     95    'U_HELP' => get_root_url().'popuphelp.php?page=advanced_feature',
     96    'U_ACTIVE_MENU' => 5
    9697  ));
    9798
  • branches/2.0/admin/element_set.php

    r3046 r3217  
    134134{
    135135  $page['title'] = l10n('Elements_not_linked');
     136  $template->assign(array('U_ACTIVE_MENU' => 5 ));
    136137
    137138  // we are searching elements not linked to any virtual category
     
    164165{
    165166  $page['title'] = l10n('Duplicates');
     167  $template->assign(array('U_ACTIVE_MENU' => 5 ));
    166168
    167169  // we are searching related elements twice or more to physical categories
  • branches/2.0/admin/include/functions_themes.inc.php

    r2662 r3217  
    3434        return 3;
    3535      case 'user_list':
     36      case 'user_perm':
    3637      case 'group_list':
     38      case 'group_perm':
    3739      case 'notification_by_mail':
    3840        return 4;
  • branches/2.0/admin/template/goto/admin.tpl

    r2963 r3217  
    88    header: "dt.rdion",
    99    event: "click",
    10     active: {$themeconf.selected_admin_menu}
     10    active: {$U_ACTIVE_MENU|default:$themeconf.selected_admin_menu}
    1111  });
    1212});
Note: See TracChangeset for help on using the changeset viewer.