Index: templates/node.tpl.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/zen/templates/node.tpl.php,v
retrieving revision 1.10
diff -u -p -r1.10 node.tpl.php
--- templates/node.tpl.php 2 Nov 2009 17:42:27 -0000 1.10
+++ templates/node.tpl.php 12 Nov 2009 01:23:26 -0000
@@ -74,7 +74,11 @@
*/
?>
-
+
+
+
+
+
@@ -84,7 +88,7 @@
-
+
-
+
-
+
Index: templates/page.tpl.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/zen/templates/page.tpl.php,v
retrieving revision 1.26
diff -u -p -r1.26 page.tpl.php
--- templates/page.tpl.php 5 Nov 2009 13:54:57 -0000 1.26
+++ templates/page.tpl.php 12 Nov 2009 01:23:26 -0000
@@ -60,9 +60,9 @@
*
* Navigation:
* - $search_box: HTML to display the search box, empty if search has been disabled.
- * - $primary_links (array): An array containing the Primary menu links for the
+ * - $main_menu (array): An array containing the Primary menu links for the
* site, if they have been configured.
- * - $secondary_links (array): An array containing the Secondary menu links for
+ * - $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.
*
@@ -71,13 +71,13 @@
* - $messages: HTML for status and error messages. Should be displayed prominently.
* - $tabs: Tabs linking to any sub-pages beneath the current page (e.g., the
* view and edit tabs when displaying a node).
- * - $help: Dynamic help text, mostly for admin pages.
* - $content: The main content of the current page.
* - $feed_icons: A string of all feed icons for the current page.
*
* Footer/closing data:
* - $footer_message: The footer message as defined in the admin settings.
- * - $closure: Final closing markup from any modules that have altered the page.
+ * - $page_top: Markup that needs to be at the top of the body.
+ * - $page_bottom: Final closing markup from any modules that have altered the page.
* This variable should always be output last, after all other dynamic content.
*
* Helper variables:
@@ -85,6 +85,7 @@
* into a string within the variable $classes.
*
* Regions:
+ * - $help: Dynamic help text, mostly for admin pages.
* - $content_top: Items to appear above the main content of the current page.
* - $content_bottom: Items to appear below the main content of the current page.
* - $navigation: Items for the navigation bar.
@@ -103,18 +104,12 @@
* @see zen_process()
*/
?>
-
-
+
-
-
-
-
-
-
-
-
+
+
+
@@ -146,23 +141,15 @@