From ed1a9cbfa7263111ae19d5fa2c19bb02c3e8a49f Mon Sep 17 00:00:00 2001 From: Dries Buytaert Date: Fri, 30 May 2003 05:53:10 +0000 Subject: Patch by Al: - Made the import module use theme_item_list() instead of emitting the HTML and CSS itself. - Renamed the "blog-it" tag to "icon" so it can be used for other (but similar) purposes. --- misc/drupal.css | 6 +++--- modules/aggregator.module | 21 ++++++++++++++------- modules/aggregator/aggregator.module | 21 ++++++++++++++------- modules/import.module | 21 ++++++++++++++------- 4 files changed, 45 insertions(+), 24 deletions(-) diff --git a/misc/drupal.css b/misc/drupal.css index bf7d3a51b..d1bf5828d 100644 --- a/misc/drupal.css +++ b/misc/drupal.css @@ -2,9 +2,9 @@ .item-list ul { margin: 0 0 0.75em 0; padding: 0; } .item-list ul li { margin: 0 0 0.25em 1.5em; padding: 0; list-style: disc; } -.blog-it { color: #555; float: right; padding-left: 0.25em; } -.blog-it a { color: #000; text-decoration: none; } -.blog-it a:hover { color: #000; text-decoration: none; } +.item-list .icon { color: #555; float: right; padding-left: 0.25em; } +.item-list .icon a { color: #000; text-decoration: none; } +.item-list .icon a:hover { color: #000; text-decoration: none; } .poll-foreground { background-color: #000; float: left; height: 1em; } .poll-background { background-color: #ddd; float: left; height: 1em; } diff --git a/modules/aggregator.module b/modules/aggregator.module index b1aea5d6e..04222cc42 100644 --- a/modules/aggregator.module +++ b/modules/aggregator.module @@ -72,7 +72,7 @@ function import_format_item($item, $feed = 0) { if ($user->uid && user_access("maintain personal blog")) { // $output .= " ". l("\"".", "node/add/blog&iid=$item->iid", array("title" => t("Comment on this news item in your personal blog."))); - $output .= "
(". l("b", "node/add/blog&iid=$item->iid", array("title" => t("Comment on this news item in your personal blog."))) .")
"; + $output .= "
(". l("b", "node/add/blog&iid=$item->iid", array("title" => t("Comment on this news item in your personal blog."))) .")
"; } // external link @@ -90,22 +90,29 @@ function import_bundle_block($attributes) { $result = db_query_range("SELECT * FROM item WHERE ". implode(" OR ", $where) ." ORDER BY iid DESC", 0, variable_get("import_block_limit", 15)); } - $output = "
"; + + $output = "
"; + $output .= theme("theme_item_list", $items); + $output .= "
"; return $output; } function import_feed_block($feed) { $result = db_query_range("SELECT * FROM item WHERE fid = %d ORDER BY iid DESC ", $feed->fid, 0, variable_get("import_block_limit", 15)); - $output = "
"; + + $output = "
"; + $output .= theme("theme_item_list", $items); + $output .= "
"; return $output; } diff --git a/modules/aggregator/aggregator.module b/modules/aggregator/aggregator.module index b1aea5d6e..04222cc42 100644 --- a/modules/aggregator/aggregator.module +++ b/modules/aggregator/aggregator.module @@ -72,7 +72,7 @@ function import_format_item($item, $feed = 0) { if ($user->uid && user_access("maintain personal blog")) { // $output .= " ". l("\"".", "node/add/blog&iid=$item->iid", array("title" => t("Comment on this news item in your personal blog."))); - $output .= "
(". l("b", "node/add/blog&iid=$item->iid", array("title" => t("Comment on this news item in your personal blog."))) .")
"; + $output .= "
(". l("b", "node/add/blog&iid=$item->iid", array("title" => t("Comment on this news item in your personal blog."))) .")
"; } // external link @@ -90,22 +90,29 @@ function import_bundle_block($attributes) { $result = db_query_range("SELECT * FROM item WHERE ". implode(" OR ", $where) ." ORDER BY iid DESC", 0, variable_get("import_block_limit", 15)); } - $output = "
"; + + $output = "
"; + $output .= theme("theme_item_list", $items); + $output .= "
"; return $output; } function import_feed_block($feed) { $result = db_query_range("SELECT * FROM item WHERE fid = %d ORDER BY iid DESC ", $feed->fid, 0, variable_get("import_block_limit", 15)); - $output = "
"; + + $output = "
"; + $output .= theme("theme_item_list", $items); + $output .= "
"; return $output; } diff --git a/modules/import.module b/modules/import.module index b1aea5d6e..04222cc42 100644 --- a/modules/import.module +++ b/modules/import.module @@ -72,7 +72,7 @@ function import_format_item($item, $feed = 0) { if ($user->uid && user_access("maintain personal blog")) { // $output .= " ". l("\"".", "node/add/blog&iid=$item->iid", array("title" => t("Comment on this news item in your personal blog."))); - $output .= "
(". l("b", "node/add/blog&iid=$item->iid", array("title" => t("Comment on this news item in your personal blog."))) .")
"; + $output .= "
(". l("b", "node/add/blog&iid=$item->iid", array("title" => t("Comment on this news item in your personal blog."))) .")
"; } // external link @@ -90,22 +90,29 @@ function import_bundle_block($attributes) { $result = db_query_range("SELECT * FROM item WHERE ". implode(" OR ", $where) ." ORDER BY iid DESC", 0, variable_get("import_block_limit", 15)); } - $output = "
"; + + $output = "
"; + $output .= theme("theme_item_list", $items); + $output .= "
"; return $output; } function import_feed_block($feed) { $result = db_query_range("SELECT * FROM item WHERE fid = %d ORDER BY iid DESC ", $feed->fid, 0, variable_get("import_block_limit", 15)); - $output = "
"; + + $output = "
"; + $output .= theme("theme_item_list", $items); + $output .= "
"; return $output; } -- cgit v1.2.3