summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGábor Hojtsy2008-01-17 21:50:59 (GMT)
committerGábor Hojtsy2008-01-17 21:50:59 (GMT)
commit4dc9ed032e74e4a6689ef35cbdba4f63d00b4ac5 (patch)
tree39bdb66985aff568330be7b7048136e42b6f332f
parentb05a49e46261fa5f63cdc64cfa3da2de80a1154b (diff)
#211322 by keith.smith: drag and drop documentation for input formats was missing, damn
-rw-r--r--CHANGELOG.txt2
-rw-r--r--modules/filter/filter.module2
2 files changed, 2 insertions, 2 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 268a4ef..0a322f2 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, and profile fields.
+ terms, 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/filter/filter.module b/modules/filter/filter.module
index f35fd43..0d3cf62 100644
--- a/modules/filter/filter.module
+++ b/modules/filter/filter.module
@@ -35,7 +35,7 @@ function filter_help($path, $arg) {
return '<p>'. t('If you cannot find the settings for a certain filter, make sure you have enabled it on the <a href="@url">view tab</a> first.', array('@url' => url('admin/settings/filters/'. $arg[3]))) .'</p>';
case 'admin/settings/filters/%/order':
$output = '<p>'. t('Because of the flexible filtering system, you might encounter a situation where one filter prevents another from doing its job. For example: a word in an URL gets converted into a glossary term, before the URL can be converted to a clickable link. When this happens, rearrange the order of the filters.') .'</p>';
- $output .= '<p>'. t('Filters are executed from top-to-bottom. You can use the weight column to rearrange them: heavier filters "sink" to the bottom.') .'</p>';
+ $output .= '<p>'. t("Filters are executed from top-to-bottom. To change the order of the filters, modify the values in the <em>Weight</em> column or grab a drag-and-drop handle under the <em>Name</em> column and drag filters to new locations 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 configuration</em> button at the bottom of the page.") .'</p>';
return $output;
}
}