Index: includes/common.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/common.inc,v retrieving revision 1.964 diff -u -r1.964 common.inc --- includes/common.inc 19 Aug 2009 20:19:36 -0000 1.964 +++ includes/common.inc 20 Aug 2009 11:41:00 -0000 @@ -3941,6 +3941,18 @@ $elements['#theme'] = 'markup'; } + // If there is are action links associated with this element but the access + // property has not been set, use the menu callback to determine whether or + // not it is editable by the current user. + if (isset($elements['#actions'])) { + foreach ($elements['#actions'] as $key => $data) { + if (!isset($data['access']) && drupal_function_exists('menu_get_item')) { + $item = menu_get_item($data['href']); + $elements['#actions'][$key]['access'] = !empty($item['access']); + } + } + } + // Make any final changes to the element before it is rendered. This means // that the $element or the children can be altered or corrected before the // element is rendered into the final text. @@ -4248,6 +4260,9 @@ 'links' => array( 'arguments' => array('links' => NULL, 'attributes' => array('class' => 'links')), ), + 'action_links' => array( + 'arguments' => array('link' => NULL, 'element' => NULL), + ), 'image' => array( 'arguments' => array('path' => NULL, 'alt' => '', 'title' => '', 'attributes' => array(), 'getsize' => TRUE), ), Index: includes/menu.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/menu.inc,v retrieving revision 1.335 diff -u -r1.335 menu.inc --- includes/menu.inc 19 Aug 2009 23:29:13 -0000 1.335 +++ includes/menu.inc 20 Aug 2009 11:41:00 -0000 @@ -766,7 +766,7 @@ } /** - * Render a menu tree based on the current path. + * Returns a menu tree based on the current path. * * The tree is expanded based on the current path and dynamic paths are also * changed according to the defined to_arg functions (for example the 'My account' @@ -775,28 +775,30 @@ * @param $menu_name * The name of the menu. * @return - * The rendered HTML of that menu on the current page. + * An array representing the menu on the current page, suitable for + * rendering with drupal_render(). */ function menu_tree($menu_name) { - $menu_output = &drupal_static(__FUNCTION__, array()); + $menu_tree = &drupal_static(__FUNCTION__, array()); - if (!isset($menu_output[$menu_name])) { + if (!isset($menu_tree[$menu_name])) { $tree = menu_tree_page_data($menu_name); - $menu_output[$menu_name] = menu_tree_output($tree); + $menu_tree[$menu_name] = menu_tree_unrendered($tree); } - return $menu_output[$menu_name]; + return $menu_tree[$menu_name]; } /** - * Returns a rendered menu tree. + * Returns an array representing a menu, suitable for rendering. * * @param $tree * A data structure representing the tree as returned from menu_tree_data. * @return - * The rendered HTML of that data structure. + * A structured array representing the menu, suitable for rendering with + * drupal_render(). */ -function menu_tree_output($tree) { - $output = ''; +function menu_tree_unrendered($tree) { + $content = ''; $items = array(); // Pull out just the menu items we are going to render so that we @@ -819,13 +821,28 @@ $extra_class = implode(' ', $extra_class); $link = theme('menu_item_link', $data['link']); if ($data['below']) { - $output .= theme('menu_item', $link, $data['link']['has_children'], menu_tree_output($data['below']), $data['link']['in_active_trail'], $extra_class); + $content .= theme('menu_item', $link, $data['link']['has_children'], menu_tree_output($data['below']), $data['link']['in_active_trail'], $extra_class); } else { - $output .= theme('menu_item', $link, $data['link']['has_children'], '', $data['link']['in_active_trail'], $extra_class); + $content .= theme('menu_item', $link, $data['link']['has_children'], '', $data['link']['in_active_trail'], $extra_class); } } - return $output ? theme('menu_tree', $output) : ''; + return array( + '#theme' => 'menu_tree', + '#menu' => $content, + ); +} + +/** + * Returns a rendered menu tree. + * + * @param $tree + * A data structure representing the tree as returned from menu_tree_data. + * @return + * The rendered HTML of that data structure. + */ +function menu_tree_output($tree) { + return drupal_render(menu_tree_unrendered($tree)); } /** @@ -1258,7 +1275,7 @@ * @ingroup themeable */ function theme_menu_tree($tree) { - return ''; + return !empty($tree['#menu']) ? '' : ''; } /** Index: includes/theme.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/theme.inc,v retrieving revision 1.506 diff -u -r1.506 theme.inc --- includes/theme.inc 19 Aug 2009 22:44:05 -0000 1.506 +++ includes/theme.inc 20 Aug 2009 11:58:13 -0000 @@ -805,7 +805,12 @@ if (!empty($info[$phase])) { foreach ($info[$phase] as $processor_function) { if (drupal_function_exists($processor_function)) { - $processor_function($variables, $hook_clone); + $result = $processor_function($variables, $hook_clone); + // Allow process functions to abort rendering the item by returning + // FALSE. + if ($result === FALSE) { + return ''; + } } } } @@ -848,16 +853,22 @@ } else { // The theme call is a template. - $variables = array( - 'template_files' => array() - ); + $variables = array(); if (!empty($info['arguments'])) { + // Populate the variables with arguments passed to the theme function. + // Note that the first argument may be treated specially by template + // preprocess functions, so it must go into the variables array before + // anything else does. $count = 0; foreach ($info['arguments'] as $name => $default) { $variables[$name] = isset($args[$count]) ? $args[$count] : $default; $count++; } } + // Add an empty array of template files as a default; preprocess functions + // will be able to modify this. We include it last, as per the comment + // above. + $variables += array('template_files' => array()); // default render function and extension. $render_function = 'theme_render_template'; @@ -1431,6 +1442,33 @@ } /** + * Return themed action links for an element on a page. + * + * @param $links + * An array representing the action links to be themed, in the format + * expected by theme_links(); e.g., the array can have keys including + * 'title', 'href', 'html', etc. + * @param $element + * An array representing the editable page element. + * @return + * A themed HTML string representing the edit link. + * + * @see theme_links() + */ +function theme_action_links($links, $element) { + // Construct a CSS class which associates this edit link with the region on + // the page that it edits. + $links_array = array(); + foreach ($links as $key => $link) { + $class = "actions-link actions-$key-link actions-at-" . str_replace('/', '-', $link['href']); + $links_array[$class] = $link; + } + drupal_add_js('misc/actions.js'); + drupal_add_css('misc/actions.css'); + return theme('links', $links_array, array('class' => 'action-links')); +} + +/** * Return a themed image. * * @param $path @@ -1948,6 +1986,63 @@ // Initialize html class attribute for the current hook. $variables['classes_array'] = array($hook); + // Only theme action links if edit mode is enabled. + if (!empty($_SESSION['edit_mode'])) { + // If the first item passed to the theme function is an editable page + // element which the current user has access to, populate useful variables + // for constructing edit links and other editable markup. + $element = reset($variables); + $variables['has_actions'] = FALSE; + if (is_array($element) && isset($element['#actions'])) { + foreach ($element['#actions'] as $key => $data) { + $variables['has_actions'] = $variables['has_actions'] || !empty($data['access']); + } + } + // Do not show edit links when the user is already on the page that is + // being linked to. + $show_action_links = FALSE; + if ($variables['has_actions'] && isset($_GET['q'])) { + foreach ($element['#actions'] as $key => $data) { + $show_action_links = $show_action_links || ($data['href'] != $_GET['q']); + } + } + // Add appropriate CSS classes that define this element as editable and + // associate it with its edit link. + if ($variables['has_actions']) { + $variables['classes_array'][] = 'actions-enabled-region'; + foreach ($element['#actions'] as $key => $data) { + $variables['classes_array'][] = 'actions-enabled-at-' . str_replace('/', '-', $data['href']); + } + } + if ($show_action_links) { + $text_items = array(); + $info_items = array(); + foreach ($element['#actions'] as $key => $data) { + $check_plain = isset($data['attributes']['html']) ? !$data['attributes']['html'] : TRUE; + $text_items[$key] = $check_plain ? check_plain($data['title']) : $data['title']; + $info_items[$key] = array( + 'title' => ' ', + 'href' => $data['href'], + 'html' => TRUE, + // Refer users back to the current page after they have completed + // their edits. + 'query' => drupal_get_destination(), + 'attributes' => array( + 'class' => 'action-link action-link-' . $key, + 'title' => $text_items[$key], + ), + ); + } + $variables['action_links'] = theme('action_links', $info_items, $element); + } + else { + $variables['action_links'] = ''; + } + } + else { + $variables['action_links'] = ''; + } + // Set default variables that depend on the database. $variables['is_admin'] = FALSE; $variables['is_front'] = FALSE; Index: modules/block/block.module =================================================================== RCS file: /cvs/drupal/drupal/modules/block/block.module,v retrieving revision 1.360 diff -u -r1.360 block.module --- modules/block/block.module 20 Aug 2009 10:56:33 -0000 1.360 +++ modules/block/block.module 20 Aug 2009 11:41:00 -0000 @@ -278,8 +278,20 @@ unset($block->content); $build[$key] += array( '#block' => $block, + '#actions' => array( + 'configure' => array( + 'href' => 'admin/structure/block/configure/' . $block->module . '/' . $block->delta, + 'title' => !empty($block->subject) ? t('Configure the @block block', array('@block' => drupal_strtolower($block->subject))) : t('Configure this block'), + ), + ), '#weight' => ++$weight, ); + // Special exception for the main system content block: it's weird and + // confusing to show action links for it - what exactly is the user + // configuring? + if ($block->module == 'system' && $block->delta == 'main') { + unset($build[$key]['#actions']['configure']); + } $build[$key]['#theme_wrappers'][] ='block'; } $build['#sorted'] = TRUE; @@ -833,6 +845,22 @@ function template_preprocess_block(&$variables) { $block_counter = &drupal_static(__FUNCTION__, array()); $variables['block'] = $variables['elements']['#block']; + + // Create the $content variable that templates expect. If the block is + // empty, do not show it. + $variables['content'] = $variables['elements']['#children']; + if (empty($variables['content'])) { + // TODO: This is necessary to match the behavior in _block_render_blocks() + // when $block->content contains HTML output rather than a structured + // array. The inconsistency is ugly, though. It also means that the array + // of blocks per region inserted into the page via block_page_alter() can + // contain a larger number of blocks than actually will display on the + // page. (This part actually might not be bad, though; it means that other + // modules have a chance to insert content into these "empty" blocks and + // therefore make them appear after all, if they want to.) + return FALSE; + } + // All blocks get an independent counter for each region. if (!isset($block_counter[$variables['block']->region])) { $block_counter[$variables['block']->region] = 1; @@ -841,9 +869,6 @@ $variables['block_zebra'] = ($block_counter[$variables['block']->region] % 2) ? 'odd' : 'even'; $variables['block_id'] = $block_counter[$variables['block']->region]++; - // Create the $content variable that templates expect. - $variables['content'] = $variables['elements']['#children']; - $variables['classes_array'][] = 'block-' . $variables['block']->module; $variables['template_files'][] = 'block-' . $variables['block']->region; Index: modules/block/block.tpl.php =================================================================== RCS file: /cvs/drupal/drupal/modules/block/block.tpl.php,v retrieving revision 1.3 diff -u -r1.3 block.tpl.php --- modules/block/block.tpl.php 12 Jun 2009 09:02:55 -0000 1.3 +++ modules/block/block.tpl.php 20 Aug 2009 11:41:01 -0000 @@ -30,12 +30,22 @@ * - $logged_in: Flags true when the current user is a logged-in member. * - $is_admin: Flags true when the current user is an administrator. * + * Action variables: + * - $has_actions: TRUE when the block is editable by the current user. + * - $action_links: Already-themed link(s) for actions that may be taken on the + * block; may be empty. + * * @see template_preprocess() * @see template_preprocess_block() * @see template_process() */ ?>
+ + + + + subject): ?>

subject ?>

Index: modules/menu/menu.module =================================================================== RCS file: /cvs/drupal/drupal/modules/menu/menu.module,v retrieving revision 1.195 diff -u -r1.195 menu.module --- modules/menu/menu.module 20 Jul 2009 18:51:33 -0000 1.195 +++ modules/menu/menu.module 20 Aug 2009 11:41:01 -0000 @@ -147,6 +147,10 @@ 'file' => 'menu.admin.inc', 'arguments' => array('title' => NULL, 'name' => NULL, 'description' => NULL), ), + 'menu_editable' => array( + 'arguments' => array('element' => NULL), + 'template' => 'menu-editable', + ), ); } @@ -291,6 +295,32 @@ } /** + * Implement hook_page_alter(). + */ +function menu_page_alter(&$page) { + // Search for every non-empty menu block on the page. + // TODO: This works, but cries out for something like hook_block_alter()... + foreach (element_children($page) as $region) { + $blocks = &$page[$region]; + foreach (element_children($blocks) as $id) { + if (isset($blocks[$id]['#theme'])) { + $block = $blocks[$id]['#block']; + $content = &$blocks[$id]; + if ($content['#theme'] == 'menu_tree' && !empty($content['#menu'])) { + // If we have a non-empty menu tree, wrap it in a theme function + // that will display an edit link. + $content['#theme_wrappers'] += array('menu_editable'); + $content['#actions']['edit'] = array( + 'href' => 'admin/structure/menu-customize/' . $block->delta, + 'title' => t('Edit the @menu menu', array('@menu' => drupal_strtolower($content['#block']->subject))), + ); + } + } + } + } +} + +/** * Implement hook_node_insert(). */ function menu_node_insert($node) { @@ -486,3 +516,11 @@ return $query->execute()->fetchAllKeyed(); } + +/** + * Process variables for menu-editable.tpl.php. + */ +function template_preprocess_menu_editable(&$variables) { + // Create the $content variable that templates expect. + $variables['content'] = $variables['element']['#children']; +} Index: modules/node/node.module =================================================================== RCS file: /cvs/drupal/drupal/modules/node/node.module,v retrieving revision 1.1102 diff -u -r1.1102 node.module --- modules/node/node.module 20 Aug 2009 09:47:04 -0000 1.1102 +++ modules/node/node.module 20 Aug 2009 11:58:10 -0000 @@ -1143,6 +1143,16 @@ $build += array( '#theme' => 'node', '#node' => $node, + '#actions' => array( + 'edit' => array( + 'href' => 'node/' . $node->nid . '/edit', + 'title' => t('Edit @type @node', array('@type' => drupal_strtolower(node_type_get_name($node)), '@node' => drupal_strtolower($node->title))), + ), + 'delete' => array( + 'href' => 'node/' . $node->nid . '/delete', + 'title' => t('Delete @type @node', array('@type' => drupal_strtolower(node_type_get_name($node)), '@node' => drupal_strtolower($node->title))), + ), + ), '#build_mode' => $build_mode, ); return $build; Index: modules/node/node.tpl.php =================================================================== RCS file: /cvs/drupal/drupal/modules/node/node.tpl.php,v retrieving revision 1.19 diff -u -r1.19 node.tpl.php --- modules/node/node.tpl.php 6 Aug 2009 05:05:59 -0000 1.19 +++ modules/node/node.tpl.php 20 Aug 2009 11:41:01 -0000 @@ -45,6 +45,15 @@ * teaser listings. * - $id: Position of the node. Increments each time it's output. * + * Action links variables: + * - $has_actions: TRUE when the node is editable by the current user. + * - $action_links: Already-themed links to the actioni pages for the node; may + * be empty. + * - $action_links_text: An array of caption for the action links of the node; + * may be empty. + * - $action_links_info: An array of information describing the links to take + * action on the node; may be empty. + * * Node status variables: * - $build_mode: Build mode, e.g. 'full', 'teaser'... * - $teaser: Flag for the teaser state (shortcut for $build_mode == 'teaser'). @@ -68,6 +77,10 @@ + + + +

Index: modules/system/system.module =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system.module,v retrieving revision 1.752 diff -u -r1.752 system.module --- modules/system/system.module 20 Aug 2009 10:48:03 -0000 1.752 +++ modules/system/system.module 20 Aug 2009 11:58:07 -0000 @@ -496,6 +496,12 @@ 'access callback' => TRUE, 'type' => MENU_CALLBACK, ); + $items['edit-mode/toggle'] = array( + 'title callback' => 'edit_mode_toggle_title', + 'page callback' => 'edit_mode_toggle_page', + 'access callback' => TRUE, + 'type' => MENU_CALLBACK, + ); $items['admin'] = array( 'title' => 'Administer', 'access arguments' => array('access administration pages'), @@ -1205,6 +1211,13 @@ } /** + * Menu item title callback. + */ +function edit_mode_toggle_title() { + return empty($_SESSION['edit_mode']) ? t('Enable edit mode') : t('Disable edit mode'); +} + +/** * Menu item access callback - only admin or enabled themes can be accessed. */ function _system_themes_access($theme) { @@ -2849,6 +2862,20 @@ } /** + * Menu callback; toggle the global edit mode and redirect. + */ +function edit_mode_toggle_page() { + if (!empty($_SESSION['edit_mode'])) { + unset($_SESSION['edit_mode']); + } + else { + $_SESSION['edit_mode'] = 1; + } + $referer = isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : ''; + drupal_goto($referer); +} + +/** * Format the Powered by Drupal text. * * @ingroup themeable Index: modules/toolbar/toolbar.install =================================================================== RCS file: /cvs/drupal/drupal/modules/toolbar/toolbar.install,v retrieving revision 1.3 diff -u -r1.3 toolbar.install --- modules/toolbar/toolbar.install 30 Jul 2009 19:24:21 -0000 1.3 +++ modules/toolbar/toolbar.install 20 Aug 2009 11:41:01 -0000 @@ -28,7 +28,14 @@ 'node/add' => 'Add', 'admin/content' => 'Find content', 'admin' => 'Dashboard', + 'edit-mode/toggle' => '', ); + + db_delete('menu_links') + ->condition('link_path', 'edit-mode/toggle') + ->condition('menu_name', 'navigation') + ->execute(); + $weight = -20; foreach ($items as $path => $title) { $link = array( Index: profiles/default/default.profile =================================================================== RCS file: /cvs/drupal/drupal/profiles/default/default.profile,v retrieving revision 1.62 diff -u -r1.62 default.profile --- profiles/default/default.profile 3 Aug 2009 03:04:34 -0000 1.62 +++ profiles/default/default.profile 20 Aug 2009 11:41:01 -0000 @@ -216,8 +216,12 @@ menu_rebuild(); // Save some default links. - $link = array('link_path' => 'admin/structure/menu-customize/main-menu/add', 'link_title' => 'Add a main menu link', 'menu_name' => 'main-menu'); - menu_link_save($link); + $links = array(); + $links[] = array('link_path' => 'edit-mode/toggle', 'link_title' => '', 'menu_name' => 'main-menu'); + $links[] = array('link_path' => 'admin/structure/menu-customize/main-menu/add', 'link_title' => 'Add a main menu link', 'menu_name' => 'main-menu'); + foreach ($links as $link) { + menu_link_save($link); + } // Enable the admin theme. db_update('system') Index: themes/garland/block.tpl.php =================================================================== RCS file: /cvs/drupal/drupal/themes/garland/block.tpl.php,v retrieving revision 1.7 diff -u -r1.7 block.tpl.php --- themes/garland/block.tpl.php 12 Jun 2009 09:02:55 -0000 1.7 +++ themes/garland/block.tpl.php 20 Aug 2009 11:41:01 -0000 @@ -3,9 +3,14 @@ ?>
+ + + + subject)): ?>

subject ?>

+
Index: themes/garland/node.tpl.php =================================================================== RCS file: /cvs/drupal/drupal/themes/garland/node.tpl.php,v retrieving revision 1.14 diff -u -r1.14 node.tpl.php --- themes/garland/node.tpl.php 6 Aug 2009 05:06:00 -0000 1.14 +++ themes/garland/node.tpl.php 20 Aug 2009 11:41:01 -0000 @@ -3,6 +3,10 @@ ?>
+ + + + Index: themes/garland/style.css =================================================================== RCS file: /cvs/drupal/drupal/themes/garland/style.css,v retrieving revision 1.63 diff -u -r1.63 style.css --- themes/garland/style.css 17 Aug 2009 19:05:26 -0000 1.63 +++ themes/garland/style.css 20 Aug 2009 11:41:01 -0000 @@ -88,7 +88,7 @@ background: #5294c1; } -ul, .block ul, ol { +ul, .block ul.menu, ol { margin: 0.5em 0 1em; padding: 0 0 0 1.5em; /* LTR */ } @@ -294,6 +294,10 @@ margin-bottom: 2.5em; } +.edit-link { + font-size: 0.8em; +} + /** * Layout */ @@ -654,8 +658,8 @@ */ .node { border-bottom: 1px solid #e9eff3; - margin: 0 -26px 1.5em; - padding: 1.5em 26px; + margin: 0 -16px 1.5em; + padding: 1.5em 16px; } ul.links li, ul.inline li { @@ -813,6 +817,29 @@ } /** + * Edit icons. + */ +.actions-enabled-region { + outline: dashed #027AC6 2px; +} + +.active-actions-region { + outline-style: solid; +} + +ul.action-links li a { + text-decoration: none; +} + +ul.action-links li a span { + background-color: #027AC6; +} + +ul.action-links li a:hover span { + background-color: #0062A0; +} + +/** * Collapsible fieldsets */ fieldset { --- /dev/null +++ misc/actions.css @@ -0,0 +1,106 @@ +/* $Id$ */ + +/* +** Highlighted regions for actions.js. +*/ +.action-link-icon { + font-size: 1px; + padding-top: 14px; + padding-right: 14px; + margin-left: -4px; + background-color: #000000; +} + +.action-link-icon-configure { + background-image: url(configure.png); +} + +.action-link-icon-delete { + background-image: url(delete.png); +} + +.action-link-icon-edit { + background-image: url(edit.png); +} + +.actions-enabled-region { + outline: dashed #000000 2px; + position: relative; +} + +.active-actions-region { + outline-style: solid; +} + +ul.action-links { + position: absolute; + right: 0; + top: 0; + padding: 0; + margin: 0; +} + +ul.action-links li { + padding: 0; + margin: 0; + list-style: none; + display: inline; + line-height: 100%; +} + +ul.action-links li a { + text-decoration: none; +} +/* $Id$ */ + +/* +** Highlighted regions for actions.js. +*/ +.action-link-icon { + font-size: 1px; + padding-top: 14px; + padding-right: 14px; + margin-left: -4px; + background-color: #000000; +} + +.action-link-icon-configure { + background-image: url(configure.png); +} + +.action-link-icon-delete { + background-image: url(delete.png); +} + +.action-link-icon-edit { + background-image: url(edit.png); +} + +.actions-enabled-region { + outline: dashed #000000 2px; + position: relative; +} + +.active-actions-region { + outline-style: solid; +} + +ul.action-links { + position: absolute; + right: 0; + top: 0; + padding: 0; + margin: 0; +} + +ul.action-links li { + padding: 0; + margin: 0; + list-style: none; + display: inline; + line-height: 100%; +} + +ul.action-links li a { + text-decoration: none; +} --- /dev/null +++ misc/actions.js @@ -0,0 +1,54 @@ +// $Id$ +(function ($) { + +/** + * Highlights the actions region when hovering over an edit link. + */ +Drupal.behaviors.highlightEditableRegion = { + attach: function (context) { + var addHighlight = function () { + var matches = $(this).attr('class').match(/[^ ]*-at-(\S+)/); + if (matches) { + var class = '.actions-enabled-at-' + matches[1]; + $(class).addClass('active-actions-region'); + $(this).addClass('active-actions-link'); + } + }; + + var removeHighlight = function () { + $('.active-actions-region').removeClass('active-actions-region'); + $('.active-actions-link').removeClass('active-actions-link'); + }; + + $('.action-links li').hover(addHighlight, removeHighlight); + } +}; + +})(jQuery); +// $Id$ +(function ($) { + +/** + * Highlights the actions region when hovering over an edit link. + */ +Drupal.behaviors.highlightEditableRegion = { + attach: function (context) { + var addHighlight = function () { + var matches = $(this).attr('class').match(/[^ ]*-at-(\S+)/); + if (matches) { + var class = '.actions-enabled-at-' + matches[1]; + $(class).addClass('active-actions-region'); + $(this).addClass('active-actions-link'); + } + }; + + var removeHighlight = function () { + $('.active-actions-region').removeClass('active-actions-region'); + $('.active-actions-link').removeClass('active-actions-link'); + }; + + $('.action-links li').hover(addHighlight, removeHighlight); + } +}; + +})(jQuery);