From ee92242333ebdd30809b725226e77a01c5b043b0 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Thu, 11 Dec 2003 21:35:52 +0000
Subject: [PATCH] - Bugfix: got rid of the double titles on the import module
pages.
TODO: get rid of the custom import specific navigation menu.
---
modules/aggregator.module | 10 +++++-----
modules/aggregator/aggregator.module | 10 +++++-----
modules/import.module | 10 +++++-----
3 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/modules/aggregator.module b/modules/aggregator.module
index bbc2676a1f3e..e6631558ede3 100644
--- a/modules/aggregator.module
+++ b/modules/aggregator.module
@@ -663,7 +663,7 @@ function import_page_last() {
$output .= "</table>\n";
print theme("header");
- print theme("box", t("News feeds"), import_page_info());
+ print import_page_info();
print theme("box", t("Latest news"), $output);
print theme("footer");
}
@@ -698,7 +698,7 @@ function import_page_feed($fid) {
$output .= "</table>\n";
print theme("header");
- print theme("box", t("News feeds"), import_page_info());
+ print import_page_info();
print theme("box", $feed->title, $header);
print theme("box", t("Latest news"), $output);
print theme("footer");
@@ -737,7 +737,7 @@ function import_page_bundle($bid) {
$output .= "</table>\n";
print theme("header");
- print theme("box", t("News feeds"), import_page_info());
+ print import_page_info();
print theme("box", $bundle->title, $header);
print theme("box", t("Latest news"), $output);
print theme("footer");
@@ -757,7 +757,7 @@ function import_page_sources() {
$output .= "<div style=\"xml-icon\">". l("<img src=\"". theme("image", "xml.gif") ."\" width=\"36\" height=\"14\" style=\"border: 0px;\" />", "import/fd", array("title" => t("View the list of syndicated web sites in XML format."))) ."</div><br />";
print theme("header");
- print theme("box", t("News feeds"), import_page_info());
+ print import_page_info();
print theme("box", t("News sources"), $output);
print theme("footer");
}
@@ -795,7 +795,7 @@ function import_page_blocks($blocks) {
print theme("header");
- print theme("box", t("News feeds"), import_page_info());
+ print import_page_info();
print "<table cellpadding=\"0\" cellspacing=\"5\" border=\"0\" style=\"width: 100%;\">\n";
print " <tr>\n";
diff --git a/modules/aggregator/aggregator.module b/modules/aggregator/aggregator.module
index bbc2676a1f3e..e6631558ede3 100644
--- a/modules/aggregator/aggregator.module
+++ b/modules/aggregator/aggregator.module
@@ -663,7 +663,7 @@ function import_page_last() {
$output .= "</table>\n";
print theme("header");
- print theme("box", t("News feeds"), import_page_info());
+ print import_page_info();
print theme("box", t("Latest news"), $output);
print theme("footer");
}
@@ -698,7 +698,7 @@ function import_page_feed($fid) {
$output .= "</table>\n";
print theme("header");
- print theme("box", t("News feeds"), import_page_info());
+ print import_page_info();
print theme("box", $feed->title, $header);
print theme("box", t("Latest news"), $output);
print theme("footer");
@@ -737,7 +737,7 @@ function import_page_bundle($bid) {
$output .= "</table>\n";
print theme("header");
- print theme("box", t("News feeds"), import_page_info());
+ print import_page_info();
print theme("box", $bundle->title, $header);
print theme("box", t("Latest news"), $output);
print theme("footer");
@@ -757,7 +757,7 @@ function import_page_sources() {
$output .= "<div style=\"xml-icon\">". l("<img src=\"". theme("image", "xml.gif") ."\" width=\"36\" height=\"14\" style=\"border: 0px;\" />", "import/fd", array("title" => t("View the list of syndicated web sites in XML format."))) ."</div><br />";
print theme("header");
- print theme("box", t("News feeds"), import_page_info());
+ print import_page_info();
print theme("box", t("News sources"), $output);
print theme("footer");
}
@@ -795,7 +795,7 @@ function import_page_blocks($blocks) {
print theme("header");
- print theme("box", t("News feeds"), import_page_info());
+ print import_page_info();
print "<table cellpadding=\"0\" cellspacing=\"5\" border=\"0\" style=\"width: 100%;\">\n";
print " <tr>\n";
diff --git a/modules/import.module b/modules/import.module
index bbc2676a1f3e..e6631558ede3 100644
--- a/modules/import.module
+++ b/modules/import.module
@@ -663,7 +663,7 @@ function import_page_last() {
$output .= "</table>\n";
print theme("header");
- print theme("box", t("News feeds"), import_page_info());
+ print import_page_info();
print theme("box", t("Latest news"), $output);
print theme("footer");
}
@@ -698,7 +698,7 @@ function import_page_feed($fid) {
$output .= "</table>\n";
print theme("header");
- print theme("box", t("News feeds"), import_page_info());
+ print import_page_info();
print theme("box", $feed->title, $header);
print theme("box", t("Latest news"), $output);
print theme("footer");
@@ -737,7 +737,7 @@ function import_page_bundle($bid) {
$output .= "</table>\n";
print theme("header");
- print theme("box", t("News feeds"), import_page_info());
+ print import_page_info();
print theme("box", $bundle->title, $header);
print theme("box", t("Latest news"), $output);
print theme("footer");
@@ -757,7 +757,7 @@ function import_page_sources() {
$output .= "<div style=\"xml-icon\">". l("<img src=\"". theme("image", "xml.gif") ."\" width=\"36\" height=\"14\" style=\"border: 0px;\" />", "import/fd", array("title" => t("View the list of syndicated web sites in XML format."))) ."</div><br />";
print theme("header");
- print theme("box", t("News feeds"), import_page_info());
+ print import_page_info();
print theme("box", t("News sources"), $output);
print theme("footer");
}
@@ -795,7 +795,7 @@ function import_page_blocks($blocks) {
print theme("header");
- print theme("box", t("News feeds"), import_page_info());
+ print import_page_info();
print "<table cellpadding=\"0\" cellspacing=\"5\" border=\"0\" style=\"width: 100%;\">\n";
print " <tr>\n";
--
GitLab