Index: includes/common.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/common.inc,v retrieving revision 1.1008 diff -u -p -u -p -r1.1008 common.inc --- includes/common.inc 5 Oct 2009 02:48:38 -0000 1.1008 +++ includes/common.inc 6 Oct 2009 10:50:06 -0000 @@ -3106,7 +3106,7 @@ function drupal_clear_css_cache() { * @return * The cleaned identifier. */ -function drupal_clean_html_identifier($identifier, $filter = array(' ' => '-', '_' => '-', '[' => '-', ']' => '')) { +function drupal_clean_html_identifier($identifier, $filter = array(' ' => '-', '_' => '-', '/' => '-', '[' => '-', ']' => '')) { // By default, we filter using Drupal's coding standards. $identifier = strtr($identifier, $filter); Index: includes/theme.inc =================================================================== RCS file: /cvs/drupal/drupal/includes/theme.inc,v retrieving revision 1.531 diff -u -p -u -p -r1.531 theme.inc --- includes/theme.inc 5 Oct 2009 02:43:01 -0000 1.531 +++ includes/theme.inc 6 Oct 2009 10:50:06 -0000 @@ -867,10 +867,13 @@ function theme() { } else { // The theme call is a template. - $variables = array( - 'template_files' => array() - ); + $variables = array(); if (!empty($info['arguments'])) { + // Populate the variables array with arguments passed to the theme + // function. The first argument may be treated specially by template + // preprocess functions (since it is assumed to be the primary object + // that is being themed), 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; @@ -878,6 +881,11 @@ function theme() { } } + // Add an empty array of template files as a default; preprocess functions + // will be able to modify this. We include it in the variables array last, + // as per the comment above. + $variables += array('template_files' => array()); + // default render function and extension. $render_function = 'theme_render_template'; $extension = '.tpl.php'; @@ -2071,6 +2079,29 @@ function template_preprocess(&$variables $variables['attributes_array'] = array(); $variables['title_attributes_array'] = array(); + // Initialize a variable to hold any attached links. This is populated when + // the first item passed to the theme function is a page element that has + // links attached to it. + $variables['attached_links'] = array(); + $element = reset($variables); + if (is_array($element) && !empty($element['#attached_links'])) { + $variables['attached_links'] = $element['#attached_links']; + // Add appropriate CSS classes that associate the element with the links + // that are attached to it. + $attached_link_classes = template_generate_attached_link_classes($element['#attached_links']); + if (!empty($attached_link_classes)) { + $variables['classes_array'][] = 'attached-links-enabled-region'; + $variables['classes_array'] = array_merge($variables['classes_array'], $attached_link_classes); + } + // Wrap the attached links associated with this element in a theme function + // that will group them together for display. Templates which render + // different sets of attached links separately - for example, by using + // render($attached_links['block']) rather than render($attached_links) - + // will automatically avoid this wrapper function and therefore will have + // complete freedom to display the links anywhere within the page element. + $variables['attached_links']['#theme_wrappers'][] = 'attached_links_group'; + } + // Set default variables that depend on the database. $variables['is_admin'] = FALSE; $variables['is_front'] = FALSE; @@ -2102,6 +2133,40 @@ function template_process(&$variables, $ } /** + * Generate a list of relevant CSS classes from an array of attached links. + * + * The array of attached links is searched recursively for all items of type + * 'attached_links', and the 'href' parameter of each link is used to generate + * an appropriate CSS class. + * + * @param $attached_links + * An associative array containing the links that will be searched. Usually, + * this will be the '#attached_links' property of a page element. + * @return + * An array of CSS classes generated from the attached links. + * + * @see system_pre_render_attached_links() + */ +function template_generate_attached_link_classes($attached_links) { + $classes = array(); + // If the array itself contains attached links, generate classes from them. + if (isset($attached_links['#type']) && $attached_links['#type'] == 'attached_links') { + if (isset($attached_links['#links'])) { + foreach ($attached_links['#links'] as $link) { + $classes[] = drupal_html_class('attached-links-region-for-' . $link['href']); + } + } + } + // Otherwise, recursively search the element's children for links. + else { + foreach (element_children($attached_links) as $group) { + $classes = array_merge($classes, template_generate_attached_link_classes($attached_links[$group])); + } + } + return $classes; +} + +/** * Preprocess variables for html.tpl.php * * @see system_elements() Index: misc/attached_links.css =================================================================== RCS file: misc/attached_links.css diff -N misc/attached_links.css --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ misc/attached_links.css 6 Oct 2009 10:50:06 -0000 @@ -0,0 +1,62 @@ +/* $Id$ */ + +/* +** Highlighted regions for attached_links.js. +*/ +.attached-links-link-icon { + -moz-border-radius: 3px; + -webkit-border-radius: 3px; + background: #444 none no-repeat scroll 2px 2px; + height: 19px; + width: 19px; + float: left; + display: block; + margin-right: 2px; +} + +.attached-links-link-icon-configure { + background-image: url(configure.png); +} + +.attached-links-link-icon-delete { + background-image: url(delete.png); +} + +.attached-links-link-icon-edit { + background-image: url(edit.png); +} + +.attached-links-enabled-region { + outline: none; + position: relative; +} + +.active-attached-links-region { + outline: #000 dashed 2px; +} + +.attached-links-group { + position: absolute; + right: 0; + top: 0; + padding: 0; + margin: 0; +} + +ul.attached-links { + float: right; + padding: 0; + margin: 0; +} + +ul.attached-links li { + padding: 0; + margin: 0; + list-style: none; + display: inline; + line-height: 100%; +} + +ul.attached-links li a { + text-decoration: none; +} Index: misc/attached_links.js =================================================================== RCS file: misc/attached_links.js diff -N misc/attached_links.js --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ misc/attached_links.js 6 Oct 2009 10:50:06 -0000 @@ -0,0 +1,31 @@ +// $Id$ +(function ($) { + +/** + * Highlights the region of the page that an attached link is associated with. + */ +Drupal.behaviors.highlightAttachedLinkRegion = { + attach: function (context) { + var addHighlight = function () { + // If the attached link has a CSS class containing an encoded version of + // the URL that the link points to, find the region of the page whose CSS + // class contains the same encoded URL. + var matches = $(this).attr('class').match(/\battached-links-link-to-(\S+)/); + if (matches) { + var className = '.attached-links-region-for-' + matches[1]; + $(className).addClass('active-attached-links-region'); + $(className).addClass('active-attached-links-link'); + } + }; + + var removeHighlight = function () { + $('.active-attached-links-region').removeClass('active-attached-links-region'); + $('.active-attached-links-link').removeClass('active-attached-links-link'); + }; + + // Trigger the behavior when hovering over the link. + $('.attached-links-link').hover(addHighlight, removeHighlight); + } +}; + +})(jQuery); Index: modules/block/block.module =================================================================== RCS file: /cvs/drupal/drupal/modules/block/block.module,v retrieving revision 1.383 diff -u -p -u -p -r1.383 block.module --- modules/block/block.module 5 Oct 2009 01:18:25 -0000 1.383 +++ modules/block/block.module 6 Oct 2009 10:50:06 -0000 @@ -249,6 +249,25 @@ function block_get_blocks_by_region($reg foreach ($list as $key => $block) { $build[$key] = $block->content; unset($block->content); + // Attach links to the block. Skip this for empty blocks and also for the + // main system content block, which has nothing useful to configure. + if (!empty($build[$key]) && ($block->module != 'system' || $block->delta != 'main')) { + // First grab any links associated with the block content, so we can + // attach them along with the block configuration link itself. + if (!empty($build[$key]['#attached_links'])) { + $build[$key]['#attached_links'] = array('block content' => $build[$key]['#attached_links']); + } + // Now add the configuration link for the block itself. + $build[$key]['#attached_links']['block'] = array( + '#type' => 'attached_links', + '#links' => 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'), + ), + ), + ); + } $build[$key] += array( '#block' => $block, '#weight' => ++$weight, Index: modules/block/block.tpl.php =================================================================== RCS file: /cvs/drupal/drupal/modules/block/block.tpl.php,v retrieving revision 1.4 diff -u -p -u -p -r1.4 block.tpl.php --- modules/block/block.tpl.php 11 Sep 2009 06:48:02 -0000 1.4 +++ modules/block/block.tpl.php 6 Oct 2009 10:50:06 -0000 @@ -11,6 +11,12 @@ * - $block->module: Module that generated the block. * - $block->delta: An ID for the block, unique within each module. * - $block->region: The block region embedding the current block. + * - $attached_links: An array of links that are attached to the block on the + * page. Use render($attached_links) to print them all, or print a subset + * using render($attached_links['block']), which prints the configuration + * links for the block itself, or render($attached_links['block content']), + * which prints the links associated with the content that is displayed in + * the block. * - $classes: String of classes that can be used to style contextually through * CSS. It can be manipulated through the variable $classes_array from * preprocess functions. The default values can be one or more of the following: @@ -36,6 +42,11 @@ */ ?>
> + + + + + subject): ?> >subject ?> Index: modules/locale/locale.test =================================================================== RCS file: /cvs/drupal/drupal/modules/locale/locale.test,v retrieving revision 1.41 diff -u -p -u -p -r1.41 locale.test --- modules/locale/locale.test 28 Sep 2009 22:14:30 -0000 1.41 +++ modules/locale/locale.test 6 Oct 2009 10:50:06 -0000 @@ -1072,7 +1072,7 @@ class LanguageSwitchingFunctionalTest ex $this->assertText(t('Languages'), t('Language switcher block found.')); // Assert that only the current language is marked as active. - list($language_switcher) = $this->xpath('//div[@id="block-locale-language-switcher"]'); + list($language_switcher) = $this->xpath('//div[@id="block-locale-language-switcher"]/div[@class="content"]'); $links = array( 'active' => array(), 'inactive' => array(), @@ -1081,7 +1081,7 @@ class LanguageSwitchingFunctionalTest ex 'active' => array(), 'inactive' => array(), ); - foreach ($language_switcher->div->ul->li as $link) { + foreach ($language_switcher->ul->li as $link) { $classes = explode(" ", (string) $link['class']); list($language) = array_intersect($classes, array('en', 'fr')); if (in_array('active', $classes)) { Index: modules/menu/menu.module =================================================================== RCS file: /cvs/drupal/drupal/modules/menu/menu.module,v retrieving revision 1.206 diff -u -p -u -p -r1.206 menu.module --- modules/menu/menu.module 3 Oct 2009 01:16:02 -0000 1.206 +++ modules/menu/menu.module 6 Oct 2009 10:50:06 -0000 @@ -297,6 +297,17 @@ function menu_block_view($delta = '') { $menus = menu_get_menus(FALSE); $data['subject'] = check_plain($menus[$delta]); $data['content'] = menu_tree($delta); + if (!empty($data['content'])) { + $data['content']['#attached_links'] = array( + '#type' => 'attached_links', + '#links' => array( + 'edit' => array( + 'href' => 'admin/structure/menu/manage/' . $delta, + 'title' => t('Edit the !menu menu', array('!menu' => drupal_strtolower($menus[$delta]))), + ), + ), + ); + } return $data; } Index: modules/node/node.module =================================================================== RCS file: /cvs/drupal/drupal/modules/node/node.module,v retrieving revision 1.1139 diff -u -p -u -p -r1.1139 node.module --- modules/node/node.module 5 Oct 2009 01:18:25 -0000 1.1139 +++ modules/node/node.module 6 Oct 2009 10:50:06 -0000 @@ -1053,6 +1053,19 @@ function node_build($node, $build_mode = $build += array( '#theme' => 'node', '#node' => $node, + '#attached_links' => array( + '#type' => 'attached_links', + '#links' => 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.22 diff -u -p -u -p -r1.22 node.tpl.php --- modules/node/node.tpl.php 11 Sep 2009 06:48:03 -0000 1.22 +++ modules/node/node.tpl.php 6 Oct 2009 10:50:07 -0000 @@ -18,6 +18,8 @@ * - $node_url: Direct url of the current node. * - $terms: the themed list of taxonomy term links output from theme_links(). * - $display_submitted: whether submission information should be displayed. + * - $attached_links: An array of links that are attached to the node on the + * page. Use render($attached_links) to print them all. * - $classes: String of classes that can be used to style contextually through * CSS. It can be manipulated through the variable $classes_array from * preprocess functions. The default values can be one or more of the following: @@ -74,6 +76,10 @@ + + + + > Index: modules/system/system.module =================================================================== RCS file: /cvs/drupal/drupal/modules/system/system.module,v retrieving revision 1.801 diff -u -p -u -p -r1.801 system.module --- modules/system/system.module 5 Oct 2009 02:43:01 -0000 1.801 +++ modules/system/system.module 6 Oct 2009 10:50:07 -0000 @@ -204,6 +204,9 @@ function system_theme() { 'system_run_cron_image' => array( 'arguments' => array('image_path' => NULL), ), + 'attached_links_group' => array( + 'arguments' => array('elements' => NULL), + ), )); } @@ -299,6 +302,16 @@ function system_element_info() { '#attributes' => array(), '#items' => array(), ); + $types['attached_links'] = array( + '#theme' => 'links', + '#pre_render' => array('system_pre_render_attached_links'), + '#attributes' => array('class' => array('attached-links')), + '#links' => array(), + '#attached' => array( + 'js' => array('misc/attached_links.js'), + 'css' => array('misc/attached_links.css'), + ), + ); // Input elements. $types['submit'] = array( @@ -503,6 +516,14 @@ function system_menu() { 'type' => MENU_CALLBACK, 'file' => 'system.admin.inc', ); + + $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'), @@ -1308,6 +1329,13 @@ function blocked_ip_load($iid) { } /** + * 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) { @@ -1637,6 +1665,19 @@ function system_block_view($delta = '') if (isset($system_menus[$delta])) { $block['subject'] = t($system_menus[$delta]); $block['content'] = menu_tree($delta); + // @todo: Should we move this to the menu module? The code is much + // cleaner and easier to read when we put it here. + if (!empty($block['content']) && module_exists('menu')) { + $block['content']['#attached_links'] = array( + '#type' => 'attached_links', + '#links' => array( + 'edit' => array( + 'href' => 'admin/structure/menu/manage/' . $delta, + 'title' => t('Edit the !menu menu', array('!menu' => drupal_strtolower($block['subject']))), + ), + ), + ); + } return $block; } break; @@ -2687,6 +2728,20 @@ function system_timezone($abbreviation = } /** + * 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 @@ -2897,3 +2952,79 @@ function theme_system_run_cron_image($im return ''; } +/** + * Checks access, adds classes, and performs other actions on attached links. + * + * This is used as a pre-render function for the #attached_links type. + */ +function system_pre_render_attached_links($element) { + if (empty($_SESSION['edit_mode'])) { + // Do not show attached links when edit mode is disabled. + return array(); + } + + $transformed_links = array(); + foreach ($element['#links'] as $type => $link_data) { + // Use the menu item to determine access to the link, if an access property + // was not already set. + if (!isset($link_data['#access'])) { + $item = menu_get_item($link_data['href']); + $link_data['#access'] = !empty($item['access']); + } + + // Do not display this link if the current user does not have access to it, + // or if the user is already on the page that is being linked to. + if (!$link_data['#access'] || $link_data['href'] == $_GET['q']) { + continue; + } + + // Get the link title from the menu item if none was set. + if (!isset($link_data['title'])) { + $item = menu_get_item($link_data['href']); + $link_data['title'] = $item['title']; + } + + // Define a class that will associate this link with the region of the page + // that it is attached to. See template_generate_attached_link_classes(). + $link_class = implode(' ', array('attached-links-link', drupal_html_class("attached-links-$type-link"), drupal_html_class('attached-links-link-to-' . $link_data['href']))); + + // Add wrapper classes for the icon display. + $existing_wrapper_class = !empty($link_data['attributes']['class']) ? $link_data['attributes']['class'] : array(); + $wrapper_class = array_merge($existing_wrapper_class, array("attached-links-link-icon", "attached-links-link-icon-$type")); + + // Transform and add to the link. + $transformed_links[$link_class] = array( + 'href' => $link_data['href'], + // Refer users back to the current page after they have completed any + // action (for example, a form submission) associated with the attached + // link. + 'query' => drupal_get_destination(), + // Prepare the link to be displayed as an icon with the original link + // title appearing on hover. + 'title' => '', + 'attributes' => array( + 'class' => $wrapper_class, + 'title' => $link_data['title'], + ), + ); + } + + // Replace the links data with the recomputed items. + $element['#links'] = $transformed_links; + return $element; +} + +/** + * Theme a group of attached links. + * + * @param $element + * An associative array containing the properties of the element. + * Properties used: #children + * @return + * A themed HTML string representing the group of attached links. + * + * @ingroup themeable + */ +function theme_attached_links_group($element) { + return '
' . $element['#children'] . '
'; +} Index: modules/toolbar/toolbar.install =================================================================== RCS file: /cvs/drupal/drupal/modules/toolbar/toolbar.install,v retrieving revision 1.4 diff -u -p -u -p -r1.4 toolbar.install --- modules/toolbar/toolbar.install 31 Aug 2009 17:09:01 -0000 1.4 +++ modules/toolbar/toolbar.install 6 Oct 2009 10:50:07 -0000 @@ -28,7 +28,10 @@ function toolbar_install() { 'node/add' => 'Add content', 'admin/content' => 'Find content', 'admin' => 'Dashboard', + // No title, so the title callback prevails. + 'edit-mode/toggle' => '', ); + $weight = -20; foreach ($items as $path => $title) { $link = array( @@ -37,7 +40,11 @@ function toolbar_install() { 'link_path' => $path, 'router_path' => $path, 'menu_name' => 'admin_shortcuts', - 'module' => 'menu', + // Save these links within the toolbar module, which makes it impossible + // to delete them via the user interface (they can still be disabled, + // however). This is important for items like the edit mode toggle, which + // cannot be accessed easily from elsewhere. + 'module' => 'toolbar', 'weight' => $weight, ); Index: themes/garland/block.tpl.php =================================================================== RCS file: /cvs/drupal/drupal/themes/garland/block.tpl.php,v retrieving revision 1.9 diff -u -p -u -p -r1.9 block.tpl.php --- themes/garland/block.tpl.php 11 Sep 2009 06:48:03 -0000 1.9 +++ themes/garland/block.tpl.php 6 Oct 2009 10:50:07 -0000 @@ -3,6 +3,10 @@ ?>
> + + + + subject)): ?>

>subject ?>

Index: themes/garland/node.tpl.php =================================================================== RCS file: /cvs/drupal/drupal/themes/garland/node.tpl.php,v retrieving revision 1.16 diff -u -p -u -p -r1.16 node.tpl.php --- themes/garland/node.tpl.php 11 Sep 2009 06:48:03 -0000 1.16 +++ themes/garland/node.tpl.php 6 Oct 2009 10:50:07 -0000 @@ -3,6 +3,10 @@ ?>
> + + + + Index: themes/garland/style.css =================================================================== RCS file: /cvs/drupal/drupal/themes/garland/style.css,v retrieving revision 1.65 diff -u -p -u -p -r1.65 style.css --- themes/garland/style.css 5 Oct 2009 02:43:01 -0000 1.65 +++ themes/garland/style.css 6 Oct 2009 10:50:07 -0000 @@ -650,8 +650,8 @@ ul.secondary li.active a { */ .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 { @@ -809,6 +809,32 @@ tr.even td.menu-disabled { } /** + * Icons for attached links. + */ +.attached-links-enabled-region { + outline: none; +} + +.active-attached-links-region { + outline: dashed #027AC6 2px; +} + +ul.attached-links li a { + text-decoration: none; + background-color: #027AC6; +} + +ul.attached-links li a:hover { + background-color: #0062A0; +} + +/* Override the styling applied to normal block lists. */ +.block ul.attached-links { + margin: 0; + padding: 0; +} + +/** * Collapsible fieldsets */ fieldset {