? 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.133
diff -u -r1.133 drupal.css
--- misc/drupal.css	14 Jan 2006 09:40:22 -0000	1.133
+++ misc/drupal.css	16 Jan 2006 22:13:13 -0000
@@ -192,8 +192,15 @@
 /*
 ** Module specific styles
 */
-#aggregator .feed img {
-  float: right;
+#aggregator .feed-source .feed-title {
+  margin-top:0;
+}
+#aggregator .feed-source .feed-image img {
+  margin-bottom:0.75em;
+}
+#aggregator .feed-source .feed-icon {
+  float:right;
+  display:block;
 }
 #aggregator .news-item {
   clear: both;
@@ -206,7 +213,7 @@
   margin-top: 1em;
   margin-left: 1em;
 }
-#aggregator .news-item .body .feed {
+#aggregator .news-item .body .feed-source {
   font-size: 0.9em;
 }
 #aggregator .news-item .title {
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	16 Jan 2006 22:34:37 -0000
@@ -423,7 +423,8 @@
         }
 
         if ($image['LINK'] && $image['URL'] && $image['TITLE']) {
-          $image = '<a href="'. $image['LINK'] .'"><img src="'. $image['URL'] .'" alt="'. $image['TITLE'] .'" /></a>';
+          // Note, we should really use theme_image() here but that only works with local images it won't work with images fetched with a URL unless PHP version > 5
+          $image = '<a href="'. $image['LINK'] .'" class="feed-image"><img src="'. $image['URL'] .'" alt="'. $image['TITLE'] .'" /></a>';
         }
         else {
           $image = NULL;
@@ -908,7 +909,7 @@
   $feed = db_fetch_object(db_query('SELECT * FROM {aggregator_feed} WHERE fid = %d', arg(2)));
   $info = theme('aggregator_feed', $feed);
 
-  return _aggregator_page_list('SELECT * FROM {aggregator_item} WHERE fid = '. $feed->fid .' ORDER BY timestamp DESC, iid DESC', arg(3), "<div class=\"feed\">$info</div>");
+  return _aggregator_page_list('SELECT * FROM {aggregator_item} WHERE fid = '. $feed->fid .' ORDER BY timestamp DESC, iid DESC', arg(3), $info);
 }
 
 /**
@@ -1148,25 +1149,22 @@
  * @ingroup themeable
  */
 function theme_aggregator_feed($feed) {
-  $output  = '';
-
-  if ($feed->image) {
-    $output .= $feed->image;
-  }
-
-  $output .= $feed->description;
-  $output .= '<h3>'. t('URL') ."</h3>\n";
-  $output .= theme('xml_icon', $feed->url);
-  $output .= '<a href="'. check_url($feed->link) .'">'. check_plain($feed->link) ."</a>\n";
-  $output .= '<h3>'. t('Last update') ."</h3>\n";
+  $output  = '<div class="feed-source">';
+  $output .= theme('feed_icon', $feed->url) ."\n";
+  $output .= $feed->image . ' <h3 class="feed-title"><a href="'. check_url($feed->link) .'">'. check_plain($feed->title) ."</a></h3>\n";
+  $output .= '<div class="feed-description"><em>'. t('Description:') .' </em> '. check_plain($feed->description) ."</div>\n";
+  $output .= '<div class="feed-updated"><em>'. t('Updated: ') .' </em> ';
+  
   $updated = t('%time ago', array('%time' => format_interval(time() - $feed->checked)));
-
+  
   if (user_access('administer news feeds')) {
     $output .= l($updated, 'admin/aggregator');
   }
   else {
     $output .= $updated;
   }
+  
+  $output .= "</div></div>\n";
 
   return $output;
 }
Index: themes/bluemarine/style.css
===================================================================
RCS file: /cvs/drupal/drupal/themes/bluemarine/style.css,v
retrieving revision 1.11
diff -u -r1.11 style.css
--- themes/bluemarine/style.css	2 Sep 2005 19:18:14 -0000	1.11
+++ themes/bluemarine/style.css	16 Jan 2006 21:00:13 -0000
@@ -272,7 +272,7 @@
 /*
 ** Module specific styles
 */
-#aggregator .feed {
+#aggregator .feed-source {
   background-color: #eee;
   border: 1px solid #ccc;
   padding: 1em;
Index: themes/chameleon/common.css
===================================================================
RCS file: /cvs/drupal/drupal/themes/chameleon/common.css,v
retrieving revision 1.8
diff -u -r1.8 common.css
--- themes/chameleon/common.css	20 Sep 2004 14:36:53 -0000	1.8
+++ themes/chameleon/common.css	16 Jan 2006 22:27:56 -0000
@@ -145,7 +145,7 @@
 .form-item textarea {
   font-size: 1em;
 }
-#aggregator .feed {
+#aggregator .feed-source {
   border: 1px solid gray;
   padding: 1em;
 }
Index: themes/pushbutton/style.css
===================================================================
RCS file: /cvs/drupal/drupal/themes/pushbutton/style.css,v
retrieving revision 1.12
diff -u -r1.12 style.css
--- themes/pushbutton/style.css	2 Sep 2005 19:18:14 -0000	1.12
+++ themes/pushbutton/style.css	16 Jan 2006 22:28:13 -0000
@@ -482,7 +482,7 @@
 .content .active {
   color: #369;
 }
-#aggregator .feed {
+#aggregator .feed-source {
   background-color: #eee;
   border: 1px solid #ccc;
   padding: 1em;