From be324d8f70f6959d0390db63e3b0670ac95760d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=A1bor=20Hojtsy?= <gabor@hojtsy.hu>
Date: Tue, 8 Jan 2008 11:31:49 +0000
Subject: #195091 by Rowanw: (usability) swap enabled and expanded checkbox in
 menu admin and allow setting elements without children to be expanded

---
 modules/menu/menu.admin.inc | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'modules')

diff --git a/modules/menu/menu.admin.inc b/modules/menu/menu.admin.inc
index c711ad301..924ec510c 100644
--- a/modules/menu/menu.admin.inc
+++ b/modules/menu/menu.admin.inc
@@ -76,7 +76,7 @@ function _menu_overview_tree_form($tree) {
       );
       $form[$mlid]['expanded'] = array(
         '#type' => 'checkbox',
-        '#default_value' => $item['has_children'] && $item['expanded'],
+        '#default_value' => $item['expanded'],
       );
       $form[$mlid]['weight'] = array(
         '#type' => 'weight',
@@ -172,8 +172,8 @@ function theme_menu_overview_form($form) {
 
   $header = array(
     t('Menu item'),
-    array('data' => t('Expanded'), 'class' => 'checkbox'),
     array('data' => t('Enabled'), 'class' => 'checkbox'),
+    array('data' => t('Expanded'), 'class' => 'checkbox'),
     t('Weight'),
     array('data' => t('Operations'), 'colspan' => '3'),
   );
@@ -201,8 +201,8 @@ function theme_menu_overview_form($form) {
 
       $row = array();
       $row[] = theme('indentation', $element['#item']['depth'] - 1) . drupal_render($element['title']);
-      $row[] = array('data' => drupal_render($element['expanded']), 'class' => 'checkbox');
       $row[] = array('data' => drupal_render($element['hidden']), 'class' => 'checkbox');
+      $row[] = array('data' => drupal_render($element['expanded']), 'class' => 'checkbox');
       $row[] = drupal_render($element['weight']) . drupal_render($element['plid']) . drupal_render($element['mlid']);
       $row = array_merge($row, $operations);
 
-- 
cgit v1.2.3