From a2694498f141f24ba4860f73a2c3ec238f65eab0 Mon Sep 17 00:00:00 2001
From: Angie Byron <webchick@24967.no-reply.drupal.org>
Date: Sat, 22 Aug 2009 19:58:28 +0000
Subject: =?UTF-8?q?#542658=20by=20G=C3=A1bor=20Hojtsy,=20sun,=20pwolanin:?=
 =?UTF-8?q?=20Move=20action=20'tabs'=20out=20of=20local=20tasks.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/menu/menu.module    | 4 ++--
 modules/system/page.tpl.php | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'modules')

diff --git a/modules/menu/menu.module b/modules/menu/menu.module
index 3bab4280c..beb29590b 100644
--- a/modules/menu/menu.module
+++ b/modules/menu/menu.module
@@ -65,7 +65,7 @@ function menu_menu() {
     'page callback' => 'drupal_get_form',
     'page arguments' => array('menu_edit_menu', 'add'),
     'access arguments' => array('administer menu'),
-    'type' => MENU_LOCAL_TASK,
+    'type' => MENU_LOCAL_ACTION,
   );
   $items['admin/structure/menu/settings'] = array(
     'title' => 'Settings',
@@ -94,7 +94,7 @@ function menu_menu() {
     'page callback' => 'drupal_get_form',
     'page arguments' => array('menu_edit_item', 'add', NULL, 3),
     'access arguments' => array('administer menu'),
-    'type' => MENU_LOCAL_TASK,
+    'type' => MENU_LOCAL_ACTION,
   );
   $items['admin/structure/menu-customize/%menu/edit'] = array(
     'title' => 'Edit menu',
diff --git a/modules/system/page.tpl.php b/modules/system/page.tpl.php
index 39127200e..eb449a619 100644
--- a/modules/system/page.tpl.php
+++ b/modules/system/page.tpl.php
@@ -68,6 +68,8 @@
  * - $secondary_menu (array): An array containing the Secondary menu links for
  *   the site, if they have been configured.
  * - $breadcrumb: The breadcrumb trail for the current page.
+ * - $action_links: Actions local to the page, such as 'Add menu' on the menu
+ *   administration interface.
  *
  * Page content (in order of occurrence in the default page.tpl.php):
  * - $title: The page title, for use in the actual HTML content.
@@ -171,6 +173,7 @@
         <?php if ($title): ?><h1 class="title" id="page-title"><?php print $title; ?></h1><?php endif; ?>
         <?php if ($tabs): ?><div class="tabs"><?php print $tabs; ?></div><?php endif; ?>
         <?php print $help; ?>
+        <?php if ($action_links): ?><ul class="action-links"><?php print $action_links; ?></ul><?php endif; ?>
         <div id="content-area" class="region">
           <?php print $content; ?>
         </div> <!-- /#content-area -->
-- 
cgit v1.2.3