From ed1a9cbfa7263111ae19d5fa2c19bb02c3e8a49f Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
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.
---
 modules/aggregator.module            | 21 ++++++++++++++-------
 modules/aggregator/aggregator.module | 21 ++++++++++++++-------
 modules/import.module                | 21 ++++++++++++++-------
 3 files changed, 42 insertions(+), 21 deletions(-)

(limited to 'modules')

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 .= "&nbsp;". l("<img src=\"". theme("image", "blog.gif") ."\" border=\"0\" width=\"12\" height=\"16\" alt=\"". t("Blog this item") ."\" />", "node/add/blog&amp;iid=$item->iid", array("title" => t("Comment on this news item in your personal blog.")));
-    $output .= "<div class=\"blog-it\">(". l("b", "node/add/blog&amp;iid=$item->iid", array("title" => t("Comment on this news item in your personal blog."))) .")</div>";
+    $output .= "<div class=\"icon\">(". l("b", "node/add/blog&amp;iid=$item->iid", array("title" => t("Comment on this news item in your personal blog."))) .")</div>";
   }
 
   // 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 = "<div class=\"item-list\"><ul>";
+  $items = array();
   while ($item = db_fetch_object($result)) {
-    $output .= "<li>". import_format_item($item) ."</li>";
+    $items[] = import_format_item($item);
   }
-  $output .= "</ul></div>";
+
+  $output = "<div class=\"import-block\"><div class=\"bundle\">";
+  $output .= theme("theme_item_list", $items);
+  $output .= "</div></div>";
 
   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 = "<div class=\"item-list\"><ul>";
+
+  $items = array();
   while ($item = db_fetch_object($result)) {
-    $output .= "<li>". import_format_item($item) ."</li>";
+    $items[] = import_format_item($item);
   }
-  $output .= "</ul></div>";
+
+  $output = "<div class=\"import-block\"><div class=\"feed\">";
+  $output .= theme("theme_item_list", $items);
+  $output .= "</div></div>";
 
   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 .= "&nbsp;". l("<img src=\"". theme("image", "blog.gif") ."\" border=\"0\" width=\"12\" height=\"16\" alt=\"". t("Blog this item") ."\" />", "node/add/blog&amp;iid=$item->iid", array("title" => t("Comment on this news item in your personal blog.")));
-    $output .= "<div class=\"blog-it\">(". l("b", "node/add/blog&amp;iid=$item->iid", array("title" => t("Comment on this news item in your personal blog."))) .")</div>";
+    $output .= "<div class=\"icon\">(". l("b", "node/add/blog&amp;iid=$item->iid", array("title" => t("Comment on this news item in your personal blog."))) .")</div>";
   }
 
   // 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 = "<div class=\"item-list\"><ul>";
+  $items = array();
   while ($item = db_fetch_object($result)) {
-    $output .= "<li>". import_format_item($item) ."</li>";
+    $items[] = import_format_item($item);
   }
-  $output .= "</ul></div>";
+
+  $output = "<div class=\"import-block\"><div class=\"bundle\">";
+  $output .= theme("theme_item_list", $items);
+  $output .= "</div></div>";
 
   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 = "<div class=\"item-list\"><ul>";
+
+  $items = array();
   while ($item = db_fetch_object($result)) {
-    $output .= "<li>". import_format_item($item) ."</li>";
+    $items[] = import_format_item($item);
   }
-  $output .= "</ul></div>";
+
+  $output = "<div class=\"import-block\"><div class=\"feed\">";
+  $output .= theme("theme_item_list", $items);
+  $output .= "</div></div>";
 
   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 .= "&nbsp;". l("<img src=\"". theme("image", "blog.gif") ."\" border=\"0\" width=\"12\" height=\"16\" alt=\"". t("Blog this item") ."\" />", "node/add/blog&amp;iid=$item->iid", array("title" => t("Comment on this news item in your personal blog.")));
-    $output .= "<div class=\"blog-it\">(". l("b", "node/add/blog&amp;iid=$item->iid", array("title" => t("Comment on this news item in your personal blog."))) .")</div>";
+    $output .= "<div class=\"icon\">(". l("b", "node/add/blog&amp;iid=$item->iid", array("title" => t("Comment on this news item in your personal blog."))) .")</div>";
   }
 
   // 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 = "<div class=\"item-list\"><ul>";
+  $items = array();
   while ($item = db_fetch_object($result)) {
-    $output .= "<li>". import_format_item($item) ."</li>";
+    $items[] = import_format_item($item);
   }
-  $output .= "</ul></div>";
+
+  $output = "<div class=\"import-block\"><div class=\"bundle\">";
+  $output .= theme("theme_item_list", $items);
+  $output .= "</div></div>";
 
   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 = "<div class=\"item-list\"><ul>";
+
+  $items = array();
   while ($item = db_fetch_object($result)) {
-    $output .= "<li>". import_format_item($item) ."</li>";
+    $items[] = import_format_item($item);
   }
-  $output .= "</ul></div>";
+
+  $output = "<div class=\"import-block\"><div class=\"feed\">";
+  $output .= theme("theme_item_list", $items);
+  $output .= "</div></div>";
 
   return $output;
 }
-- 
cgit v1.2.3