From de3b0796d24c05856340d94504c109195b51d71c Mon Sep 17 00:00:00 2001 From: Dries Buytaert Date: Thu, 5 Jun 2003 18:09:39 +0000 Subject: - Bugfix: better charset support for non-ISO-8859-1 languages. Patch 0029.charset.fixes.patch by Al. Could East Asia test this please. - Bugfix: made the "moderate" field behave. Patch 0030.queue.module.help.and.settings.form.patch by Al. - Documentation: revised a large part of the help texts / documentation! Al's 0024.* patches. - Documentation: added a glossary to the help module. Patch 0025.help.module.glossary.patch by Al and Michael. - Usability: first step towards unifying the terminology used in the cloud module. Patch by 0028.site.cloud.rationalize.name.patch Al. - Usability + CSS improvements: revamped the node form and removed all tables. Patch 0027.node.form.rewrite.patch by Al. - CSS improvements: patch 0026.admin.css.small.improvement.patch by Al. - Updated the MAINTAINERS file. --- modules/aggregator.module | 6 ++-- modules/aggregator/aggregator.module | 6 ++-- modules/blog.module | 10 +++--- modules/blog/blog.module | 10 +++--- modules/book.module | 14 ++++----- modules/book/book.module | 14 ++++----- modules/cloud.module | 6 ++-- modules/forum.module | 6 ++-- modules/forum/forum.module | 6 ++-- modules/help.module | 23 ++++++++++++++ modules/help/help.module | 23 ++++++++++++++ modules/import.module | 6 ++-- modules/node.module | 61 +++++++++++++++++++----------------- modules/node/node.module | 61 +++++++++++++++++++----------------- modules/poll.module | 2 +- modules/poll/poll.module | 2 +- modules/queue.module | 14 ++++----- modules/story.module | 12 +++---- modules/story/story.module | 12 +++---- modules/taxonomy.module | 6 ++-- modules/taxonomy/taxonomy.module | 6 ++-- 21 files changed, 181 insertions(+), 125 deletions(-) (limited to 'modules') diff --git a/modules/aggregator.module b/modules/aggregator.module index a07c98a25..d7916491c 100644 --- a/modules/aggregator.module +++ b/modules/aggregator.module @@ -706,13 +706,13 @@ function import_page_fd() { $result = db_query("SELECT * FROM feed ORDER BY title"); - $output .= "\n\n"; + $output .= "\n\n"; $output .= "\n\n"; while ($feed = db_fetch_object($result)) { $output .= "\n"; - $output .= " ". htmlspecialchars($feed->title) ."\n"; - $output .= " ". htmlspecialchars($feed->url) ."\n"; + $output .= " ". drupal_specialchars($feed->title) ."\n"; + $output .= " ". drupal_specialchars($feed->url) ."\n"; $output .= "\n\n"; } diff --git a/modules/aggregator/aggregator.module b/modules/aggregator/aggregator.module index a07c98a25..d7916491c 100644 --- a/modules/aggregator/aggregator.module +++ b/modules/aggregator/aggregator.module @@ -706,13 +706,13 @@ function import_page_fd() { $result = db_query("SELECT * FROM feed ORDER BY title"); - $output .= "\n\n"; + $output .= "\n\n"; $output .= "\n\n"; while ($feed = db_fetch_object($result)) { $output .= "\n"; - $output .= " ". htmlspecialchars($feed->title) ."\n"; - $output .= " ". htmlspecialchars($feed->url) ."\n"; + $output .= " ". drupal_specialchars($feed->title) ."\n"; + $output .= " ". drupal_specialchars($feed->url) ."\n"; $output .= "\n\n"; } diff --git a/modules/blog.module b/modules/blog.module index 80723e029..fe663d3b0 100644 --- a/modules/blog.module +++ b/modules/blog.module @@ -18,7 +18,7 @@ function blog_node($field) { global $user; $info["name"] = t("personal blog entry"); - $info["description"] = t("A blog is a regularly updated web page that is similar to a diary -- that (generally) anyone in the world can see. It is made up of individual entries, often called posts, that are time stamped and typically arranged by the day, with the newest on top (a diary is the reverse). Blogs often contain links to things you've seen, or on which you agree/disagree. Some blogs also contain original material written solely for the blog. Since a Blog is personal, you and only you have full control on what you publish. The most interesting blog entries or those blog entries that fit the site's topic well might get promoted to the front page by the community or the people with access to do this."); + $info["description"] = t("A blog is a regularly updated journal made up of individual entries, often called posts, that are time stamped and typically arranged by the day, with the newest on top (a diary is the reverse). They tend to be quite personal, often containing links to things you've seen, or to editorials that you find interesting. Some blogs also contain original material written solely for the blog. Since a Blog is personal, you and only you have full control over what you publish. The most interesting blog entries or those blog entries that fit the site's topic well might get promoted to the front page by the community or by users with the access do this."); return $info[$field]; } @@ -71,10 +71,10 @@ function blog_user($type, &$edit, &$user) { } function blog_help() { - $output .= "

Drupal's blog module allows registered users to maintain an online weblog (commonly known as a blog), often referred to as an online journal or diary. They can be filled with daily thoughts, poetry, boneless blabber, spiritual theories, intimate details, valuable experiences, cynical rants, semi-coherent comments, writing experiments, artistic babblings, critics on current facts, fresh insights, diverse dreams, chronicles and mumbling madness available for public consumption."; - $output .= " Blogs made up of individual entries, nodes, that are timestamped and are typically viewed by day as you would a diary. Blogs often contain links to things you've seen, or agree/disagree with. A typical example of a long term blog can be seen at http://www.scripting.com/.

"; - $output .= "

The blog module adds a couple of menu options. \"user blogs\", a page that everyone gets to see that displays the most recent blog entries from every participant. Your personal menu adds a \"create a blog entry\" link which takes you to a submission form, a \"view personal blog\" link which displays your blog entries as other people will see them. And, on the bottom of each of your blog entry, there is an \"edit this blog entry\" link that lets you edit or delete old entries.

"; - $output .= "

In the import module (news aggregator) a glyph that looks like a pinboard stickit note is displayed. Click on this and you are taken to the blog submission form. The system helpfully copies the title, a link to the item, and a link to the source into the body text ready for you to add your explanation. This actively encourages people to add blog entries about things they see and hear elsewhere in the Drupal site.

"; + $output .= "

Drupal's blog module allows registered users to maintain an online weblog (commonly known as a blog), often referred to as an online journal or diary. These can be filled with daily thoughts, poetry, boneless blabber, spiritual theories, intimate details, valuable experiences, cynical rants, semi-coherent comments, writing experiments, artistic babblings, critics on current facts, fresh insights, diverse dreams, chronicles and mumbling madness available for public consumption.

"; + $output .= "

Blogs are made up of individual entries (nodes) that are timestamped and are typically viewed by day as you would a diary. Blogs often contain links to things you've seen, or agree/disagree with. A typical example of a long term blog can be seen at http://www.scripting.com/.

"; + $output .= "

The blog module adds a \"user blogs\" navigation link to the site, which takes any visitor to a page that displays the most recent blog entries from all the users on the site. Personal user menus gain a \"create a blog entry\" link (which takes you to a submission form) and a \"view personal blog\" link (which displays your blog entries as other people will see them). On the bottom of each of your own blog entries, there is an \"edit this blog entry\" link that lets you edit or delete that entry.

"; + $output .= "

If a user has the ability to post blogs, then the import module (news aggregator) will display a blog-it link (b) next to each news item in its lists. Click on this and you will be taken to the blog submission form, with the title, a link to the item, and a link to the source into the body text already in the text box, ready for you to add your explanation. This actively encourages people to add blog entries about things they see and hear elsewhere in the Drupal site and from your syndicated partner sites.

"; return t($output); diff --git a/modules/blog/blog.module b/modules/blog/blog.module index 80723e029..fe663d3b0 100644 --- a/modules/blog/blog.module +++ b/modules/blog/blog.module @@ -18,7 +18,7 @@ function blog_node($field) { global $user; $info["name"] = t("personal blog entry"); - $info["description"] = t("A blog is a regularly updated web page that is similar to a diary -- that (generally) anyone in the world can see. It is made up of individual entries, often called posts, that are time stamped and typically arranged by the day, with the newest on top (a diary is the reverse). Blogs often contain links to things you've seen, or on which you agree/disagree. Some blogs also contain original material written solely for the blog. Since a Blog is personal, you and only you have full control on what you publish. The most interesting blog entries or those blog entries that fit the site's topic well might get promoted to the front page by the community or the people with access to do this."); + $info["description"] = t("A blog is a regularly updated journal made up of individual entries, often called posts, that are time stamped and typically arranged by the day, with the newest on top (a diary is the reverse). They tend to be quite personal, often containing links to things you've seen, or to editorials that you find interesting. Some blogs also contain original material written solely for the blog. Since a Blog is personal, you and only you have full control over what you publish. The most interesting blog entries or those blog entries that fit the site's topic well might get promoted to the front page by the community or by users with the access do this."); return $info[$field]; } @@ -71,10 +71,10 @@ function blog_user($type, &$edit, &$user) { } function blog_help() { - $output .= "

Drupal's blog module allows registered users to maintain an online weblog (commonly known as a blog), often referred to as an online journal or diary. They can be filled with daily thoughts, poetry, boneless blabber, spiritual theories, intimate details, valuable experiences, cynical rants, semi-coherent comments, writing experiments, artistic babblings, critics on current facts, fresh insights, diverse dreams, chronicles and mumbling madness available for public consumption."; - $output .= " Blogs made up of individual entries, nodes, that are timestamped and are typically viewed by day as you would a diary. Blogs often contain links to things you've seen, or agree/disagree with. A typical example of a long term blog can be seen at http://www.scripting.com/.

"; - $output .= "

The blog module adds a couple of menu options. \"user blogs\", a page that everyone gets to see that displays the most recent blog entries from every participant. Your personal menu adds a \"create a blog entry\" link which takes you to a submission form, a \"view personal blog\" link which displays your blog entries as other people will see them. And, on the bottom of each of your blog entry, there is an \"edit this blog entry\" link that lets you edit or delete old entries.

"; - $output .= "

In the import module (news aggregator) a glyph that looks like a pinboard stickit note is displayed. Click on this and you are taken to the blog submission form. The system helpfully copies the title, a link to the item, and a link to the source into the body text ready for you to add your explanation. This actively encourages people to add blog entries about things they see and hear elsewhere in the Drupal site.

"; + $output .= "

Drupal's blog module allows registered users to maintain an online weblog (commonly known as a blog), often referred to as an online journal or diary. These can be filled with daily thoughts, poetry, boneless blabber, spiritual theories, intimate details, valuable experiences, cynical rants, semi-coherent comments, writing experiments, artistic babblings, critics on current facts, fresh insights, diverse dreams, chronicles and mumbling madness available for public consumption.

"; + $output .= "

Blogs are made up of individual entries (nodes) that are timestamped and are typically viewed by day as you would a diary. Blogs often contain links to things you've seen, or agree/disagree with. A typical example of a long term blog can be seen at http://www.scripting.com/.

"; + $output .= "

The blog module adds a \"user blogs\" navigation link to the site, which takes any visitor to a page that displays the most recent blog entries from all the users on the site. Personal user menus gain a \"create a blog entry\" link (which takes you to a submission form) and a \"view personal blog\" link (which displays your blog entries as other people will see them). On the bottom of each of your own blog entries, there is an \"edit this blog entry\" link that lets you edit or delete that entry.

"; + $output .= "

If a user has the ability to post blogs, then the import module (news aggregator) will display a blog-it link (b) next to each news item in its lists. Click on this and you will be taken to the blog submission form, with the title, a link to the item, and a link to the source into the body text already in the text box, ready for you to add your explanation. This actively encourages people to add blog entries about things they see and hear elsewhere in the Drupal site and from your syndicated partner sites.

"; return t($output); diff --git a/modules/book.module b/modules/book.module index ee55265e2..ee8eb9b24 100644 --- a/modules/book.module +++ b/modules/book.module @@ -748,16 +748,16 @@ function book_admin() { } function book_help() { - $output .= "

The collaborative book is a magnificient mechanism for organizing content authored by many users. You may use it to organize a manual, to maintain a FAQ, or to manage any outline-like content. Books can have chapters, sections, etc. In fact, books can have an arbitrarily deep nesting strucuture.

"; - $output .= "

Under the covers, a book is only an organization of nodes. These nodes are often of type book page, but can be of any content type. Every node in the book has a Parent. The parent is the node which \"contains\" the child node. This is how book.module establishes its hierarchy. On any given level in the hierarchy, a book can contain many nodes. Book uses the Weight field to order these sibling nodes.

"; - $output .= "

Book pages are a special, powerful node type. These nodes are specifically designed to be included in a book. Their special power comes from the abilility to embed PHP within the body of the page. This capability is only offerred to administrators, since malicious users could abuse this power. In addiiton, book pages contain a log message field which helps your users understand the motivation behind an edit of a book page. Each edited version of a book page is usually stored as a new revision of a node. This capability makes it easy to revert to an old version of a page, should that become desirable.

"; + $output .= "

The collaborative book organises content into a nested hierarchical structure. It is particularly good for manuals, FAQs and the like, allowing you to have chapters, sections, etc.

"; + $output .= "

A book is simply a collection of nodes that have been linked together. These nodes are usually of type book page, but you can make insert nodes of any type into a book outline. Every node in the book has a parent node which \"contains\" it. This is how book.module establishes its hierarchy. At any given level in the hierarchy, a book can contain many nodes. All these sibling nodes are sorted according to the weight that you give them.

"; + $output .= "

A book page is a special node type that allows you to embed PHP within the body of the page. This capability is only offerred to administrators, since malicious users could abuse this power. In addiiton, book pages contain a log message field which helps your users understand the motivation behind an edit of a book page. Each edited version of a book page is stored as a new revision of a node. This capability makes it easy to revert to an old version of a page, should that be desirable.

"; $output .= "

Like other node types, book submissions and edits may be subject to moderation, depending on your configuration. Similarly, books use ". l("permissions", "admin/user/permission") ." to determine who may read and write to them. Only administrators are allowed to create new books, which are really just nodes whose parent is <root>. To include an existing node in your book, click on the \"administer\"-link in that node. At the bottom of this administration page, click on the edit book outline button. This enables you to place the node wherever you'd like within the book hierarchy. To add a new node into your book, use the create book page link.

"; $output .= "

Administrators may review the hierarchy of their books by clicking on the ". l("collaborative book", "admin/node/book")." link in the adminstration pages. There, nodes may be edited, reorganized, removed from book, and deleted. This behavior may change in the future. When a parent node is deleted, he may leave behind child nodes. These nodes are now orphans. Administrators should periodically ". l("review their books for orphans", "admin/node/book/orphan") ." and reaffiliate those pages as desired. Finally, administrators may also ". l("export their books", "book/print") ." to a single, flat HTML page which is suitable for printing.

"; - $output .= "

Maintain a FAQ using a collaborative book

"; - $output .= "

The collaborative book (i.e. book.module) in Drupal is a terrific way to easily manage an FAQ (Frequently Asked Questions) section of your web site. The main benefit for an administrator is that you don't have to write all the questions/answers by yourself. Let the community do it for you!

"; - $output .= "

In order to setup the FAQ, you have to create a new Book which will hold all your content. To do so, click on Create Book Page in your user box. Give it a thoughtful Title, and Body. A title like \"Estonia Travel - FAQ\" is nice. You may always edit these fields later. You will probably want to designate <root> as the parent of this page. Leave the log message and type fields blank for now. After you have submitted this book page, you are ready to begin filling up your book with questions that are frequently asked.

"; + $output .= "

Maintain an FAQ using a collaborative book

"; + $output .= "

Collaborative books let you easily set up a Frequently Asked Questions section on your web site. The main benefit is that you don't have to write all the questions/answers by yourself - let the community do it for you!

"; + $output .= "

In order to set up the FAQ, you have to create a new book which will hold all your content. To do so, click on create book page in your user box. Give it a thoughtful title, and body. A title like \"Estonia Travel - FAQ\" is nice. You may always edit these fields later. You will probably want to designate <root> as the parent of this page. Leave the log message and type fields blank for now. After you have submitted this book page, you are ready to begin filling up your book with questions that are frequently asked.

"; $output .= "

Whenever you come across a post which you want to include in your FAQ, click on the administer link. Then click on the edit book outline button at the bottom of the page. Then place the relevant post wherever is most appropriate in your book by selecting a parent. Books are quite flexible. They can have sections like Flying to Estonia, Eating in Estonia and so on. As you get more experienced with the collaborative book, you can reorganize posts in your book so that it stays organized.

"; - $output .= "

Notes:

  • Any comments attached to those relevant posts which you designate as book pages will also be transported into your book. This is a great feature, since much wisdom is shared via comments. And remember that all future comments and edits will automatically be reflected in your book.
  • You may wish to edit the title and teaser of posts when adding them to your FAQ. This is done on the same page as the Edit book outline button. Clear titles help users navigate quickly to the information that they seek.
  • Book pages may come from any content type (blog, story, page, etc.). If you are creating a post solely for inclusion in your book, then use the Create book page link.
  • If you don't see the administer link, then you probably have insufficient ". l("permissions", "admin/user/permission") .".
  • If you want to get really fancy, note that Books are one of the few content types which allow raw PHP in their body. So you've got lots of geeky possibilities there.
"; + $output .= "

Notes:

  • Any comments attached to those relevant posts which you designate as book pages will also be transported into your book. This is a great feature, since much wisdom is shared via comments. Remember that all future comments and edits will automatically be reflected in your book.
  • You may wish to edit the title of posts when adding them to your FAQ. This is done on the same page as the Edit book outline button. Clear titles improve navigability enormously.
  • Book pages may come from any content type (blog, story, page, etc.). If you are creating a post solely for inclusion in your book, then use the Create book page link.
  • If you don't see the administer link, then you probably have insufficient ". l("permissions", "admin/user/permission") .".
  • If you want to get really fancy, note that books are one of the few content types which allow raw PHP in their body. So you've got lots of geeky possibilities there.
"; return t($output); } diff --git a/modules/book/book.module b/modules/book/book.module index ee55265e2..ee8eb9b24 100644 --- a/modules/book/book.module +++ b/modules/book/book.module @@ -748,16 +748,16 @@ function book_admin() { } function book_help() { - $output .= "

The collaborative book is a magnificient mechanism for organizing content authored by many users. You may use it to organize a manual, to maintain a FAQ, or to manage any outline-like content. Books can have chapters, sections, etc. In fact, books can have an arbitrarily deep nesting strucuture.

"; - $output .= "

Under the covers, a book is only an organization of nodes. These nodes are often of type book page, but can be of any content type. Every node in the book has a Parent. The parent is the node which \"contains\" the child node. This is how book.module establishes its hierarchy. On any given level in the hierarchy, a book can contain many nodes. Book uses the Weight field to order these sibling nodes.

"; - $output .= "

Book pages are a special, powerful node type. These nodes are specifically designed to be included in a book. Their special power comes from the abilility to embed PHP within the body of the page. This capability is only offerred to administrators, since malicious users could abuse this power. In addiiton, book pages contain a log message field which helps your users understand the motivation behind an edit of a book page. Each edited version of a book page is usually stored as a new revision of a node. This capability makes it easy to revert to an old version of a page, should that become desirable.

"; + $output .= "

The collaborative book organises content into a nested hierarchical structure. It is particularly good for manuals, FAQs and the like, allowing you to have chapters, sections, etc.

"; + $output .= "

A book is simply a collection of nodes that have been linked together. These nodes are usually of type book page, but you can make insert nodes of any type into a book outline. Every node in the book has a parent node which \"contains\" it. This is how book.module establishes its hierarchy. At any given level in the hierarchy, a book can contain many nodes. All these sibling nodes are sorted according to the weight that you give them.

"; + $output .= "

A book page is a special node type that allows you to embed PHP within the body of the page. This capability is only offerred to administrators, since malicious users could abuse this power. In addiiton, book pages contain a log message field which helps your users understand the motivation behind an edit of a book page. Each edited version of a book page is stored as a new revision of a node. This capability makes it easy to revert to an old version of a page, should that be desirable.

"; $output .= "

Like other node types, book submissions and edits may be subject to moderation, depending on your configuration. Similarly, books use ". l("permissions", "admin/user/permission") ." to determine who may read and write to them. Only administrators are allowed to create new books, which are really just nodes whose parent is <root>. To include an existing node in your book, click on the \"administer\"-link in that node. At the bottom of this administration page, click on the edit book outline button. This enables you to place the node wherever you'd like within the book hierarchy. To add a new node into your book, use the create book page link.

"; $output .= "

Administrators may review the hierarchy of their books by clicking on the ". l("collaborative book", "admin/node/book")." link in the adminstration pages. There, nodes may be edited, reorganized, removed from book, and deleted. This behavior may change in the future. When a parent node is deleted, he may leave behind child nodes. These nodes are now orphans. Administrators should periodically ". l("review their books for orphans", "admin/node/book/orphan") ." and reaffiliate those pages as desired. Finally, administrators may also ". l("export their books", "book/print") ." to a single, flat HTML page which is suitable for printing.

"; - $output .= "

Maintain a FAQ using a collaborative book

"; - $output .= "

The collaborative book (i.e. book.module) in Drupal is a terrific way to easily manage an FAQ (Frequently Asked Questions) section of your web site. The main benefit for an administrator is that you don't have to write all the questions/answers by yourself. Let the community do it for you!

"; - $output .= "

In order to setup the FAQ, you have to create a new Book which will hold all your content. To do so, click on Create Book Page in your user box. Give it a thoughtful Title, and Body. A title like \"Estonia Travel - FAQ\" is nice. You may always edit these fields later. You will probably want to designate <root> as the parent of this page. Leave the log message and type fields blank for now. After you have submitted this book page, you are ready to begin filling up your book with questions that are frequently asked.

"; + $output .= "

Maintain an FAQ using a collaborative book

"; + $output .= "

Collaborative books let you easily set up a Frequently Asked Questions section on your web site. The main benefit is that you don't have to write all the questions/answers by yourself - let the community do it for you!

"; + $output .= "

In order to set up the FAQ, you have to create a new book which will hold all your content. To do so, click on create book page in your user box. Give it a thoughtful title, and body. A title like \"Estonia Travel - FAQ\" is nice. You may always edit these fields later. You will probably want to designate <root> as the parent of this page. Leave the log message and type fields blank for now. After you have submitted this book page, you are ready to begin filling up your book with questions that are frequently asked.

"; $output .= "

Whenever you come across a post which you want to include in your FAQ, click on the administer link. Then click on the edit book outline button at the bottom of the page. Then place the relevant post wherever is most appropriate in your book by selecting a parent. Books are quite flexible. They can have sections like Flying to Estonia, Eating in Estonia and so on. As you get more experienced with the collaborative book, you can reorganize posts in your book so that it stays organized.

"; - $output .= "

Notes:

  • Any comments attached to those relevant posts which you designate as book pages will also be transported into your book. This is a great feature, since much wisdom is shared via comments. And remember that all future comments and edits will automatically be reflected in your book.
  • You may wish to edit the title and teaser of posts when adding them to your FAQ. This is done on the same page as the Edit book outline button. Clear titles help users navigate quickly to the information that they seek.
  • Book pages may come from any content type (blog, story, page, etc.). If you are creating a post solely for inclusion in your book, then use the Create book page link.
  • If you don't see the administer link, then you probably have insufficient ". l("permissions", "admin/user/permission") .".
  • If you want to get really fancy, note that Books are one of the few content types which allow raw PHP in their body. So you've got lots of geeky possibilities there.
"; + $output .= "

Notes:

  • Any comments attached to those relevant posts which you designate as book pages will also be transported into your book. This is a great feature, since much wisdom is shared via comments. Remember that all future comments and edits will automatically be reflected in your book.
  • You may wish to edit the title of posts when adding them to your FAQ. This is done on the same page as the Edit book outline button. Clear titles improve navigability enormously.
  • Book pages may come from any content type (blog, story, page, etc.). If you are creating a post solely for inclusion in your book, then use the Create book page link.
  • If you don't see the administer link, then you probably have insufficient ". l("permissions", "admin/user/permission") .".
  • If you want to get really fancy, note that books are one of the few content types which allow raw PHP in their body. So you've got lots of geeky possibilities there.
"; return t($output); } diff --git a/modules/cloud.module b/modules/cloud.module index d85473e4e..e2fa4fddf 100644 --- a/modules/cloud.module +++ b/modules/cloud.module @@ -42,11 +42,11 @@ function cloud_link($type) { } if ($type == "admin" && user_access("administer site cloud")) { - $help["general"] = t("The cloud monitor tracks or crawls other interesting web sites and displays their last modification dates. Visitors to the host site learn about relevant sites and can easily see if there is new content. To get the blogroll to work you must setup cron support. To get the blogroll block to display you must turn on the Site cloud block. To go to a monitored site, click on the site name, to load and/or update the blogroll for that site immediately click on \"update site\", to delete the site go to \"edit site\". ", array("%block" => url("admin/block"))); - $help["add"] = t("Add a site too the blogroll. Don't forget the \"http://\" for your URLs."); + $help["general"] = t("The cloud monitor tracks or crawls other interesting web sites and displays their last modification dates. Visitors to the host site learn about relevant sites and can easily see if there is new content. To get the blogroll to work you must setup cron support. To get the site cloud block to display you must turn on the Site cloud block. To go to a monitored site, click on the site name, to load and/or update the record for that site immediately click on \"update site\", to delete the site go to \"edit site\". ", array("%block" => url("admin/block"))); + $help["add"] = t("Add a site to the site cloud. Don't forget the \"http://\" for your URLs."); menu("admin/syndication", "content syndication", NULL, NULL, 5); - menu("admin/syndication/cloud", "blogrolling", "cloud_admin", $help["general"]); + menu("admin/syndication/cloud", "site cloud", "cloud_admin", $help["general"]); menu("admin/syndication/cloud/add", "add new site", "cloud_admin", $help["add"]); menu("admin/syndication/cloud/help", "help", "cloud_help", NULL, 9); } diff --git a/modules/forum.module b/modules/forum.module index 4c8ebcf01..a5a68c8de 100644 --- a/modules/forum.module +++ b/modules/forum.module @@ -714,9 +714,9 @@ function _forum_get_topic_order($sortby) { } function forum_help() { - $output .= "

Creating a forum

Drupal lets you set up a countless number of forums by using the powerful taxonomy module. Therefore to create a forum you first have to create a ". l("taxonomy vocuabulary", "admin/taxonomy/add/vocabulary") ." and ". l("add some terms", "admin/taxonomy") ." to it; each term will become a forum. Choose a name for the vocabulary (examples: forum, message boards, or debates), and make sure under \"Types\" that forum is selected. Nothing else needs to be configured, so unless you have more advanced needs save the vocabulary. Now ". l("add a term", "admin/taxonomy") ." to the vocabulary just created (examples: general, off topic, support), and a description to make it clear to the users what the forum is about. Each term become a forum. Continue creating fora by adding terms until you are satisfied."; - $output .= "

Once a vocabulary is entered go to ". l("site configuration » modules » forum","admin/system/modules/forum") ." and set the Forum vocabulary (don't forget to save). There will now be fora active on the site. For users to access them they must have the \"access content\" permission and to create a topic they must have \"create forum topics\" permission. The permissions can be set in the ". l("user management", "admin/user/permission") ." pages.

"; - $output .= "

Containers

By designating a forum as a container, users are not allowed to post into that forum. The forum will be visible on the forum listing page, so it acts as a section delimiter if you will. This is useful if you have a lots of forums which are nested. For example,

"; + $output .= "

Creating a forum

The forum module uses taxonomy to organize itself. To create a forum you first have to create a ". l("taxonomy vocuabulary", "admin/taxonomy/add/vocabulary") ." When doing this, choose a sensible name for it (such as \"fora\") and make sure under \"Types\" that \"forum\" is selected. Once you have done this, ". l("add some terms", "admin/taxonomy") ." to it. Each term will become a forum. If you fill in the description field, users will be given additonal information about the forum on the main forum page. For example: \"troubleshooting\" - \"Please ask your questions here.\"

"; + $output .= "

When you are happy with your vocabulary, go to ". l("site configuration » modules » forum","admin/system/modules/forum") ." and set Forum vocabulary to the one you have just created. There will now be fora active on the site. For users to access them they must have the \"access content\" permission and to create a topic they must have ithe \"create forum topics\" permission. These permissions can be set in the ". l("user management", "admin/user/permission") ." pages.

"; + $output .= "

Containers

If you designate a forum as a container, users will not be able to post to it. The forum will be visible on the forum listing page, so it acts as a section delimiter if you will. This is useful if you have a lots of forums which are nested. For example,

"; $output .= "

Marketing
-- Market research
-- Brand management

Sales
-- Closing the deal
-- Avoiding ear and throat pain

"; $output .= "

If you don't want people posting into the Marketing or Sales folders, you designate them as Containers.

"; $output .= "

Icons

To disable icons, set the icon path as blank in ". l("site configuration » modules » forums","admin/system/module/forum") ."

"; diff --git a/modules/forum/forum.module b/modules/forum/forum.module index 4c8ebcf01..a5a68c8de 100644 --- a/modules/forum/forum.module +++ b/modules/forum/forum.module @@ -714,9 +714,9 @@ function _forum_get_topic_order($sortby) { } function forum_help() { - $output .= "

Creating a forum

Drupal lets you set up a countless number of forums by using the powerful taxonomy module. Therefore to create a forum you first have to create a ". l("taxonomy vocuabulary", "admin/taxonomy/add/vocabulary") ." and ". l("add some terms", "admin/taxonomy") ." to it; each term will become a forum. Choose a name for the vocabulary (examples: forum, message boards, or debates), and make sure under \"Types\" that forum is selected. Nothing else needs to be configured, so unless you have more advanced needs save the vocabulary. Now ". l("add a term", "admin/taxonomy") ." to the vocabulary just created (examples: general, off topic, support), and a description to make it clear to the users what the forum is about. Each term become a forum. Continue creating fora by adding terms until you are satisfied."; - $output .= "

Once a vocabulary is entered go to ". l("site configuration » modules » forum","admin/system/modules/forum") ." and set the Forum vocabulary (don't forget to save). There will now be fora active on the site. For users to access them they must have the \"access content\" permission and to create a topic they must have \"create forum topics\" permission. The permissions can be set in the ". l("user management", "admin/user/permission") ." pages.

"; - $output .= "

Containers

By designating a forum as a container, users are not allowed to post into that forum. The forum will be visible on the forum listing page, so it acts as a section delimiter if you will. This is useful if you have a lots of forums which are nested. For example,

"; + $output .= "

Creating a forum

The forum module uses taxonomy to organize itself. To create a forum you first have to create a ". l("taxonomy vocuabulary", "admin/taxonomy/add/vocabulary") ." When doing this, choose a sensible name for it (such as \"fora\") and make sure under \"Types\" that \"forum\" is selected. Once you have done this, ". l("add some terms", "admin/taxonomy") ." to it. Each term will become a forum. If you fill in the description field, users will be given additonal information about the forum on the main forum page. For example: \"troubleshooting\" - \"Please ask your questions here.\"

"; + $output .= "

When you are happy with your vocabulary, go to ". l("site configuration » modules » forum","admin/system/modules/forum") ." and set Forum vocabulary to the one you have just created. There will now be fora active on the site. For users to access them they must have the \"access content\" permission and to create a topic they must have ithe \"create forum topics\" permission. These permissions can be set in the ". l("user management", "admin/user/permission") ." pages.

"; + $output .= "

Containers

If you designate a forum as a container, users will not be able to post to it. The forum will be visible on the forum listing page, so it acts as a section delimiter if you will. This is useful if you have a lots of forums which are nested. For example,

"; $output .= "

Marketing
-- Market research
-- Brand management

Sales
-- Closing the deal
-- Avoiding ear and throat pain

"; $output .= "

If you don't want people posting into the Marketing or Sales folders, you designate them as Containers.

"; $output .= "

Icons

To disable icons, set the icon path as blank in ". l("site configuration » modules » forums","admin/system/module/forum") ."

"; diff --git a/modules/help.module b/modules/help.module index 7766b6727..7f2096409 100644 --- a/modules/help.module +++ b/modules/help.module @@ -8,10 +8,33 @@ function help_system($field){ function help_link($type) { if ($type == "admin") { + menu("admin/help/glossary", "glossary", "help_glossary", NULL, 8); menu("admin/help", "help", "help_admin", NULL, 9); } } +function help_glossary() { + + $output .= "

Glossary

"; + $output .= "
Block
A small box containing information or content placed in the left-hand or right-hand sidebar of a web page.
"; + $output .= "
Comment
A note attached to a node. Usually intended to clarify, explain, criticize, or express an opinion on the original material.
"; + $output .= "
Moderation
The activity of making sure a post to a Drupal site fits in with what is expected for that Drupal site.
"; + $output .= "
Approved
A moderated post which has been accepted by the moderators for publication. (See published).
"; + $output .= "
Waiting
A moderated post which is still being voted on to be accepted for publication. (See published.)
"; + $output .= "
Moderators
The group of Drupal users that reviews posts before they are published. These users have the \"access submission queue\" permission. (See Published).
"; + $output .= "
Node
The basic data unit in Drupal. Everything is a node or an extention of a node.
"; + $output .= "
Public
See published.
"; + $output .= "
Published
A node that is viewable by everyone. (See unpublished.)
"; + $output .= "
Role
You can classify users into roles, for the purpose of setting lots of users' permissions at once.
"; + $output .= "
Taxonomy
A division of a collection of things into ordered, classified groups. (See ". l("taxonomy help","admin/taxonomy/help") .")
"; + $output .= "
Unpublished
A node that is only viewable by administrators and moderators.
"; + $output .= "
User
A person who has an account at your Drupal site, and is logged in with that account.
"; + $output .= "
Visitor
A person who does not have an account at your Drupal site or a person who has an account at your Drupal bite but is not logged in with that account. Also termed \"anonymous user\".
"; + $output .= "
"; + return t($output); + +} + function help_admin() { foreach (module_list() as $name) { diff --git a/modules/help/help.module b/modules/help/help.module index 7766b6727..7f2096409 100644 --- a/modules/help/help.module +++ b/modules/help/help.module @@ -8,10 +8,33 @@ function help_system($field){ function help_link($type) { if ($type == "admin") { + menu("admin/help/glossary", "glossary", "help_glossary", NULL, 8); menu("admin/help", "help", "help_admin", NULL, 9); } } +function help_glossary() { + + $output .= "

Glossary

"; + $output .= "
Block
A small box containing information or content placed in the left-hand or right-hand sidebar of a web page.
"; + $output .= "
Comment
A note attached to a node. Usually intended to clarify, explain, criticize, or express an opinion on the original material.
"; + $output .= "
Moderation
The activity of making sure a post to a Drupal site fits in with what is expected for that Drupal site.
"; + $output .= "
Approved
A moderated post which has been accepted by the moderators for publication. (See published).
"; + $output .= "
Waiting
A moderated post which is still being voted on to be accepted for publication. (See published.)
"; + $output .= "
Moderators
The group of Drupal users that reviews posts before they are published. These users have the \"access submission queue\" permission. (See Published).
"; + $output .= "
Node
The basic data unit in Drupal. Everything is a node or an extention of a node.
"; + $output .= "
Public
See published.
"; + $output .= "
Published
A node that is viewable by everyone. (See unpublished.)
"; + $output .= "
Role
You can classify users into roles, for the purpose of setting lots of users' permissions at once.
"; + $output .= "
Taxonomy
A division of a collection of things into ordered, classified groups. (See ". l("taxonomy help","admin/taxonomy/help") .")
"; + $output .= "
Unpublished
A node that is only viewable by administrators and moderators.
"; + $output .= "
User
A person who has an account at your Drupal site, and is logged in with that account.
"; + $output .= "
Visitor
A person who does not have an account at your Drupal site or a person who has an account at your Drupal bite but is not logged in with that account. Also termed \"anonymous user\".
"; + $output .= "
"; + return t($output); + +} + function help_admin() { foreach (module_list() as $name) { diff --git a/modules/import.module b/modules/import.module index a07c98a25..d7916491c 100644 --- a/modules/import.module +++ b/modules/import.module @@ -706,13 +706,13 @@ function import_page_fd() { $result = db_query("SELECT * FROM feed ORDER BY title"); - $output .= "\n\n"; + $output .= "\n\n"; $output .= "\n\n"; while ($feed = db_fetch_object($result)) { $output .= "\n"; - $output .= " ". htmlspecialchars($feed->title) ."\n"; - $output .= " ". htmlspecialchars($feed->url) ."\n"; + $output .= " ". drupal_specialchars($feed->title) ."\n"; + $output .= " ". drupal_specialchars($feed->url) ."\n"; $output .= "\n\n"; } diff --git a/modules/node.module b/modules/node.module index e975dc1d8..e51d0cc4c 100644 --- a/modules/node.module +++ b/modules/node.module @@ -17,7 +17,7 @@ function node_help() { $output .= "
Allow user comments
A node can have comments, which are other nodes. These comments can be written by other users (Read-write), or only by admins (Read-only).
"; $output .= "
Attributes
A way to sort nodes.
Revisions
Drupal has a revision system so that you can \"roll back\" to an older version of a node if the new version is not what you want.
"; $output .= "
Promote to front page
To get people to look at the new stuff on your site you can choose to move it to the front page.
"; - $output .= "
Approved
Drupal has a moderation system. If it is active, a node is in one of three states: approved and published, approved and unpublished, and awaiting approval. If you are not moderating a node it should be approved.
"; + $output .= "
In moderation queue
Drupal has a moderation system. If it is active, a node is in one of three states: approved and published, approved and unpublished, and awaiting approval. If you are moderating a node it should be in the moderation queue.
"; $output .= "
Votes
If you are moderating a node this counts how many votes the node has gotten. Once a node gets a certain number of vote if will either be Approved, or Dropped (To setup the number of votes needed and the promote and dump scores ". l("click here","admin/system/modules/queue") .".).
"; $output .= "
Score
The score of the node is gotten by the votes it is given.
"; $output .= "
Users
The list of users who have voted on a moderated node.
"; @@ -864,7 +864,7 @@ function node_block($op = "list", $delta = 0) { } function node_feed($nodes = 0, $channel = array()) { - global $base_url; + global $base_url, $languages; /* ** A generic function for generating RSS feeds from a set of nodes. @@ -884,14 +884,15 @@ function node_feed($nodes = 0, $channel = array()) { $items .= format_rss_item($item->title, $link, $item->teaser); } - $output .= "\n"; + $output .= "\n"; $output .= "]>\n"; // NOTE: é - for example - is the correct ISO-8859-1 translation of (e acute) but apparently XML parsers don't (have to) understand it. To solve this problem, we use a DTD that defines commonly used entity such as é. if (!$channel["version"]) $channel["version"] = "0.91"; if (!$channel["title"]) $channel["title"] = variable_get("site_name", "drupal") ." - ". variable_get("site_slogan", ""); if (!$channel["link"]) $channel["link"] = $base_url; if (!$channel["description"]) $channel["description"] = variable_get("site_mission", ""); - if (!$channel["language"]) $channel["language"] = "en"; + foreach ($languages as $key => $value) break; + if (!$channel["language"]) $channel["language"] = $key ? $key : "en"; $output .= "\n"; $output .= format_rss_channel($channel["title"], $channel["link"], $channel["description"], $items, $channel["language"]); $output .= "\n"; @@ -1050,14 +1051,37 @@ function node_form($edit, $error = NULL) { $output .= "

$help

"; } - $output .= ""; - $output .= " "; - $output .= " "; - $output .= " "; - $output .= "
"; + $output .= "
"; /* - ** Add the default fields: + ** Add the admin specific parts: */ + if (user_access("administer nodes")) { + $output .= "
"; + $output .= "
"; + $output .= form_textfield(t("Authored by"), "name", $edit->name, 20, 60, $error["name"]); + $output .= form_textfield(t("Authored on"), "date", $edit->date, 20, 25, $error["date"]); + $output .= "
"; + + $options .= form_checkbox(t("Published"), "status", 1, isset($edit->status) ? $edit->status : variable_get("node_status_$edit->type", 1)); + $options .= form_checkbox(t("In moderation queue"), "moderate", 1, isset($edit->moderate) ? $edit->moderate : variable_get("node_moderate_$edit->type", 0)); + $options .= form_checkbox(t("Promoted to front page"), "promote", 1, isset($edit->promote) ? $edit->promote : variable_get("node_promote_$edit->type", 1)); + $options .= form_checkbox(t("Static on front page"), "static", 1, isset($edit->static) ? $edit->static : variable_get("node_static_$edit->type", 0)); + $options .= form_checkbox(t("Create new revision"), "revision", 1, isset($edit->revision) ? $edit->revision : variable_get("node_revision_$edit->type", 0)); + + $output .= "
"; + $output .= form_item(t("Options"), $options); + $output .= "
"; + + $extras .= implode("
", node_invoke_all($edit, "nodeapi", "form admin")); + $output .= $extras ? "
$extras
" : "
"; + } + + /* + ** Add the default fields: + */ + $output .= "
"; $output .= form_textfield(t("Title"), "title", $edit->title, 60, 64, $error["title"]); /* @@ -1105,26 +1129,7 @@ function node_form($edit, $error = NULL) { $output .= form_submit(t("Delete")); } - /* - ** Add the admin specific parts: - */ - - if (user_access("administer nodes")) { - $output .= "
"; - $output .= form_textfield(t("Authored by"), "name", $edit->name, 20, 60, $error["name"]); - $output .= form_textfield(t("Authored on"), "date", $edit->date, 20, 25, $error["date"]); - $output .= "
"; - $output .= form_checkbox(t("Published"), "status", 1, isset($edit->status) ? $edit->status : variable_get("node_status_$edit->type", 1)); - $output .= form_checkbox(t("Approved"), "moderate", 1, isset($edit->moderate) ? $edit->moderate : variable_get("node_moderate_$edit->type", 0)); - $output .= form_checkbox(t("Promoted to front page"), "promote", 1, isset($edit->promote) ? $edit->promote : variable_get("node_promote_$edit->type", 1)); - $output .= form_checkbox(t("Static on front page"), "static", 1, isset($edit->static) ? $edit->static : variable_get("node_static_$edit->type", 0)); - $output .= form_checkbox(t("Create new revision"), "revision", 1, isset($edit->revision) ? $edit->revision : variable_get("node_revision_$edit->type", 0)); - $output .= implode("", node_invoke_all($edit, "nodeapi", "form admin")); - } - - $output .= "
"; + $output .= ""; return form($output, ($param["method"] ? $param["method"] : "post"), $param["action"], $param["options"]); } diff --git a/modules/node/node.module b/modules/node/node.module index e975dc1d8..e51d0cc4c 100644 --- a/modules/node/node.module +++ b/modules/node/node.module @@ -17,7 +17,7 @@ function node_help() { $output .= "
Allow user comments
A node can have comments, which are other nodes. These comments can be written by other users (Read-write), or only by admins (Read-only).
"; $output .= "
Attributes
A way to sort nodes.
Revisions
Drupal has a revision system so that you can \"roll back\" to an older version of a node if the new version is not what you want.
"; $output .= "
Promote to front page
To get people to look at the new stuff on your site you can choose to move it to the front page.
"; - $output .= "
Approved
Drupal has a moderation system. If it is active, a node is in one of three states: approved and published, approved and unpublished, and awaiting approval. If you are not moderating a node it should be approved.
"; + $output .= "
In moderation queue
Drupal has a moderation system. If it is active, a node is in one of three states: approved and published, approved and unpublished, and awaiting approval. If you are moderating a node it should be in the moderation queue.
"; $output .= "
Votes
If you are moderating a node this counts how many votes the node has gotten. Once a node gets a certain number of vote if will either be Approved, or Dropped (To setup the number of votes needed and the promote and dump scores ". l("click here","admin/system/modules/queue") .".).
"; $output .= "
Score
The score of the node is gotten by the votes it is given.
"; $output .= "
Users
The list of users who have voted on a moderated node.
"; @@ -864,7 +864,7 @@ function node_block($op = "list", $delta = 0) { } function node_feed($nodes = 0, $channel = array()) { - global $base_url; + global $base_url, $languages; /* ** A generic function for generating RSS feeds from a set of nodes. @@ -884,14 +884,15 @@ function node_feed($nodes = 0, $channel = array()) { $items .= format_rss_item($item->title, $link, $item->teaser); } - $output .= "\n"; + $output .= "\n"; $output .= "]>\n"; // NOTE: é - for example - is the correct ISO-8859-1 translation of (e acute) but apparently XML parsers don't (have to) understand it. To solve this problem, we use a DTD that defines commonly used entity such as é. if (!$channel["version"]) $channel["version"] = "0.91"; if (!$channel["title"]) $channel["title"] = variable_get("site_name", "drupal") ." - ". variable_get("site_slogan", ""); if (!$channel["link"]) $channel["link"] = $base_url; if (!$channel["description"]) $channel["description"] = variable_get("site_mission", ""); - if (!$channel["language"]) $channel["language"] = "en"; + foreach ($languages as $key => $value) break; + if (!$channel["language"]) $channel["language"] = $key ? $key : "en"; $output .= "\n"; $output .= format_rss_channel($channel["title"], $channel["link"], $channel["description"], $items, $channel["language"]); $output .= "\n"; @@ -1050,14 +1051,37 @@ function node_form($edit, $error = NULL) { $output .= "

$help

"; } - $output .= ""; - $output .= " "; - $output .= " "; - $output .= " "; - $output .= "
"; + $output .= "
"; /* - ** Add the default fields: + ** Add the admin specific parts: */ + if (user_access("administer nodes")) { + $output .= "
"; + $output .= "
"; + $output .= form_textfield(t("Authored by"), "name", $edit->name, 20, 60, $error["name"]); + $output .= form_textfield(t("Authored on"), "date", $edit->date, 20, 25, $error["date"]); + $output .= "
"; + + $options .= form_checkbox(t("Published"), "status", 1, isset($edit->status) ? $edit->status : variable_get("node_status_$edit->type", 1)); + $options .= form_checkbox(t("In moderation queue"), "moderate", 1, isset($edit->moderate) ? $edit->moderate : variable_get("node_moderate_$edit->type", 0)); + $options .= form_checkbox(t("Promoted to front page"), "promote", 1, isset($edit->promote) ? $edit->promote : variable_get("node_promote_$edit->type", 1)); + $options .= form_checkbox(t("Static on front page"), "static", 1, isset($edit->static) ? $edit->static : variable_get("node_static_$edit->type", 0)); + $options .= form_checkbox(t("Create new revision"), "revision", 1, isset($edit->revision) ? $edit->revision : variable_get("node_revision_$edit->type", 0)); + + $output .= "
"; + $output .= form_item(t("Options"), $options); + $output .= "
"; + + $extras .= implode("
", node_invoke_all($edit, "nodeapi", "form admin")); + $output .= $extras ? "
$extras
" : "
"; + } + + /* + ** Add the default fields: + */ + $output .= "
"; $output .= form_textfield(t("Title"), "title", $edit->title, 60, 64, $error["title"]); /* @@ -1105,26 +1129,7 @@ function node_form($edit, $error = NULL) { $output .= form_submit(t("Delete")); } - /* - ** Add the admin specific parts: - */ - - if (user_access("administer nodes")) { - $output .= "
"; - $output .= form_textfield(t("Authored by"), "name", $edit->name, 20, 60, $error["name"]); - $output .= form_textfield(t("Authored on"), "date", $edit->date, 20, 25, $error["date"]); - $output .= "
"; - $output .= form_checkbox(t("Published"), "status", 1, isset($edit->status) ? $edit->status : variable_get("node_status_$edit->type", 1)); - $output .= form_checkbox(t("Approved"), "moderate", 1, isset($edit->moderate) ? $edit->moderate : variable_get("node_moderate_$edit->type", 0)); - $output .= form_checkbox(t("Promoted to front page"), "promote", 1, isset($edit->promote) ? $edit->promote : variable_get("node_promote_$edit->type", 1)); - $output .= form_checkbox(t("Static on front page"), "static", 1, isset($edit->static) ? $edit->static : variable_get("node_static_$edit->type", 0)); - $output .= form_checkbox(t("Create new revision"), "revision", 1, isset($edit->revision) ? $edit->revision : variable_get("node_revision_$edit->type", 0)); - $output .= implode("", node_invoke_all($edit, "nodeapi", "form admin")); - } - - $output .= "
"; + $output .= ""; return form($output, ($param["method"] ? $param["method"] : "post"), $param["action"], $param["options"]); } diff --git a/modules/poll.module b/modules/poll.module index f3c9e6d2e..e52d38b43 100644 --- a/modules/poll.module +++ b/modules/poll.module @@ -130,7 +130,7 @@ function poll_form(&$node, &$help, &$error) { } function poll_help() { - $output .= "

Drupal's poll module allows users to vote on polls create by administrators, or even other users. Access to, voting on, and creation of polls is completely controlled by the Drupal ". l("access system","admin/user/permission") ."

  • To create a poll a users needs the \"create polls\" permission.
  • To vote on a poll question a user must have the \"vote on polls\" permission.
  • To view the results one needs the \"access content\" permission.
  • To administer a vote you need the \"administer nodes\" permission.

Creating a vote can be done with \"create poll\". The title of the poll should be the question, then enter the answers and the \"base\" vote counts. Finally the time span the vote will run.

". l("Poll", "poll") ." on the menu bar will take you to a page where you can see all the current polls, vote on them -- if you haven't already --, and view the results. To edit the node, and its vote counts, go to node administration.

"; + $output .= "

Users with the correct ". l("permissions","admin/user/permission") ." can create and/or vote on polls.

  • To create a poll a user needs the \"create polls\" permission.
  • To vote on a poll question a user must have the \"vote on polls\" permission.
  • To view the results one needs the \"access content\" permission.
  • To administer polls you need the \"administer nodes\" permission.

Creating a poll is much like creating any other node. Click \"create poll\" in your user box. The title of the poll should be the question, then enter the answers and the \"base\" vote counts. You can also choose the time period over which the vote will run.

The ". l("Poll", "poll") ." item in the navigation links will take you to a page where you can see all the current polls, vote on them (if you haven't already) and view the results.

"; return t($output); } diff --git a/modules/poll/poll.module b/modules/poll/poll.module index f3c9e6d2e..e52d38b43 100644 --- a/modules/poll/poll.module +++ b/modules/poll/poll.module @@ -130,7 +130,7 @@ function poll_form(&$node, &$help, &$error) { } function poll_help() { - $output .= "

Drupal's poll module allows users to vote on polls create by administrators, or even other users. Access to, voting on, and creation of polls is completely controlled by the Drupal ". l("access system","admin/user/permission") ."

  • To create a poll a users needs the \"create polls\" permission.
  • To vote on a poll question a user must have the \"vote on polls\" permission.
  • To view the results one needs the \"access content\" permission.
  • To administer a vote you need the \"administer nodes\" permission.

Creating a vote can be done with \"create poll\". The title of the poll should be the question, then enter the answers and the \"base\" vote counts. Finally the time span the vote will run.

". l("Poll", "poll") ." on the menu bar will take you to a page where you can see all the current polls, vote on them -- if you haven't already --, and view the results. To edit the node, and its vote counts, go to node administration.

"; + $output .= "

Users with the correct ". l("permissions","admin/user/permission") ." can create and/or vote on polls.

  • To create a poll a user needs the \"create polls\" permission.
  • To vote on a poll question a user must have the \"vote on polls\" permission.
  • To view the results one needs the \"access content\" permission.
  • To administer polls you need the \"administer nodes\" permission.

Creating a poll is much like creating any other node. Click \"create poll\" in your user box. The title of the poll should be the question, then enter the answers and the \"base\" vote counts. You can also choose the time period over which the vote will run.

The ". l("Poll", "poll") ." item in the navigation links will take you to a page where you can see all the current polls, vote on them (if you haven't already) and view the results.

"; return t($output); } diff --git a/modules/queue.module b/modules/queue.module index e8fa7fec9..7773e5724 100644 --- a/modules/queue.module +++ b/modules/queue.module @@ -3,7 +3,7 @@ function queue_system($field){ $system["description"] = t("Enables content to be moderated by the community."); - $system["admin_help"] = t("** REWRITE **These are the settings for the moderation system. When the moderation value of a node is the same as or greater than the Post threshold then the node will be promoted to the front page. If the moderation value of a node falls below the Dump threshold then the node will be changed to an \"unpublished/private\" node. If the number of votes a node has recieved is the same as or higher than the Expiration threshold, and the node has not been promoted to the front page or dumped, then the node will be changed to an \"unpublished/private\" node. In all of three cases the moderation of the node will be marked as \"Approved\".
If \"Show comments\" is enabled then the comments on this node will be shown in the moderation form."); + $system["admin_help"] = t("The queue provides a way for your users to vote on submitted content. This is called moderation. Users can moderate a post up (give it a point), or down (subtract a point). The settings below give you control over how many points are required for the status of a post to be automatically changed. See individual items for details."); return $system[$field]; } @@ -12,10 +12,10 @@ function queue_settings() { $threshold_dump = array(-1 => -1, -2 => -2, -3 => -3, -4 => -4, -5 => -5, -6 => -6, -7 => -7, -8 => -8, -9 => -9, -10 => -10, -11 => -11, -12 => -12, -13 => -13, -14 => -14, -15 => -15, -20 => -20, -25 => -25, -30 => -30); $threshold_expire = array(1 => 1, 2 => 2, 3 => 3, 4 => 4, 5 => 5, 6 => 6, 7 => 7, 8 => 8, 9 => 9, 10 => 10, 11 => 11, 12 => 12, 13 => 13, 14 => 14, 15 => 15, 20 => 20, 25 => 25, 30 => 30, 35 => 35, 40 => 40, 45 => 45, 50 => 50, 60 => 60, 70 => 70, 80 => 80, 90 => 90, 100 => 100); - $output .= form_select(t("Post threshold"), "queue_threshold_post", variable_get("queue_threshold_post", 4), $threshold_post, t("If new submissions are subject to moderation, select a post threshold.")); - $output .= form_select(t("Dump threshold"), "queue_threshold_dump", variable_get("queue_threshold_dump", -2), $threshold_dump, t("If new submissions are subject to moderation, select a dump threshold.")); - $output .= form_select(t("Expiration threshold"), "queue_threshold_expire", variable_get("queue_threshold_expire", 8), $threshold_expire, t("If new submissions are subject to moderation, select an expiration threshold.")); - $output .= form_select(t("Show comments"), "queue_show_comments", variable_get("queue_show_comments", 1), array(0 => "Disabled", 1 => "Enabled"), t("If enabled comments will be shown below the moderation form.")); + $output .= form_select(t("Post threshold"), "queue_threshold_post", variable_get("queue_threshold_post", 4), $threshold_post, t("When a post gets this number of moderation points, it is promoted to the front page automatically.")); + $output .= form_select(t("Dump threshold"), "queue_threshold_dump", variable_get("queue_threshold_dump", -2), $threshold_dump, t("When a post drops below this number of points, its status is changed to unpublished.")); + $output .= form_select(t("Expiration threshold"), "queue_threshold_expire", variable_get("queue_threshold_expire", 8), $threshold_expire, t("When a post gets this number of points, its status is changed to unpublished.")); + $output .= form_item(t("Show comments"), form_checkbox(t("Enabled"), "queue_show_comments", 1, variable_get("queue_show_comments", 1)), t("Tick the box to show comments below the moderation form.")); return $output; } @@ -144,7 +144,7 @@ function queue_view($nid) { ** Display some explanation or voting guidelines: */ - $output .= "

". t("When new content get submitted it goes to the submission queue. Most, if not all, registered users can access this queue and can vote whether they think the content should be approved or not. When enough people vote to approve the content, it is pushed over the threshold and up it goes. On the other hand, when too many people voted to drop some content, the content will get trashed.") ."

"; + $output .= "

". t("When new content is submitted it goes into the submission queue. Registered users with the appropriate permission can access this queue and vote whether they think the content should be approved or not. When enough people vote to approve the content it is displayed on the front page. On the other hand, if enough people vote to drop it, the content will disappear.") ."

"; /* ** Display a voting form: @@ -208,7 +208,7 @@ function queue_block($op = "list", $delta = 0) { } $block["subject"] = t("Moderation results"); - $block["content"] = $output ? $output : t("This node has not been moderated yet."); + $block["content"] = $output ? $output : t("This node has not yet been moderated."); } } elseif ((user_access("access submission queue") || user_access("administer blocks")) && (substr_count(request_uri(), url("user")) || substr_count(request_uri(), url("admin")))) { diff --git a/modules/story.module b/modules/story.module index dc35a407d..9d80e73ad 100644 --- a/modules/story.module +++ b/modules/story.module @@ -2,27 +2,27 @@ // $Id$ function story_help() { - $output .= "

The story module enables to users to submit thoughful, cohesive posts for consideration by the rest of the community. Stories usually follow a specific content flow: submit -> moderate -> post to home page -> comment. Administrators are able to shortcut this flow as desired.

"; - $output .= "In ". l("site configuration >> modules >> story", "admin/system/modules/story") ." you can setup an introductory text for story authors, and a floor on the number of words which may be included in a story. This is designed to help discourage the submission of trvially short stories."; + $output .= "

The story module lets your users submit articles for consideration by the rest of the community, who can vote on them if moderation is enabled. Stories usually follow a publishing flow of submit -> moderate -> post to the main page -> comments. Administrators are able to shortcut this flow as desired.

"; + $output .= "In ". l("site configuration >> modules >> story", "admin/system/modules/story") ." you can set up an introductory text for story authors, and a floor on the number of words which may be included in a story. This is designed to help discourage the submission of trivially short stories."; return $output; } function story_system($field){ $system["description"] = t("Enables users to submit stories, articles or similar content."); - $system["admin_help"] = t("**REWRITE** Stories are nodes with a complete thought. Think of newspaper stories. Stories follow the flow \"submit -> moderate -> post to the main page -> comment on story\". Below enter the minimum word count for a story, and the small block which will be displayed to users wanting to enter a story."); + $system["admin_help"] = t("Stories are like newspaper articles. They tend to follow a publishing flow of submit -> moderate -> post to the main page -> comments. Below you may fix a minimum word count for stories and also write some submission or content guidelines for users wanting to post a story."); return $system[$field]; } function story_settings() { - $output .= form_textarea("Explanation or submission guidelines", "story_help", variable_get("story_help", ""), 70, 5, "This text will be displayed at the top of the story submission form. Useful for helping or instructing your users."); - $output .= form_select(t("Minimum number of words"), "minimum_story_size", variable_get("minimum_story_size", 0), array(0 => "0 words", 10 => "10 words", 25 => "25 words", 50 => "50 words", 75 => "75 words", 100 => "100 words", 125 => "125 words", 150 => "150 words", 175 => "175 words", 200 => "200 words"), t("The minimum number of words a personal story entry should consist of. This can be useful to rule out submissions that do not meet the site's standards, such as short test posts.")); + $output .= form_textarea("Explanation or submission guidelines", "story_help", variable_get("story_help", ""), 70, 5, "This text will be displayed at the top of the story submission form. It is useful for helping or instructing your users."); + $output .= form_select(t("Minimum number of words"), "minimum_story_size", variable_get("minimum_story_size", 0), array(0 => "0 words", 10 => "10 words", 25 => "25 words", 50 => "50 words", 75 => "75 words", 100 => "100 words", 125 => "125 words", 150 => "150 words", 175 => "175 words", 200 => "200 words"), t("The minimum number of words a story must be to be considered valid. This can be useful to rule out submissions that do not meet the site's standards, such as short test posts.")); return $output; } function story_node($field) { $info["name"] = t("story"); - $info["description"] = t("A story is a post that is submitted to the attention of other users and is queued in the submission queue. Users and moderators vote on the posts they like or dislike, promoting or demoting them. When a post gets above a certain threshold it gets automatically published to front page."); + $info["description"] = t("A story is a post that is submitted to the attention of other users and is queued in the submission queue. Users and moderators vote on the posts they like or dislike, promoting or demoting them. When a post gets above a certain threshold it automatically gets promoted to the front page."); return $info[$field]; } diff --git a/modules/story/story.module b/modules/story/story.module index dc35a407d..9d80e73ad 100644 --- a/modules/story/story.module +++ b/modules/story/story.module @@ -2,27 +2,27 @@ // $Id$ function story_help() { - $output .= "

The story module enables to users to submit thoughful, cohesive posts for consideration by the rest of the community. Stories usually follow a specific content flow: submit -> moderate -> post to home page -> comment. Administrators are able to shortcut this flow as desired.

"; - $output .= "In ". l("site configuration >> modules >> story", "admin/system/modules/story") ." you can setup an introductory text for story authors, and a floor on the number of words which may be included in a story. This is designed to help discourage the submission of trvially short stories."; + $output .= "

The story module lets your users submit articles for consideration by the rest of the community, who can vote on them if moderation is enabled. Stories usually follow a publishing flow of submit -> moderate -> post to the main page -> comments. Administrators are able to shortcut this flow as desired.

"; + $output .= "In ". l("site configuration >> modules >> story", "admin/system/modules/story") ." you can set up an introductory text for story authors, and a floor on the number of words which may be included in a story. This is designed to help discourage the submission of trivially short stories."; return $output; } function story_system($field){ $system["description"] = t("Enables users to submit stories, articles or similar content."); - $system["admin_help"] = t("**REWRITE** Stories are nodes with a complete thought. Think of newspaper stories. Stories follow the flow \"submit -> moderate -> post to the main page -> comment on story\". Below enter the minimum word count for a story, and the small block which will be displayed to users wanting to enter a story."); + $system["admin_help"] = t("Stories are like newspaper articles. They tend to follow a publishing flow of submit -> moderate -> post to the main page -> comments. Below you may fix a minimum word count for stories and also write some submission or content guidelines for users wanting to post a story."); return $system[$field]; } function story_settings() { - $output .= form_textarea("Explanation or submission guidelines", "story_help", variable_get("story_help", ""), 70, 5, "This text will be displayed at the top of the story submission form. Useful for helping or instructing your users."); - $output .= form_select(t("Minimum number of words"), "minimum_story_size", variable_get("minimum_story_size", 0), array(0 => "0 words", 10 => "10 words", 25 => "25 words", 50 => "50 words", 75 => "75 words", 100 => "100 words", 125 => "125 words", 150 => "150 words", 175 => "175 words", 200 => "200 words"), t("The minimum number of words a personal story entry should consist of. This can be useful to rule out submissions that do not meet the site's standards, such as short test posts.")); + $output .= form_textarea("Explanation or submission guidelines", "story_help", variable_get("story_help", ""), 70, 5, "This text will be displayed at the top of the story submission form. It is useful for helping or instructing your users."); + $output .= form_select(t("Minimum number of words"), "minimum_story_size", variable_get("minimum_story_size", 0), array(0 => "0 words", 10 => "10 words", 25 => "25 words", 50 => "50 words", 75 => "75 words", 100 => "100 words", 125 => "125 words", 150 => "150 words", 175 => "175 words", 200 => "200 words"), t("The minimum number of words a story must be to be considered valid. This can be useful to rule out submissions that do not meet the site's standards, such as short test posts.")); return $output; } function story_node($field) { $info["name"] = t("story"); - $info["description"] = t("A story is a post that is submitted to the attention of other users and is queued in the submission queue. Users and moderators vote on the posts they like or dislike, promoting or demoting them. When a post gets above a certain threshold it gets automatically published to front page."); + $info["description"] = t("A story is a post that is submitted to the attention of other users and is queued in the submission queue. Users and moderators vote on the posts they like or dislike, promoting or demoting them. When a post gets above a certain threshold it automatically gets promoted to the front page."); return $info[$field]; } diff --git a/modules/taxonomy.module b/modules/taxonomy.module index 5bd21f416..a301dfc85 100644 --- a/modules/taxonomy.module +++ b/modules/taxonomy.module @@ -798,8 +798,8 @@ function taxonomy_admin() { function taxonomy_help() { - $output .= "

Background

Taxonomy is the science of classification, acording to a predetermined system, where the results are used for analysis, discussion, or information retreival. In Drupal the taxonomy.module allows you to define a taxonomy which is then used to classify the Drupal nodes. The module can create classification that can include multiple lists of categories (controlled vocabularies), as well as thesauri (controlled vocabularies that indicated the relationships of terms) and taxonomies (controlled vocabularies where relationships arehierarchical). For more details about classification types and insight into the development of the taxonomy.module, see this drupal.org discussion.

"; - $output .= "

An example taxonomy: food

Dairy
--Milk
Drink
--Alchohol
--Pop
--Milk
Meat
--Beef
--Chicken
--Lamb
Spices
--Sugar

"; + $output .= "

Background

Taxonomy is the study of classification. Drupal's taxonomy module allows you to define categories which are used to classify content. The module supports hierarchical classification and association between terms, allowing for truly flexible information retrieval and classification. For more details about classification types and insight into the development of the taxonomy.module, see this drupal.org discussion.

"; + $output .= "

An example taxonomy: food

  • Dairy
    • Milk
  • Drink
    • Alchohol
      • Beer
      • Wine
    • Pop
    • Milk
  • Meat
    • Beef
    • Chicken
    • Lamb
  • Spices
    • Sugar
"; $output .= "

Notes

  • The term Milk appears within both Dairy and Drink. This is an example of multiple parents for a term.
  • In Drupal the order of siblings (e.g. Beef, Chicken, Lamb) in a taxonomy may be controlled with the weight parameter.
"; $output .= "

Vocabularies

When you create a controlled vocabulary you are creating a set of terms to use for describing content (known as descriptors in indexing lingo). Drupal allows you to describe each node of content (blog, story, etc.) using one or many of these terms. For simple implementations, you might create a set of categories without subcategories, similar to Slashdot's sections. For more complex implementations, you might create a hierarchical list of categories such as Food taxonomy shown above.

"; $output .= "

Setting up a vocabulary

When setting up a controlled vocabulary, if you select the hierarchy option, you will be defining a taxonomy or a thesaurus. If you select the related terms option, you are allowing the definition of related terms, think see also, as in a thesaurus. Selecting multiple select will allow you to describe a node using more than one term. That node will then appear in each term's page, thus increasing the chance that a user will find it.

"; @@ -807,7 +807,7 @@ function taxonomy_help() { $output .= "

Adding terms to a vocabulary

Once done defining the vocabulary, you have to add terms to it to make it useful. The options you see when adding a term to a vocabulary will depend on what you selected for related terms, hierarchy and multiple select. These options are:

"; $output .= "

  • Term name (Required) -- The name for this term. Example: Milk
  • Description (Optional) -- Description of the term that may be used by modules and feeds. This is synonymous with a 'scope note'.
  • Parent (Required) -- Select the term under which this term is a subset -- the branch of the hierarchy that this term belongs under. This is also known as the \"Broader term\" indicator used in thesauri.
  • Synonyms (Optional) -- Enter synonyms for this term, one synonym per line. Synonyms can be used for variant spellings, acronyms, and other terms that have the same meaning as the added term, but which are not explicitly listed in this thesaurus (i.e. unauthorized terms)
  • Weight (Optional) -- The weight is used to sort the terms of this vocabulary.

"; $output .= "

Displaying nodes organized by term(s)

In order to view the nodes associated with a term or a collection of terms, you should browse to a properly formed Taxonomy URL. For example, ". l("taxonomy/page/or/1,2","taxonomy/pages/or/1,2") .". Taxonomy URLs always contain one or more term IDs (tid) at the end of the URL (a.k.a the querystring). You may learn the term ID for a given term by hovering over that term in the ". l("taxonomy overview", "admin/taxonomy") ." page and noting the number at the end or the URL. To build a Taxonomy URL start with \"taxonomy/page\". Now add the querystring parameter, either or, which chooses nodes tagged with any of the given term IDs, or and, which chooses nodes tagged with all of the given Term IDs. Thus or is less specific than and. Finally add a comma seperated list of term IDs.

"; - $output .= "

RSS feeds

Every term, or collection of terms, provides an RSS feed to which interested users may subscribe. The URL format for an sample RSS feed is ". l("node/feed/or/1,2","node/feed/or/1,2") .". Built like a Taxonomy URL, ". l("see above", "admin/taxonomy/help#taxonomyURL") ." it starts with \"node/feed\", then has the querystring parameter, and finally the Term IDs.

"; + $output .= "

RSS feeds

Every term, or collection of terms, provides an RSS feed to which interested users may subscribe. The URL format for a sample RSS feed is ". l("node/feed/or/1,2","node/feed/or/1,2") .". Built like a Taxonomy URL, ". l("see above", "admin/taxonomy/help#taxonomyURL") ." it starts with \"node/feed\", then has the querystring parameter, and finally the Term IDs.

"; return t($output); } ?> diff --git a/modules/taxonomy/taxonomy.module b/modules/taxonomy/taxonomy.module index 5bd21f416..a301dfc85 100644 --- a/modules/taxonomy/taxonomy.module +++ b/modules/taxonomy/taxonomy.module @@ -798,8 +798,8 @@ function taxonomy_admin() { function taxonomy_help() { - $output .= "

Background

Taxonomy is the science of classification, acording to a predetermined system, where the results are used for analysis, discussion, or information retreival. In Drupal the taxonomy.module allows you to define a taxonomy which is then used to classify the Drupal nodes. The module can create classification that can include multiple lists of categories (controlled vocabularies), as well as thesauri (controlled vocabularies that indicated the relationships of terms) and taxonomies (controlled vocabularies where relationships arehierarchical). For more details about classification types and insight into the development of the taxonomy.module, see this drupal.org discussion.

"; - $output .= "

An example taxonomy: food

Dairy
--Milk
Drink
--Alchohol
--Pop
--Milk
Meat
--Beef
--Chicken
--Lamb
Spices
--Sugar

"; + $output .= "

Background

Taxonomy is the study of classification. Drupal's taxonomy module allows you to define categories which are used to classify content. The module supports hierarchical classification and association between terms, allowing for truly flexible information retrieval and classification. For more details about classification types and insight into the development of the taxonomy.module, see this drupal.org discussion.

"; + $output .= "

An example taxonomy: food

  • Dairy
    • Milk
  • Drink
    • Alchohol
      • Beer
      • Wine
    • Pop
    • Milk
  • Meat
    • Beef
    • Chicken
    • Lamb
  • Spices
    • Sugar
"; $output .= "

Notes

  • The term Milk appears within both Dairy and Drink. This is an example of multiple parents for a term.
  • In Drupal the order of siblings (e.g. Beef, Chicken, Lamb) in a taxonomy may be controlled with the weight parameter.
"; $output .= "

Vocabularies

When you create a controlled vocabulary you are creating a set of terms to use for describing content (known as descriptors in indexing lingo). Drupal allows you to describe each node of content (blog, story, etc.) using one or many of these terms. For simple implementations, you might create a set of categories without subcategories, similar to Slashdot's sections. For more complex implementations, you might create a hierarchical list of categories such as Food taxonomy shown above.

"; $output .= "

Setting up a vocabulary

When setting up a controlled vocabulary, if you select the hierarchy option, you will be defining a taxonomy or a thesaurus. If you select the related terms option, you are allowing the definition of related terms, think see also, as in a thesaurus. Selecting multiple select will allow you to describe a node using more than one term. That node will then appear in each term's page, thus increasing the chance that a user will find it.

"; @@ -807,7 +807,7 @@ function taxonomy_help() { $output .= "

Adding terms to a vocabulary

Once done defining the vocabulary, you have to add terms to it to make it useful. The options you see when adding a term to a vocabulary will depend on what you selected for related terms, hierarchy and multiple select. These options are:

"; $output .= "

  • Term name (Required) -- The name for this term. Example: Milk
  • Description (Optional) -- Description of the term that may be used by modules and feeds. This is synonymous with a 'scope note'.
  • Parent (Required) -- Select the term under which this term is a subset -- the branch of the hierarchy that this term belongs under. This is also known as the \"Broader term\" indicator used in thesauri.
  • Synonyms (Optional) -- Enter synonyms for this term, one synonym per line. Synonyms can be used for variant spellings, acronyms, and other terms that have the same meaning as the added term, but which are not explicitly listed in this thesaurus (i.e. unauthorized terms)
  • Weight (Optional) -- The weight is used to sort the terms of this vocabulary.

"; $output .= "

Displaying nodes organized by term(s)

In order to view the nodes associated with a term or a collection of terms, you should browse to a properly formed Taxonomy URL. For example, ". l("taxonomy/page/or/1,2","taxonomy/pages/or/1,2") .". Taxonomy URLs always contain one or more term IDs (tid) at the end of the URL (a.k.a the querystring). You may learn the term ID for a given term by hovering over that term in the ". l("taxonomy overview", "admin/taxonomy") ." page and noting the number at the end or the URL. To build a Taxonomy URL start with \"taxonomy/page\". Now add the querystring parameter, either or, which chooses nodes tagged with any of the given term IDs, or and, which chooses nodes tagged with all of the given Term IDs. Thus or is less specific than and. Finally add a comma seperated list of term IDs.

"; - $output .= "

RSS feeds

Every term, or collection of terms, provides an RSS feed to which interested users may subscribe. The URL format for an sample RSS feed is ". l("node/feed/or/1,2","node/feed/or/1,2") .". Built like a Taxonomy URL, ". l("see above", "admin/taxonomy/help#taxonomyURL") ." it starts with \"node/feed\", then has the querystring parameter, and finally the Term IDs.

"; + $output .= "

RSS feeds

Every term, or collection of terms, provides an RSS feed to which interested users may subscribe. The URL format for a sample RSS feed is ". l("node/feed/or/1,2","node/feed/or/1,2") .". Built like a Taxonomy URL, ". l("see above", "admin/taxonomy/help#taxonomyURL") ." it starts with \"node/feed\", then has the querystring parameter, and finally the Term IDs.

"; return t($output); } ?> -- cgit v1.2.3