From 1c38cd909918550882e96e5cc30664321623ed63 Mon Sep 17 00:00:00 2001 From: Dries Buytaert Date: Tue, 24 Jun 2003 15:55:22 +0000 Subject: - Bugfix: renamed "create PHP content" to "create php content". Reported by Simon, patch by Gerhard. - Improvement: synchronized the import module help with the version on drupal.org. --- modules/aggregator.module | 53 ++++++++++++++++++++++++++++++++---- modules/aggregator/aggregator.module | 53 ++++++++++++++++++++++++++++++++---- modules/block.module | 6 ++-- modules/block/block.module | 6 ++-- modules/import.module | 53 ++++++++++++++++++++++++++++++++---- 5 files changed, 147 insertions(+), 24 deletions(-) (limited to 'modules') diff --git a/modules/aggregator.module b/modules/aggregator.module index a59927836..78adefc7c 100644 --- a/modules/aggregator.module +++ b/modules/aggregator.module @@ -1,13 +1,54 @@ **REWRITE** In Drupal you have feeds and bundles. Feeds define news sources and bundles categorize syndicated content by source, topic or any other heuristic. Bundles provide a generalized way of creating composite feeds. They allow you, for example, to combine various sport-related feeds into one bundle called \"Sport\".

"; - $output .= "

You can have several providers of news feeds. You can add a feed by clicking the \"add feed\" link on the import administration pages. Give the feed a name, supply the URI and a comma-separated list of attributes that you want to associate the feed with. The update interval defines how often Drupal should go out to try and grab fresh content. The expiration time defines how long syndicated content is kept in the database. So set the update and expiration time and save your settings. You have just defined your first feed. If you have more feeds repeat as necessary.

"; - $output .= "

To verify whether your feed works, press \"update items\" at the overview page. The number of news items that have been sucessfully fetched, should then become visible in the third column of the feed overview.

"; - $output .= "

Now you have to define some bundles. Bundles look for feeds that contain one of the keywords associated with the bundle and display those feeds together. To define a bundle you have to give it a name and a comma-separated list of keywords just like this is the case for feeds.

"; - $output .= "

Your newly created bundle will now show up in the list of blocks that you can see at the block related administration pages. There you can customize where and when your bundles will be displayed.

"; - return t($output); + $output .= "

Thousands of web sites, especially news sites and weblogs, syndicate their most recent site content for others to display. The syndicated content always includes titles, also known as headlines, for the newest published stories. Each headline acts as a direct link to the stories on the remote site. Along with the headline, most sites typically provide either the first few paragraphs of the story or a short summary. Many individuals use client-based news aggregators on their personal computer to aggregate content, such as AmphetaDesk.

"; + + $output .= "

Drupal also has a news aggregator built in as a standard feature. With it, you can subscribe to feeds from other sites and display their content for your site users. Simply enable the import module in site administration and enter the feeds that you choose.

"; + $output .= "

What do I need to subscribe to a feed?

"; + $output .= "

The standard method of syndication is using the XML-based Rich Site Summary (RSS). To syndicate a site's content, obtain the full URL of the RSS page providing syndication. Common file tags for RSS pages are .rss, .xml and .rdf. Example: http://slashdot.org/slashdot.rdf.

"; + $output .= "

Most weblog sites that offer syndication will have an obvious link on the main page. Often you need only look for an xml syndication button, such as the one Drupal uses for site syndication.

"; + $output .= "

But some sites do not make their RSS feeds as easy to find. Or maybe you want to find a number of feeds on a given topic, without extensively searching the web. In that case, try an RSS syndication directory such as Syndic8.

"; + $output .= "

To learn much more about RSS, read Mark Pilgrim's What is RSS and WebReference.com's The Evolution of RSS.

"; + $output .= "

NOTE: Enable your site's xml syndication button by turning on the Syndicate block in block management.

"; + $output .= "

Configuring news feeds

"; + $output .= "

To subscribe to an RSS feed on another site, use the administer news feeds shortcut at the top of the news aggregation page. The link leads directly to the news aggregation configuration section of Drupal site administration.

"; + $output .= "

Once there, select add new feed from the left hand menu. Drupal will then ask for the following:

"; + $output .= ""; + $output .= "

Once you submit your new feed, check to see if it is working properly. Select update items on the main news aggregation page. If you do not see any items listed for that feed, edit the feed and make sure that the URL was entered correctly.

"; + $output .= "

Adding bundles

"; + $output .= "

You may want to follow some feeds more closely than others. Or perhaps you'd like to display a select list of the titles for some feeds as a block for users. Bundles are a way of grouping your feeds into categories. Bundles look for feeds that contain at least one of the keywords, or attributes, associated with the bundle and display those feeds together.

"; + $output .= "

When adding a bundle, Drupal will ask for:

"; + $output .= ""; + $output .= "

Using the news aggregator

"; + $output .= "

The news aggregator has a number of ways that it displays your subscribed content:

"; + $output .= ""; + $output .= "

RSS feed blocks

"; + $output .= "

In addition to providing subscribed content through the news aggregator, Drupal automatically creates a block for each subscribed feed and every bundle created. Beside each headline in each block, Drupal includes an icon which acts a blog it link. Enable any or all of the blocks using block management.

"; + return $output; } function import_system($field){ diff --git a/modules/aggregator/aggregator.module b/modules/aggregator/aggregator.module index a59927836..78adefc7c 100644 --- a/modules/aggregator/aggregator.module +++ b/modules/aggregator/aggregator.module @@ -1,13 +1,54 @@ **REWRITE** In Drupal you have feeds and bundles. Feeds define news sources and bundles categorize syndicated content by source, topic or any other heuristic. Bundles provide a generalized way of creating composite feeds. They allow you, for example, to combine various sport-related feeds into one bundle called \"Sport\".

"; - $output .= "

You can have several providers of news feeds. You can add a feed by clicking the \"add feed\" link on the import administration pages. Give the feed a name, supply the URI and a comma-separated list of attributes that you want to associate the feed with. The update interval defines how often Drupal should go out to try and grab fresh content. The expiration time defines how long syndicated content is kept in the database. So set the update and expiration time and save your settings. You have just defined your first feed. If you have more feeds repeat as necessary.

"; - $output .= "

To verify whether your feed works, press \"update items\" at the overview page. The number of news items that have been sucessfully fetched, should then become visible in the third column of the feed overview.

"; - $output .= "

Now you have to define some bundles. Bundles look for feeds that contain one of the keywords associated with the bundle and display those feeds together. To define a bundle you have to give it a name and a comma-separated list of keywords just like this is the case for feeds.

"; - $output .= "

Your newly created bundle will now show up in the list of blocks that you can see at the block related administration pages. There you can customize where and when your bundles will be displayed.

"; - return t($output); + $output .= "

Thousands of web sites, especially news sites and weblogs, syndicate their most recent site content for others to display. The syndicated content always includes titles, also known as headlines, for the newest published stories. Each headline acts as a direct link to the stories on the remote site. Along with the headline, most sites typically provide either the first few paragraphs of the story or a short summary. Many individuals use client-based news aggregators on their personal computer to aggregate content, such as AmphetaDesk.

"; + + $output .= "

Drupal also has a news aggregator built in as a standard feature. With it, you can subscribe to feeds from other sites and display their content for your site users. Simply enable the import module in site administration and enter the feeds that you choose.

"; + $output .= "

What do I need to subscribe to a feed?

"; + $output .= "

The standard method of syndication is using the XML-based Rich Site Summary (RSS). To syndicate a site's content, obtain the full URL of the RSS page providing syndication. Common file tags for RSS pages are .rss, .xml and .rdf. Example: http://slashdot.org/slashdot.rdf.

"; + $output .= "

Most weblog sites that offer syndication will have an obvious link on the main page. Often you need only look for an xml syndication button, such as the one Drupal uses for site syndication.

"; + $output .= "

But some sites do not make their RSS feeds as easy to find. Or maybe you want to find a number of feeds on a given topic, without extensively searching the web. In that case, try an RSS syndication directory such as Syndic8.

"; + $output .= "

To learn much more about RSS, read Mark Pilgrim's What is RSS and WebReference.com's The Evolution of RSS.

"; + $output .= "

NOTE: Enable your site's xml syndication button by turning on the Syndicate block in block management.

"; + $output .= "

Configuring news feeds

"; + $output .= "

To subscribe to an RSS feed on another site, use the administer news feeds shortcut at the top of the news aggregation page. The link leads directly to the news aggregation configuration section of Drupal site administration.

"; + $output .= "

Once there, select add new feed from the left hand menu. Drupal will then ask for the following:

"; + $output .= ""; + $output .= "

Once you submit your new feed, check to see if it is working properly. Select update items on the main news aggregation page. If you do not see any items listed for that feed, edit the feed and make sure that the URL was entered correctly.

"; + $output .= "

Adding bundles

"; + $output .= "

You may want to follow some feeds more closely than others. Or perhaps you'd like to display a select list of the titles for some feeds as a block for users. Bundles are a way of grouping your feeds into categories. Bundles look for feeds that contain at least one of the keywords, or attributes, associated with the bundle and display those feeds together.

"; + $output .= "

When adding a bundle, Drupal will ask for:

"; + $output .= ""; + $output .= "

Using the news aggregator

"; + $output .= "

The news aggregator has a number of ways that it displays your subscribed content:

"; + $output .= ""; + $output .= "

RSS feed blocks

"; + $output .= "

In addition to providing subscribed content through the news aggregator, Drupal automatically creates a block for each subscribed feed and every bundle created. Beside each headline in each block, Drupal includes an icon which acts a blog it link. Enable any or all of the blocks using block management.

"; + return $output; } function import_system($field){ diff --git a/modules/block.module b/modules/block.module index d76731657..e2da7eba5 100644 --- a/modules/block.module +++ b/modules/block.module @@ -43,7 +43,7 @@ function block_perm() { function block_link($type) { if ($type == "admin" && user_access("administer blocks")) { $help["block"] = t("Blocks are the boxes visible in the side bars on the left- and right-hand side of the web site, depending on the choosen theme. They are created by active Drupal modules. In order to view a block it must be enabled. You can assign the block's placement by giving it a region and a weight. The region specifies which side of the page the block is on, and the weight sorts blocks within a region. Lighter (smaller weight value) blocks \"float up\" towards the top of the page. The path setting is a mask which lets you define on which pages you want the specific block to be shown. The custom checkbox lets your users hide the block from their account setting page. You can also create your own blocks, where you specify the content of the block rather than it being generated by a module (you can even use PHP in these). You can create one of these by clicking the %createblock link in the menu to the left. Edit and delete links will become active below for these customized blocks.", array("%createblock" => l(t("create new block"), "admin/block/add"))); - $help["create"] = t("Here you can create a custom content block. Once you have created this block you must make it active, and give it a place on the page using block management. The title is used when displaying the block. The description is used in the \"block\" column on the block management page. If you are going to place PHP code in the block, and you have create PHP content permission (see user management >> user permissions) you must change the type to PHP to make your code active.", array("%overview" => url("admin/block"), "%permission" => url("admin/user/permission"))); + $help["create"] = t("Here you can create a custom content block. Once you have created this block you must make it active, and give it a place on the page using block management. The title is used when displaying the block. The description is used in the \"block\" column on the block management page. If you are going to place PHP code in the block, and you have create php content permission (see user management >> user permissions) you must change the type to PHP to make your code active.", array("%overview" => url("admin/block"), "%permission" => url("admin/user/permission"))); $help["preview"] = t("This page helps show you the placement of your blocks in different themes. The numbers are the weight of each block, which is used to sort them within the sidebars."); menu("admin/block", "block management", "block_admin", $help["block"], 3); @@ -233,7 +233,7 @@ function block_box_form($edit = array()) { } function block_box_save($edit) { - if (!user_access("create PHP content")) { + if (!user_access("create php content")) { $edit["type"] = 0; } @@ -330,4 +330,4 @@ function block_user($type, &$edit, &$user) { } } -?> \ No newline at end of file +?> diff --git a/modules/block/block.module b/modules/block/block.module index d76731657..e2da7eba5 100644 --- a/modules/block/block.module +++ b/modules/block/block.module @@ -43,7 +43,7 @@ function block_perm() { function block_link($type) { if ($type == "admin" && user_access("administer blocks")) { $help["block"] = t("Blocks are the boxes visible in the side bars on the left- and right-hand side of the web site, depending on the choosen theme. They are created by active Drupal modules. In order to view a block it must be enabled. You can assign the block's placement by giving it a region and a weight. The region specifies which side of the page the block is on, and the weight sorts blocks within a region. Lighter (smaller weight value) blocks \"float up\" towards the top of the page. The path setting is a mask which lets you define on which pages you want the specific block to be shown. The custom checkbox lets your users hide the block from their account setting page. You can also create your own blocks, where you specify the content of the block rather than it being generated by a module (you can even use PHP in these). You can create one of these by clicking the %createblock link in the menu to the left. Edit and delete links will become active below for these customized blocks.", array("%createblock" => l(t("create new block"), "admin/block/add"))); - $help["create"] = t("Here you can create a custom content block. Once you have created this block you must make it active, and give it a place on the page using block management. The title is used when displaying the block. The description is used in the \"block\" column on the block management page. If you are going to place PHP code in the block, and you have create PHP content permission (see user management >> user permissions) you must change the type to PHP to make your code active.", array("%overview" => url("admin/block"), "%permission" => url("admin/user/permission"))); + $help["create"] = t("Here you can create a custom content block. Once you have created this block you must make it active, and give it a place on the page using block management. The title is used when displaying the block. The description is used in the \"block\" column on the block management page. If you are going to place PHP code in the block, and you have create php content permission (see user management >> user permissions) you must change the type to PHP to make your code active.", array("%overview" => url("admin/block"), "%permission" => url("admin/user/permission"))); $help["preview"] = t("This page helps show you the placement of your blocks in different themes. The numbers are the weight of each block, which is used to sort them within the sidebars."); menu("admin/block", "block management", "block_admin", $help["block"], 3); @@ -233,7 +233,7 @@ function block_box_form($edit = array()) { } function block_box_save($edit) { - if (!user_access("create PHP content")) { + if (!user_access("create php content")) { $edit["type"] = 0; } @@ -330,4 +330,4 @@ function block_user($type, &$edit, &$user) { } } -?> \ No newline at end of file +?> diff --git a/modules/import.module b/modules/import.module index a59927836..78adefc7c 100644 --- a/modules/import.module +++ b/modules/import.module @@ -1,13 +1,54 @@ **REWRITE** In Drupal you have feeds and bundles. Feeds define news sources and bundles categorize syndicated content by source, topic or any other heuristic. Bundles provide a generalized way of creating composite feeds. They allow you, for example, to combine various sport-related feeds into one bundle called \"Sport\".

"; - $output .= "

You can have several providers of news feeds. You can add a feed by clicking the \"add feed\" link on the import administration pages. Give the feed a name, supply the URI and a comma-separated list of attributes that you want to associate the feed with. The update interval defines how often Drupal should go out to try and grab fresh content. The expiration time defines how long syndicated content is kept in the database. So set the update and expiration time and save your settings. You have just defined your first feed. If you have more feeds repeat as necessary.

"; - $output .= "

To verify whether your feed works, press \"update items\" at the overview page. The number of news items that have been sucessfully fetched, should then become visible in the third column of the feed overview.

"; - $output .= "

Now you have to define some bundles. Bundles look for feeds that contain one of the keywords associated with the bundle and display those feeds together. To define a bundle you have to give it a name and a comma-separated list of keywords just like this is the case for feeds.

"; - $output .= "

Your newly created bundle will now show up in the list of blocks that you can see at the block related administration pages. There you can customize where and when your bundles will be displayed.

"; - return t($output); + $output .= "

Thousands of web sites, especially news sites and weblogs, syndicate their most recent site content for others to display. The syndicated content always includes titles, also known as headlines, for the newest published stories. Each headline acts as a direct link to the stories on the remote site. Along with the headline, most sites typically provide either the first few paragraphs of the story or a short summary. Many individuals use client-based news aggregators on their personal computer to aggregate content, such as AmphetaDesk.

"; + + $output .= "

Drupal also has a news aggregator built in as a standard feature. With it, you can subscribe to feeds from other sites and display their content for your site users. Simply enable the import module in site administration and enter the feeds that you choose.

"; + $output .= "

What do I need to subscribe to a feed?

"; + $output .= "

The standard method of syndication is using the XML-based Rich Site Summary (RSS). To syndicate a site's content, obtain the full URL of the RSS page providing syndication. Common file tags for RSS pages are .rss, .xml and .rdf. Example: http://slashdot.org/slashdot.rdf.

"; + $output .= "

Most weblog sites that offer syndication will have an obvious link on the main page. Often you need only look for an xml syndication button, such as the one Drupal uses for site syndication.

"; + $output .= "

But some sites do not make their RSS feeds as easy to find. Or maybe you want to find a number of feeds on a given topic, without extensively searching the web. In that case, try an RSS syndication directory such as Syndic8.

"; + $output .= "

To learn much more about RSS, read Mark Pilgrim's What is RSS and WebReference.com's The Evolution of RSS.

"; + $output .= "

NOTE: Enable your site's xml syndication button by turning on the Syndicate block in block management.

"; + $output .= "

Configuring news feeds

"; + $output .= "

To subscribe to an RSS feed on another site, use the administer news feeds shortcut at the top of the news aggregation page. The link leads directly to the news aggregation configuration section of Drupal site administration.

"; + $output .= "

Once there, select add new feed from the left hand menu. Drupal will then ask for the following:

"; + $output .= ""; + $output .= "

Once you submit your new feed, check to see if it is working properly. Select update items on the main news aggregation page. If you do not see any items listed for that feed, edit the feed and make sure that the URL was entered correctly.

"; + $output .= "

Adding bundles

"; + $output .= "

You may want to follow some feeds more closely than others. Or perhaps you'd like to display a select list of the titles for some feeds as a block for users. Bundles are a way of grouping your feeds into categories. Bundles look for feeds that contain at least one of the keywords, or attributes, associated with the bundle and display those feeds together.

"; + $output .= "

When adding a bundle, Drupal will ask for:

"; + $output .= ""; + $output .= "

Using the news aggregator

"; + $output .= "

The news aggregator has a number of ways that it displays your subscribed content:

"; + $output .= ""; + $output .= "

RSS feed blocks

"; + $output .= "

In addition to providing subscribed content through the news aggregator, Drupal automatically creates a block for each subscribed feed and every bundle created. Beside each headline in each block, Drupal includes an icon which acts a blog it link. Enable any or all of the blocks using block management.

"; + return $output; } function import_system($field){ -- cgit v1.2.3