diff options
Diffstat (limited to 'modules/aggregator')
| -rw-r--r-- | modules/aggregator/aggregator.module | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/modules/aggregator/aggregator.module b/modules/aggregator/aggregator.module index 1ed5dd648..4ae74fd54 100644 --- a/modules/aggregator/aggregator.module +++ b/modules/aggregator/aggregator.module @@ -108,7 +108,7 @@ function import_update() { } } -function import_format_item($item, $feed = 0) { +function import_theme_format_item($item, $feed = 0) { global $user; if ($user->uid && module_exist("blog") && user_access("maintain personal blog")) { @@ -132,7 +132,7 @@ function import_bundle_block($attributes) { $items = array(); while ($item = db_fetch_object($result)) { - $items[] = theme("import_theme_format_item",$item); + $items[] = theme("import_theme_format_item", $item); } $output = "<div class=\"import-block\"><div class=\"bundle\">"; @@ -177,13 +177,13 @@ function import_block($op, $delta) { case "feed": $feed = db_fetch_object(db_query("SELECT * FROM {feed} WHERE fid = %d", $id)); $block["subject"] = $feed->title; - $block["content"] .= import_feed_block($feed) ."<div style=\"text-align: right;\">". l(t("more"), "import/feed/$feed->fid", array("title" => t("View this feed's recent news."))) ."</div>"; + $block["content"] .= import_feed_block($feed) ."<div class=\"more-link\">". l(t("more"), "import/feed/$feed->fid", array("title" => t("View this feed's recent news."))) ."</div>"; break; case "bundle": $bundle = db_fetch_object(db_query("SELECT * FROM {bundle} WHERE bid = %d", $id)); $block["subject"] = $bundle->title; - $block["content"] .= import_bundle_block($bundle->attributes) ."<div style=\"text-align: right;\">". l(t("more"), "import/bundle/$bundle->bid", array("title" => t("View this bundle's recent news."))) ."</div>"; + $block["content"] .= import_bundle_block($bundle->attributes) ."<div class=\"more-link\">". l(t("more"), "import/bundle/$bundle->bid", array("title" => t("View this bundle's recent news."))) ."</div>"; break; } @@ -198,9 +198,7 @@ function import_get_bundles($attributes = 0) { $result = db_query("SELECT * FROM {bundle} ORDER BY title"); while ($bundle = db_fetch_object($result)) { $block["bundle:$bundle->bid"]["subject"] = $bundle->title; - $block["bundle:$bundle->bid"]["content"] = import_bundle_block($bundle->attributes) ."<div style=\"text-align: right;\">". - l(t("more"), "import/bundle/$bundle->bid", array("title" => t("View this bundle's recent news."))) - ."</div>"; + $block["bundle:$bundle->bid"]["content"] = import_bundle_block($bundle->attributes) ."<div class=\"more-link\">". l(t("more"), "import/bundle/$bundle->bid", array("title" => t("View this bundle's recent news."))) ."</div>"; $block["bundle:$bundle->bid"]["info"] = "$bundle->title bundle"; } @@ -214,9 +212,7 @@ function import_get_feeds($attributes = 0) { $result = db_query("SELECT * FROM {feed} ORDER BY fid"); while ($feed = db_fetch_object($result)) { $block["feed:$feed->fid"]["subject"] = $feed->title; - $block["feed:$feed->fid"]["content"] = import_feed_block($feed) ."<div style=\"text-align: right;\">". - l(t("more"), "import/feed/$feed->fid", array("title" => t("View this feed's recent news."))) - ."</div>"; + $block["feed:$feed->fid"]["content"] = import_feed_block($feed) ."<div class=\"more-link\">". l(t("more"), "import/feed/$feed->fid", array("title" => t("View this feed's recent news."))) ."</div>"; $block["feed:$feed->fid"]["info"] = "$feed->title feed"; } |