Commit 7ac1ae2a authored by Kjartan's avatar Kjartan
Browse files

- adds missing navigation to feed and bundle view.

- adds missing links.
parent b06bbe74
...@@ -596,6 +596,7 @@ function import_page_feed($fid) { ...@@ -596,6 +596,7 @@ function import_page_feed($fid) {
$output .= "</table>\n"; $output .= "</table>\n";
$theme->header(); $theme->header();
$theme->box(t("News feeds"), import_page_info());
$theme->box(check_output($feed->title), $header); $theme->box(check_output($feed->title), $header);
$theme->box(t("Latest news"), $output); $theme->box(t("Latest news"), $output);
$theme->footer(); $theme->footer();
...@@ -606,7 +607,7 @@ function import_page_bundle($bid) { ...@@ -606,7 +607,7 @@ function import_page_bundle($bid) {
$bundle = db_fetch_object(db_query("SELECT * FROM bundle WHERE bid = '%s'", $bid)); $bundle = db_fetch_object(db_query("SELECT * FROM bundle WHERE bid = '%s'", $bid));
$header .= "<p><b>". t("Website") .":</b><div style=\"margin-left: 20px;\">". lm("", array("mod" => "import", "op" => "bundle", "id" => $bundle->bid)) ."</div></p>"; $header .= "<p><b>". t("Website") .":</b><div style=\"margin-left: 20px;\">". lm($bundle->title, array("mod" => "import", "op" => "bundle", "id" => $bundle->bid)) ."</div></p>";
$header .= "<p><b>". t("Description") .":</b><div style=\"margin-left: 20px;\">". t("A composite news feed about") ." ". check_output($bundle->attributes) .".</div></p>"; $header .= "<p><b>". t("Description") .":</b><div style=\"margin-left: 20px;\">". t("A composite news feed about") ." ". check_output($bundle->attributes) .".</div></p>";
$keys = explode(",", $bundle->attributes); $keys = explode(",", $bundle->attributes);
...@@ -632,6 +633,7 @@ function import_page_bundle($bid) { ...@@ -632,6 +633,7 @@ function import_page_bundle($bid) {
$output .= "</table>\n"; $output .= "</table>\n";
$theme->header(); $theme->header();
$theme->box(t("News feeds"), import_page_info());
$theme->box(check_output($bundle->title), $header); $theme->box(check_output($bundle->title), $header);
$theme->box(t("Latest news"), $output); $theme->box(t("Latest news"), $output);
$theme->footer(); $theme->footer();
...@@ -644,7 +646,7 @@ function import_page_sources() { ...@@ -644,7 +646,7 @@ function import_page_sources() {
$result = db_query("SELECT * FROM feed ORDER BY title"); $result = db_query("SELECT * FROM feed ORDER BY title");
while ($feed = db_fetch_object($result)) { while ($feed = db_fetch_object($result)) {
$output .= lm("", array("mod" => "import", "op" => "feed", "id" => $feed->fid)); $output .= lm($feed->title, array("mod" => "import", "op" => "feed", "id" => $feed->fid));
$output .= "<div style=\"margin-left: 20px;\">". check_output($feed->description, 1) ."</div><br />"; $output .= "<div style=\"margin-left: 20px;\">". check_output($feed->description, 1) ."</div><br />";
} }
......
...@@ -596,6 +596,7 @@ function import_page_feed($fid) { ...@@ -596,6 +596,7 @@ function import_page_feed($fid) {
$output .= "</table>\n"; $output .= "</table>\n";
$theme->header(); $theme->header();
$theme->box(t("News feeds"), import_page_info());
$theme->box(check_output($feed->title), $header); $theme->box(check_output($feed->title), $header);
$theme->box(t("Latest news"), $output); $theme->box(t("Latest news"), $output);
$theme->footer(); $theme->footer();
...@@ -606,7 +607,7 @@ function import_page_bundle($bid) { ...@@ -606,7 +607,7 @@ function import_page_bundle($bid) {
$bundle = db_fetch_object(db_query("SELECT * FROM bundle WHERE bid = '%s'", $bid)); $bundle = db_fetch_object(db_query("SELECT * FROM bundle WHERE bid = '%s'", $bid));
$header .= "<p><b>". t("Website") .":</b><div style=\"margin-left: 20px;\">". lm("", array("mod" => "import", "op" => "bundle", "id" => $bundle->bid)) ."</div></p>"; $header .= "<p><b>". t("Website") .":</b><div style=\"margin-left: 20px;\">". lm($bundle->title, array("mod" => "import", "op" => "bundle", "id" => $bundle->bid)) ."</div></p>";
$header .= "<p><b>". t("Description") .":</b><div style=\"margin-left: 20px;\">". t("A composite news feed about") ." ". check_output($bundle->attributes) .".</div></p>"; $header .= "<p><b>". t("Description") .":</b><div style=\"margin-left: 20px;\">". t("A composite news feed about") ." ". check_output($bundle->attributes) .".</div></p>";
$keys = explode(",", $bundle->attributes); $keys = explode(",", $bundle->attributes);
...@@ -632,6 +633,7 @@ function import_page_bundle($bid) { ...@@ -632,6 +633,7 @@ function import_page_bundle($bid) {
$output .= "</table>\n"; $output .= "</table>\n";
$theme->header(); $theme->header();
$theme->box(t("News feeds"), import_page_info());
$theme->box(check_output($bundle->title), $header); $theme->box(check_output($bundle->title), $header);
$theme->box(t("Latest news"), $output); $theme->box(t("Latest news"), $output);
$theme->footer(); $theme->footer();
...@@ -644,7 +646,7 @@ function import_page_sources() { ...@@ -644,7 +646,7 @@ function import_page_sources() {
$result = db_query("SELECT * FROM feed ORDER BY title"); $result = db_query("SELECT * FROM feed ORDER BY title");
while ($feed = db_fetch_object($result)) { while ($feed = db_fetch_object($result)) {
$output .= lm("", array("mod" => "import", "op" => "feed", "id" => $feed->fid)); $output .= lm($feed->title, array("mod" => "import", "op" => "feed", "id" => $feed->fid));
$output .= "<div style=\"margin-left: 20px;\">". check_output($feed->description, 1) ."</div><br />"; $output .= "<div style=\"margin-left: 20px;\">". check_output($feed->description, 1) ."</div><br />";
} }
......
...@@ -596,6 +596,7 @@ function import_page_feed($fid) { ...@@ -596,6 +596,7 @@ function import_page_feed($fid) {
$output .= "</table>\n"; $output .= "</table>\n";
$theme->header(); $theme->header();
$theme->box(t("News feeds"), import_page_info());
$theme->box(check_output($feed->title), $header); $theme->box(check_output($feed->title), $header);
$theme->box(t("Latest news"), $output); $theme->box(t("Latest news"), $output);
$theme->footer(); $theme->footer();
...@@ -606,7 +607,7 @@ function import_page_bundle($bid) { ...@@ -606,7 +607,7 @@ function import_page_bundle($bid) {
$bundle = db_fetch_object(db_query("SELECT * FROM bundle WHERE bid = '%s'", $bid)); $bundle = db_fetch_object(db_query("SELECT * FROM bundle WHERE bid = '%s'", $bid));
$header .= "<p><b>". t("Website") .":</b><div style=\"margin-left: 20px;\">". lm("", array("mod" => "import", "op" => "bundle", "id" => $bundle->bid)) ."</div></p>"; $header .= "<p><b>". t("Website") .":</b><div style=\"margin-left: 20px;\">". lm($bundle->title, array("mod" => "import", "op" => "bundle", "id" => $bundle->bid)) ."</div></p>";
$header .= "<p><b>". t("Description") .":</b><div style=\"margin-left: 20px;\">". t("A composite news feed about") ." ". check_output($bundle->attributes) .".</div></p>"; $header .= "<p><b>". t("Description") .":</b><div style=\"margin-left: 20px;\">". t("A composite news feed about") ." ". check_output($bundle->attributes) .".</div></p>";
$keys = explode(",", $bundle->attributes); $keys = explode(",", $bundle->attributes);
...@@ -632,6 +633,7 @@ function import_page_bundle($bid) { ...@@ -632,6 +633,7 @@ function import_page_bundle($bid) {
$output .= "</table>\n"; $output .= "</table>\n";
$theme->header(); $theme->header();
$theme->box(t("News feeds"), import_page_info());
$theme->box(check_output($bundle->title), $header); $theme->box(check_output($bundle->title), $header);
$theme->box(t("Latest news"), $output); $theme->box(t("Latest news"), $output);
$theme->footer(); $theme->footer();
...@@ -644,7 +646,7 @@ function import_page_sources() { ...@@ -644,7 +646,7 @@ function import_page_sources() {
$result = db_query("SELECT * FROM feed ORDER BY title"); $result = db_query("SELECT * FROM feed ORDER BY title");
while ($feed = db_fetch_object($result)) { while ($feed = db_fetch_object($result)) {
$output .= lm("", array("mod" => "import", "op" => "feed", "id" => $feed->fid)); $output .= lm($feed->title, array("mod" => "import", "op" => "feed", "id" => $feed->fid));
$output .= "<div style=\"margin-left: 20px;\">". check_output($feed->description, 1) ."</div><br />"; $output .= "<div style=\"margin-left: 20px;\">". check_output($feed->description, 1) ."</div><br />";
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment