? .DS_Store
? node-tpl-php-9.patch
? modules/node/.DS_Store
? modules/user/.DS_Store
? sites/default/files
? sites/default/settings.php
Index: modules/node/node.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/node/node.tpl.php,v
retrieving revision 1.18
diff -u -p -r1.18 node.tpl.php
--- modules/node/node.tpl.php	23 Jul 2009 22:12:53 -0000	1.18
+++ modules/node/node.tpl.php	3 Aug 2009 05:29:35 -0000
@@ -11,8 +11,7 @@
  *   print a subset such as render($content['field_example']). Use
  *   hide($content['field_example']) to temporarily suppress the printing of a
  *   given element.
- * - $picture: The authors picture of the node output from
- *   theme_user_picture().
+ * - $user_picture: The node author's picture.
  * - $date: Formatted creation date (use $created to reformat with
  *   format_date()).
  * - $name: Themed username of node author output from theme_username().
@@ -65,23 +64,25 @@
  * @see template_process()
  */
 ?>
-<div id="node-<?php print $node->nid; ?>" class="<?php print $classes ?> clearfix">
+<div id="node-<?php print $node->nid; ?>" class="<?php print $classes; ?> clearfix">
 
-<?php print $picture ?>
+  <?php print $user_picture; ?>
 
-<?php if (!$page): ?>
-  <h2><a href="<?php print $node_url ?>"><?php print $title ?></a></h2>
-<?php endif; ?>
-
-  <div class="meta">
-  <?php if ($submitted): ?>
-    <span class="submitted"><?php print $submitted ?></span>
+  <?php if (!$page): ?>
+    <h2><a href="<?php print $node_url; ?>"><?php print $title; ?></a></h2>
   <?php endif; ?>
 
-  <?php if (!empty($content['links']['terms'])): ?>
-    <div class="terms terms-inline"><?php render($content['links']['terms']) ?></div>
-  <?php endif;?>
-  </div>
+  <?php if ($submitted || !empty($content['links']['terms'])): ?>
+    <div class="meta">
+      <?php if ($submitted): ?>
+        <span class="submitted"><?php print $submitted; ?></span>
+      <?php endif; ?>
+
+      <?php if (!empty($content['links']['terms'])): ?>
+        <div class="terms terms-inline"><?php render($content['links']['terms']); ?></div>
+      <?php endif; ?>
+    </div>
+  <?php endif; ?>
 
   <div class="content">
     <?php
@@ -96,4 +97,4 @@
 
   <?php print render($content['comments']); ?>
 
-</div>
+</div>
\ No newline at end of file
Index: modules/user/user-picture.tpl.php
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user-picture.tpl.php,v
retrieving revision 1.4
diff -u -p -r1.4 user-picture.tpl.php
--- modules/user/user-picture.tpl.php	24 Apr 2009 09:03:21 -0000	1.4
+++ modules/user/user-picture.tpl.php	3 Aug 2009 05:29:36 -0000
@@ -7,7 +7,7 @@
  * user's account.
  *
  * Available variables:
- * - $picture: Image set by the user or the site's default. Will be linked
+ * - $user_picture: Image set by the user or the site's default. Will be linked
  *   depending on the viewer's permission to view the users profile page.
  * - $account: Array of account information. Potentially unsafe. Be sure to
  *   check_plain() before use.
@@ -15,8 +15,8 @@
  * @see template_preprocess_user_picture()
  */
 ?>
-<?php if ($picture): ?>
-  <div class="picture">
-    <?php print $picture; ?>
+<?php if ($user_picture): ?>
+  <div class="user-picture">
+    <?php print $user_picture; ?>
   </div>
 <?php endif; ?>
Index: modules/user/user.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/user/user.module,v
retrieving revision 1.1015
diff -u -p -r1.1015 user.module
--- modules/user/user.module	31 Jul 2009 19:01:03 -0000	1.1015
+++ modules/user/user.module	3 Aug 2009 05:29:37 -0000
@@ -1153,7 +1153,7 @@ function user_block_view($delta = '') {
  * @see user-picture.tpl.php
  */
 function template_preprocess_user_picture(&$variables) {
-  $variables['picture'] = '';
+  $variables['user_picture'] = '';
   if (variable_get('user_pictures', 0)) {
     $account = $variables['account'];
     if (!empty($account->picture)) {
@@ -1177,14 +1177,14 @@ function template_preprocess_user_pictur
     if (isset($filepath)) {
       $alt = t("@user's picture", array('@user' => $account->name ? $account->name : variable_get('anonymous', t('Anonymous'))));
       if (module_exists('image') && $style = variable_get('user_picture_style', '')) {
-        $variables['picture'] = theme('image_style', $style, $filepath, $alt, $alt, array(), FALSE);
+        $variables['user_picture'] = theme('image_style', $style, $filepath, $alt, $alt, array(), FALSE);
       }
       else {
-        $variables['picture'] = theme('image', $filepath, $alt, $alt, array(), FALSE);
+        $variables['user_picture'] = theme('image', $filepath, $alt, $alt, array(), FALSE);
       }
       if (!empty($account->uid) && user_access('access user profiles')) {
         $attributes = array('attributes' => array('title' => t('View user profile.')), 'html' => TRUE);
-        $variables['picture'] = l($variables['picture'], "user/$account->uid", $attributes);
+        $variables['user_picture'] = l($variables['user_picture'], "user/$account->uid", $attributes);
       }
     }
   }
Index: themes/garland/style-rtl.css
===================================================================
RCS file: /cvs/drupal/drupal/themes/garland/style-rtl.css,v
retrieving revision 1.14
diff -u -p -r1.14 style-rtl.css
--- themes/garland/style-rtl.css	3 Aug 2009 03:04:34 -0000	1.14
+++ themes/garland/style-rtl.css	3 Aug 2009 05:29:37 -0000
@@ -11,15 +11,22 @@ body {
   direction: rtl;
 }
 
-ul, .block ul, ol {
+ul,
+ol,
+.block ul, {
   padding: 0 1.5em 0 0;
 }
 
-ul.menu, .item-list ul {
+ul.menu,
+.item-list ul {
   margin: 0.35em -0.5em 0 0;
 }
 
-ol li, ul li, ul.menu li, .item-list ul li, li.leaf {
+ol li,
+ul li,
+ul.menu li,
+.item-list ul li,
+li.leaf {
   margin: 0.15em .5em 0.15em 0;
 }
 
@@ -68,7 +75,8 @@ dl dd {
   padding: 0 1.3 0 0;
 }
 
-.form-button, .form-submit {
+.form-button,
+.form-submit {
   margin: 2em 0 1em 0.5em;
 }
 
@@ -181,8 +189,14 @@ h2.with-tabs {
   margin: 0 0 0 2em;
 }
 
-ul.primary li a, ul.primary li.active a, ul.primary li a:hover, ul.primary li a:visited,
-ul.secondary li a, ul.secondary li.active a, ul.secondary li a:hover, ul.secondary li a:visited {
+ul.primary li a,
+ul.primary li.active a,
+ul.primary li a:hover,
+ul.primary li a:visited,
+ul.secondary li a,
+ul.secondary li.active a,
+ul.secondary li a:hover,
+ul.secondary li a:visited {
   margin: 0 1px 0 0;
 
 }
@@ -191,22 +205,26 @@ ul.primary li a:after {
   content: " ";
 }
 
-ul.links li, ul.inline li {
+ul.links li,
+ul.inline li {
   padding-left: 1em;
   padding-right: 0;
 }
 
-.node .links, .comment .links {
+.node .links,
+.comment .links {
   text-align: right;
 }
 
-.node .links ul.links li, .comment .links ul.links li {}
+.node .links ul.links li,
+.comment .links ul.links li {}
 .terms ul.links li {
   padding-right: 1em;
   padding-left: 0;
 }
 
-.picture, .comment .submitted {
+.user-picture,
+.comment .submitted {
   padding-left: 0;
   float: left;
   clear: left;
@@ -293,8 +311,14 @@ div.admin .right {
  */
 
 /* Position:relative on these breaks IE7. */
-ul.primary li a, ul.primary li.active a, ul.primary li a:hover, ul.primary li a:visited,
-ul.secondary li a, ul.secondary li.active a, ul.secondary li a:hover, ul.secondary li a:visited {
+ul.primary li a,
+ul.primary li.active a,
+ul.primary li a:hover,
+ul.primary li a:visited,
+ul.secondary li a,
+ul.secondary li.active a,
+ul.secondary li a:hover,
+ul.secondary li a:visited {
   position: static;
 }
 
Index: themes/garland/style.css
===================================================================
RCS file: /cvs/drupal/drupal/themes/garland/style.css,v
retrieving revision 1.60
diff -u -p -r1.60 style.css
--- themes/garland/style.css	3 Aug 2009 03:04:34 -0000	1.60
+++ themes/garland/style.css	3 Aug 2009 05:29:37 -0000
@@ -673,7 +673,8 @@ ul.links li, ul.inline li {
   padding-left: 1em;
 }
 
-.picture, .comment .submitted {
+.picture,
+.comment .submitted {
   float: right; /* LTR */
   clear: right; /* LTR */
   padding-left: 1em; /* LTR */