From 534805718ae542a47e222e0924263bd145dc08b5 Mon Sep 17 00:00:00 2001 From: Dries Buytaert Date: Sun, 13 Nov 2005 07:52:14 +0000 Subject: - Rollback an accidentical commit. --- modules/menu/menu.module | 126 ++++++----------------------------------------- 1 file changed, 16 insertions(+), 110 deletions(-) (limited to 'modules/menu/menu.module') diff --git a/modules/menu/menu.module b/modules/menu/menu.module index ef14ca9d6..8dfec2728 100644 --- a/modules/menu/menu.module +++ b/modules/menu/menu.module @@ -106,21 +106,17 @@ function menu_configure() { $primary_options[$mid] = $menu['items'][$mid]['title']; } - $form['settings_links'] = array( - '#type' => 'fieldset', - '#title' => t('Primary links settings'), - ); - + $form['settings_links'] = array('#type' => 'fieldset', '#title' => t('Primary links settings')); $form['settings_links']['intro'] = array( - '#type' => 'item', - '#value' => t('Primary links is a navigation system which usually (depending on your theme) appears at the top-right of the browser window. There are usually two rows of links, primary and secondary. You may control which links appear in this area by choosing a menu from which the links will be generated and then placing your links into the menu using the menu administration or the \'Menu settings\' pane on each node authoring form.', array('%menu' => url('admin/menu'))), + '#type' => 'markup', + '#value' => t('Primary links is a navigation system which usually (depending on your theme) appears at the top-right of the browser window. There are usually two rows of links, primary and secondary. You may control which links appear in this area by choosing a menu from which the links will be generated and then placing your links into the menu using the menu administration or the \'Menu settings\' pane on each edit node form.', array('%menu' => url('admin/menu'))) ); $form['settings_links']['menu_primary_menu'] = array( '#type' => 'select', '#title' => t('Menu containing primary links'), '#default_value' => variable_get('menu_primary_menu', 0), - '#options' => $primary_options, + '#options' => $primary_options ); $secondary_options[0] = t('No secondary links'); @@ -133,30 +129,7 @@ function menu_configure() { '#title' => t('Menu containing secondary links'), '#default_value' => variable_get('menu_secondary_menu', 0), '#options' => $secondary_options, - '#description' => t('If you select the same menu as primary links then secondary links will display the appropriate second level of your navigation hierarchy.'), - ); - - $form['settings_authoring'] = array( - '#type' => 'fieldset', - '#title' => t('Node authoring form settings'), - ); - - $form['settings_authoring']['intro'] = array( - '#type' => 'item', - '#value' => t('On each post authoring form there is a \'Menu settings\' pane. This setting allows you to limit what is displayed in the \'Parent item\' drop-down menu of that pane. This can be used to force new menu items to be created in the primary links menu or to hide admin menu items.'), - ); - - $authoring_options = array(0 => t('Show all menus')); - foreach ($menu['items'][0]['children'] as $mid) { - $authoring_options[$mid] = $menu['items'][$mid]['title']; - } - - $form['settings_authoring']['menu_parent_items'] = array( - '#type' => 'select', - '#title' => t('Restrict parent items to'), - '#default_value' => variable_get('menu_parent_items', 0), - '#options' => $authoring_options, - '#description' => t('Choose the menu from which parent items will be made available. Only this menu item and its children will be shown.'), + '#description' => t('If you select the same menu as primary links then secondary links will display the appropriate second level of your navigation hierarchy.') ); return system_settings_form('menu_configure', $form); @@ -637,89 +610,22 @@ function menu_node_form($edit = array()) { } } - $form['menu'] = array( - '#type' => 'fieldset', - '#title' => t('Menu settings'), - '#collapsible' => TRUE, - '#collapsed' => TRUE, - '#tree' => TRUE, - ); + $form['menu'] = array('#type' => 'fieldset', '#title' => t('Menu settings'), '#collapsible' => TRUE, '#collapsed' => TRUE, '#tree' => TRUE); - $form['menu']['title'] = array( - '#type' => 'textfield', - '#title' => t('Title'), - '#default_value' => $item['title'], - '#size' => 60, - '#maxlength' => 128, - '#description' => t('The name to display for this link.'), - ); + $form['menu']['title'] = array('#type' => 'textfield', '#title' => t('Title'), '#default_value' => $item['title'], '#description' => t('The name to display for this link.')); - $form['menu']['description'] = array( - '#type' => 'textfield', - '#title' => t('Description'), - '#default_value' => $item['description'], - '#size' => 60, - '#maxlength' => 128, - '#description' => t('The description displayed when hovering over a menu item.'), - ); + // Generate a list of possible parents (not including this item or descendants). + $options = menu_parent_options($edit['mid']); + $form['menu']['pid'] = array('#type' => select, '#title' => t('Parent item'), '#default_value' => $item['pid'], '#options' => $options); + $form['menu']['description'] = array('#type' => 'hidden', '#value' => $item['description']); + $form['menu']['path'] = array('#type' => 'hidden', '#value' => $item['path']); + $form['menu']['weight'] = array('#type' => 'hidden', '#value' => $item['weight'] ? $item['weight'] : 0); - // Generate a list of possible parents. Exclude this item and its children. - $pid = variable_get('menu_parent_items', 0); - $options = array(); - $menu = menu_get_menu(); - $depth = 0; - // if $pid is not root, add it to the option list - if ($pid > 0 && isset($menu['items'][$pid])) { - $depth = 1; - $title = $menu['items'][$pid]['title']; - if (!($menu['items'][$pid]['type'] & MENU_VISIBLE_IN_TREE)) { - $title .= ' ('. t('disabled') .')'; - } - $options[$pid] = $title; - } - $options += menu_parent_options($item['mid'], $pid, $depth); - - $form['menu']['pid'] = array( - '#type' => select, - '#title' => t('Parent item'), - '#default_value' => $item['pid'], - '#options' => $options, - ); - - $form['menu']['path'] = array( - '#type' => 'hidden', - '#value' => $item['path'], - ); - - $form['menu']['weight'] = array( - '#type' => 'weight', - '#title' => t('Weight'), - '#default_value' => $item['weight'], - '#delta' => 10, - '#description' => t('Optional. In the menu, the heavier items will sink and the lighter items will be positioned nearer the top.'), - ); - - $form['menu']['mid'] = array( - '#type' => 'hidden', - '#value' => $item['mid'] ? $item['mid'] : 0, - ); - - $form['menu']['type'] = array( - '#type' => 'hidden', - '#value' => $item['type'] ? $item['type'] : MENU_CUSTOM_ITEM, - ); + $form['menu']['mid'] = array('#type' => 'hidden', '#value' => $item['mid'] ? $item['mid'] : 0); + $form['menu']['type'] = array('#type' => 'hidden', '#value' => $item['type'] ? $item['type'] : MENU_CUSTOM_ITEM); if ($item['mid'] > 0) { - $form['menu']['delete'] = array( - '#type' => 'checkbox', - '#title' => t('Check to delete this menu item.'), - '#default_value' => $item['delete'], - ); - - $form['menu']['advanced'] = array( - '#type' => 'item', - '#value' => t('You may also edit the advanced settings for this menu item.', array('%menuitem' => url("admin/menu/item/edit/{$item['mid']}"))), - ); + $form['menu']['delete'] = array('#type' => 'checkbox', '#title' => t('Check to delete this menu item.'), '#default_value' => $item['delete']); } return $form; -- cgit v1.2.3