/[drupal]/contributions/modules/administration/merged.inc
ViewVC logotype

Diff of /contributions/modules/administration/merged.inc

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

revision 1.2, Thu Apr 13 15:49:30 2006 UTC revision 1.3, Fri Jun 23 02:02:02 2006 UTC
# Line 322  function _administration_menu_config() { Line 322  function _administration_menu_config() {
322    );    );
323    
324    // overrides to repoint a couple of settings.    // overrides to repoint a couple of settings.
325    $config['section']['admin'] = array(    $config['section']['admin/uncategorized'] = array(
326      'title' => t('configure modules'),      'title' => t('configure modules'),
327      'description' => t("Configure uncategorized module settings"),      'description' => t("Configure uncategorized module settings"),
328      'callback'    => '_administration_sub_dashboard_page',      'callback'    => '_administration_sub_dashboard_page',
# Line 384  function theme_administration_menu_panel Line 384  function theme_administration_menu_panel
384    else {    else {
385      if ($config['section'][$path]['menu_expandable']) $collapsible = 'collapsible';      if ($config['section'][$path]['menu_expandable']) $collapsible = 'collapsible';
386      $output .= '<ul class="' . $collapsible . '">';      $output .= '<ul class="' . $collapsible . '">';
387      foreach ($menu['visible'][$mid]['children'] as $cid) {      foreach ((array) $menu['visible'][$mid]['children'] as $cid) {
388        $title = !empty($menu['items'][$cid]['description']) ? $menu['items'][$cid]['description'] : $menu['items'][$cid]['title'];        $title = !empty($menu['items'][$cid]['description']) ? $menu['items'][$cid]['description'] : $menu['items'][$cid]['title'];
389        $src = _administration_get_icon_file_name($menu['items'][$cid]['path']);        $src = _administration_get_icon_file_name($menu['items'][$cid]['path']);
390        if (!empty($menu['visible'][$cid]['children'])) {        if (!empty($menu['visible'][$cid]['children'])) {
# Line 650  function theme_administration_statistics Line 650  function theme_administration_statistics
650    return $output;    return $output;
651  }  }
652    
653  function administration_form_default($form, $edit = ''){  function administration_form_merged($form){
654    $form['default'] = array(    $form['merged'] = array(
655      '#type' => 'fieldset', '#title' => t('Settings for default dashboard theme'),      '#type' => 'fieldset', '#title' => t('Settings for default dashboard theme'),
656      '#collapsible' => FALSE, '#collapsed' => FALSE      '#collapsible' => FALSE, '#collapsed' => FALSE
657    );    );
658    $form['default']['menu_icons'] = array(    $form['merged']['menu_icons'] = array(
659      '#type' => 'checkbox',      '#type' => 'checkbox',
660      '#title' => t('Use graphical icons for menu bullets within the administration dashboard'),      '#title' => t('Use graphical icons for menu bullets within the administration dashboard'),
661      '#default_value' => variable_get('administration_show_menu_icons', FALSE),      '#default_value' => variable_get('administration_show_menu_icons', FALSE),
662      '#tree' => FALSE      '#tree' => FALSE
663    );    );
   $form['buttons']['submit'] = array('#type' => 'submit', '#value' => t('Save configuration') );  
   $form['buttons']['reset'] = array('#type' => 'submit', '#value' => t('Reset to defaults') );  
664    return $form;    return $form;
665  }  }
666    
667  function administration_form_submit_default($formid, $form_values) {  function administration_form_submit_merged($formid, $form_values) {
668    $op = isset($_POST['op']) ? $_POST['op'] : '';    variable_set('administration_show_menu_icons', $form_values['menu_icons']);
   
   if ($op == 'Save configuration') {  
     variable_set('administration_show_menu_icons', $form_values['menu_icons']);  
   }  
   else {  
     if ($op == 'Reset to defaults') {  
       variable_set('administration_show_menu_icons', FALSE);  
     }  
   }  
669  }  }
670    
671  function _administration_get_icon_file_name($path) {  function _administration_get_icon_file_name($path) {
Legend:
Removed from v.1.2  
changed lines
  Added in v.1.3
  ViewVC Help
Powered by ViewVC 1.1.2