summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGábor Hojtsy2008-01-27 17:55:15 (GMT)
committerGábor Hojtsy2008-01-27 17:55:15 (GMT)
commit8eb3ba596a819fe42f5e218abd8098a6e3d80412 (patch)
treebb7ecc9e2de68a1bc95f64bcd778333be4e46fa2
parente130f20871a6d9f2cf8acccbb2f9227a9516408e (diff)
#214579 by keith.smith: vocabulary drag and drop was not properly documented (string change)
-rw-r--r--CHANGELOG.txt2
-rw-r--r--modules/taxonomy/taxonomy.module4
2 files changed, 4 insertions, 2 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 9706903..7472311 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -47,7 +47,7 @@ Drupal 6.0, xxxx-xx-xx (development version)
* Dynamically check password strength and confirmation.
* Refactored poll administration.
* Implemented drag-and-drop positioning for blocks, menu items, taxonomy
- terms, forums, profile fields, and input format filters.
+ vocabularies and terms, forums, profile fields, and input format filters.
- Theme system:
* Added .info files to themes and made it easier to specify regions and
features.
diff --git a/modules/taxonomy/taxonomy.module b/modules/taxonomy/taxonomy.module
index 25d01b7..af40899 100644
--- a/modules/taxonomy/taxonomy.module
+++ b/modules/taxonomy/taxonomy.module
@@ -1243,7 +1243,9 @@ function taxonomy_help($path, $arg) {
$output .= '<p>'. t('For more information, see the online handbook entry for <a href="@taxonomy">Taxonomy module</a>.', array('@taxonomy' => 'http://drupal.org/handbook/modules/taxonomy/')) .'</p>';
return $output;
case 'admin/content/taxonomy':
- return '<p>'. t("The taxonomy module allows you to categorize your content using both tags and administrator defined terms. It is a flexible tool for classifying content with many advanced features. To begin, create a 'Vocabulary' to hold one set of terms or tags. You can create one free-tagging vocabulary for everything, or separate controlled vocabularies to define the various properties of your content, for example 'Countries' or 'Colors'.") .'</p>';
+ $output = '<p>'. t("The taxonomy module allows you to categorize your content using both tags and administrator defined terms. It is a flexible tool for classifying content with many advanced features. To begin, create a 'Vocabulary' to hold one set of terms or tags. You can create one free-tagging vocabulary for everything, or separate controlled vocabularies to define the various properties of your content, for example 'Countries' or 'Colors'.") .'</p>';
+ $output .= '<p>'. t('Use the list below to configure and review the vocabularies defined on your site, or to list and manage the terms (tags) they contain. A vocabulary may (optionally) be tied to specific content types as shown in the <em>Type</em> column and, if so, will be displayed when creating or editing posts of that type. Multiple vocabularies tied to the same content type will be displayed in the order shown below. To change the order of a vocabulary, grab a drag-and-drop handle under the <em>Name</em> column and drag it to a new location in the list. (Grab a handle by clicking and holding the mouse while hovering over a handle icon.) Remember that your changes will not be saved until you click the <em>Save</em> button at the bottom of the page.') .'</p>';
+ return $output;
case 'admin/content/taxonomy/%':
$vocabulary = taxonomy_vocabulary_load($arg[3]);
if ($vocabulary->tags) {