From c71e1339584173f47cb7c1869426ef3cf9639ef3 Mon Sep 17 00:00:00 2001 From: Dries Buytaert Date: Mon, 7 Jan 2002 22:08:52 +0000 Subject: - Added about 50 title tags. --- modules/aggregator.module | 36 +++++++++++++++++++----------------- modules/aggregator/aggregator.module | 36 +++++++++++++++++++----------------- modules/blog.module | 36 +++++++++++++++++------------------- modules/blog/blog.module | 36 +++++++++++++++++------------------- modules/book.module | 8 ++++---- modules/book/book.module | 8 ++++---- modules/comment.module | 12 ++++++------ modules/comment/comment.module | 12 ++++++------ modules/import.module | 36 +++++++++++++++++++----------------- modules/node.module | 10 +++++----- modules/node/node.module | 10 +++++----- modules/queue.module | 2 +- modules/user.module | 6 +++--- modules/user/user.module | 6 +++--- 14 files changed, 128 insertions(+), 126 deletions(-) (limited to 'modules') diff --git a/modules/aggregator.module b/modules/aggregator.module index cee9bf2e3..013cd7100 100644 --- a/modules/aggregator.module +++ b/modules/aggregator.module @@ -29,7 +29,7 @@ function import_link($type) { } if ($type == "page" && user_access("access news feeds")) { - $links[] = "". t("news feeds") .""; + $links[] = "". t("news feeds") .""; } return $links ? $links : array(); @@ -53,7 +53,7 @@ function import_format_item($item, $feed = 0) { global $theme, $user; if ($user->uid && user_access("post blogs")) { - $output .= "iid\">image("blog.gif") ."\" border=\"0\" width=\"12\" height=\"16\" alt=\"". t("Blog this item") ."\" /> "; + $output .= "iid\" title=\"". t("Comment on this news item in your personal blog.") ."\">image("blog.gif") ."\" border=\"0\" width=\"12\" height=\"16\" alt=\"". t("Blog this item") ."\" /> "; } $output .= "link) ."\" target=\"new\">". check_output($item->title) .""; @@ -97,7 +97,7 @@ function import_get_bundles($attributes = 0) { $i = 0; while ($bundle = db_fetch_object($result)) { $block[$i]["subject"] = $bundle->title; - $block[$i]["content"] = import_bundle_block($bundle->attributes) ."

bid\">". t("more") ."

"; + $block[$i]["content"] = import_bundle_block($bundle->attributes) ."

bid\" title=\"". t("View this bundle's recent news.") ."\">". t("more") ."

"; $block[$i]["info"] = "$bundle->title bundle"; $i++; @@ -112,7 +112,7 @@ function import_get_feeds($attributes = 0) { $i = 0; while ($feed = db_fetch_object($result)) { $block[$i]["subject"] = $feed->title; - $block[$i]["content"] = import_feed_block($feed) ."

fid\">". t("more") ."

"; + $block[$i]["content"] = import_feed_block($feed) ."

fid\" title=\"". t("View this feed's recent news.") ."\">". t("more") ."

"; $block[$i]["info"] = "$feed->title feed"; $i++; @@ -137,7 +137,7 @@ function import_refresh($feed) { } /* - ** Grab the headlines: + ** Grab the news items: */ if ($fp = @fopen($feed["url"], "r")) { @@ -514,10 +514,10 @@ function import_admin() { function import_page_info() { global $theme; - $links[] = "". t("latest news") .""; - $links[] = "". t("news by source") .""; - $links[] = "". t("news by topic") .""; - $links[] = "". t("news sources") .""; + $links[] = "". t("latest news") .""; + $links[] = "". t("news by source") .""; + $links[] = "". t("news by topic") .""; + $links[] = "". t("news sources") .""; return "
". $theme->links($links) ."
"; } @@ -529,12 +529,13 @@ function import_page_last() { $output .= ""; while ($item = db_fetch_object($result)) { - $links[] = "iid\">". t("blog it") .""; - $links[] = "fid\">". t("feed") .""; + $links[] = "iid\" title=\"". t("Comment on this news item in your personal blog.") ."\">". t("blog it") .""; + $links[] = "fid\" title=\"". t("Read more syndicated news from this feed.") ."\">". t("feed") .""; if ($item->link) { - $output .= "\n"; + $output .= "\n"; } + if ($item->description) { $output .= ""; } @@ -562,7 +563,7 @@ function import_page_feed($fid) { $output .= "
". format_url($item->link, $item->title) ." · fid\">$item->ftitle". $theme->links($links) ."
". format_url($item->link, $item->title) ." · fid\" title=\"". t("View more information about this feed.") ."\">$item->ftitle". $theme->links($links) ."
". check_output($item->description, 1) ."

"; while ($item = db_fetch_object($result)) { - $links[] = "iid\">". t("blog it") .""; + $links[] = "iid\" title=\"". t("Comment on this news item in your personal blog.") ."\">". t("blog it") .""; $links[] = "link\">". t("visit") .""; if ($item->link) { @@ -596,13 +597,14 @@ function import_page_bundle($bid) { $output .= "
"; while ($item = db_fetch_object($result)) { - $links[] = "iid\">". t("blog it") .""; - $links[] = "fid\">". t("feed") .""; + $links[] = "iid\" title=\"". t("Comment on this news item in your personal blog.") ."\">". t("blog it") .""; + $links[] = "fid\" title=\"". t("Read more syndicated news from this feed.") ."\">". t("feed") .""; $links[] = "link\">". t("visit") .""; if ($item->link) { - $output .= "\n"; + $output .= "\n"; } + if ($item->description) { $output .= ""; } @@ -628,7 +630,7 @@ function import_page_sources() { $output .= "
". check_output($feed->description, 1) ."

"; } - $output .= "image("xml.gif") ."\" width=\"36\" height=\"14\" align=\"right\" border=\"0\" />
\n"; + $output .= "image("xml.gif") ."\" width=\"36\" height=\"14\" align=\"right\" border=\"0\" />
\n"; $theme->header(); $theme->box(t("News feeds"), import_page_info()); diff --git a/modules/aggregator/aggregator.module b/modules/aggregator/aggregator.module index cee9bf2e3..013cd7100 100644 --- a/modules/aggregator/aggregator.module +++ b/modules/aggregator/aggregator.module @@ -29,7 +29,7 @@ function import_link($type) { } if ($type == "page" && user_access("access news feeds")) { - $links[] = "". t("news feeds") .""; + $links[] = "". t("news feeds") .""; } return $links ? $links : array(); @@ -53,7 +53,7 @@ function import_format_item($item, $feed = 0) { global $theme, $user; if ($user->uid && user_access("post blogs")) { - $output .= "iid\">image("blog.gif") ."\" border=\"0\" width=\"12\" height=\"16\" alt=\"". t("Blog this item") ."\" /> "; + $output .= "iid\" title=\"". t("Comment on this news item in your personal blog.") ."\">image("blog.gif") ."\" border=\"0\" width=\"12\" height=\"16\" alt=\"". t("Blog this item") ."\" /> "; } $output .= "link) ."\" target=\"new\">". check_output($item->title) .""; @@ -97,7 +97,7 @@ function import_get_bundles($attributes = 0) { $i = 0; while ($bundle = db_fetch_object($result)) { $block[$i]["subject"] = $bundle->title; - $block[$i]["content"] = import_bundle_block($bundle->attributes) ."

bid\">". t("more") ."

"; + $block[$i]["content"] = import_bundle_block($bundle->attributes) ."

bid\" title=\"". t("View this bundle's recent news.") ."\">". t("more") ."

"; $block[$i]["info"] = "$bundle->title bundle"; $i++; @@ -112,7 +112,7 @@ function import_get_feeds($attributes = 0) { $i = 0; while ($feed = db_fetch_object($result)) { $block[$i]["subject"] = $feed->title; - $block[$i]["content"] = import_feed_block($feed) ."

fid\">". t("more") ."

"; + $block[$i]["content"] = import_feed_block($feed) ."

fid\" title=\"". t("View this feed's recent news.") ."\">". t("more") ."

"; $block[$i]["info"] = "$feed->title feed"; $i++; @@ -137,7 +137,7 @@ function import_refresh($feed) { } /* - ** Grab the headlines: + ** Grab the news items: */ if ($fp = @fopen($feed["url"], "r")) { @@ -514,10 +514,10 @@ function import_admin() { function import_page_info() { global $theme; - $links[] = "". t("latest news") .""; - $links[] = "". t("news by source") .""; - $links[] = "". t("news by topic") .""; - $links[] = "". t("news sources") .""; + $links[] = "". t("latest news") .""; + $links[] = "". t("news by source") .""; + $links[] = "". t("news by topic") .""; + $links[] = "". t("news sources") .""; return "
". $theme->links($links) ."
"; } @@ -529,12 +529,13 @@ function import_page_last() { $output .= "
". format_url($item->link, $item->title) ." · fid\">$item->ftitle". $theme->links($links) ."
". format_url($item->link, $item->title) ." · fid\" title=\"". t("View more information about this feed.") ."\">$item->ftitle". $theme->links($links) ."
". check_output($item->description, 1) ."

"; while ($item = db_fetch_object($result)) { - $links[] = "iid\">". t("blog it") .""; - $links[] = "fid\">". t("feed") .""; + $links[] = "iid\" title=\"". t("Comment on this news item in your personal blog.") ."\">". t("blog it") .""; + $links[] = "fid\" title=\"". t("Read more syndicated news from this feed.") ."\">". t("feed") .""; if ($item->link) { - $output .= "\n"; + $output .= "\n"; } + if ($item->description) { $output .= ""; } @@ -562,7 +563,7 @@ function import_page_feed($fid) { $output .= "
". format_url($item->link, $item->title) ." · fid\">$item->ftitle". $theme->links($links) ."
". format_url($item->link, $item->title) ." · fid\" title=\"". t("View more information about this feed.") ."\">$item->ftitle". $theme->links($links) ."
". check_output($item->description, 1) ."

"; while ($item = db_fetch_object($result)) { - $links[] = "iid\">". t("blog it") .""; + $links[] = "iid\" title=\"". t("Comment on this news item in your personal blog.") ."\">". t("blog it") .""; $links[] = "link\">". t("visit") .""; if ($item->link) { @@ -596,13 +597,14 @@ function import_page_bundle($bid) { $output .= "
"; while ($item = db_fetch_object($result)) { - $links[] = "iid\">". t("blog it") .""; - $links[] = "fid\">". t("feed") .""; + $links[] = "iid\" title=\"". t("Comment on this news item in your personal blog.") ."\">". t("blog it") .""; + $links[] = "fid\" title=\"". t("Read more syndicated news from this feed.") ."\">". t("feed") .""; $links[] = "link\">". t("visit") .""; if ($item->link) { - $output .= "\n"; + $output .= "\n"; } + if ($item->description) { $output .= ""; } @@ -628,7 +630,7 @@ function import_page_sources() { $output .= "
". check_output($feed->description, 1) ."

"; } - $output .= "image("xml.gif") ."\" width=\"36\" height=\"14\" align=\"right\" border=\"0\" />
\n"; + $output .= "image("xml.gif") ."\" width=\"36\" height=\"14\" align=\"right\" border=\"0\" />
\n"; $theme->header(); $theme->box(t("News feeds"), import_page_info()); diff --git a/modules/blog.module b/modules/blog.module index 04a6846d2..b3c1081e0 100644 --- a/modules/blog.module +++ b/modules/blog.module @@ -9,11 +9,10 @@ function blog_conf_options() { } - function blog_node($field) { global $user; - $info["name"] = t("personal blog"); + $info["name"] = t("personal blog entry"); $info["description"] = t("A blog is your personal diary or journal. It is made up of individual entries that are time stamped and are typically arranged by the day, as normal a diary. Blogs often contain links to things you've seen, or on which you agree/disagree. Since a Blog is personal, you and only you have full control on what you publish. The most interesting blogs, or those blogs that fit the site's topic might get promoted to the front page."); return $info[$field]; @@ -168,19 +167,19 @@ function blog_page_user($uid = 0, $date = 0) { if ($date != date("dny", $blog->created)) { $date = date("dny", $blog->created); - $output .= ""; + $output .= ""; } if ($user->uid && $user->uid == $uid) { - $links[] = "nid\">". t("edit") .""; + $links[] = "nid\" title=\"". t("Make changes to your blog entry.") ."\">". t("edit") .""; } if ($user->uid) { - $links[] = "nid\">". t("blog it") .""; + $links[] = "nid\" title=\"". t("Comment on this blog entry in your personal blog.") ."\">". t("blog it") .""; } if ($blog->comment) { - $links[] = "nid\">". format_plural(comment_num_all($blog->nid), t("comment"), t("comments")) .""; + $links[] = "nid\" title=\"". t("View this posting and all of its comments.") ."\">". format_plural(comment_num_all($blog->nid), t("comment"), t("comments")) .""; } $output .= ""; @@ -189,7 +188,7 @@ function blog_page_user($uid = 0, $date = 0) { } $output .= "
". format_url($item->link, $item->title) ." · fid\">$item->ftitle". $theme->links($links) ."
". format_url($item->link, $item->title) ." · fid\" title=\"". t("View more information about this feed.") ."\">$item->ftitle". $theme->links($links) ."
". check_output($item->description, 1) ."

uid&date=". mktime(23, 59, 59, date("n", $blog->created), date("d", $blog->created), date("Y", $blog->created)) ."\">". format_date($blog->created, custom, "d M Y") .":
uid&date=". mktime(23, 59, 59, date("n", $blog->created), date("d", $blog->created), date("Y", $blog->created)) ."\" title=\"". t("Permanent link to this blog entry.") ."\">". format_date($blog->created, custom, "d M Y") .":
". check_output($blog->title) ."
". $theme->links($links) ."
"; - $output .= "uid\">image("xml.gif") ."\" width=\"36\" height=\"14\" align=\"right\" border=\"0\" />\n"; + $output .= "uid\" title=\"". t("View the XML version of this page.") ."\">image("xml.gif") ."\" width=\"36\" height=\"14\" align=\"right\" border=\"0\" />\n"; $theme->box(sprintf(t("%s's blog"), $account->name), $output, "main"); } @@ -206,18 +205,18 @@ function blog_page_last() { $links = array(); - $links[] = "uid\">". sprintf("%s's blog", $blog->name) .""; + $links[] = "uid\" title=\"". sprintf(t("Read %s's latest blog entries."), $blog->name) ."\">". sprintf("%s's blog", $blog->name) .""; if ($blog->uid == $user->uid) { - $links[] = "nid\">". t("edit") .""; + $links[] = "nid\" title=\"". t("Edit this blog entry.") ."\">". t("edit") .""; } if ($user->uid) { - $links[] = "nid\">". t("blog it") .""; + $links[] = "nid\" title=\"". t("Comment on this blog entry in your personal blog.") ."\">". t("blog it") .""; } if ($blog->comment) { - $links[] = "nid\">". format_plural(comment_num_all($blog->nid), t("comment"), t("comments")) .""; + $links[] = "nid\" title=\"". t("Read the posted comments or add a new comment.") ."\">". format_plural(comment_num_all($blog->nid), t("comment"), t("comments")) .""; } $output .= "". check_output($blog->title) ."". $theme->links($links) .""; @@ -226,7 +225,7 @@ function blog_page_last() { } $output .= ""; - $output .= "image("xml.gif") ."\" width=\"36\" height=\"14\" align=\"right\" border=\"0\" />\n"; + $output .= "image("xml.gif") ."\" width=\"36\" height=\"14\" align=\"right\" border=\"0\" />\n"; $theme->box(t("User blogs"), $output, "main"); } @@ -312,27 +311,26 @@ function blog_link($type, $node = 0) { global $user; if ($type == "page" && user_access("access content")) { - $links[] = "". t("user blogs") .""; + $links[] = "". t("user blogs") .""; } if ($type == "menu") { - $links[] = "". t("add blog entry") .""; - $links[] = "uid\">". t("view your blog") .""; + $links[] = "". t("add blog entry") .""; + $links[] = "uid\" title=\"". t("View your latest blog entries in chronological order.") ."\">". t("view your blog") .""; } if ($type == "node" && $node->type == "blog") { if (blog_access("update", $node)) { - $links[] = "nid\">". t("update this blog") .""; + $links[] = "nid\" title=\"". t("Update this blog entry.") ."\">". t("update this blog") .""; } else { - $links[] = "uid\">". strtr(t("%a's blog"), array("%a" => $node->name)) .""; + $links[] = "uid\" title=\"". sprintf(t("Read %s's latest blog entries."), $node->name) ."\">". strtr(t("%a's blog"), array("%a" => $node->name)) .""; } } return $links ? $links : array(); } - function blog_block() { global $user; @@ -342,7 +340,7 @@ function blog_block() { $output .= "nid\">". check_output($node->title) ."
\n"; } - $output .= "
". t("more") ."
"; + $output .= "
". t("more") ."
"; $block[0]["subject"] = t("User blogs"); $block[0]["content"] = $output; diff --git a/modules/blog/blog.module b/modules/blog/blog.module index 04a6846d2..b3c1081e0 100644 --- a/modules/blog/blog.module +++ b/modules/blog/blog.module @@ -9,11 +9,10 @@ function blog_conf_options() { } - function blog_node($field) { global $user; - $info["name"] = t("personal blog"); + $info["name"] = t("personal blog entry"); $info["description"] = t("A blog is your personal diary or journal. It is made up of individual entries that are time stamped and are typically arranged by the day, as normal a diary. Blogs often contain links to things you've seen, or on which you agree/disagree. Since a Blog is personal, you and only you have full control on what you publish. The most interesting blogs, or those blogs that fit the site's topic might get promoted to the front page."); return $info[$field]; @@ -168,19 +167,19 @@ function blog_page_user($uid = 0, $date = 0) { if ($date != date("dny", $blog->created)) { $date = date("dny", $blog->created); - $output .= "uid&date=". mktime(23, 59, 59, date("n", $blog->created), date("d", $blog->created), date("Y", $blog->created)) ."\">". format_date($blog->created, custom, "d M Y") .":"; + $output .= "uid&date=". mktime(23, 59, 59, date("n", $blog->created), date("d", $blog->created), date("Y", $blog->created)) ."\" title=\"". t("Permanent link to this blog entry.") ."\">". format_date($blog->created, custom, "d M Y") .":"; } if ($user->uid && $user->uid == $uid) { - $links[] = "nid\">". t("edit") .""; + $links[] = "nid\" title=\"". t("Make changes to your blog entry.") ."\">". t("edit") .""; } if ($user->uid) { - $links[] = "nid\">". t("blog it") .""; + $links[] = "nid\" title=\"". t("Comment on this blog entry in your personal blog.") ."\">". t("blog it") .""; } if ($blog->comment) { - $links[] = "nid\">". format_plural(comment_num_all($blog->nid), t("comment"), t("comments")) .""; + $links[] = "nid\" title=\"". t("View this posting and all of its comments.") ."\">". format_plural(comment_num_all($blog->nid), t("comment"), t("comments")) .""; } $output .= "
". check_output($blog->title) ."
". $theme->links($links) .""; @@ -189,7 +188,7 @@ function blog_page_user($uid = 0, $date = 0) { } $output .= ""; - $output .= "uid\">image("xml.gif") ."\" width=\"36\" height=\"14\" align=\"right\" border=\"0\" />\n"; + $output .= "uid\" title=\"". t("View the XML version of this page.") ."\">image("xml.gif") ."\" width=\"36\" height=\"14\" align=\"right\" border=\"0\" />\n"; $theme->box(sprintf(t("%s's blog"), $account->name), $output, "main"); } @@ -206,18 +205,18 @@ function blog_page_last() { $links = array(); - $links[] = "uid\">". sprintf("%s's blog", $blog->name) .""; + $links[] = "uid\" title=\"". sprintf(t("Read %s's latest blog entries."), $blog->name) ."\">". sprintf("%s's blog", $blog->name) .""; if ($blog->uid == $user->uid) { - $links[] = "nid\">". t("edit") .""; + $links[] = "nid\" title=\"". t("Edit this blog entry.") ."\">". t("edit") .""; } if ($user->uid) { - $links[] = "nid\">". t("blog it") .""; + $links[] = "nid\" title=\"". t("Comment on this blog entry in your personal blog.") ."\">". t("blog it") .""; } if ($blog->comment) { - $links[] = "nid\">". format_plural(comment_num_all($blog->nid), t("comment"), t("comments")) .""; + $links[] = "nid\" title=\"". t("Read the posted comments or add a new comment.") ."\">". format_plural(comment_num_all($blog->nid), t("comment"), t("comments")) .""; } $output .= "". check_output($blog->title) ."". $theme->links($links) .""; @@ -226,7 +225,7 @@ function blog_page_last() { } $output .= ""; - $output .= "image("xml.gif") ."\" width=\"36\" height=\"14\" align=\"right\" border=\"0\" />\n"; + $output .= "image("xml.gif") ."\" width=\"36\" height=\"14\" align=\"right\" border=\"0\" />\n"; $theme->box(t("User blogs"), $output, "main"); } @@ -312,27 +311,26 @@ function blog_link($type, $node = 0) { global $user; if ($type == "page" && user_access("access content")) { - $links[] = "". t("user blogs") .""; + $links[] = "". t("user blogs") .""; } if ($type == "menu") { - $links[] = "". t("add blog entry") .""; - $links[] = "uid\">". t("view your blog") .""; + $links[] = "". t("add blog entry") .""; + $links[] = "uid\" title=\"". t("View your latest blog entries in chronological order.") ."\">". t("view your blog") .""; } if ($type == "node" && $node->type == "blog") { if (blog_access("update", $node)) { - $links[] = "nid\">". t("update this blog") .""; + $links[] = "nid\" title=\"". t("Update this blog entry.") ."\">". t("update this blog") .""; } else { - $links[] = "uid\">". strtr(t("%a's blog"), array("%a" => $node->name)) .""; + $links[] = "uid\" title=\"". sprintf(t("Read %s's latest blog entries."), $node->name) ."\">". strtr(t("%a's blog"), array("%a" => $node->name)) .""; } } return $links ? $links : array(); } - function blog_block() { global $user; @@ -342,7 +340,7 @@ function blog_block() { $output .= "nid\">". check_output($node->title) ."
\n"; } - $output .= "
". t("more") ."
"; + $output .= "
". t("more") ."
"; $block[0]["subject"] = t("User blogs"); $block[0]["content"] = $output; diff --git a/modules/book.module b/modules/book.module index 1e2a77979..8a8464bb2 100644 --- a/modules/book.module +++ b/modules/book.module @@ -95,7 +95,7 @@ function book_save($op, $node) { function book_link($type, $node = 0, $main = 0) { if ($type == "page" && user_access("access content")) { - $links[] = "". t("collaborative book") .""; + $links[] = "". t("collaborative book") .""; } if ($type == "admin" && user_access("administer nodes")) { @@ -103,7 +103,7 @@ function book_link($type, $node = 0, $main = 0) { } if ($type == "node" && $node->type == "book" && book_access("update", $node)) { - $links[] = "nid\">". t("update this book page") .""; + $links[] = "nid\" title=\"". t("Suggest an update for this book page.") ."\">". t("update this book page") .""; } return $links ? $links : array(); @@ -401,8 +401,8 @@ function book_view($node, $main = 0) { } $output .= "
"; - $output .= " ". ($prev ? "nid\">". t("previous") ."" : t("previous")) ."index". ($next ? "nid\">". t("next") ."" : t("next")) .""; - $output .= " ". ($prev ? "". check_output($prev->title) ."" : " ") ."". ($node->parent ? "parent\">". t("up") ."" : t("up")) ."". ($next ? "". check_output($next->title) ."" : " ") .""; + $output .= " ". ($prev ? "nid\" title=\"". t("View the previous page in this book.") ."\">". t("previous") ."" : t("previous")) ."index". ($next ? "nid\" title=\"". t("View the next page in this book.") ."\">". t("next") ."" : t("next")) .""; + $output .= " ". ($prev ? "". check_output($prev->title) ."" : " ") ."". ($node->parent ? "parent\" title=\"". t("View the parent section.") ."\">". t("up") ."" : t("up")) ."". ($next ? "". check_output($next->title) ."" : " ") .""; $output .= "
"; $output .= "
". $theme->links(link_node($node, $main)) ."
"; $output .= ""; diff --git a/modules/book/book.module b/modules/book/book.module index 1e2a77979..8a8464bb2 100644 --- a/modules/book/book.module +++ b/modules/book/book.module @@ -95,7 +95,7 @@ function book_save($op, $node) { function book_link($type, $node = 0, $main = 0) { if ($type == "page" && user_access("access content")) { - $links[] = "". t("collaborative book") .""; + $links[] = "". t("collaborative book") .""; } if ($type == "admin" && user_access("administer nodes")) { @@ -103,7 +103,7 @@ function book_link($type, $node = 0, $main = 0) { } if ($type == "node" && $node->type == "book" && book_access("update", $node)) { - $links[] = "nid\">". t("update this book page") .""; + $links[] = "nid\" title=\"". t("Suggest an update for this book page.") ."\">". t("update this book page") .""; } return $links ? $links : array(); @@ -401,8 +401,8 @@ function book_view($node, $main = 0) { } $output .= "
"; - $output .= " ". ($prev ? "nid\">". t("previous") ."" : t("previous")) ."index". ($next ? "nid\">". t("next") ."" : t("next")) .""; - $output .= " ". ($prev ? "". check_output($prev->title) ."" : " ") ."". ($node->parent ? "parent\">". t("up") ."" : t("up")) ."". ($next ? "". check_output($next->title) ."" : " ") .""; + $output .= " ". ($prev ? "nid\" title=\"". t("View the previous page in this book.") ."\">". t("previous") ."" : t("previous")) ."index". ($next ? "nid\" title=\"". t("View the next page in this book.") ."\">". t("next") ."" : t("next")) .""; + $output .= " ". ($prev ? "". check_output($prev->title) ."" : " ") ."". ($node->parent ? "parent\" title=\"". t("View the parent section.") ."\">". t("up") ."" : t("up")) ."". ($next ? "". check_output($next->title) ."" : " ") .""; $output .= "
"; $output .= "
". $theme->links(link_node($node, $main)) ."
"; $output .= ""; diff --git a/modules/comment.module b/modules/comment.module index 344bf2359..820e5ce41 100644 --- a/modules/comment.module +++ b/modules/comment.module @@ -58,7 +58,7 @@ function comment_tag_new($nid) { function comment_is_new($comment) { global $user; static $date; - + if (!$date) { if ($user->uid) { $history = db_fetch_object(db_query("SELECT timestamp FROM history WHERE uid = '$user->uid' AND nid = '$comment->nid'")); @@ -357,15 +357,15 @@ function comment_links($comment, $return = 1) { } if (user_access("administer comments")) { - $links[] = "cid\">type\">". t("administer") .""; + $links[] = "cid\" title=\"". t("Administer this comment.") ."\">type\">". t("administer") .""; } if (user_access("post comments")) { if (comment_access("edit", $comment)) { - $links[] = "cid\">type\">". t("edit your comment") .""; + $links[] = "cid\">type\" title=\"". t("Make changes to your comment.") ."\">". t("edit your comment") .""; } else { - $links[] = "nid&pid=$comment->cid\">type\">". t("reply to this comment") .""; + $links[] = "nid&pid=$comment->cid\" title=\"". t("Reply to this comment.") ."\">type\">". t("reply to this comment") .""; } } @@ -551,7 +551,7 @@ function comment_link($type, $node = 0, $main = 0) { $all = comment_num_all($node->nid); $new = comment_num_new($node->nid); - $links[] = "nid#comment\">". format_plural($all, "comment", "comments") . ($new ? ", $new ". t("new") : "") .""; + $links[] = "nid#comment\" title=\"". t("View this posting and all of its comments.") ."\">". format_plural($all, "comment", "comments") . ($new ? ", $new ". t("new") : "") .""; } } else { @@ -561,7 +561,7 @@ function comment_link($type, $node = 0, $main = 0) { */ if (user_access("post comments")) { - $links[] = "nid#comment\">". t("add new comment") .""; + $links[] = "nid#comment\" title=\"". t("Share your thoughts and opinions related to this posting.") ."\">". t("add new comment") .""; } } } diff --git a/modules/comment/comment.module b/modules/comment/comment.module index 344bf2359..820e5ce41 100644 --- a/modules/comment/comment.module +++ b/modules/comment/comment.module @@ -58,7 +58,7 @@ function comment_tag_new($nid) { function comment_is_new($comment) { global $user; static $date; - + if (!$date) { if ($user->uid) { $history = db_fetch_object(db_query("SELECT timestamp FROM history WHERE uid = '$user->uid' AND nid = '$comment->nid'")); @@ -357,15 +357,15 @@ function comment_links($comment, $return = 1) { } if (user_access("administer comments")) { - $links[] = "cid\">type\">". t("administer") .""; + $links[] = "cid\" title=\"". t("Administer this comment.") ."\">type\">". t("administer") .""; } if (user_access("post comments")) { if (comment_access("edit", $comment)) { - $links[] = "cid\">type\">". t("edit your comment") .""; + $links[] = "cid\">type\" title=\"". t("Make changes to your comment.") ."\">". t("edit your comment") .""; } else { - $links[] = "nid&pid=$comment->cid\">type\">". t("reply to this comment") .""; + $links[] = "nid&pid=$comment->cid\" title=\"". t("Reply to this comment.") ."\">type\">". t("reply to this comment") .""; } } @@ -551,7 +551,7 @@ function comment_link($type, $node = 0, $main = 0) { $all = comment_num_all($node->nid); $new = comment_num_new($node->nid); - $links[] = "nid#comment\">". format_plural($all, "comment", "comments") . ($new ? ", $new ". t("new") : "") .""; + $links[] = "nid#comment\" title=\"". t("View this posting and all of its comments.") ."\">". format_plural($all, "comment", "comments") . ($new ? ", $new ". t("new") : "") .""; } } else { @@ -561,7 +561,7 @@ function comment_link($type, $node = 0, $main = 0) { */ if (user_access("post comments")) { - $links[] = "nid#comment\">". t("add new comment") .""; + $links[] = "nid#comment\" title=\"". t("Share your thoughts and opinions related to this posting.") ."\">". t("add new comment") .""; } } } diff --git a/modules/import.module b/modules/import.module index cee9bf2e3..013cd7100 100644 --- a/modules/import.module +++ b/modules/import.module @@ -29,7 +29,7 @@ function import_link($type) { } if ($type == "page" && user_access("access news feeds")) { - $links[] = "". t("news feeds") .""; + $links[] = "". t("news feeds") .""; } return $links ? $links : array(); @@ -53,7 +53,7 @@ function import_format_item($item, $feed = 0) { global $theme, $user; if ($user->uid && user_access("post blogs")) { - $output .= "iid\">image("blog.gif") ."\" border=\"0\" width=\"12\" height=\"16\" alt=\"". t("Blog this item") ."\" /> "; + $output .= "iid\" title=\"". t("Comment on this news item in your personal blog.") ."\">image("blog.gif") ."\" border=\"0\" width=\"12\" height=\"16\" alt=\"". t("Blog this item") ."\" /> "; } $output .= "link) ."\" target=\"new\">". check_output($item->title) .""; @@ -97,7 +97,7 @@ function import_get_bundles($attributes = 0) { $i = 0; while ($bundle = db_fetch_object($result)) { $block[$i]["subject"] = $bundle->title; - $block[$i]["content"] = import_bundle_block($bundle->attributes) ."

bid\">". t("more") ."

"; + $block[$i]["content"] = import_bundle_block($bundle->attributes) ."

bid\" title=\"". t("View this bundle's recent news.") ."\">". t("more") ."

"; $block[$i]["info"] = "$bundle->title bundle"; $i++; @@ -112,7 +112,7 @@ function import_get_feeds($attributes = 0) { $i = 0; while ($feed = db_fetch_object($result)) { $block[$i]["subject"] = $feed->title; - $block[$i]["content"] = import_feed_block($feed) ."

fid\">". t("more") ."

"; + $block[$i]["content"] = import_feed_block($feed) ."

fid\" title=\"". t("View this feed's recent news.") ."\">". t("more") ."

"; $block[$i]["info"] = "$feed->title feed"; $i++; @@ -137,7 +137,7 @@ function import_refresh($feed) { } /* - ** Grab the headlines: + ** Grab the news items: */ if ($fp = @fopen($feed["url"], "r")) { @@ -514,10 +514,10 @@ function import_admin() { function import_page_info() { global $theme; - $links[] = "". t("latest news") .""; - $links[] = "". t("news by source") .""; - $links[] = "". t("news by topic") .""; - $links[] = "". t("news sources") .""; + $links[] = "". t("latest news") .""; + $links[] = "". t("news by source") .""; + $links[] = "". t("news by topic") .""; + $links[] = "". t("news sources") .""; return "
". $theme->links($links) ."
"; } @@ -529,12 +529,13 @@ function import_page_last() { $output .= ""; while ($item = db_fetch_object($result)) { - $links[] = "iid\">". t("blog it") .""; - $links[] = "fid\">". t("feed") .""; + $links[] = "iid\" title=\"". t("Comment on this news item in your personal blog.") ."\">". t("blog it") .""; + $links[] = "fid\" title=\"". t("Read more syndicated news from this feed.") ."\">". t("feed") .""; if ($item->link) { - $output .= "\n"; + $output .= "\n"; } + if ($item->description) { $output .= ""; } @@ -562,7 +563,7 @@ function import_page_feed($fid) { $output .= "
". format_url($item->link, $item->title) ." · fid\">$item->ftitle". $theme->links($links) ."
". format_url($item->link, $item->title) ." · fid\" title=\"". t("View more information about this feed.") ."\">$item->ftitle". $theme->links($links) ."
". check_output($item->description, 1) ."

"; while ($item = db_fetch_object($result)) { - $links[] = "iid\">". t("blog it") .""; + $links[] = "iid\" title=\"". t("Comment on this news item in your personal blog.") ."\">". t("blog it") .""; $links[] = "link\">". t("visit") .""; if ($item->link) { @@ -596,13 +597,14 @@ function import_page_bundle($bid) { $output .= "
"; while ($item = db_fetch_object($result)) { - $links[] = "iid\">". t("blog it") .""; - $links[] = "fid\">". t("feed") .""; + $links[] = "iid\" title=\"". t("Comment on this news item in your personal blog.") ."\">". t("blog it") .""; + $links[] = "fid\" title=\"". t("Read more syndicated news from this feed.") ."\">". t("feed") .""; $links[] = "link\">". t("visit") .""; if ($item->link) { - $output .= "\n"; + $output .= "\n"; } + if ($item->description) { $output .= ""; } @@ -628,7 +630,7 @@ function import_page_sources() { $output .= "
". check_output($feed->description, 1) ."

"; } - $output .= "image("xml.gif") ."\" width=\"36\" height=\"14\" align=\"right\" border=\"0\" />
\n"; + $output .= "image("xml.gif") ."\" width=\"36\" height=\"14\" align=\"right\" border=\"0\" />
\n"; $theme->header(); $theme->box(t("News feeds"), import_page_info()); diff --git a/modules/node.module b/modules/node.module index c4999b1b6..0ca006ea2 100644 --- a/modules/node.module +++ b/modules/node.module @@ -358,7 +358,7 @@ function node_link($type, $node = 0, $main = 0) { } if ($type == "page" && user_access("post content")) { - $links[] = "submit"; + $links[] = "". t("submit") .""; } if ($type == "node") { @@ -367,11 +367,11 @@ function node_link($type, $node = 0, $main = 0) { } if ($main == 1 && $node->teaser != $node->body) { - $links[] = "nid\">". t("read more") .""; + $links[] = "nid\" title=\"". t("Read the rest of this posting.") ."\">". t("read more") .""; } if (user_access("administer nodes")) { - $links[] = "nid\">". t("administer") .""; + $links[] = "nid\" title=\"". t("Administer this node.") ."\">". t("administer") .""; } } @@ -644,7 +644,7 @@ function node_block() { global $theme; $block[0][subject] = t("Syndicate"); - $block[0][content] = "
image("xml.gif") ."\" width=\"36\" height=\"14\" border=\"0\" alt=\"XML\" />
\n"; + $block[0][content] = "
image("xml.gif") ."\" width=\"36\" height=\"14\" border=\"0\" alt=\"XML\" />
\n"; $block[0][info] = "Syndicate"; return $block; @@ -879,7 +879,7 @@ function node_add($type) { foreach (module_list() as $name) { if (module_hook($name, "node") && node_access("create", array("type" => $name))) { $output .= "
  • "; - $output .= " ". module_invoke($name, "node", "name") .""; + $output .= " ". module_invoke($name, "node", "name") .""; $output .= "
    ". module_invoke($name, "node", "description") ."
    "; $output .= "
    • "; } diff --git a/modules/node/node.module b/modules/node/node.module index c4999b1b6..0ca006ea2 100644 --- a/modules/node/node.module +++ b/modules/node/node.module @@ -358,7 +358,7 @@ function node_link($type, $node = 0, $main = 0) { } if ($type == "page" && user_access("post content")) { - $links[] = "submit"; + $links[] = "". t("submit") .""; } if ($type == "node") { @@ -367,11 +367,11 @@ function node_link($type, $node = 0, $main = 0) { } if ($main == 1 && $node->teaser != $node->body) { - $links[] = "nid\">". t("read more") .""; + $links[] = "nid\" title=\"". t("Read the rest of this posting.") ."\">". t("read more") .""; } if (user_access("administer nodes")) { - $links[] = "nid\">". t("administer") .""; + $links[] = "nid\" title=\"". t("Administer this node.") ."\">". t("administer") .""; } } @@ -644,7 +644,7 @@ function node_block() { global $theme; $block[0][subject] = t("Syndicate"); - $block[0][content] = "
    image("xml.gif") ."\" width=\"36\" height=\"14\" border=\"0\" alt=\"XML\" />
    \n"; + $block[0][content] = "
    image("xml.gif") ."\" width=\"36\" height=\"14\" border=\"0\" alt=\"XML\" />
    \n"; $block[0][info] = "Syndicate"; return $block; @@ -879,7 +879,7 @@ function node_add($type) { foreach (module_list() as $name) { if (module_hook($name, "node") && node_access("create", array("type" => $name))) { $output .= "
  • "; - $output .= " ". module_invoke($name, "node", "name") .""; + $output .= " ". module_invoke($name, "node", "name") .""; $output .= "
    ". module_invoke($name, "node", "description") ."
    "; $output .= "
    • "; } diff --git a/modules/queue.module b/modules/queue.module index 33335d63a..11790447e 100644 --- a/modules/queue.module +++ b/modules/queue.module @@ -20,7 +20,7 @@ function queue_perm() { function queue_link($type) { if ($type == "menu" && user_access("access submission queue")) { - $links[] = "". t("submission queue") ." (". queue_count() .")"; + $links[] = "". t("submission queue") ." (". queue_count() .")"; } return $links ? $links : array(); diff --git a/modules/user.module b/modules/user.module index 2bf932dfe..a80d9db3b 100644 --- a/modules/user.module +++ b/modules/user.module @@ -414,12 +414,12 @@ function user_search($keys) { function user_link($type) { if ($type == "page") { - $links[] = "". t("user account") .""; + $links[] = "". t("user account") .""; } if ($type == "menu") { - $links[] = "". t("account settings") .""; - $links[] = "
    ". t("logout") .""; + $links[] = "". t("account settings") .""; + $links[] = "
    ". t("logout") .""; } if ($type == "admin" && user_access("administer users")) { diff --git a/modules/user/user.module b/modules/user/user.module index 2bf932dfe..a80d9db3b 100644 --- a/modules/user/user.module +++ b/modules/user/user.module @@ -414,12 +414,12 @@ function user_search($keys) { function user_link($type) { if ($type == "page") { - $links[] = "". t("user account") .""; + $links[] = "". t("user account") .""; } if ($type == "menu") { - $links[] = "". t("account settings") .""; - $links[] = "
    ". t("logout") .""; + $links[] = "". t("account settings") .""; + $links[] = "
    ". t("logout") .""; } if ($type == "admin" && user_access("administer users")) { -- cgit v1.2.3
    ". format_url($item->link, $item->title) ." · fid\">$item->ftitle". $theme->links($links) ."
    ". format_url($item->link, $item->title) ." · fid\" title=\"". t("View more information about this feed.") ."\">$item->ftitle". $theme->links($links) ."
    ". check_output($item->description, 1) ."