summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--misc/drupal.css10
-rw-r--r--modules/aggregator.module138
-rw-r--r--modules/aggregator/aggregator.module138
-rw-r--r--themes/chameleon/marvin.css4
-rw-r--r--themes/chameleon/pure.css9
-rw-r--r--themes/xtemplate/xtemplate.css23
6 files changed, 169 insertions, 153 deletions
diff --git a/misc/drupal.css b/misc/drupal.css
index 5435f93da..9efffa6ed 100644
--- a/misc/drupal.css
+++ b/misc/drupal.css
@@ -126,6 +126,16 @@ img {
.form-submit {
margin: 0.5em 0;
}
+.news-item .date {
+ float: left;
+}
+.news-item .body {
+ margin-top: 1em;
+ margin-left: 4em;
+}
+.news-item .body .feed {
+ font-size: 0.9em;
+}
#forum .description {
font-size: 0.9em;
margin: 0.5em;
diff --git a/modules/aggregator.module b/modules/aggregator.module
index 52330386c..2c20319d5 100644
--- a/modules/aggregator.module
+++ b/modules/aggregator.module
@@ -123,19 +123,6 @@ function aggregator_update() {
}
}
-function theme_aggregator_format_item($item, $feed = 0) {
- global $user;
-
- if ($user->uid && module_exist("blog") && user_access("maintain personal blog")) {
- $output .= "<div class=\"icon\">". l("<img src=\"". theme("image", "blog.gif") ."\" alt=\"". t("blog it") ."\" title=\"". t("blog it") ."\" />", "node/add/blog", array("title" => t("Comment on this news item in your personal blog."), "class" => "blog-it"), "iid=$item->iid") ."</div>";
- }
-
- // external link
- $output .= "<a href=\"$item->link\">$item->title</a>";
-
- return $output;
-}
-
function aggregator_bundle_block($attributes) {
if ($attributes) {
$keys = explode(",", $attributes);
@@ -148,7 +135,7 @@ function aggregator_bundle_block($attributes) {
$items = array();
while ($item = db_fetch_object($result)) {
- $items[] = theme("aggregator_format_item", $item);
+ $items[] = theme("aggregator_block_item", $item);
}
return theme("item_list", $items);
@@ -159,7 +146,7 @@ function aggregator_feed_block($feed) {
$items = array();
while ($item = db_fetch_object($result)) {
- $items[] = theme("aggregator_format_item", $item);
+ $items[] = theme("aggregator_block_item", $item);
}
return theme("item_list", $items);
@@ -622,23 +609,11 @@ function aggregator_admin() {
function aggregator_page_last() {
$result = db_query_range("SELECT i.*, f.title AS ftitle, f.link AS flink FROM {item} i INNER JOIN {feed} f ON i.fid = f.fid ORDER BY i.timestamp DESC", 0, variable_get("aggregator_page_limit", 75));
- $output = "<table border=\"0\" cellpadding=\"4\" cellspacing=\"2\">";
+ $output = "<div id=\"aggregator\">";
while ($item = db_fetch_object($result)) {
- $links = array(format_date($item->timestamp));
- if (module_exist("blog") && user_access("maintain personal blog")) {
- $links[] = l(t("blog it"), "node/add/blog", array("title" => t("Comment on this news item in your personal blog.")), "iid=$item->iid");
- }
- $links[] = l(t("feed"), "aggregator/feed/$item->fid", array("title" => t("Read more syndicated news from this feed.")));
-
- if ($item->link) {
- $output .= "<tr><td><a href=\"$item->link\">$item->title</a> &middot; ". l($item->ftitle, "aggregator/feed/$item->fid", array("title" => t("View more information about this feed."))) ."</td><td style=\"text-align: right; vertical-align: top;\">". theme("links", $links) ."</td></tr>\n";
- }
-
- if ($item->description) {
- $output .= "<tr><td colspan=\"2\"><div style=\"margin-left: 20px;\">$item->description</div><br /></td></tr>";
- }
+ $output .= theme('aggregator_page_item', $item);
}
- $output .= "</table>\n";
+ $output .= "</div>";
print theme("page", $output);
}
@@ -646,69 +621,36 @@ function aggregator_page_last() {
function aggregator_page_feed($fid) {
$feed = db_fetch_object(db_query("SELECT * FROM {feed} WHERE fid = %d", $fid));
- $header = "<p><strong>". t("Website") .":</strong><div style=\"margin-left: 20px;\"><a href=\"$feed->link\">$feed->link</a></div></p>";
- $header .= "<p><strong>". t("Description") .":</strong><div style=\"margin-left: 20px;\">$feed->description</div></p>";
- $header .= "<p><strong>". t("Last update") .":</strong><div style=\"margin-left: 20px; text-align: right;\">". t("%time ago", array("%time" => format_interval(time() - $feed->checked))) ." <a href=\"$feed->url\"><img src=\"". theme("image", "xml.gif") ."\" width=\"36\" height=\"14\" style=\"border: 0px;\" alt=\"\" title=\"\" /></a><br /><br /></div></p>\n";
+ $info = $feed->description;
+ $info .= "<h3>". t("URL") ."</h3><a href=\"$feed->link\">$feed->link</a> <a href=\"$feed->url\"><img src=\"". theme("image", "xml.gif") ."\" width=\"36\" height=\"14\" style=\"border: 0px;\" alt=\"\" title=\"\" /></a>\n";
+ $info .= "<h3>". t("Last update") ."</h3>". t("%time ago", array("%time" => format_interval(time() - $feed->checked)));
$result = db_query_range("SELECT * FROM {item} WHERE fid = %d ORDER BY timestamp DESC", $fid, 0, variable_get("aggregator_page_limit", 75));
-
- $output .= "<table border=\"0\" cellpadding=\"4\" cellspacing=\"2\">";
while ($item = db_fetch_object($result)) {
- $links = array();
- if (module_exist("blog") && user_access("maintain personal blog")) {
- $links[] = l(t("blog it"), "node/add/blog", array("title" => t("Comment on this news item in your personal blog.")), "iid=$item->iid");
- }
- $links[] = "<a href=\"$item->link\">". t("visit") ."</a>";
-
- if ($item->link) {
- $output .= "<tr><td><a href=\"$item->link\">$item->title</a></td><td style=\"text-align: right; vertical-align: top;\">". theme("links", $links) ."</td></tr>\n";
- }
- if ($item->description) {
- $output .= "<tr><td colspan=\"2\"><div style=\"margin-left: 20px;\">$item->description</div><br /></td></tr>";
- }
+ $content .= theme('aggregator_page_item', $item);
}
- $output .= "</table>\n";
- print theme("header");
- print theme("box", $feed->title, $header);
- print theme("box", t("Latest news"), $output);
- print theme("footer");
+ $output = "<div id=\"aggregator\"><div class=\"info\">$info</div><div class=\"content\">$content</div></div>";
+
+ print theme("page", $output, $feed->title, array(l(t('Home'), NULL), l(t('news aggregator'), 'aggregator'), l(t('news by source'), 'aggregator/feeds')));
}
function aggregator_page_bundle($bid) {
$bundle = db_fetch_object(db_query("SELECT * FROM {bundle} WHERE bid = %d", $bid));
- $header .= "<p><strong>". t("Website") .":</strong><div style=\"margin-left: 20px;\">". l($bundle->title, "aggregator/bundle/$bundle->bid") ."</div></p>";
- $header .= "<p><strong>". t("Description") .":</strong><div style=\"margin-left: 20px;\">". t("A composite news feed about") ." $bundle->attributes.</div></p>";
+ $info = t("A composite news feed about") ." $bundle->attributes.";
$keys = explode(",", $bundle->attributes);
foreach ($keys as $key) $where[] = "i.attributes LIKE '%". trim($key) ."%'";
$result = db_query_range("SELECT i.*, f.title AS ftitle, f.link AS flink FROM {item} i, {feed} f WHERE (". implode(" OR ", $where) .") AND i.fid = f.fid ORDER BY timestamp DESC", 0, variable_get("aggregator_page_limit", 75));
- $output .= "<table border=\"0\" cellpadding=\"4\" cellspacing=\"2\">";
while ($item = db_fetch_object($result)) {
- if (module_exist("blog") && user_access("maintain personal blog")) {
- $links[] = l(t("blog it"), "node/add/blog", array("title" => t("Comment on this news item in your personal blog.")), "iid=$item->iid");
- }
- $links[] = l(t("feed"), "aggregator/feed/$item->fid", array("title" => t("Read more syndicated news from this feed.")));
- $links[] = "<a href=\"$item->link\">". t("visit") ."</a>";
-
- if ($item->link) {
- $output .= "<tr><td><a href=\"$item->link\">$item->title</a> &middot; ". l($item->ftitle, "aggregator/feed/$item->fid", array("title" => t("View more information about this feed."))) ."</td><td style=\"text-align: right; vertical-align: top;\">". theme("links", $links) ."</td></tr>\n";
- }
-
- if ($item->description) {
- $output .= "<tr><td colspan=\"2\"><div style=\"margin-left: 20px;\">$item->description</div><br /></td></tr>";
- }
-
- unset($links);
+ $content .= theme('aggregator_page_item', $item);
}
- $output .= "</table>\n";
- print theme("header");
- print theme("box", $bundle->title, $header);
- print theme("box", t("Latest news"), $output);
- print theme("footer");
+ $output = "<div id=\"aggregator\"><div class=\"info\">$info</div><div class=\"content\">$content</div></div>";
+
+ print theme("page", $output, $bundle->title, array(l(t('Home'), NULL), l(t('news aggregator'), 'aggregator'), l(t('news by topic'), 'aggregator/bundles')));
}
function aggregator_page_sources() {
@@ -805,4 +747,50 @@ function aggregator_page() {
}
}
+/**
+ * @addtogroup themeable
+ * @{
+ */
+
+function theme_aggregator_block_item($item, $feed = 0) {
+ global $user;
+
+ if ($user->uid && module_exist("blog") && user_access("maintain personal blog")) {
+ $output .= "<div class=\"icon\">". l("<img src=\"". theme("image", "blog.gif") ."\" alt=\"". t("blog it") ."\" title=\"". t("blog it") ."\" />", "node/add/blog", array("title" => t("Comment on this news item in your personal blog."), "class" => "blog-it"), "iid=$item->iid") ."</div>";
+ }
+
+ // external link
+ $output .= "<a href=\"$item->link\">$item->title</a>";
+
+ return $output;
+}
+
+function theme_aggregator_page_item($item) {
+
+ static $last;
+
+ $date = date("Ymd", $item->timestamp);
+ if ($date != $last) {
+ $last = $date;
+ $output .= "<h3>". date("F j, Y", $item->timestamp) ."</h3>\n";
+ }
+
+ $output .= "<div class=\"news-item\">\n";
+ $output .= " <div class=\"date\">". date("H:i", $item->timestamp) ."</div>\n";
+ $output .= " <div class=\"body\">\n";
+ $output .= " <div class=\"title\"><a href=\"$item->link\">$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/feed/$item->fid") ."</div>\n";
+ }
+ $output .= " </div>\n";
+ $output .= "</div>\n";
+
+ return $output;
+}
+
+/** @} End of addtogroup themeable */
+
?>
diff --git a/modules/aggregator/aggregator.module b/modules/aggregator/aggregator.module
index 52330386c..2c20319d5 100644
--- a/modules/aggregator/aggregator.module
+++ b/modules/aggregator/aggregator.module
@@ -123,19 +123,6 @@ function aggregator_update() {
}
}
-function theme_aggregator_format_item($item, $feed = 0) {
- global $user;
-
- if ($user->uid && module_exist("blog") && user_access("maintain personal blog")) {
- $output .= "<div class=\"icon\">". l("<img src=\"". theme("image", "blog.gif") ."\" alt=\"". t("blog it") ."\" title=\"". t("blog it") ."\" />", "node/add/blog", array("title" => t("Comment on this news item in your personal blog."), "class" => "blog-it"), "iid=$item->iid") ."</div>";
- }
-
- // external link
- $output .= "<a href=\"$item->link\">$item->title</a>";
-
- return $output;
-}
-
function aggregator_bundle_block($attributes) {
if ($attributes) {
$keys = explode(",", $attributes);
@@ -148,7 +135,7 @@ function aggregator_bundle_block($attributes) {
$items = array();
while ($item = db_fetch_object($result)) {
- $items[] = theme("aggregator_format_item", $item);
+ $items[] = theme("aggregator_block_item", $item);
}
return theme("item_list", $items);
@@ -159,7 +146,7 @@ function aggregator_feed_block($feed) {
$items = array();
while ($item = db_fetch_object($result)) {
- $items[] = theme("aggregator_format_item", $item);
+ $items[] = theme("aggregator_block_item", $item);
}
return theme("item_list", $items);
@@ -622,23 +609,11 @@ function aggregator_admin() {
function aggregator_page_last() {
$result = db_query_range("SELECT i.*, f.title AS ftitle, f.link AS flink FROM {item} i INNER JOIN {feed} f ON i.fid = f.fid ORDER BY i.timestamp DESC", 0, variable_get("aggregator_page_limit", 75));
- $output = "<table border=\"0\" cellpadding=\"4\" cellspacing=\"2\">";
+ $output = "<div id=\"aggregator\">";
while ($item = db_fetch_object($result)) {
- $links = array(format_date($item->timestamp));
- if (module_exist("blog") && user_access("maintain personal blog")) {
- $links[] = l(t("blog it"), "node/add/blog", array("title" => t("Comment on this news item in your personal blog.")), "iid=$item->iid");
- }
- $links[] = l(t("feed"), "aggregator/feed/$item->fid", array("title" => t("Read more syndicated news from this feed.")));
-
- if ($item->link) {
- $output .= "<tr><td><a href=\"$item->link\">$item->title</a> &middot; ". l($item->ftitle, "aggregator/feed/$item->fid", array("title" => t("View more information about this feed."))) ."</td><td style=\"text-align: right; vertical-align: top;\">". theme("links", $links) ."</td></tr>\n";
- }
-
- if ($item->description) {
- $output .= "<tr><td colspan=\"2\"><div style=\"margin-left: 20px;\">$item->description</div><br /></td></tr>";
- }
+ $output .= theme('aggregator_page_item', $item);
}
- $output .= "</table>\n";
+ $output .= "</div>";
print theme("page", $output);
}
@@ -646,69 +621,36 @@ function aggregator_page_last() {
function aggregator_page_feed($fid) {
$feed = db_fetch_object(db_query("SELECT * FROM {feed} WHERE fid = %d", $fid));
- $header = "<p><strong>". t("Website") .":</strong><div style=\"margin-left: 20px;\"><a href=\"$feed->link\">$feed->link</a></div></p>";
- $header .= "<p><strong>". t("Description") .":</strong><div style=\"margin-left: 20px;\">$feed->description</div></p>";
- $header .= "<p><strong>". t("Last update") .":</strong><div style=\"margin-left: 20px; text-align: right;\">". t("%time ago", array("%time" => format_interval(time() - $feed->checked))) ." <a href=\"$feed->url\"><img src=\"". theme("image", "xml.gif") ."\" width=\"36\" height=\"14\" style=\"border: 0px;\" alt=\"\" title=\"\" /></a><br /><br /></div></p>\n";
+ $info = $feed->description;
+ $info .= "<h3>". t("URL") ."</h3><a href=\"$feed->link\">$feed->link</a> <a href=\"$feed->url\"><img src=\"". theme("image", "xml.gif") ."\" width=\"36\" height=\"14\" style=\"border: 0px;\" alt=\"\" title=\"\" /></a>\n";
+ $info .= "<h3>". t("Last update") ."</h3>". t("%time ago", array("%time" => format_interval(time() - $feed->checked)));
$result = db_query_range("SELECT * FROM {item} WHERE fid = %d ORDER BY timestamp DESC", $fid, 0, variable_get("aggregator_page_limit", 75));
-
- $output .= "<table border=\"0\" cellpadding=\"4\" cellspacing=\"2\">";
while ($item = db_fetch_object($result)) {
- $links = array();
- if (module_exist("blog") && user_access("maintain personal blog")) {
- $links[] = l(t("blog it"), "node/add/blog", array("title" => t("Comment on this news item in your personal blog.")), "iid=$item->iid");
- }
- $links[] = "<a href=\"$item->link\">". t("visit") ."</a>";
-
- if ($item->link) {
- $output .= "<tr><td><a href=\"$item->link\">$item->title</a></td><td style=\"text-align: right; vertical-align: top;\">". theme("links", $links) ."</td></tr>\n";
- }
- if ($item->description) {
- $output .= "<tr><td colspan=\"2\"><div style=\"margin-left: 20px;\">$item->description</div><br /></td></tr>";
- }
+ $content .= theme('aggregator_page_item', $item);
}
- $output .= "</table>\n";
- print theme("header");
- print theme("box", $feed->title, $header);
- print theme("box", t("Latest news"), $output);
- print theme("footer");
+ $output = "<div id=\"aggregator\"><div class=\"info\">$info</div><div class=\"content\">$content</div></div>";
+
+ print theme("page", $output, $feed->title, array(l(t('Home'), NULL), l(t('news aggregator'), 'aggregator'), l(t('news by source'), 'aggregator/feeds')));
}
function aggregator_page_bundle($bid) {
$bundle = db_fetch_object(db_query("SELECT * FROM {bundle} WHERE bid = %d", $bid));
- $header .= "<p><strong>". t("Website") .":</strong><div style=\"margin-left: 20px;\">". l($bundle->title, "aggregator/bundle/$bundle->bid") ."</div></p>";
- $header .= "<p><strong>". t("Description") .":</strong><div style=\"margin-left: 20px;\">". t("A composite news feed about") ." $bundle->attributes.</div></p>";
+ $info = t("A composite news feed about") ." $bundle->attributes.";
$keys = explode(",", $bundle->attributes);
foreach ($keys as $key) $where[] = "i.attributes LIKE '%". trim($key) ."%'";
$result = db_query_range("SELECT i.*, f.title AS ftitle, f.link AS flink FROM {item} i, {feed} f WHERE (". implode(" OR ", $where) .") AND i.fid = f.fid ORDER BY timestamp DESC", 0, variable_get("aggregator_page_limit", 75));
- $output .= "<table border=\"0\" cellpadding=\"4\" cellspacing=\"2\">";
while ($item = db_fetch_object($result)) {
- if (module_exist("blog") && user_access("maintain personal blog")) {
- $links[] = l(t("blog it"), "node/add/blog", array("title" => t("Comment on this news item in your personal blog.")), "iid=$item->iid");
- }
- $links[] = l(t("feed"), "aggregator/feed/$item->fid", array("title" => t("Read more syndicated news from this feed.")));
- $links[] = "<a href=\"$item->link\">". t("visit") ."</a>";
-
- if ($item->link) {
- $output .= "<tr><td><a href=\"$item->link\">$item->title</a> &middot; ". l($item->ftitle, "aggregator/feed/$item->fid", array("title" => t("View more information about this feed."))) ."</td><td style=\"text-align: right; vertical-align: top;\">". theme("links", $links) ."</td></tr>\n";
- }
-
- if ($item->description) {
- $output .= "<tr><td colspan=\"2\"><div style=\"margin-left: 20px;\">$item->description</div><br /></td></tr>";
- }
-
- unset($links);
+ $content .= theme('aggregator_page_item', $item);
}
- $output .= "</table>\n";
- print theme("header");
- print theme("box", $bundle->title, $header);
- print theme("box", t("Latest news"), $output);
- print theme("footer");
+ $output = "<div id=\"aggregator\"><div class=\"info\">$info</div><div class=\"content\">$content</div></div>";
+
+ print theme("page", $output, $bundle->title, array(l(t('Home'), NULL), l(t('news aggregator'), 'aggregator'), l(t('news by topic'), 'aggregator/bundles')));
}
function aggregator_page_sources() {
@@ -805,4 +747,50 @@ function aggregator_page() {
}
}
+/**
+ * @addtogroup themeable
+ * @{
+ */
+
+function theme_aggregator_block_item($item, $feed = 0) {
+ global $user;
+
+ if ($user->uid && module_exist("blog") && user_access("maintain personal blog")) {
+ $output .= "<div class=\"icon\">". l("<img src=\"". theme("image", "blog.gif") ."\" alt=\"". t("blog it") ."\" title=\"". t("blog it") ."\" />", "node/add/blog", array("title" => t("Comment on this news item in your personal blog."), "class" => "blog-it"), "iid=$item->iid") ."</div>";
+ }
+
+ // external link
+ $output .= "<a href=\"$item->link\">$item->title</a>";
+
+ return $output;
+}
+
+function theme_aggregator_page_item($item) {
+
+ static $last;
+
+ $date = date("Ymd", $item->timestamp);
+ if ($date != $last) {
+ $last = $date;
+ $output .= "<h3>". date("F j, Y", $item->timestamp) ."</h3>\n";
+ }
+
+ $output .= "<div class=\"news-item\">\n";
+ $output .= " <div class=\"date\">". date("H:i", $item->timestamp) ."</div>\n";
+ $output .= " <div class=\"body\">\n";
+ $output .= " <div class=\"title\"><a href=\"$item->link\">$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/feed/$item->fid") ."</div>\n";
+ }
+ $output .= " </div>\n";
+ $output .= "</div>\n";
+
+ return $output;
+}
+
+/** @} End of addtogroup themeable */
+
?>
diff --git a/themes/chameleon/marvin.css b/themes/chameleon/marvin.css
index bf55aef86..f3e2c49e7 100644
--- a/themes/chameleon/marvin.css
+++ b/themes/chameleon/marvin.css
@@ -33,6 +33,10 @@ table {
#main {
width: 80%;
}
+#aggregator .info {
+ border: 1px dashed #888;
+ padding: 1em;
+}
.block {
margin-bottom: 10px;
font-size: 0.9em;
diff --git a/themes/chameleon/pure.css b/themes/chameleon/pure.css
index bd2422310..f3383c0bd 100644
--- a/themes/chameleon/pure.css
+++ b/themes/chameleon/pure.css
@@ -44,6 +44,15 @@ ul {
#header .title a:hover {
color: #930;
}
+#aggregator .source {
+ color: #777;
+ font-style: italic;
+ font-size: 0.9em;
+}
+#aggregator .info {
+ border: 1px dashed #000;
+ padding: 1em;
+}
.item-list ul li {
list-style: square;
}
diff --git a/themes/xtemplate/xtemplate.css b/themes/xtemplate/xtemplate.css
index a92866ffb..f7fd2129a 100644
--- a/themes/xtemplate/xtemplate.css
+++ b/themes/xtemplate/xtemplate.css
@@ -23,13 +23,13 @@ h1, h2, h3, h4, h5, h6 {
margin: 0;
}
h1 {
- font-size: 1.2em;
+ font-size: 1.3em;
}
h2 {
- font-size: 1.1em;
+ font-size: 1.2em;
}
h3, h4, h5, h6 {
- font-size: 1em;
+ font-size: 1.1em;
}
a {
text-decoration: none;
@@ -242,6 +242,23 @@ table {
/*
** Module specific styles
*/
+#aggregator .info {
+ background-color: #eee;
+ border: 1px solid #ccc;
+ padding: 1em;
+ margin: 1em 0 1em 0;
+}
+#aggregator .news-item .source {
+ color: #999;
+ font-style: italic;
+ font-size: 0.9em;
+}
+#aggregator .title {
+ font-size: 0.5em;
+}
+#aggregator h3 {
+ margin-top: 1em;
+}
#tracker th {
text-align: left;
border-bottom: 1px solid #ddd;
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-21 17:07:54 +0000