6 files changed, 27 insertions, 29 deletions
diff --git a/misc/drupal.css b/misc/drupal.css
index 337e27255..f659c63f6 100644
--- a/misc/drupal.css
+++ b/misc/drupal.css
@@ -210,11 +210,11 @@ tr.odd .form-item, tr.even .form-item {
   padding-bottom: 1em;
 }
 #aggregator .news-item .date {
-  float: left;
+  float: right;
 }
 #aggregator .news-item .body {
   margin-top: 1em;
-  margin-left: 4em;
+  margin-left: 1em;
 }
 #aggregator .news-item .body .feed {
   font-size: 0.9em;
diff --git a/modules/aggregator.module b/modules/aggregator.module
index dcc33122d..b4656573e 100644
--- a/modules/aggregator.module
+++ b/modules/aggregator.module
@@ -132,13 +132,13 @@ function aggregator_menu($may_cache) {
       'weight' => 5);
     $items[] = array('path' => 'aggregator/sources', 'title' => t('sources'),
       'callback' => 'aggregator_page_sources', 'access' => $view);
-    $items[] = array('path' => 'aggregator/rss', 'title' => t('rss feed'),
-      'callback' => 'aggregator_page_rss', 'access' => $view );
     $items[] = array('path' => 'aggregator/categories', 'title' => t('categories'),
       'callback' => 'aggregator_page_categories', 'access' => $view,
       'type' => MENU_ITEM_GROUPING);
-
-    $items[] = array('path' => 'aggregator/opml', 'title' => t('opml'),
+    $items[] = array('path' => 'aggregator/rss', 'title' => t('RSS feed'),
+      'callback' => 'aggregator_page_rss', 'access' => $view,
+      'type' => MENU_CALLBACK);
+    $items[] = array('path' => 'aggregator/opml', 'title' => t('OPML feed'),
       'callback' => 'aggregator_page_opml', 'access' => $view,
       'type' => MENU_CALLBACK);
   }
@@ -1210,13 +1210,17 @@ function theme_aggregator_page_item($item) {
   $output .= "<div class=\"news-item\">\n";
   $output .= ' <div class="date">'. format_date($item->timestamp, 'custom', 'H:i') ."</div>\n";
   $output .= " <div class=\"body\">\n";
-  $output .= '  <div class="title"><a href="'. check_url($item->link) .'">'. check_plain($item->title) ."</a></div>\n";
+
+  $source = '';
+  if ($item->ftitle && $item->fid) {
+    $source = '<span class="source">'. l($item->ftitle, "aggregator/sources/$item->fid") .":</span>\n";
+  }
+
+  $output .= '  <div class="title">'. $source .'<a href="'. check_url($item->link) .'">'. check_plain($item->title) ."</a></div>\n";
+
   if ($item->description) {
     $output .= '  <div class="description">'. $item->description ."</div>\n";
   }
-  if ($item->ftitle && $item->fid) {
-    $output .= '  <div class="source">'. t('Source') .': '. l($item->ftitle, "aggregator/sources/$item->fid") ."</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);
   $categories = array();
diff --git a/modules/aggregator/aggregator.module b/modules/aggregator/aggregator.module
index dcc33122d..b4656573e 100644
--- a/modules/aggregator/aggregator.module
+++ b/modules/aggregator/aggregator.module
@@ -132,13 +132,13 @@ function aggregator_menu($may_cache) {
       'weight' => 5);
     $items[] = array('path' => 'aggregator/sources', 'title' => t('sources'),
       'callback' => 'aggregator_page_sources', 'access' => $view);
-    $items[] = array('path' => 'aggregator/rss', 'title' => t('rss feed'),
-      'callback' => 'aggregator_page_rss', 'access' => $view );
     $items[] = array('path' => 'aggregator/categories', 'title' => t('categories'),
       'callback' => 'aggregator_page_categories', 'access' => $view,
       'type' => MENU_ITEM_GROUPING);
-
-    $items[] = array('path' => 'aggregator/opml', 'title' => t('opml'),
+    $items[] = array('path' => 'aggregator/rss', 'title' => t('RSS feed'),
+      'callback' => 'aggregator_page_rss', 'access' => $view,
+      'type' => MENU_CALLBACK);
+    $items[] = array('path' => 'aggregator/opml', 'title' => t('OPML feed'),
       'callback' => 'aggregator_page_opml', 'access' => $view,
       'type' => MENU_CALLBACK);
   }
@@ -1210,13 +1210,17 @@ function theme_aggregator_page_item($item) {
   $output .= "<div class=\"news-item\">\n";
   $output .= ' <div class="date">'. format_date($item->timestamp, 'custom', 'H:i') ."</div>\n";
   $output .= " <div class=\"body\">\n";
-  $output .= '  <div class="title"><a href="'. check_url($item->link) .'">'. check_plain($item->title) ."</a></div>\n";
+
+  $source = '';
+  if ($item->ftitle && $item->fid) {
+    $source = '<span class="source">'. l($item->ftitle, "aggregator/sources/$item->fid") .":</span>\n";
+  }
+
+  $output .= '  <div class="title">'. $source .'<a href="'. check_url($item->link) .'">'. check_plain($item->title) ."</a></div>\n";
+
   if ($item->description) {
     $output .= '  <div class="description">'. $item->description ."</div>\n";
   }
-  if ($item->ftitle && $item->fid) {
-    $output .= '  <div class="source">'. t('Source') .': '. l($item->ftitle, "aggregator/sources/$item->fid") ."</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);
   $categories = array();
diff --git a/themes/bluemarine/style.css b/themes/bluemarine/style.css
index 557ac161e..b19b268dc 100644
--- a/themes/bluemarine/style.css
+++ b/themes/bluemarine/style.css
@@ -278,7 +278,7 @@ table {
   padding: 1em;
   margin: 1em 0 1em 0;
 }
-#aggregator .news-item .source, #aggregator .news-item .categories, #aggregator .source, #aggregator .age {
+#aggregator .news-item .categories, #aggregator .source, #aggregator .age {
   color: #999;
   font-style: italic;
   font-size: 0.9em;
diff --git a/themes/chameleon/style.css b/themes/chameleon/style.css
index 594c0cef7..705b746c0 100644
--- a/themes/chameleon/style.css
+++ b/themes/chameleon/style.css
@@ -88,8 +88,3 @@ ul {
 .item-list ul li {
   list-style: square;
 }
-#aggregator .source {
-  color: gray;
-  font-style: italic;
-  font-size: 0.9em;
-}
diff --git a/themes/pushbutton/style.css b/themes/pushbutton/style.css
index 6a2727508..389c7bcb0 100644
--- a/themes/pushbutton/style.css
+++ b/themes/pushbutton/style.css
@@ -488,11 +488,6 @@ table#footer-menu {
   padding: 1em;
   margin: 1em 0 1em 0;
 }
-#aggregator .news-item .source {
-  color: #999;
-  font-style: italic;
-  font-size: 0.85em;
-}
 #aggregator .title {
   font-size: 1em;
 }