? files
? generate-content.php
? t.patch
? modules/devel
? modules/project
? modules/timesheet
? modules/tinymce
? modules/znode_tabs
? themes/spreadfirefox
Index: misc/drupal.css
===================================================================
RCS file: /cvs/drupal/drupal/misc/drupal.css,v
retrieving revision 1.134
diff -u -r1.134 drupal.css
--- misc/drupal.css	17 Jan 2006 21:19:43 -0000	1.134
+++ misc/drupal.css	18 Jan 2006 04:10:57 -0000
@@ -195,26 +195,18 @@
 #aggregator .feed img {
   float: right;
 }
-#aggregator .news-item {
-  clear: both;
-  padding-bottom: 1em;
+#aggregator .feed-item {
+  margin-bottom: 1.5em;
 }
-#aggregator .news-item .date {
-  float: right;
+#aggregator .feed-item-title {
+  margin-bottom: 0;
 }
-#aggregator .news-item .body {
-  margin-top: 1em;
-  margin-left: 1em;
+#aggregator .feed-item-meta, #aggregator .feed-item-body {
+  margin-bottom: 0.5em;
 }
-#aggregator .news-item .body .feed {
+#aggregator .feed-item-categories {
   font-size: 0.9em;
 }
-#aggregator .news-item .title {
-  float: left;
-}
-#aggregator .news-item .description {
-  clear: both;
-}
 #aggregator td {
   vertical-align: bottom;
 }
Index: modules/aggregator.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/aggregator.module,v
retrieving revision 1.269
diff -u -r1.269 aggregator.module
--- modules/aggregator.module	15 Jan 2006 17:03:34 -0000	1.269
+++ modules/aggregator.module	18 Jan 2006 04:16:21 -0000
@@ -1214,27 +1214,25 @@
  * @ingroup themeable
  */
 function theme_aggregator_page_item($item) {
-  static $last;
-
-  $date = format_date($item->timestamp, 'custom', 'Ymd');
-  if ($date != $last) {
-    $last = $date;
-    $output .= '<h3>'. format_date($item->timestamp, 'custom', 'F j, Y') ."</h3>\n";
-  }
-
-  $output .= "<div class=\"news-item\">\n";
-  $output .= ' <div class="date">'. format_date($item->timestamp, 'custom', 'H:i') ."</div>\n";
-  $output .= " <div class=\"body\">\n";
-
+  
   $source = '';
   if ($item->ftitle && $item->fid) {
-    $source = '<span class="source">'. l($item->ftitle, "aggregator/sources/$item->fid") .":</span>\n";
+    $source = l($item->ftitle, "aggregator/sources/$item->fid", array('class' => 'feed-item-source')) . ' -';
   }
-
-  $output .= '  <div class="title">'. $source .'<a href="'. check_url($item->link) .'">'. check_plain($item->title) ."</a></div>\n";
+  
+  if (date('Ymd', $item->timestamp) == date('Ymd')) {
+    $source_date = t('%ago ago', array('%ago' => format_interval(time() - $item->timestamp)));
+  }
+  else {
+    $source_date = format_date($item->timestamp, 'custom', variable_get('date_format_medium', 'D, Y-m-d H:i'));
+  }
+  
+  $output .= "<div class=\"feed-item\">\n";
+  $output .= '<h3 class="feed-item-title"><a href="'. check_url($item->link) .'">'. check_plain($item->title) ."</a></h3>\n";
+  $output .= "<div class=\"feed-item-meta\">$source <span class=\"feed-item-date\">$source_date</span></div>\n";
 
   if ($item->description) {
-    $output .= '  <div class="description">'. $item->description ."</div>\n";
+    $output .= '<div class="feed-item-body">'. filter_xss($item->description) ."</div>\n";
   }
 
   $result = db_query('SELECT c.title, c.cid FROM {aggregator_category_item} ci LEFT JOIN {aggregator_category} c ON ci.cid = c.cid WHERE ci.iid = %d ORDER BY c.title', $item->iid);
@@ -1243,10 +1241,9 @@
     $categories[] = l($category->title, 'aggregator/categories/'. $category->cid);
   }
   if ($categories) {
-    $output .= '  <div class="categories">'. t('Categories') .': '. implode(', ', $categories) ."</div>\n";
+    $output .= '<div class="feed-item-categories">'. t('Categories') .': '. implode(', ', $categories) ."</div>\n";
   }
 
-  $output .= " </div>\n";
   $output .= "</div>\n";
 
   return $output;