Commit f7bf3f28 authored by noahlively's avatar noahlively
Browse files

Applied patch

parent 1d1bca51
...@@ -15,14 +15,16 @@ function muchomenu_overview_page() { ...@@ -15,14 +15,16 @@ function muchomenu_overview_page() {
$result = db_query($sql); $result = db_query($sql);
$content = array(); $content = array();
foreach ($result as $menu) { foreach ($result as $menu) {
$menu->href = 'admin/structure/menu/muchomenu-customize/' . $menu->id; $menu->href = 'admin/structure/menu/muchomenu/muchomenu-customize/' . $menu->id;
$menu->localized_options = array(); $menu->localized_options = array();
$menu->description = filter_xss_admin($menu->description); $menu->description = filter_xss_admin($menu->description);
$content[] = (array) $menu; $content[] = (array) $menu;
} }
if (empty($content)) { if (empty($content)) {
$content[] = array( $content[] = array(
'description' => t('There are no muchomenus yet.'), 'title' => 'Add a MuchoMenu',
'href' => 'admin/structure/menu/muchomenu/add',
'description' => '<strong>' . t('There are no MuchoMenus yet.') .'</strong>',
'localized_options' => array() 'localized_options' => array()
); );
} }
...@@ -54,9 +56,14 @@ function muchomenu_overview_form($form, &$form_state, $menu = array()) { ...@@ -54,9 +56,14 @@ function muchomenu_overview_form($form, &$form_state, $menu = array()) {
); );
} }
else { else {
$form['empty_menu'] = array('#value' => t('There are no muchomenu items yet.')); $form['empty_menu'] = array(
'#markup' => t('There are no MuchoMenu items yet. <br />!addlink', array(
'!addlink' => l('Add a MuchoMenu item', 'admin/structure/menu/muchomenu/muchomenu-customize/' . $menu['id'] . '/add'),
)),
);
} }
drupal_set_title($menu['title']);
return $form; return $form;
} }
...@@ -180,17 +187,17 @@ function muchomenu_edit_menu($form, &$form_state, $type, $menu = array()) { ...@@ -180,17 +187,17 @@ function muchomenu_edit_menu($form, &$form_state, $type, $menu = array()) {
$menu = array('title' => '', 'description' => '', 'orientation' => 'horizontal'); $menu = array('title' => '', 'description' => '', 'orientation' => 'horizontal');
$form['#insert'] = TRUE; $form['#insert'] = TRUE;
} }
$form['#title'] = $menu['title']; $form['#title'] = isset($menu['title']) ? $menu['title'] : t('MuchoMenu');
$form['title'] = array( $form['title'] = array(
'#type' => 'textfield', '#type' => 'textfield',
'#title' => t('Title'), '#title' => t('Title'),
'#default_value' => $menu['title'], '#default_value' => isset($menu['title']) ? $menu['title'] : '',
'#required' => TRUE, '#required' => TRUE,
); );
$form['description'] = array( $form['description'] = array(
'#type' => 'textarea', '#type' => 'textarea',
'#title' => t('Description'), '#title' => t('Description'),
'#default_value' => $menu['description'], '#default_value' => isset($menu['description']) ? $menu['description'] : '',
); );
$form['orientation'] = array( $form['orientation'] = array(
'#type' => 'radios', '#type' => 'radios',
...@@ -199,7 +206,7 @@ function muchomenu_edit_menu($form, &$form_state, $type, $menu = array()) { ...@@ -199,7 +206,7 @@ function muchomenu_edit_menu($form, &$form_state, $type, $menu = array()) {
'horizontal' => t('Horizontal'), 'horizontal' => t('Horizontal'),
'vertical' => t('Vertical'), 'vertical' => t('Vertical'),
), ),
'#default_value' => $menu['orientation'], '#default_value' => isset($menu['orientation']) ? $menu['orientation'] : 'horizontal',
'#description' => t('Select whether the menu will extend horizontally and drop down, or if it will extend vertically and fly out.'), '#description' => t('Select whether the menu will extend horizontally and drop down, or if it will extend vertically and fly out.'),
); );
$form['animation_effect'] = array( $form['animation_effect'] = array(
...@@ -210,22 +217,25 @@ function muchomenu_edit_menu($form, &$form_state, $type, $menu = array()) { ...@@ -210,22 +217,25 @@ function muchomenu_edit_menu($form, &$form_state, $type, $menu = array()) {
'fade' => t('Fade'), 'fade' => t('Fade'),
'slide' => t('Slide'), 'slide' => t('Slide'),
), ),
'#default_value' => $menu['animation_effect'], '#default_value' => isset($menu['animation_effect']) ? $menu['animation_effect'] : '',
'#description' => t('Choose the effect to use when showing or hiding the menu'), '#description' => t('Choose the effect to use when showing or hiding the menu'),
); );
/* $form['animation_speed'] = array(
$form['animation_speed'] = array(
'#type' => 'select', '#type' => 'select',
'#title' => t('Animation Speed'), '#title' => t('Animation Speed'),
'#options' => array( '#options' => array(
'slow' => t('Slow'), 'slow' => t('Slow'),
'fast' => t('Fast'), 'fast' => t('Fast'),
), ),
'#default_value' => $menu['animation_speed'], '#default_value' => isset($menu['animation_speed']) ? $menu['animation_speed'] : 'slow',
'#description' => t('Choose the speed at which to show the effect'), '#description' => t('Choose the speed at which to show the effect'),
); '#states' => array(
'invisible' => array(
'select[name=animation_effect]' => array('value' => ''),
),
),
);
*/
$form['submit'] = array( $form['submit'] = array(
'#type' => 'submit', '#type' => 'submit',
'#value' => t('Save'), '#value' => t('Save'),
...@@ -239,11 +249,11 @@ function muchomenu_edit_menu($form, &$form_state, $type, $menu = array()) { ...@@ -239,11 +249,11 @@ function muchomenu_edit_menu($form, &$form_state, $type, $menu = array()) {
*/ */
function muchomenu_edit_menu_submit($form, &$form_state) { function muchomenu_edit_menu_submit($form, &$form_state) {
$menu = $form_state['values']; $menu = $form_state['values'];
$path = 'admin/structure/menu/muchomenu-customize/'; $path = 'admin/structure/menu/muchomenu/muchomenu-customize/';
if ($form['#insert']) { if ($form['#insert']) {
$obj = new stdClass(); $obj = new stdClass();
$key = NULL; $key = array();
} }
else { else {
$obj = (object) muchomenu_load($menu['id']); $obj = (object) muchomenu_load($menu['id']);
...@@ -269,7 +279,7 @@ function muchomenu_edit_menu_submit($form, &$form_state) { ...@@ -269,7 +279,7 @@ function muchomenu_edit_menu_submit($form, &$form_state) {
* Submit function for the 'Delete' button on the menu editing form. * Submit function for the 'Delete' button on the menu editing form.
*/ */
function muchomenu_delete_menu_submit($form, &$form_state) { function muchomenu_delete_menu_submit($form, &$form_state) {
$form_state['redirect'] = 'admin/structure/menu/muchomenu-customize/' . $form_state['values']['id'] . '/delete'; $form_state['redirect'] = 'admin/structure/menu/muchomenu/muchomenu-customize/' . $form_state['values']['id'] . '/delete';
} }
/** /**
...@@ -278,7 +288,7 @@ function muchomenu_delete_menu_submit($form, &$form_state) { ...@@ -278,7 +288,7 @@ function muchomenu_delete_menu_submit($form, &$form_state) {
function muchomenu_delete_menu_confirm($form, &$form_state, $menu) { function muchomenu_delete_menu_confirm($form, &$form_state, $menu) {
$form['#menu'] = $menu; $form['#menu'] = $menu;
$caption = '<p>' . t('This action cannot be undone.') . '</p>'; $caption = '<p>' . t('This action cannot be undone.') . '</p>';
return confirm_form($form, t('Are you sure you want to delete the muchomenu %title?', array('%title' => $menu['title'])), 'admin/structure/menu/muchomenu-customize/' . $menu['id'], $caption, t('Delete')); return confirm_form($form, t('Are you sure you want to delete the muchomenu %title?', array('%title' => $menu['title'])), 'admin/structure/menu/muchomenu/muchomenu-customize/' . $menu['id'], $caption, t('Delete'));
} }
/** /**
...@@ -349,6 +359,9 @@ function muchomenu_edit_item($form, &$form_state, $type, $item, $menu) { ...@@ -349,6 +359,9 @@ function muchomenu_edit_item($form, &$form_state, $type, $item, $menu) {
'#weight' => 10, '#weight' => 10,
); );
} }
if (!isset($item['type'])) {
$item['type'] = $type;
}
foreach (array('id', 'menu_id', 'title', 'path', 'panel_name', 'alt', 'enabled', 'type', 'weight') as $key) { foreach (array('id', 'menu_id', 'title', 'path', 'panel_name', 'alt', 'enabled', 'type', 'weight') as $key) {
$form['menu'][$key] = array('#type' => 'value', '#value' => $item[$key]); $form['menu'][$key] = array('#type' => 'value', '#value' => $item[$key]);
} }
...@@ -356,7 +369,7 @@ function muchomenu_edit_item($form, &$form_state, $type, $item, $menu) { ...@@ -356,7 +369,7 @@ function muchomenu_edit_item($form, &$form_state, $type, $item, $menu) {
$form['menu']['title'] = array( $form['menu']['title'] = array(
'#type' => 'textfield', '#type' => 'textfield',
'#title' => t('Title'), '#title' => t('Title'),
'#default_value' => $item['title'], '#default_value' => isset($item['title']) ? $item['title'] : '',
'#description' => t('The name of the menu item (displayed when hovering over a menu image).'), '#description' => t('The name of the menu item (displayed when hovering over a menu image).'),
'#required' => TRUE, '#required' => TRUE,
'#weight' => -10, '#weight' => -10,
...@@ -367,42 +380,42 @@ function muchomenu_edit_item($form, &$form_state, $type, $item, $menu) { ...@@ -367,42 +380,42 @@ function muchomenu_edit_item($form, &$form_state, $type, $item, $menu) {
'#title' => t('Panel'), '#title' => t('Panel'),
'#description' => t('Select a mini panel.'), '#description' => t('Select a mini panel.'),
'#options' => $pane_options, '#options' => $pane_options,
'#default_value' => $item['panel_name'], '#default_value' => isset($item['panel_name']) ? $item['panel_name'] : '',
'#weight' => -8, '#weight' => -8,
); );
$form['menu']['path'] = array( $form['menu']['path'] = array(
'#type' => 'textfield', '#type' => 'textfield',
'#title' => t('Path'), '#title' => t('Path'),
'#default_value' => $item['path'], '#default_value' => isset($item['path']) ? $item['path'] : '',
'#description' => t('The path this menu item links to. This can be an internal Drupal path such as %add-node or an external URL such as %drupal. Enter %front to link to the front page.', array('%front' => '<front>', '%add-node' => 'node/add', '%drupal' => 'http://drupal.org')), '#description' => t('The path this menu item links to. This can be an internal Drupal path such as %add-node or an external URL such as %drupal. Enter %front to link to the front page.', array('%front' => '<front>', '%add-node' => 'node/add', '%drupal' => 'http://drupal.org')),
'#weight' => -7, '#weight' => -7,
); );
$form['menu']['alt'] = array( $form['menu']['alt'] = array(
'#type' => 'textfield', '#type' => 'textfield',
'#title' => t('Description'), '#title' => t('Description'),
'#default_value' => $item['alt'], '#default_value' => isset($item['alt']) ? $item['alt'] : '',
'#description' => t('The ALT tag for the image if its not displayed.'), '#description' => t('The ALT tag for the image if its not displayed.'),
'#weight' => -6, '#weight' => -6,
); );
$form['menu']['enabled'] = array( $form['menu']['enabled'] = array(
'#type' => 'checkbox', '#type' => 'checkbox',
'#title' => t('Enabled'), '#title' => t('Enabled'),
'#default_value' => ($item['enabled'] ? 1 : 0), '#default_value' => (isset($item['enabled']) && $item['enabled'] == TRUE) ? 1 : 0,
'#description' => t('Menu items that are not enabled will not be listed in any menu.'), '#description' => t('Menu items that are not enabled will not be listed in any menu.'),
'#weight' => -5, '#weight' => -5,
); );
$form['menu']['target'] = array( $form['menu']['target'] = array(
'#type' => 'checkbox', '#type' => 'checkbox',
'#title' => t('Open in New Window'), '#title' => t('Open in New Window'),
'#default_value' => ($item['target'] ? 1 : 0), '#default_value' => (isset($item['target']) && $item['target'] == TRUE) ? 1 : 0,
'#description' => t('If checked, this link will open in a new window.'), '#description' => t('If checked, this link will open in a new window.'),
'#weight' => -5, '#weight' => -5,
); );
$form['menu']['disable_click'] = array( $form['menu']['disable_click'] = array(
'#type' => 'checkbox', '#type' => 'checkbox',
'#title' => t('Disable Click'), '#title' => t('Disable Click'),
'#default_value' => ($item['disable_click'] ? 1 : 0), '#default_value' => (isset($item['disable_click']) && $item['disable_click'] == TRUE) ? 1 : 0,
'#description' => t('Disable clicking directly on this menu item. Use this to force people to use the flyout menu'), '#description' => t('Disable clicking directly on this menu item. Use this to force people to use the flyout menu'),
'#weight' => -5, '#weight' => -5,
); );
...@@ -413,13 +426,12 @@ function muchomenu_edit_item($form, &$form_state, $type, $item, $menu) { ...@@ -413,13 +426,12 @@ function muchomenu_edit_item($form, &$form_state, $type, $item, $menu) {
'#type' => 'weight', '#type' => 'weight',
'#title' => t('Weight'), '#title' => t('Weight'),
'#delta' => 50, '#delta' => 50,
'#default_value' => $item['weight'], '#default_value' => isset($item['weight']) ? $item['weight'] : 0,
'#description' => t('Optional. In the menu, the heavier items will sink and the lighter items will be positioned nearer the top.'), '#description' => t('Optional. In the menu, the heavier items will sink and the lighter items will be positioned nearer the top.'),
'#weight' => -2, '#weight' => -2,
); );
$form['submit'] = array('#type' => 'submit', '#value' => t('Save')); $form['submit'] = array('#type' => 'submit', '#value' => t('Save'));
return $form; return $form;
} }
...@@ -486,7 +498,7 @@ function muchomenu_edit_item_submit($form, &$form_state) { ...@@ -486,7 +498,7 @@ function muchomenu_edit_item_submit($form, &$form_state) {
watchdog('muchomenu', 'Updated muchomenu menu item %title', $t_args, WATCHDOG_NOTICE); watchdog('muchomenu', 'Updated muchomenu menu item %title', $t_args, WATCHDOG_NOTICE);
} }
$form_state['redirect'] = 'admin/structure/menu/muchomenu-customize/' . $item['menu_id']; $form_state['redirect'] = 'admin/structure/menu/muchomenu/muchomenu-customize/' . $item['menu_id'];
} }
/** /**
...@@ -502,7 +514,7 @@ function muchomenu_item_delete_submit($form, &$form_state) { ...@@ -502,7 +514,7 @@ function muchomenu_item_delete_submit($form, &$form_state) {
function muchomenu_item_delete_form($form, &$form_state, $item) { function muchomenu_item_delete_form($form, &$form_state, $item) {
$form['#item'] = $item; $form['#item'] = $item;
$menu_id = muchomenu_item_get_menu_id($item); $menu_id = muchomenu_item_get_menu_id($item);
return confirm_form($form, t('Are you sure you want to delete the muchomenu item %item?', array('%item' => $item['title'])), 'admin/structure/menu/muchomenu-customize/' . $menu_id); return confirm_form($form, t('Are you sure you want to delete the muchomenu item %item?', array('%item' => $item['title'])), 'admin/structure/menu/muchomenu/muchomenu-customize/' . $menu_id);
} }
/** /**
...@@ -518,7 +530,7 @@ function muchomenu_item_delete_form_submit($form, &$form_state) { ...@@ -518,7 +530,7 @@ function muchomenu_item_delete_form_submit($form, &$form_state) {
->execute(); ->execute();
drupal_set_message(t('The muchomenu item %title has been deleted.', array('%title' => $item['title']))); drupal_set_message(t('The muchomenu item %title has been deleted.', array('%title' => $item['title'])));
watchdog('menu', 'Deleted muchomenu item %title.', array('%title' => $item['title']), WATCHDOG_NOTICE); watchdog('menu', 'Deleted muchomenu item %title.', array('%title' => $item['title']), WATCHDOG_NOTICE);
$form_state['redirect'] = 'admin/structure/menu/muchomenu-customize/' . $menu_id; $form_state['redirect'] = 'admin/structure/menu/muchomenu/muchomenu-customize/' . $menu_id;
} }
/** /**
......
...@@ -9,7 +9,7 @@ function muchomenu_menu() { ...@@ -9,7 +9,7 @@ function muchomenu_menu() {
$items['admin/structure/menu/muchomenu'] = array( $items['admin/structure/menu/muchomenu'] = array(
'title' => 'muchomenus', 'title' => 'MuchoMenus',
'page callback' => 'muchomenu_overview_page', 'page callback' => 'muchomenu_overview_page',
'access arguments' => $admin_access, 'access arguments' => $admin_access,
'file' => 'includes/admin.inc', 'file' => 'includes/admin.inc',
...@@ -41,42 +41,42 @@ function muchomenu_menu() { ...@@ -41,42 +41,42 @@ function muchomenu_menu() {
'access arguments' => $admin_access, 'access arguments' => $admin_access,
); );
$items['admin/structure/menu/muchomenu-customize/%muchomenu'] = array( $items['admin/structure/menu/muchomenu/muchomenu-customize/%muchomenu'] = array(
'page callback' => 'drupal_get_form', 'page callback' => 'drupal_get_form',
'page arguments' => array('muchomenu_overview_form', 4), 'page arguments' => array('muchomenu_overview_form', 5),
'access arguments' => $admin_access, 'access arguments' => $admin_access,
'file' => 'includes/admin.inc', 'file' => 'includes/admin.inc',
'title callback' => 'muchomenu_overview_title', 'title callback' => 'muchomenu_overview_title',
'title arguments' => array(4), 'title arguments' => array(5),
); );
$items['admin/structure/menu/muchomenu-customize/%muchomenu/list'] = array( $items['admin/structure/menu/muchomenu/muchomenu-customize/%muchomenu/list'] = array(
'title' => 'List items', 'title' => 'List items',
'weight' => -10, 'weight' => -10,
'type' => MENU_DEFAULT_LOCAL_TASK, 'type' => MENU_DEFAULT_LOCAL_TASK,
'file' => 'includes/admin.inc', 'file' => 'includes/admin.inc',
); );
$items['admin/structure/menu/muchomenu-customize/%muchomenu/add'] = array( $items['admin/structure/menu/muchomenu/muchomenu-customize/%muchomenu/add'] = array(
'title' => 'Add item', 'title' => 'Add item',
'page callback' => 'drupal_get_form', 'page callback' => 'drupal_get_form',
'page arguments' => array('muchomenu_edit_item', 'add', NULL, 4), 'page arguments' => array('muchomenu_edit_item', 'add', NULL, 5),
'type' => MENU_LOCAL_TASK, 'type' => MENU_LOCAL_TASK,
'file' => 'includes/admin.inc', 'file' => 'includes/admin.inc',
'access arguments' => $admin_access, 'access arguments' => $admin_access,
); );
$items['admin/structure/menu/muchomenu-customize/%muchomenu/edit'] = array( $items['admin/structure/menu/muchomenu/muchomenu-customize/%muchomenu/edit'] = array(
'title' => 'Edit menu', 'title' => 'Edit menu',
'page callback' => 'drupal_get_form', 'page callback' => 'drupal_get_form',
'page arguments' => array('muchomenu_edit_menu', 'edit', 4), 'page arguments' => array('muchomenu_edit_menu', 'edit', 5),
'type' => MENU_LOCAL_TASK, 'type' => MENU_LOCAL_TASK,
'file' => 'includes/admin.inc', 'file' => 'includes/admin.inc',
'access arguments' => $admin_access, 'access arguments' => $admin_access,
); );
$items['admin/structure/menu/muchomenu-customize/%muchomenu/delete'] = array( $items['admin/structure/menu/muchomenu/muchomenu-customize/%muchomenu/delete'] = array(
'title' => 'Delete menu', 'title' => 'Delete menu',
'page callback' => 'drupal_get_form', 'page callback' => 'drupal_get_form',
'page arguments' => array('muchomenu_delete_menu_confirm', 4), 'page arguments' => array('muchomenu_delete_menu_confirm', 5),
'type' => MENU_CALLBACK, 'type' => MENU_CALLBACK,
'file' => 'includes/admin.inc', 'file' => 'includes/admin.inc',
'access arguments' => $admin_access, 'access arguments' => $admin_access,
...@@ -124,7 +124,7 @@ function muchomenu_block_info() { ...@@ -124,7 +124,7 @@ function muchomenu_block_info() {
if (!empty($menus)) { if (!empty($menus)) {
foreach ($menus as $id => $title) { foreach ($menus as $id => $title) {
$blocks[$id]['info'] = check_plain($title); $blocks[$id]['info'] = check_plain($title);
$blocks[$id]['cache'] = BLOCK_NO_CACHE; $blocks[$id]['cache'] = DRUPAL_NO_CACHE;
} }
} }
return $blocks; return $blocks;
......
...@@ -198,7 +198,7 @@ function template_preprocess_muchomenu_overview_form(&$variables) { ...@@ -198,7 +198,7 @@ function template_preprocess_muchomenu_overview_form(&$variables) {
$row['class'][] = 'draggable'; $row['class'][] = 'draggable';
$rows[] = $row; $rows[] = $row;
} else { } else {
$variables['extra_fields'] .= drupal_render($variables['form'][$id]); $variables['extra_fields'] = isset($variables['extra_fields']) ? $variables['extra_fields'] . drupal_render($variables['form'][$id]) : drupal_render($variables['form'][$id]);
} }
} }
......
<?php print $variables['table']; ?> <?php if (isset($variables['table'])): print $variables['table']; endif; ?>
<?php print $variables['extra_fields']; ?> <?php if (isset($variables['extra_fields'])): print $variables['extra_fields']; endif; ?>
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment