? themes/bartik/color
? themes/bartik/css
? themes/bartik/images
Index: themes/bartik/README.txt
===================================================================
RCS file: themes/bartik/README.txt
diff -N themes/bartik/README.txt
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ themes/bartik/README.txt	21 Feb 2010 14:26:12 -0000
@@ -0,0 +1,33 @@
+// $Id$
+
+EDITING THIS THEME
+
+You can customize this theme to make it more your own. But do not edit this
+original copy of Bartik. Duplicate the Bartik directory (the folder) with all of
+it's files, move your new copy to the sites/all/themes directory, and edit it there.
+Be sure to rename your new theme by changing the name of the directory, changing
+the name of the .info file, and editing the text inside the .info file.
+
+If you are running a multisite installation, you can place the new theme in in a
+subdirectory under /sites/{sitename}/themes/, where {sitename} is the name of your
+site (e.g., www.example.com).
+
+If you edit this copy of Bartik, you are "hacking core". Do not hack core.
+
+If you hack core, and edit the original copy of Bartik, updating Drupal will be
+much harder, and you risk having your new theme deleted in the process.
+
+For more details, see: http://drupal.org/node/176043
+
+
+CHANGING THE COLOR.CSS FILE
+
+If you adjust the colors using the color scheme tool in Bartik's theme settings,
+the color.css file will be duplicated and the new copy will be placed in
+default/sites/files/. It is this new copy that will have the CSS for the colors
+you specified. The original copy of color.css will stay in themes/bartik/css/,
+but will no longer have any impact on the site's display.
+
+If you are having trouble making changes directly to the stylesheet, if you are
+making changes but they aren't having an effect, then try turning color module
+off in the modules administration area.
Index: themes/bartik/bartik.info
===================================================================
RCS file: themes/bartik/bartik.info
diff -N themes/bartik/bartik.info
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ themes/bartik/bartik.info	21 Feb 2010 14:26:12 -0000
@@ -0,0 +1,36 @@
+; $Id$
+
+name = Bartik
+description = A flexible, recolorable theme with many regions.
+version = VERSION
+core = 7.x
+engine = phptemplate
+
+stylesheets[all][] = css/reset.css
+stylesheets[all][] = css/layout.css
+stylesheets[all][] = css/style.css
+stylesheets[all][] = css/color.css
+
+regions[header] = Header
+regions[help] = Help
+regions[page_top] = Page top
+regions[page_bottom] = Page bottom
+regions[highlight] = Highlighted
+
+regions[featured] = Featured
+regions[content] = Content
+regions[sidebar_first] = Sidebar first
+regions[sidebar_second] = Sidebar second
+
+regions[triptych_first] = Triptych first
+regions[triptych_middle] = Triptych middle
+regions[triptych_last] = Triptych last
+
+regions[footer_firstcolumn] = Footer first column
+regions[footer_secondcolumn] = Footer second column
+regions[footer_thirdcolumn] = Footer third column
+regions[footer_fourthcolumn] = Footer fourth column
+regions[footer] = Footer
+
+settings[bartik_sample_regions] = 1
+settings[shortcut_module_link] = 1
Index: themes/bartik/comment-wrapper.tpl.php
===================================================================
RCS file: themes/bartik/comment-wrapper.tpl.php
diff -N themes/bartik/comment-wrapper.tpl.php
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ themes/bartik/comment-wrapper.tpl.php	21 Feb 2010 14:26:12 -0000
@@ -0,0 +1,48 @@
+<?php
+// $Id$
+
+/**
+ * @file
+ * Bartik's theme implementation to wrap comments.
+ *
+ * Available variables:
+ * - $content: The array of content-related elements for the node. Use
+ *   render($content) to print them all, or
+ *   print a subset such as render($content['comment_form']).
+ * - $classes: String of classes that can be used to style contextually through
+ *   CSS. It can be manipulated through the variable $classes_array from
+ *   preprocess functions. The default value has the following:
+ *   - comment-wrapper: The current template type, i.e., "theming hook".
+ *
+ * The following variables are provided for contextual information.
+ * - $node: Node object the comments are attached to.
+ * The constants below the variables show the possible values and should be
+ * used for comparison.
+ * - $display_mode
+ *   - COMMENT_MODE_FLAT
+ *   - COMMENT_MODE_THREADED
+ *
+ * Other variables:
+ * - $classes_array: Array of html class attribute values. It is flattened
+ *   into a string within the variable $classes.
+ *
+ * @see template_preprocess_comment_wrapper()
+ * @see theme_comment_wrapper()
+ */
+?>
+<div id="comments-wrapper">
+  <div id="comments" class="<?php print $classes; ?>"<?php print $attributes; ?>>
+    <?php if ($node->type != 'forum'): ?>
+      <h2 class="comments"><?php print t('Comments'); ?></h2>
+    <?php endif; ?>
+
+    <?php print render($content['comments']); ?>
+
+    <?php if ($content['comment_form']): ?>
+      <h2 class="title"><?php print t('Post new comment'); ?></h2>
+      <div>
+        <?php print render($content['comment_form']); ?>
+      </div>
+    <?php endif; ?>
+  </div>
+</div>
Index: themes/bartik/comment.tpl.php
===================================================================
RCS file: themes/bartik/comment.tpl.php
diff -N themes/bartik/comment.tpl.php
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ themes/bartik/comment.tpl.php	21 Feb 2010 14:26:12 -0000
@@ -0,0 +1,102 @@
+<?php
+// $Id$
+
+/**
+ * @file
+ * Bartik's theme implementation for comments.
+ *
+ * Available variables:
+ * - $author: Comment author. Can be link or plain text.
+ * - $content: An array of comment items. Use render($content) to print them all, or
+ *   print a subset such as render($content['field_example']). Use
+ *   hide($content['field_example']) to temporarily suppress the printing of a
+ *   given element.
+ * - $created: Formatted date and time for when the comment was created.
+ *   Preprocess functions can reformat it by calling format_date() with the
+ *   desired parameters on the $comment->created variable.
+ * - $changed: Formatted date and time for when the comment was last changed.
+ *   Preprocess functions can reformat it by calling format_date() with the
+ *   desired parameters on the $comment->changed variable.
+ * - $new: New comment marker.
+ * - $permalink: Comment permalink.
+ * - $picture: Authors picture.
+ * - $signature: Authors signature.
+ * - $status: Comment status. Possible values are:
+ *   comment-unpublished, comment-published or comment-preview.
+ * - $title: Linked title.
+ * - $classes: String of classes that can be used to style contextually through
+ *   CSS. It can be manipulated through the variable $classes_array from
+ *   preprocess functions. The default values can be one or more of the following:
+ *   - comment: The current template type, i.e., "theming hook".
+ *   - comment-by-anonymous: Comment by an unregistered user.
+ *   - comment-by-node-author: Comment by the author of the parent node.
+ *   - comment-preview: When previewing a new or edited comment.
+ *   The following applies only to viewers who are registered users:
+ *   - comment-unpublished: An unpublished comment visible only to administrators.
+ *   - comment-by-viewer: Comment by the user currently viewing the page.
+ *   - comment-new: New comment since last the visit.
+ * - $title_prefix (array): An array containing additional output populated by
+ *   modules, intended to be displayed in front of the main title tag that
+ *   appears in the template.
+ * - $title_suffix (array): An array containing additional output populated by
+ *   modules, intended to be displayed after the main title tag that appears in
+ *   the template.
+ *
+ * These two variables are provided for context:
+ * - $comment: Full comment object.
+ * - $node: Node object the comments are attached to.
+ *
+ * Other variables:
+ * - $classes_array: Array of html class attribute values. It is flattened
+ *   into a string within the variable $classes.
+ *
+ * @see template_preprocess()
+ * @see template_preprocess_comment()
+ * @see template_process()
+ * @see theme_comment()
+ */
+?>
+<div class="<?php print $classes; ?> clearfix"<?php print $attributes; ?>>
+
+  <div class="attribution">
+
+    <?php print $picture; ?>
+
+    <div class="submitted">
+      <?php print $permalink; ?>
+      <p class="commenter-name">
+        <?php print t('!username ', array('!username' => $author)); ?>
+      </p>
+      <p class="comment-time">
+        <?php print t('!datetime.', array('!datetime' => $created)); ?>
+      </p>
+    </div>
+  </div>
+
+  <div class="comment-text">
+    <div class="comment-arrow"></div>
+
+    <?php if ($new): ?>
+      <span class="new"><?php print $new; ?></span>
+    <?php endif; ?>
+
+    <?php print render($title_prefix); ?>
+    <h3<?php print $title_attributes; ?>><?php print $title; ?></h3>
+    <?php print render($title_suffix); ?>
+
+    <div class="content"<?php print $content_attributes; ?>>
+      <?php
+        // We hide the comments and links now so that we can render them later.
+        hide($content['links']);
+        print render($content);
+      ?>
+      <?php if ($signature): ?>
+      <div class="user-signature clearfix">
+        <?php print $signature; ?>
+      </div>
+      <?php endif; ?>
+    </div> <!-- /.content -->
+
+    <?php print render($content['links']); ?>
+  </div> <!-- /.comment-text -->
+</div>
Index: themes/bartik/html.tpl.php
===================================================================
RCS file: themes/bartik/html.tpl.php
diff -N themes/bartik/html.tpl.php
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ themes/bartik/html.tpl.php	21 Feb 2010 14:26:12 -0000
@@ -0,0 +1,57 @@
+<?php
+// $Id$
+
+// Last conformed to D7 Head - v 1.3 2009/11/16 05:34:24 webchick
+
+/**
+ * @file
+ * Default theme implementation to display the basic html structure of a single
+ * Drupal page.
+ *
+ * Variables:
+ * - $css: An array of CSS files for the current page.
+ * - $language: (object) The language the site is being displayed in.
+ *   $language->language contains its textual representation.
+ *   $language->dir contains the language direction. It will either be 'ltr' or 'rtl'.
+ * - $rdf_namespaces: All the RDF namespace prefixes used in the HTML document.
+ * - $grddl_profile: A GRDDL profile allowing agents to extract the RDF data.
+ * - $head_title: A modified version of the page title, for use in the TITLE tag.
+ * - $head: Markup for the HEAD section (including meta tags, keyword tags, and
+ *   so on).
+ * - $styles: Style tags necessary to import all CSS files for the page.
+ * - $scripts: Script tags necessary to load the JavaScript files and settings
+ *   for the page.
+ * - $page_top: Initial markup from any modules that have altered the
+ *   page. This variable should always be output first, before all other dynamic
+ *   content.
+ * - $page: The rendered page content.
+ * - $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.
+ * - $classes String of classes that can be used to style contextually through
+ *   CSS.
+ *
+ * @see template_preprocess()
+ * @see template_preprocess_html()
+ * @see template_process()
+ */
+?><!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.0//EN"
+  "http://www.w3.org/MarkUp/DTD/xhtml-rdfa-1.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php print $language->language; ?>" version="XHTML+RDFa 1.0" dir="<?php print $language->dir; ?>"
+  <?php print $rdf_namespaces; ?>>
+
+<head profile="<?php print $grddl_profile; ?>">
+  <?php print $head; ?>
+  <title><?php print $head_title; ?></title>
+  <?php print $styles; ?>
+  <?php print $scripts; ?>
+</head>
+<body class="<?php print $classes; ?>" <?php print $attributes;?>>
+  <div id="skip-link">
+    <a href="#main-content"><?php print t('Skip to main content'); ?></a>
+  </div>
+  <?php print $page_top; ?>
+  <?php print $page; ?>
+  <?php print $page_bottom; ?>
+</body>
+</html>
Index: themes/bartik/logo.png
===================================================================
RCS file: themes/bartik/logo.png
diff -N themes/bartik/logo.png
Binary files /dev/null and logo.png differ
Index: themes/bartik/maintenance-page.tpl.php
===================================================================
RCS file: themes/bartik/maintenance-page.tpl.php
diff -N themes/bartik/maintenance-page.tpl.php
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ themes/bartik/maintenance-page.tpl.php	21 Feb 2010 14:26:12 -0000
@@ -0,0 +1,174 @@
+<?php
+// $Id$
+
+/**
+ * @file
+ * Bartik's theme implementation to display a single Drupal page while offline.
+ *
+ * All the available variables are mirrored in page.tpl.php. Some may be left
+ * blank but they are provided for consistency.
+ *
+ * @see template_preprocess()
+ * @see template_preprocess_maintenance_page()
+ * @see bartik_process_maintenance_page()
+ */
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php print $language->language; ?>" lang="<?php print $language->language; ?>" dir="<?php print $language->dir; ?>">
+
+<head>
+  <?php print $head; ?>
+  <title><?php print $head_title; ?></title>
+  <?php print $styles; ?>
+  <?php print $scripts; ?>
+</head>
+<body class="<?php print $classes; ?>" <?php print $attributes;?>>
+  <div id="skip-link">
+    <a href="#main-content"><?php print t('Skip to main content'); ?></a>
+  </div>
+  <?php print $page_top; ?>
+
+<div id="page-wrapper"><div id="page">
+
+  <div id="header"><div class="section clearfix">
+
+    <?php if ($logo): ?>
+      <a href="<?php print $front_page; ?>" title="<?php print t('Home'); ?>" rel="home" id="logo">
+        <img src="<?php print $logo; ?>" alt="<?php print t('Home'); ?>" />
+      </a>
+    <?php endif; ?>
+
+    <?php if ($site_name || $site_slogan): ?>
+      <div id="name-and-slogan"<?php if ($hide_site_name && $hide_site_slogan) { print ' class="element-invisible"'; } ?>>
+
+        <?php if ($site_name): ?>
+          <?php if ($title): ?>
+            <div id="site-name"<?php if ($hide_site_name) { print ' class="element-invisible"'; } ?>>
+              <strong>
+                <a href="<?php print $front_page; ?>" title="<?php print t('Home'); ?>" rel="home"><span><?php print $site_name; ?></span></a>
+              </strong>
+            </div>
+          <?php else: /* Use h1 when the content title is empty */ ?>
+            <h1 id="site-name"<?php if ($hide_site_name) { print ' class="element-invisible"'; } ?>>
+              <a href="<?php print $front_page; ?>" title="<?php print t('Home'); ?>" rel="home"><span><?php print $site_name; ?></span></a>
+            </h1>
+          <?php endif; ?>
+        <?php endif; ?>
+
+        <?php if ($site_slogan): ?>
+          <div id="site-slogan"<?php if ($hide_site_slogan) { print ' class="element-invisible"'; } ?>>
+            <?php print $site_slogan; ?>
+          </div>
+        <?php endif; ?>
+
+      </div> <!-- /#name-and-slogan -->
+    <?php endif; ?>
+
+    <?php print $header; ?>
+
+  </div></div> <!-- /.section, /#header -->
+
+  <?php if ($messages): ?>
+    <div id="messages"><div class="section clearfix">
+      <?php print $messages; ?>
+    </div></div> <!-- /.section, /#messages -->
+  <?php endif; ?>
+
+  <?php if ($featured): ?>
+    <div id="featured" class="region"><div class="section clearfix">
+      <?php print $featured; ?>
+    </div></div> <!-- /.section, /#featured -->
+  <?php endif; ?>
+
+  <div id="main-wrapper"><div id="main" class="clearfix">
+
+    <div id="content" class="column"><div class="section">
+      <?php if ($highlight): ?><div id="highlight"><?php print $highlight; ?></div><?php endif; ?>
+      <a id="main-content"></a>
+      <?php if ($title): ?>
+        <h1 class="title" id="page-title">
+          <?php print $title; ?>
+        </h1>
+      <?php endif; ?>
+      <?php print $content; ?>
+
+    </div></div> <!-- /.section, /#content -->
+
+    <?php if ($sidebar_first): ?>
+      <div id="sidebar-first" class="column sidebar"><div class="section">
+        <?php print $sidebar_first; ?>
+      </div></div> <!-- /.section, /#sidebar-first -->
+    <?php endif; ?>
+
+  </div></div> <!-- /#main, /#main-wrapper -->
+
+  <?php if ($triptych_first || $triptych_middle || $triptych_last): ?>
+    <div id="triptych-wrapper"><div id="triptych" class="clearfix">
+
+      <?php if ($triptych_first): ?>
+        <div id="triptych-first" class="region triptych"><div class="section">
+          <?php print $triptych_first; ?>
+        </div></div> <!-- /.section, /#triptych-first -->
+      <?php endif; ?>
+
+      <?php if ($triptych_middle): ?>
+        <div id="triptych-middle" class="region triptych"><div class="section">
+          <?php print $triptych_middle; ?>
+        </div></div> <!-- /.section, /#triptych-middle -->
+      <?php endif; ?>
+
+      <?php if ($triptych_last): ?>
+        <div id="triptych-last" class="region triptych"><div class="section">
+          <?php print $triptych_last; ?>
+        </div></div> <!-- /.section, /#triptych-last -->
+      <?php endif; ?>
+
+    </div></div> <!-- /#triptych, /#triptych-wrapper -->
+  <?php endif; ?>
+
+  <div id="footer-wrapper"><div class="section">
+
+    <?php if ($footer_firstcolumn || $footer_secondcolumn || $footer_thirdcolumn || $footer_fourthcolumn): ?>
+      <div id="footer-columns" class="clearfix">
+
+        <?php if ($footer_firstcolumn): ?>
+          <div id="footer-firstcolumn" class="region sitemap"><div class="section">
+            <?php print $footer_firstcolumn; ?>
+          </div></div> <!-- /.section, /#footer-firstcolumn -->
+        <?php endif; ?>
+
+        <?php if ($footer_secondcolumn): ?>
+          <div id="footer-secondcolumn" class="region sitemap"><div class="section">
+            <?php print $footer_secondcolumn; ?>
+          </div></div> <!-- /.section, /#footer-secondcolumn -->
+        <?php endif; ?>
+
+        <?php if ($footer_thirdcolumn): ?>
+          <div id="footer-thirdcolumn" class="region sitemap"><div class="section">
+            <?php print $footer_thirdcolumn; ?>
+          </div></div> <!-- /.section, /#footer-thirdcolumn -->
+        <?php endif; ?>
+
+        <?php if ($footer_fourthcolumn): ?>
+          <div id="footer-fourthcolumn" class="region sitemap"><div class="section">
+            <?php print $footer_fourthcolumn; ?>
+          </div></div> <!-- /.section, /#footer-fourthcolumn -->
+        <?php endif; ?>
+
+      </div><!-- /#footer-columns -->
+    <?php endif; ?>
+
+    <?php if ($footer): ?>
+      <div id="footer" class="clearfix">
+        <?php print $footer; ?>
+      </div><!-- /#footer -->
+    <?php endif; ?>
+
+  </div></div> <!-- /.section, /#footer-wrapper -->
+
+</div></div> <!-- /#page, /#page-wrapper -->
+
+  <?php print $page_bottom; ?>
+</body>
+</html>
Index: themes/bartik/node.tpl.php
===================================================================
RCS file: themes/bartik/node.tpl.php
diff -N themes/bartik/node.tpl.php
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ themes/bartik/node.tpl.php	21 Feb 2010 14:26:12 -0000
@@ -0,0 +1,134 @@
+<?php
+// $Id$
+
+/**
+ * @file
+ * Bartik's theme implementation to display a node.
+ *
+ * Available variables:
+ * - $title: the (sanitized) title of the node.
+ * - $content: An array of node items. Use render($content) to print them all, or
+ *   print a subset such as render($content['field_example']). Use
+ *   hide($content['field_example']) to temporarily suppress the printing of a
+ *   given element.
+ * - $user_picture: The node author's picture from user-picture.tpl.php.
+ * - $date: Formatted creation date. Preprocess functions can reformat it by
+ *   calling format_date() with the desired parameters on the $created variable.
+ * - $name: Themed username of node author output from theme_username().
+ * - $node_url: Direct url of the current node.
+ * - $terms: the themed list of taxonomy term links output from theme_links().
+ * - $display_submitted: whether submission information should be displayed.
+ * - $classes: String of classes that can be used to style contextually through
+ *   CSS. It can be manipulated through the variable $classes_array from
+ *   preprocess functions. The default values can be one or more of the following:
+ *   - node: The current template type, i.e., "theming hook".
+ *   - node-[type]: The current node type. For example, if the node is a
+ *     "Blog entry" it would result in "node-blog". Note that the machine
+ *     name will often be in a short form of the human readable label.
+ *   - node-teaser: Nodes in teaser form.
+ *   - node-preview: Nodes in preview mode.
+ *   The following are controlled through the node publishing options.
+ *   - node-promoted: Nodes promoted to the front page.
+ *   - node-sticky: Nodes ordered above other non-sticky nodes in teaser listings.
+ *   - node-unpublished: Unpublished nodes visible only to administrators.
+ * - $title_prefix (array): An array containing additional output populated by
+ *   modules, intended to be displayed in front of the main title tag that
+ *   appears in the template.
+ * - $title_suffix (array): An array containing additional output populated by
+ *   modules, intended to be displayed after the main title tag that appears in
+ *   the template.
+ *
+ * Other variables:
+ * - $node: Full node object. Contains data that may not be safe.
+ * - $type: Node type, i.e. story, page, blog, etc.
+ * - $comment_count: Number of comments attached to the node.
+ * - $uid: User ID of the node author.
+ * - $created: Time the node was published formatted in Unix timestamp.
+ * - $classes_array: Array of html class attribute values. It is flattened
+ *   into a string within the variable $classes.
+ * - $zebra: Outputs either "even" or "odd". Useful for zebra striping in
+ *   teaser listings.
+ * - $id: Position of the node. Increments each time it's output.
+ *
+ * Node status variables:
+ * - $view_mode: View mode, e.g. 'full', 'teaser'...
+ * - $teaser: Flag for the teaser state (shortcut for $view_mode == 'teaser').
+ * - $page: Flag for the full page state.
+ * - $promote: Flag for front page promotion state.
+ * - $sticky: Flags for sticky post setting.
+ * - $status: Flag for published status.
+ * - $comment: State of comment settings for the node.
+ * - $readmore: Flags true if the teaser content of the node cannot hold the
+ *   main body content.
+ * - $is_front: Flags true when presented in the front page.
+ * - $logged_in: Flags true when the current user is a logged-in member.
+ * - $is_admin: Flags true when the current user is an administrator.
+ *
+ * Field variables: for each field instance attached to the node a corresponding
+ * variable is defined, e.g. $node->body becomes $body. When needing to access
+ * a field's raw values, developers/themers are strongly encouraged to use these
+ * variables. Otherwise they will have to explicitly specify the desired field
+ * language, e.g. $node->body['en'], thus overriding any language negotiation
+ * rule that was previously applied.
+ *
+ * @see template_preprocess()
+ * @see template_preprocess_node()
+ * @see template_process()
+ */
+?>
+<div id="node-<?php print $node->nid; ?>" class="<?php print $classes; ?> clearfix"<?php print $attributes; ?>>
+
+  <?php print render($title_prefix); ?>
+  <?php if (!$page): ?>
+    <h2<?php print $title_attributes; ?>>
+      <a href="<?php print $node_url; ?>"><?php print $node_title; ?></a>
+    </h2>
+  <?php endif; ?>
+  <?php print render($title_suffix); ?>
+
+  <?php if ($display_submitted || !empty($content['links']['terms'])): ?>
+    <div class="meta">
+
+      <?php if ($display_submitted): ?>
+        <span class="submitted">
+          <?php print $user_picture; ?>
+          <?php
+            print t('published by !username on !datetime',
+              array('!username' => $name, '!datetime' => $date));
+          ?>
+        </span>
+      <?php endif; ?>
+
+      <?php if (!empty($content['links']['terms'])): ?>
+        <div class="terms terms-inline">
+          <?php print render($content['links']['terms']); ?>
+        </div>
+      <?php endif; ?>
+
+    </div> <!-- /.meta -->
+  <?php endif; ?>
+
+  <div class="content clearfix"<?php print $content_attributes; ?>>
+    <?php
+      // We hide the comments and links now so that we can render them later.
+      hide($content['comments']);
+      hide($content['links']);
+      print render($content);
+    ?>
+  </div>
+
+  <?php
+    // Remove the "Add new comment" link.
+    unset($content['links']['comment']['#links']['comment_add']);
+    $links = render($content['links']);
+    // Only display the wrapper div if there are links.
+    if ($links):
+  ?>
+    <div class="link-wrapper">
+      <?php print $links; ?>
+    </div>
+  <?php endif; ?>
+
+  <?php print render($content['comments']); ?>
+
+</div>
Index: themes/bartik/page.tpl.php
===================================================================
RCS file: themes/bartik/page.tpl.php
diff -N themes/bartik/page.tpl.php
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ themes/bartik/page.tpl.php	21 Feb 2010 14:26:12 -0000
@@ -0,0 +1,274 @@
+<?php
+// $Id$
+
+/**
+ * @file
+ * Bartik's theme implementation to display a single Drupal page.
+ *
+ * Available variables:
+ *
+ * General utility variables:
+ * - $base_path: The base URL path of the Drupal installation. At the very
+ *   least, this will always default to /.
+ * - $directory: The directory the template is located in, e.g. modules/system
+ *   or themes/garland.
+ * - $is_front: TRUE if the current page is the front page.
+ * - $logged_in: TRUE if the user is registered and signed in.
+ * - $is_admin: TRUE if the user has permission to access administration pages.
+ *
+ * Site identity:
+ * - $front_page: The URL of the front page. Use this instead of $base_path,
+ *   when linking to the front page. This includes the language domain or
+ *   prefix.
+ * - $logo: The path to the logo image, as defined in theme configuration.
+ * - $site_name: The name of the site, empty when display has been disabled
+ *   in theme settings.
+ * - $site_slogan: The slogan of the site, empty when display has been disabled
+ *   in theme settings.
+ * - $hide_site_name: TRUE if the site name has been toggled off on the theme
+ *   settings page. If hidden, the "element-invisible" class is added to make
+ *   the site name visually hidden, but still accessible.
+ * - $hide_site_slogan: TRUE if the site slogan has been toggled off on the
+ *   theme settings page. If hidden, the "element-invisible" class is added to
+ *   make the site slogan visually hidden, but still accessible.
+ *
+ * Navigation:
+ * - $main_menu (array): An array containing the Main menu links for the
+ *   site, if they have been configured.
+ * - $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.
+ *
+ * Page content (in order of occurrence in the default page.tpl.php):
+ * - $title_prefix (array): An array containing additional output populated by
+ *   modules, intended to be displayed in front of the main title tag that
+ *   appears in the template.
+ * - $title: The page title, for use in the actual HTML content.
+ * - $title_suffix (array): An array containing additional output populated by
+ *   modules, intended to be displayed after the main title tag that appears in
+ *   the template.
+ * - $messages: HTML for status and error messages. Should be displayed
+ *   prominently.
+ * - $tabs (array): Tabs linking to any sub-pages beneath the current page
+ *   (e.g., the view and edit tabs when displaying a node).
+ * - $action_links (array): Actions local to the page, such as 'Add menu' on the
+ *   menu administration interface.
+ * - $feed_icons: A string of all feed icons for the current page.
+ * - $node: The node object, if there is an automatically-loaded node
+ *   associated with the page, and the node ID is the second argument
+ *   in the page's path (e.g. node/12345 and node/12345/revisions, but not
+ *   comment/reply/12345).
+ *
+ * Regions:
+ * - $page['header']: Items for the header region.
+ * - $page['featured']: Items for the featured region.
+ * - $page['highlight']: Items for the highlighted content region.
+ * - $page['help']: Dynamic help text, mostly for admin pages.
+ * - $page['content']: The main content of the current page.
+ * - $page['sidebar_first']: Items for the first sidebar.
+ * - $page['triptych_first']: Items for the first triptych.
+ * - $page['triptych_middle']: Items for the middle triptych.
+ * - $page['triptych_last']: Items for the last triptych.
+ * - $page['footer_firstcolumn']: Items for the first footer column.
+ * - $page['footer_secondcolumn']: Items for the second footer column.
+ * - $page['footer_thirdcolumn']: Items for the third footer column.
+ * - $page['footer_fourthcolumn']: Items for the fourth footer column.
+ * - $page['footer']: Items for the footer region.
+ *
+ * @see template_preprocess()
+ * @see template_preprocess_page()
+ * @see template_process()
+ * @see bartik_process_page()
+ */
+?>
+<div id="page-wrapper"><div id="page">
+
+  <div id="header"><div class="section clearfix">
+
+    <?php if ($logo): ?>
+      <a href="<?php print $front_page; ?>" title="<?php print t('Home'); ?>" rel="home" id="logo">
+        <img src="<?php print $logo; ?>" alt="<?php print t('Home'); ?>" />
+      </a>
+    <?php endif; ?>
+
+    <?php if ($site_name || $site_slogan): ?>
+      <div id="name-and-slogan"<?php if ($hide_site_name && $hide_site_slogan) { print ' class="element-invisible"'; } ?>>
+
+        <?php if ($site_name): ?>
+          <?php if ($title): ?>
+            <div id="site-name"<?php if ($hide_site_name) { print ' class="element-invisible"'; } ?>>
+              <strong>
+                <a href="<?php print $front_page; ?>" title="<?php print t('Home'); ?>" rel="home"><span><?php print $site_name; ?></span></a>
+              </strong>
+            </div>
+          <?php else: /* Use h1 when the content title is empty */ ?>
+            <h1 id="site-name"<?php if ($hide_site_name) { print ' class="element-invisible"'; } ?>>
+              <a href="<?php print $front_page; ?>" title="<?php print t('Home'); ?>" rel="home"><span><?php print $site_name; ?></span></a>
+            </h1>
+          <?php endif; ?>
+        <?php endif; ?>
+
+        <?php if ($site_slogan): ?>
+          <div id="site-slogan"<?php if ($hide_site_slogan) { print ' class="element-invisible"'; } ?>>
+            <?php print $site_slogan; ?>
+          </div>
+        <?php endif; ?>
+
+      </div> <!-- /#name-and-slogan -->
+    <?php endif; ?>
+
+    <?php print render($page['header']); ?>
+
+    <?php if ($main_menu): ?>
+      <div id="navigation"><div class="section clearfix">
+        <?php print theme('links__system_main_menu', array(
+          'links' => $main_menu,
+          'attributes' => array(
+            'id' => 'main-menu',
+            'class' => array('links', 'clearfix'),
+          ),
+          'heading' => array(
+            'text' => t('Main menu'),
+            'level' => 'h2',
+            'class' => array('element-invisible'),
+          ),
+        )); ?>
+      </div></div> <!-- /.section, /#navigation -->
+    <?php endif; ?>
+
+  </div></div> <!-- /.section, /#header -->
+
+  <?php if ($messages): ?>
+    <div id="messages"><div class="section clearfix">
+      <?php print $messages; ?>
+    </div></div> <!-- /.section, /#messages -->
+  <?php endif; ?>
+
+  <?php if ($page['featured']): ?>
+    <div id="featured" class="region"><div class="section clearfix">
+      <?php print render($page['featured']); ?>
+    </div></div> <!-- /.section, /#featured -->
+  <?php endif; ?>
+
+  <div id="main-wrapper"><div id="main" class="clearfix">
+
+    <?php if ($breadcrumb): ?>
+      <div id="breadcrumb"><?php print $breadcrumb; ?></div>
+    <?php endif; ?>
+
+    <?php if ($page['sidebar_first']): ?>
+      <div id="sidebar-first" class="column sidebar"><div class="section">
+        <?php print render($page['sidebar_first']); ?>
+      </div></div> <!-- /.section, /#sidebar-first -->
+    <?php endif; ?>
+
+    <div id="content" class="column"><div class="section">
+      <?php if ($page['highlight']): ?><div id="highlight"><?php print render($page['highlight']); ?></div><?php endif; ?>
+      <a id="main-content"></a>
+      <?php print render($title_prefix); ?>
+      <?php if ($title): ?>
+        <h1 class="title" id="page-title">
+          <?php print $title; ?>
+        </h1>
+      <?php endif; ?>
+      <?php print render($title_suffix); ?>
+      <?php if ($tabs): ?>
+        <div class="tabs">
+          <?php print render($tabs); ?>
+        </div>
+      <?php endif; ?>
+      <?php print render($page['help']); ?>
+      <?php if ($action_links): ?>
+        <ul class="action-links">
+          <?php print render($action_links); ?>
+        </ul>
+      <?php endif; ?>
+      <?php print render($page['content']); ?>
+      <?php print $feed_icons; ?>
+
+    </div></div> <!-- /.section, /#content -->
+    <?php if ($page['sidebar_second']): ?>
+      <div id="sidebar-second" class="column sidebar"><div class="section">
+        <?php print render($page['sidebar_second']); ?>
+      </div></div> <!-- /.section, /#sidebar-second -->
+    <?php endif; ?>
+
+  </div></div> <!-- /#main, /#main-wrapper -->
+
+  <?php if ($page['triptych_first'] || $page['triptych_middle'] || $page['triptych_last']): ?>
+    <div id="triptych-wrapper"><div id="triptych" class="clearfix">
+
+      <?php if ($page['triptych_first']): ?>
+        <div id="triptych-first" class="region triptych"><div class="section">
+          <?php print render($page['triptych_first']); ?>
+        </div></div> <!-- /.section, /#triptych-first -->
+      <?php endif; ?>
+
+      <?php if ($page['triptych_middle']): ?>
+        <div id="triptych-middle" class="region triptych"><div class="section">
+          <?php print render($page['triptych_middle']); ?>
+        </div></div> <!-- /.section, /#triptych-middle -->
+      <?php endif; ?>
+
+      <?php if ($page['triptych_last']): ?>
+        <div id="triptych-last" class="region triptych"><div class="section">
+          <?php print render($page['triptych_last']); ?>
+        </div></div> <!-- /.section, /#triptych-last -->
+      <?php endif; ?>
+
+    </div></div> <!-- /#triptych, /#triptych-wrapper -->
+  <?php endif; ?>
+
+  <div id="footer-wrapper"><div class="section">
+
+    <?php if ($page['footer_firstcolumn'] || $page['footer_secondcolumn'] || $page['footer_thirdcolumn'] || $page['footer_fourthcolumn']): ?>
+      <div id="footer-columns" class="clearfix">
+
+        <?php if ($page['footer_firstcolumn']): ?>
+          <div id="footer-firstcolumn" class="region sitemap"><div class="section">
+            <?php print render($page['footer_firstcolumn']); ?>
+          </div></div> <!-- /.section, /#footer-firstcolumn -->
+        <?php endif; ?>
+
+        <?php if ($page['footer_secondcolumn']): ?>
+          <div id="footer-secondcolumn" class="region sitemap"><div class="section">
+            <?php print render($page['footer_secondcolumn']); ?>
+          </div></div> <!-- /.section, /#footer-secondcolumn -->
+        <?php endif; ?>
+
+        <?php if ($page['footer_thirdcolumn']): ?>
+          <div id="footer-thirdcolumn" class="region sitemap"><div class="section">
+            <?php print render($page['footer_thirdcolumn']); ?>
+          </div></div> <!-- /.section, /#footer-thirdcolumn -->
+        <?php endif; ?>
+
+        <?php if ($page['footer_fourthcolumn']): ?>
+          <div id="footer-fourthcolumn" class="region sitemap"><div class="section">
+            <?php print render($page['footer_fourthcolumn']); ?>
+          </div></div> <!-- /.section, /#footer-fourthcolumn -->
+        <?php endif; ?>
+
+      </div><!-- /#footer-columns -->
+    <?php endif; ?>
+
+    <?php if ($page['footer'] || $secondary_menu): ?>
+      <div id="footer" class="clearfix">
+        <?php print theme('links__system_secondary_menu', array(
+          'links' => $secondary_menu,
+          'attributes' => array(
+            'id' => 'secondary-menu',
+            'class' => array('links', 'clearfix'),
+          ),
+          'heading' => array(
+            'text' => t('Secondary menu'),
+            'level' => 'h2',
+            'class' => array('element-invisible'),
+          ),
+        )); ?>
+        <?php print render($page['footer']); ?>
+    </div><!-- /#footer -->
+    <?php endif; ?>
+
+  </div></div> <!-- /.section, /#footer-wrapper -->
+
+</div></div> <!-- /#page, /#page-wrapper -->
Index: themes/bartik/screenshot.png
===================================================================
RCS file: themes/bartik/screenshot.png
diff -N themes/bartik/screenshot.png
Binary files /dev/null and screenshot.png differ
Index: themes/bartik/template.php
===================================================================
RCS file: themes/bartik/template.php
diff -N themes/bartik/template.php
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ themes/bartik/template.php	21 Feb 2010 14:26:12 -0000
@@ -0,0 +1,89 @@
+<?php
+// $Id$
+
+/**
+ * Add body classes if certain regions have content.
+ */
+function bartik_preprocess_html(&$variables) {
+  if (!empty($variables['page']['featured'])) {
+    $variables['classes_array'][] = 'featured';
+  }
+
+  if (!empty($variables['page']['triptych_first'])
+    || !empty($variables['page']['triptych_middle'])
+    || !empty($variables['page']['triptych_last'])) {
+    $variables['classes_array'][] = 'triptych';
+  }
+
+  if (!empty($variables['page']['footer_firstcolumn'])
+    || !empty($variables['page']['footer_secondcolumn'])
+    || !empty($variables['page']['footer_thirdcolumn'])
+    || !empty($variables['page']['footer_fourthcolumn'])) {
+    $variables['classes_array'][] = 'footer-columns';
+  }
+}
+
+/**
+ * Override or insert variables into the page template for HTML output.
+ */
+function bartik_process_html(&$variables) {
+  // Hook into color.module.
+  if (module_exists('color')) {
+    _color_html_alter($variables);
+  }
+}
+
+/**
+ * Override or insert variables into the page template.
+ */
+function bartik_process_page(&$variables) {
+  // Hook into color.module.
+  if (module_exists('color')) {
+    _color_page_alter($variables);
+  }
+  // Always print the site name, but don't always show it visually.
+  $variables['hide_site_name']   = theme_get_setting('toggle_name') ? FALSE : TRUE;
+  $variables['hide_site_slogan'] = theme_get_setting('toggle_slogan') ? FALSE : TRUE;
+  if ($variables['hide_site_name']) {
+    // If toggle_name is FALSE, the site_name will be empty, so we rebuild it.
+    $variables['site_name'] = filter_xss_admin(variable_get('site_name', 'Drupal'));
+  }
+  if ($variables['hide_site_slogan']) {
+    // If toggle_site_slogan is FALSE, the site_slogan will be empty, so we rebuild it.
+    $variables['site_slogan'] = filter_xss_admin(variable_get('site_slogan', ''));
+  }
+
+  // Load sample content if requested.
+  if (theme_get_setting('bartik_sample_regions') && user_access('administer themes')) {
+    include_once './' . drupal_get_path('theme', 'bartik') . '/theme-settings.php';
+    _bartik_process_page($variables);
+  }
+}
+
+/**
+ * Override or insert variables into the maintenance page template.
+ */
+function bartik_process_maintenance_page(&$variables) {
+  // Always print the site name, but don't always show it visually.
+  $variables['hide_site_name']   = theme_get_setting('toggle_name') ? FALSE : TRUE;
+  $variables['hide_site_slogan'] = theme_get_setting('toggle_slogan') ? FALSE : TRUE;
+  if ($variables['hide_site_name']) {
+    // If toggle_name is FALSE, the site_name will be empty, so we rebuild it.
+    $variables['site_name'] = filter_xss_admin(variable_get('site_name', 'Drupal'));
+  }
+  if ($variables['hide_site_slogan']) {
+    // If toggle_site_slogan is FALSE, the site_slogan will be empty, so we rebuild it.
+    $variables['site_slogan'] = filter_xss_admin(variable_get('site_slogan', ''));
+  }
+}
+
+/**
+ * Override or insert variables into the block template.
+ */
+function bartik_preprocess_block(&$variables) {
+  // In the header region, visually hide the title of any menu block or of the
+  // user login block, but leave it accessible.
+  if ($variables['block']->region == 'header' && ($variables['block']->module == 'menu' || $variables['block']->module == 'user' && $variables['block']->delta == 'login')) {
+    $variables['title_attributes_array']['class'][] = 'element-invisible';
+  }
+}
Index: themes/bartik/theme-settings.php
===================================================================
RCS file: themes/bartik/theme-settings.php
diff -N themes/bartik/theme-settings.php
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ themes/bartik/theme-settings.php	21 Feb 2010 14:26:12 -0000
@@ -0,0 +1,99 @@
+<?php
+// $Id$
+
+/**
+ * Implement hook_form_system_theme_settings_alter() function.
+ *
+ * @param $form
+ *   Nested array of form elements that comprise the form.
+ * @param $form_state
+ *   A keyed array containing the current state of the form.
+ */
+function bartik_form_system_theme_settings_alter(&$form, &$form_state) {
+  $form['bartik_sample_regions'] = array(
+    '#type'          => 'checkbox',
+    '#title'         => t('Display sample content in empty regions'),
+    '#default_value' => theme_get_setting('bartik_sample_regions'),
+    '#description'   => t("When previewing this theme, it's useful to see the styling for all regions even if they won't have any content by default."),
+  );
+}
+
+/**
+ * Helper function that inserts sample content into empty regions.
+ */
+function _bartik_process_page(&$variables) {
+  // Lorem ipsum is Latin and doesn't need to be translated.
+  $paragraph = '<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.</p>';
+  // List of links to be used in footer regions.
+  $list = theme('links', array(
+    'links' => array(
+      'jean-bartik' => array(
+        'title' => t('Jean Bartik'),
+        'href' => 'http://www.google.com/search?q=Jean+Bartik',
+        'absolute'  => TRUE,
+      ),
+      'bartik-settings' => array(
+        'title' => t('Bartik theme settings'),
+        'href' => 'admin/appearance/settings/bartik',
+      ),
+      'drupal' => array(
+        'title' => t('Drupal.org'),
+        'href' => 'http://drupal.org',
+        'absolute'  => TRUE,
+      ),
+      'theme-guide' => array(
+        'title' => t('Drupal theme guide'),
+        'href' => 'http://drupal.org/theme-guide',
+        'absolute'  => TRUE,
+      ),
+    ),
+  ));
+  // Generate a link to the settings.
+  $link = '<p class="sample-regions-link">' . t('This sample content can be turned off using the “Display sample content in empty regions” option on the !link page.', array('!link' => l(t('Bartik settings'), 'admin/appearance/settings/bartik'))) . '</p>';
+
+  // Create a fake block.
+  $block = new stdClass();
+  $block->module     = 'bartik';
+  $block->theme      = 'bartik';
+  $block->status     = 1;
+  $block->weight     = 0;
+  $block->custom     = 0;
+  $block->visibility = 0;
+  $block->pages      = '';
+  $block->title      = '';
+  $block->cache      = DRUPAL_NO_CACHE;
+  $block->subject    = 'Lorem ipsum';
+
+  // Grab the list of visible regions.
+  $regions = system_region_list('bartik', REGIONS_VISIBLE);
+  // Ignore common regions.
+  $ignore_regions = array('header', 'highlight', 'help', 'content', 'footer');
+
+  // Generate sample content for any empty regions.
+  $bid = 1000;
+  foreach ($regions as $region => $label) {
+    if (!in_array($region, $ignore_regions) && empty($variables['page'][$region])) {
+      // Set dynamic bits of the fake block.
+      $bid++;
+      $block->bid    = $bid;
+      $block->delta  = 'delta-' . $bid;
+      $block->region = $region;
+      // Show the list of links in the footer regions, otherwise show lorem ipsum.
+      if (strpos($region, 'footer_') === 0) {
+        $content = $list . $link;
+      }
+      else {
+        $content = $paragraph . $link;
+      }
+      // Load the region.
+      $variables['page'][$region] = array(
+        'bartik_sample_block' => array(
+          '#markup'         => $content,
+          '#block'          => $block,
+          '#weight'         => 0,
+          '#theme_wrappers' => array('block'),
+        ),
+      );
+    }
+  }
+}