Index: CHANGELOG.txt
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/zen/CHANGELOG.txt,v
retrieving revision 1.137
diff -u -p -r1.137 CHANGELOG.txt
--- CHANGELOG.txt	7 Sep 2009 10:04:13 -0000	1.137
+++ CHANGELOG.txt	14 Oct 2009 19:57:17 -0000
@@ -60,7 +60,7 @@ Zen 6.x-1.0, 2009-02-14
 - #275832: hook_theme implementation breaks maintenance page when database is down
 - #362104: layout breaks on Zen-themed maintenance page
 - Changed "or" back to "||" in template files since themers do need to learn a little PHP
-- #346867 by debonator: navbar-inner is missing the "clear-block" class
+- #346867 by debonator: nav-inner is missing the "clear-block" class
 - #325610 by Garrett Albright: Site name and logo don't link to frontpage on multilingual site
 - #281106: Erroneous whitespace when div.clear-block touches bottom edge of viewport
 - #365631: Zen's table-styling-fix breaks update module's styling
@@ -202,7 +202,7 @@ Zen 5.x-1.0-beta2, 2008-01-29
 - #207743 by jjeff: Allow a sub-theme to add/alter block variables
 - #110897: oversize content causes IE6 layout breakage (now fixed in Zen Classic)
 - #211156 by jjeff: $subtheme_directory variable in page.tpl.php never gets populated
-- #206060: changed inline styling method for navbar links from inline to float
+- #206060: changed inline styling method for nav links from inline to float
 
 Zen 5.x-1.0-beta1, 2008-01-06
 -----------------------------
Index: zen.info
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/zen/zen.info,v
retrieving revision 1.3
diff -u -p -r1.3 zen.info
--- zen.info	12 Aug 2009 06:49:46 -0000	1.3
+++ zen.info	14 Oct 2009 19:57:17 -0000
@@ -10,7 +10,7 @@ engine = phptemplate
 
 regions[left]           = first sidebar
 regions[right]          = second sidebar
-regions[navbar]         = navigation bar
+regions[nav]            = navigation bar
 regions[content_top]    = content top
 regions[content_bottom] = content bottom
 regions[header]         = header
Index: ./STARTERKIT/STARTERKIT.info.txt
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/zen/STARTERKIT/STARTERKIT.info.txt,v
retrieving revision 1.10
diff -u -p -r1.10 STARTERKIT.info.txt
--- ./STARTERKIT/STARTERKIT.info.txt	23 Aug 2009 22:12:23 -0000	1.10
+++ ./STARTERKIT/STARTERKIT.info.txt	14 Oct 2009 19:57:17 -0000
@@ -62,7 +62,7 @@ conditional-stylesheets[if lte IE 6][all
   ; page.tpl.php template.
 regions[left]           = first sidebar
 regions[right]          = second sidebar
-regions[navbar]         = navigation bar
+regions[nav]            = navigation bar
 regions[content_top]    = content top
 regions[content_bottom] = content bottom
 regions[header]         = header
Index: ./STARTERKIT/css/ie6.css
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/zen/STARTERKIT/css/ie6.css,v
retrieving revision 1.3
diff -u -p -r1.3 ie6.css
--- ./STARTERKIT/css/ie6.css	12 Aug 2009 08:37:42 -0000	1.3
+++ ./STARTERKIT/css/ie6.css	14 Oct 2009 19:57:17 -0000
@@ -25,7 +25,7 @@ body {
 }
 
 #content,
-#navbar,
+#nav,
 #sidebar-first,
 #sidebar-second /* Floating divs */ {
   display: inline; /* display inline or double your floated margin! [1] */
Index: ./STARTERKIT/css/layout-fixed-rtl.css
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/zen/STARTERKIT/css/layout-fixed-rtl.css,v
retrieving revision 1.3
diff -u -p -r1.3 layout-fixed-rtl.css
--- ./STARTERKIT/css/layout-fixed-rtl.css	12 Aug 2009 21:41:11 -0000	1.3
+++ ./STARTERKIT/css/layout-fixed-rtl.css	14 Oct 2009 19:57:17 -0000
@@ -39,19 +39,19 @@
 }
 
 /*
- * Navbar
+ * nav
  */
-#navbar {
+#nav {
   float: right;
   margin-left: -100%;
-  margin-right: 0; /* Negative value of #navbar's width + left margin. */
+  margin-right: 0; /* Negative value of #nav's width + left margin. */
 }
 
-#navbar ul /* Primary and secondary links */ {
+#nav ul /* Primary and secondary links */ {
   text-align: right;
 }
 
-#navbar li /* A simple method to get navbar links to appear in one line. */ {
+#nav li /* A simple method to get nav links to appear in one line. */ {
   float: right;
   padding: 0 0 0 10px;
 }
Index: ./STARTERKIT/css/layout-fixed.css
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/zen/STARTERKIT/css/layout-fixed.css,v
retrieving revision 1.6
diff -u -p -r1.6 layout-fixed.css
--- ./STARTERKIT/css/layout-fixed.css	12 Aug 2009 22:17:26 -0000	1.6
+++ ./STARTERKIT/css/layout-fixed.css	14 Oct 2009 19:57:17 -0000
@@ -145,35 +145,35 @@ body {
 }
 
 /*
- * Navbar
+ * nav
  */
-#navbar {
+#nav {
   float: left; /* LTR */
   width: 100%;
   margin-left: 0; /* LTR */
-  margin-right: -100%; /* LTR */ /* Negative value of #navbar's width + left margin. */
-  padding: 0; /* DO NOT CHANGE. Add padding or margin to #navbar-inner. */
-  height: 2.3em; /* The navbar can have any arbritrary height. We picked one
+  margin-right: -100%; /* LTR */ /* Negative value of #nav's width + left margin. */
+  padding: 0; /* DO NOT CHANGE. Add padding or margin to #nav-inner. */
+  height: 2.3em; /* The nav can have any arbritrary height. We picked one
                     that is the line-height plus 1em: 1.3 + 1 = 2.3
                     Set this to the same value as the margin-top below. */
 }
 
-.with-navbar #content,
-.with-navbar #sidebar-first,
-.with-navbar #sidebar-second {
-  margin-top: 2.3em; /* Set this to the same value as the navbar height above. */
+.with-nav #content,
+.with-nav #sidebar-first,
+.with-nav #sidebar-second {
+  margin-top: 2.3em; /* Set this to the same value as the nav height above. */
 }
 
-#navbar-inner {
+#nav-inner {
 }
 
-#navbar ul /* Primary and secondary links */ {
+#nav ul /* Primary and secondary links */ {
   margin: 0;
   padding: 0;
   text-align: left; /* LTR */
 }
 
-#navbar li /* A simple method to get navbar links to appear in one line. */ {
+#nav li /* A simple method to get nav links to appear in one line. */ {
   float: left; /* LTR */
   padding: 0 10px 0 0; /* LTR */
 }
@@ -230,7 +230,7 @@ body {
  */
 #header,
 #content,
-#navbar,
+#nav,
 #sidebar-first,
 #sidebar-second,
 #footer,
@@ -239,7 +239,7 @@ body {
   word-wrap: break-word; /* A very nice CSS3 property */
 }
 
-#navbar {
+#nav {
   overflow: hidden; /* May need to be removed if using a dynamic drop-down menu */
 }
 
Index: ./STARTERKIT/css/layout-liquid-rtl.css
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/zen/STARTERKIT/css/layout-liquid-rtl.css,v
retrieving revision 1.3
diff -u -p -r1.3 layout-liquid-rtl.css
--- ./STARTERKIT/css/layout-liquid-rtl.css	12 Aug 2009 21:41:11 -0000	1.3
+++ ./STARTERKIT/css/layout-liquid-rtl.css	14 Oct 2009 19:57:17 -0000
@@ -35,17 +35,17 @@
 /*
  * Navbar
  */
-#navbar {
+#nav {
   float: right;
   margin-left: -100%;
-  margin-right: 0; /* Negative value of #navbar's width + left margin. */
+  margin-right: 0; /* Negative value of #nav's width + left margin. */
 }
 
-#navbar ul /* Primary and secondary links */ {
+#nav ul /* Primary and secondary links */ {
   text-align: right;
 }
 
-#navbar li /* A simple method to get navbar links to appear in one line. */ {
+#nav li /* A simple method to get nav links to appear in one line. */ {
   float: right;
   padding: 0 0 0 10px;
 }
Index: ./STARTERKIT/css/layout-liquid.css
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/zen/STARTERKIT/css/layout-liquid.css,v
retrieving revision 1.6
diff -u -p -r1.6 layout-liquid.css
--- ./STARTERKIT/css/layout-liquid.css	12 Aug 2009 22:17:26 -0000	1.6
+++ ./STARTERKIT/css/layout-liquid.css	14 Oct 2009 19:57:17 -0000
@@ -135,35 +135,35 @@ body {
 }
 
 /*
- * Navbar
+ * nav
  */
-#navbar {
+#nav {
   float: left; /* LTR */
   width: 100%;
   margin-left: 0; /* LTR */
-  margin-right: -100%; /* LTR */ /* Negative value of #navbar's width + left margin. */
-  padding: 0; /* DO NOT CHANGE. Add padding or margin to #navbar-inner. */
-  height: 2.3em; /* The navbar can have any arbritrary height. We picked one
+  margin-right: -100%; /* LTR */ /* Negative value of #nav's width + left margin. */
+  padding: 0; /* DO NOT CHANGE. Add padding or margin to #nav-inner. */
+  height: 2.3em; /* The nav can have any arbritrary height. We picked one
                     that is the line-height plus 1em: 1.3 + 1 = 2.3
                     Set this to the same value as the margin-top below. */
 }
 
-.with-navbar #content,
-.with-navbar #sidebar-first,
-.with-navbar #sidebar-second {
-  margin-top: 2.3em; /* Set this to the same value as the navbar height above. */
+.with-nav #content,
+.with-nav #sidebar-first,
+.with-nav #sidebar-second {
+  margin-top: 2.3em; /* Set this to the same value as the nav height above. */
 }
 
-#navbar-inner {
+#nav-inner {
 }
 
-#navbar ul /* Primary and secondary links */ {
+#nav ul /* Primary and secondary links */ {
   margin: 0;
   padding: 0;
   text-align: left; /* LTR */
 }
 
-#navbar li /* A simple method to get navbar links to appear in one line. */ {
+#nav li /* A simple method to get nav links to appear in one line. */ {
   float: left; /* LTR */
   padding: 0 10px 0 0; /* LTR */
 }
@@ -220,7 +220,7 @@ body {
  */
 #header,
 #content,
-#navbar,
+#nav,
 #sidebar-first,
 #sidebar-second,
 #footer,
@@ -229,7 +229,7 @@ body {
   word-wrap: break-word; /* A very nice CSS3 property */
 }
 
-#navbar {
+#nav {
   overflow: hidden; /* May need to be removed if using a dynamic drop-down menu */
 }
 
Index: ./STARTERKIT/css/navigation.css
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/zen/STARTERKIT/css/navigation.css,v
retrieving revision 1.3
diff -u -p -r1.3 navigation.css
--- ./STARTERKIT/css/navigation.css	12 Aug 2009 22:17:26 -0000	1.3
+++ ./STARTERKIT/css/navigation.css	14 Oct 2009 19:57:17 -0000
@@ -16,10 +16,10 @@ li a.active {
 /*
  * Navigation bar
  */
-#navbar {
+#nav {
 }
 
-#navbar-inner {
+#nav-inner {
 }
 
 /*
Index: ./STARTERKIT/css/print.css
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/zen/STARTERKIT/css/print.css,v
retrieving revision 1.3
diff -u -p -r1.3 print.css
--- ./STARTERKIT/css/print.css	12 Aug 2009 08:37:42 -0000	1.3
+++ ./STARTERKIT/css/print.css	14 Oct 2009 19:57:17 -0000
@@ -52,7 +52,7 @@ body,
 
 /* Hide sidebars and nav elements */
 #skip-to-nav,
-#navbar,
+#nav,
 #sidebar-first,
 #sidebar-second,
 #footer,
Index: ./STARTERKIT/css/wireframes.css
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/zen/STARTERKIT/css/wireframes.css,v
retrieving revision 1.2
diff -u -p -r1.2 wireframes.css
--- ./STARTERKIT/css/wireframes.css	12 Aug 2009 08:03:53 -0000	1.2
+++ ./STARTERKIT/css/wireframes.css	14 Oct 2009 19:57:17 -0000
@@ -11,7 +11,7 @@
 .with-wireframes #header-inner,
 .with-wireframes #content-inner,
 .with-wireframes #content-inner>*,
-.with-wireframes #navbar-inner,
+.with-wireframes #nav-inner,
 .with-wireframes #sidebar-first-inner,
 .with-wireframes #sidebar-second-inner,
 .with-wireframes #footer-inner {
Index: ./templates/maintenance-page.tpl.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/zen/templates/maintenance-page.tpl.php,v
retrieving revision 1.2
diff -u -p -r1.2 maintenance-page.tpl.php
--- ./templates/maintenance-page.tpl.php	24 Aug 2009 09:41:47 -0000	1.2
+++ ./templates/maintenance-page.tpl.php	14 Oct 2009 19:57:17 -0000
@@ -27,7 +27,7 @@
 
   <div id="page"><div id="page-inner">
 
-    <?php if ($navbar): ?>
+    <?php if ($nav): ?>
       <div id="skip-to-nav"><a href="#navigation"><?php print t('Skip to Navigation'); ?></a></div>
     <?php endif; ?>
 
@@ -60,7 +60,7 @@
 
     </div></div> <!-- /#header-inner, /#header -->
 
-    <div id="main"><div id="main-inner" class="clearfix<?php if ($navbar) { print ' with-navbar'; } ?>">
+    <div id="main"><div id="main-inner" class="clearfix<?php if ($nav) { print ' with-nav'; } ?>">
 
       <div id="content"><div id="content-inner">
 
@@ -91,13 +91,13 @@
 
       </div></div> <!-- /#content-inner, /#content -->
 
-      <?php if ($navbar): ?>
-        <div id="navbar"><div id="navbar-inner" class="clearfix region region-navbar">
+      <?php if ($nav): ?>
+        <div id="nav"><div id="nav-inner" class="clearfix region region-nav">
 
           <a name="navigation" id="navigation"></a>
-          <?php print $navbar; ?>
+          <?php print $nav; ?>
 
-        </div></div> <!-- /#navbar-inner, /#navbar -->
+        </div></div> <!-- /#nav-inner, /#nav -->
       <?php endif; ?>
 
       <?php if ($left): ?>
Index: ./templates/page.tpl.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/zen/templates/page.tpl.php,v
retrieving revision 1.5
diff -u -p -r1.5 page.tpl.php
--- ./templates/page.tpl.php	25 Aug 2009 09:02:17 -0000	1.5
+++ ./templates/page.tpl.php	14 Oct 2009 19:57:17 -0000
@@ -190,16 +190,16 @@
 
       </div></div> <!-- /#content-inner, /#content -->
 
-      <?php if ($primary_links || $navbar): ?>
-        <div id="navbar"><div id="navbar-inner" class="clearfix region region-navbar">
+      <?php if ($primary_links || $nav): ?>
+        <div id="nav"><div id="nav-inner" class="clearfix region region-nav">
 
           <a name="navigation" id="navigation"></a>
 
           <?php print theme('links', $primary_links, array('id' => 'main-menu', 'class' => 'links clearfix')); ?>
 
-          <?php print $navbar; ?>
+          <?php print $nav; ?>
 
-        </div></div> <!-- /#navbar-inner, /#navbar -->
+        </div></div> <!-- /#nav-inner, /#nav -->
       <?php endif; ?>
 
       <?php if ($left): ?>
Index: ./zen-internals/css/ie6.css
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/zen/zen-internals/css/ie6.css,v
retrieving revision 1.4
diff -u -p -r1.4 ie6.css
--- ./zen-internals/css/ie6.css	12 Aug 2009 22:36:06 -0000	1.4
+++ ./zen-internals/css/ie6.css	14 Oct 2009 19:57:17 -0000
@@ -25,7 +25,7 @@ body {
 }
 
 #content,
-#navbar,
+#nav,
 #sidebar-first,
 #sidebar-second /* Floating divs */ {
   display: inline; /* display inline or double your floated margin! [1] */
Index: ./zen-internals/css/print.css
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/zen/zen-internals/css/print.css,v
retrieving revision 1.4
diff -u -p -r1.4 print.css
--- ./zen-internals/css/print.css	12 Aug 2009 22:36:07 -0000	1.4
+++ ./zen-internals/css/print.css	14 Oct 2009 19:57:17 -0000
@@ -52,7 +52,7 @@ body,
 
 /* Hide sidebars and nav elements */
 #skip-to-nav,
-#navbar,
+#nav,
 #sidebar-first,
 #sidebar-second,
 #footer,
Index: ./zen-internals/css/zen-fixed.css
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/zen/zen-internals/css/zen-fixed.css,v
retrieving revision 1.4
diff -u -p -r1.4 zen-fixed.css
--- ./zen-internals/css/zen-fixed.css	12 Aug 2009 22:36:07 -0000	1.4
+++ ./zen-internals/css/zen-fixed.css	14 Oct 2009 19:57:17 -0000
@@ -302,7 +302,7 @@ fieldset {
 .with-wireframes #header-inner,
 .with-wireframes #content-inner,
 .with-wireframes #content-inner>*,
-.with-wireframes #navbar-inner,
+.with-wireframes #nav-inner,
 .with-wireframes #sidebar-first-inner,
 .with-wireframes #sidebar-second-inner,
 .with-wireframes #footer-inner {
@@ -463,35 +463,35 @@ body {
 }
 
 /*
- * Navbar
+ * nav
  */
-#navbar {
+#nav {
   float: left; /* LTR */
   width: 100%;
   margin-left: 0; /* LTR */
-  margin-right: -100%; /* LTR */ /* Negative value of #navbar's width + left margin. */
-  padding: 0; /* DO NOT CHANGE. Add padding or margin to #navbar-inner. */
-  height: 2.3em; /* The navbar can have any arbritrary height. We picked one
+  margin-right: -100%; /* LTR */ /* Negative value of #nav's width + left margin. */
+  padding: 0; /* DO NOT CHANGE. Add padding or margin to #nav-inner. */
+  height: 2.3em; /* The nav can have any arbritrary height. We picked one
                     that is the line-height plus 1em: 1.3 + 1 = 2.3
                     Set this to the same value as the margin-top below. */
 }
 
-.with-navbar #content,
-.with-navbar #sidebar-first,
-.with-navbar #sidebar-second {
-  margin-top: 2.3em; /* Set this to the same value as the navbar height above. */
+.with-nav #content,
+.with-nav #sidebar-first,
+.with-nav #sidebar-second {
+  margin-top: 2.3em; /* Set this to the same value as the nav height above. */
 }
 
-#navbar-inner {
+#nav-inner {
 }
 
-#navbar ul /* Primary and secondary links */ {
+#nav ul /* Primary and secondary links */ {
   margin: 0;
   padding: 0;
   text-align: left; /* LTR */
 }
 
-#navbar li /* A simple method to get navbar links to appear in one line. */ {
+#nav li /* A simple method to get nav links to appear in one line. */ {
   float: left; /* LTR */
   padding: 0 10px 0 0; /* LTR */
 }
@@ -548,7 +548,7 @@ body {
  */
 #header,
 #content,
-#navbar,
+#nav,
 #sidebar-first,
 #sidebar-second,
 #footer,
@@ -557,7 +557,7 @@ body {
   word-wrap: break-word; /* A very nice CSS3 property */
 }
 
-#navbar {
+#nav {
   overflow: hidden; /* May need to be removed if using a dynamic drop-down menu */
 }
 
@@ -1216,10 +1216,10 @@ li a.active {
 /*
  * Navigation bar
  */
-#navbar {
+#nav {
 }
 
-#navbar-inner {
+#nav-inner {
 }
 
 /*
Index: ./zen-internals/css/zen-liquid.css
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/zen/zen-internals/css/zen-liquid.css,v
retrieving revision 1.4
diff -u -p -r1.4 zen-liquid.css
--- ./zen-internals/css/zen-liquid.css	12 Aug 2009 22:36:07 -0000	1.4
+++ ./zen-internals/css/zen-liquid.css	14 Oct 2009 19:57:17 -0000
@@ -302,7 +302,7 @@ fieldset {
 .with-wireframes #header-inner,
 .with-wireframes #content-inner,
 .with-wireframes #content-inner>*,
-.with-wireframes #navbar-inner,
+.with-wireframes #nav-inner,
 .with-wireframes #sidebar-first-inner,
 .with-wireframes #sidebar-second-inner,
 .with-wireframes #footer-inner {
@@ -453,35 +453,35 @@ body {
 }
 
 /*
- * Navbar
+ * nav
  */
-#navbar {
+#nav {
   float: left; /* LTR */
   width: 100%;
   margin-left: 0; /* LTR */
-  margin-right: -100%; /* LTR */ /* Negative value of #navbar's width + left margin. */
-  padding: 0; /* DO NOT CHANGE. Add padding or margin to #navbar-inner. */
-  height: 2.3em; /* The navbar can have any arbritrary height. We picked one
+  margin-right: -100%; /* LTR */ /* Negative value of #nav's width + left margin. */
+  padding: 0; /* DO NOT CHANGE. Add padding or margin to #nav-inner. */
+  height: 2.3em; /* The nav can have any arbritrary height. We picked one
                     that is the line-height plus 1em: 1.3 + 1 = 2.3
                     Set this to the same value as the margin-top below. */
 }
 
-.with-navbar #content,
-.with-navbar #sidebar-first,
-.with-navbar #sidebar-second {
-  margin-top: 2.3em; /* Set this to the same value as the navbar height above. */
+.with-nav #content,
+.with-nav #sidebar-first,
+.with-nav #sidebar-second {
+  margin-top: 2.3em; /* Set this to the same value as the nav height above. */
 }
 
-#navbar-inner {
+#nav-inner {
 }
 
-#navbar ul /* Primary and secondary links */ {
+#nav ul /* Primary and secondary links */ {
   margin: 0;
   padding: 0;
   text-align: left; /* LTR */
 }
 
-#navbar li /* A simple method to get navbar links to appear in one line. */ {
+#nav li /* A simple method to get nav links to appear in one line. */ {
   float: left; /* LTR */
   padding: 0 10px 0 0; /* LTR */
 }
@@ -538,7 +538,7 @@ body {
  */
 #header,
 #content,
-#navbar,
+#nav,
 #sidebar-first,
 #sidebar-second,
 #footer,
@@ -547,7 +547,7 @@ body {
   word-wrap: break-word; /* A very nice CSS3 property */
 }
 
-#navbar {
+#nav {
   overflow: hidden; /* May need to be removed if using a dynamic drop-down menu */
 }
 
@@ -1206,10 +1206,10 @@ li a.active {
 /*
  * Navigation bar
  */
-#navbar {
+#nav {
 }
 
-#navbar-inner {
+#nav-inner {
 }
 
 /*