From 5299b9268995d1018a6b966f9d1ef260931f5c3d Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Wed, 25 Jun 2008 09:12:25 +0000
Subject: - Patch #270917 by catch, Bojhan, et al: renamed 'primary links' and
 'secondary links' to 'main menu' and 'secondary menu' respectively.  Based on
 usability study conducted with the help of Bojhan.

---
 modules/system/page.tpl.php     | 18 +++++++++---------
 modules/system/system.admin.inc |  4 ++--
 modules/system/system.install   | 12 ++++++++++++
 modules/system/system.module    |  4 ++--
 4 files changed, 25 insertions(+), 13 deletions(-)

(limited to 'modules/system')

diff --git a/modules/system/page.tpl.php b/modules/system/page.tpl.php
index 95a53db44..cbbf01f72 100644
--- a/modules/system/page.tpl.php
+++ b/modules/system/page.tpl.php
@@ -45,9 +45,9 @@
  *
  * Navigation:
  * - $search_box: HTML to display the search box, empty if search has been disabled.
- * - $primary_links (array): An array containing primary navigation links for the
+ * - $main_menu (array): An array containing the Main menu links for the
  *   site, if they have been configured.
- * - $secondary_links (array): An array containing secondary navigation links for
+ * - $secondary_menu (array): An array containing the Secondary menu links for
  *   the site, if they have been configured.
  *
  * Page content (in order of occurrance in the default page.tpl.php):
@@ -124,16 +124,16 @@
 
     <div id="container" class="clear-block">
 
-      <div id="navigation" class="menu <?php if (!empty($primary_links)) { print "withprimary"; } if (!empty($secondary_links)) { print " withsecondary"; } ?> ">
-        <?php if (!empty($primary_links)): ?>
-          <div id="primary" class="clear-block">
-            <?php print theme('links', $primary_links, array('class' => 'links primary-links')); ?>
+      <div id="navigation" class="menu <?php if (!empty($main_menu)) { print "withmain"; } if (!empty($secondary_menu)) { print " withsecondary"; } ?> ">
+        <?php if (!empty($main_menu)): ?>
+          <div id="main-menu" class="clear-block">
+            <?php print theme('links', $main_menu, array('class' => 'links main-menu')); ?>
           </div>
         <?php endif; ?>
 
-        <?php if (!empty($secondary_links)): ?>
-          <div id="secondary" class="clear-block">
-            <?php print theme('links', $secondary_links, array('class' => 'links secondary-links')); ?>
+        <?php if (!empty($secondary_menu)): ?>
+          <div id="secondary-menu" class="clear-block">
+            <?php print theme('links', $secondary_menu, array('class' => 'links secondary-menu')); ?>
           </div>
         <?php endif; ?>
       </div> <!-- /navigation -->
diff --git a/modules/system/system.admin.inc b/modules/system/system.admin.inc
index 87ef36dd9..0c8a50a7b 100644
--- a/modules/system/system.admin.inc
+++ b/modules/system/system.admin.inc
@@ -370,8 +370,8 @@ function system_theme_settings(&$form_state, $key = '') {
     'comment_user_picture' => t('User pictures in comments'),
     'search'               => t('Search box'),
     'favicon'              => t('Shortcut icon'),
-    'primary_links'        => t('Primary links'),
-    'secondary_links'      => t('Secondary links'),
+    'main_menu'            => t('Main menu'),
+    'secondary_menu'      => t('Secondary menu'),
   );
 
   // Some features are not always available
diff --git a/modules/system/system.install b/modules/system/system.install
index 7e2d240b7..044f52ef4 100644
--- a/modules/system/system.install
+++ b/modules/system/system.install
@@ -3017,6 +3017,18 @@ function system_update_7008() {
   return $ret;
 }
 
+/**
+ * Rename the variables for primary and secondary links.
+ *
+ */
+function system_update_7009() {
+  $ret = array();
+  $ret[] = update_sql("UPDATE {variable} SET name = 'menu_main_menu_source' WHERE name = 'menu_primary_links_source'");
+  $ret[] = update_sql("UPDATE {variable} SET name = 'menu_main_menu_source' WHERE name = 'menu_primary_links_source'");
+
+  return $ret;
+}
+
 /**
  * @} End of "defgroup updates-6.x-to-7.x"
  * The next series of updates should start at 8000.
diff --git a/modules/system/system.module b/modules/system/system.module
index 0293f65bd..4fa9992e5 100644
--- a/modules/system/system.module
+++ b/modules/system/system.module
@@ -928,8 +928,8 @@ function system_theme_default() {
       'node_user_picture',
       'search',
       'slogan',
-      'primary_links',
-      'secondary_links',
+      'main_menu',
+      'secondary_menu',
     ),
     'stylesheets' => array(
       'all' => array('style.css')
-- 
cgit v1.2.3