diff --git a/fckeditor.module b/fckeditor.module index 9aee52364b43ea599ac200d282cc4b98f6595eaa..f23a47b88df571d143574aec97c131389070398e 100644 --- a/fckeditor.module +++ b/fckeditor.module @@ -47,7 +47,6 @@ function fckeditor_help($section = '') { '!fckeditorlink'=>l(t('FCKeditor homepage'), 'http://www.fckeditor.net'), '!userguidelink'=>l(t('FCKeditor userguide'), 'http://wiki.fckeditor.net/UsersGuide')) ); - $output .= "
The FCKeditor module allows Drupal to replace textarea fields with a rich text or WYSIWYG editor. This editor brings many of the powerful functionalities of known desktop editors like Word to the web. It's relatively lightweight and doesn't require any kind of installation on the client computer.
@@ -81,7 +80,7 @@ You may copy the needed configuration lines from the default FCKeditor configura ', array( '!filter'=>htmlentities(' -
-
-
'),
- '!filterlink'=> l(t('filters'),'admin/filters'))
+ '!filterlink'=> l(t('filters'), 'admin/settings/filters'))
);
$output .= t('Uploading images and files
There are three ways of uploading files: By using the built-in file browser, by using a module like !imce or using the core upload module.
',
@@ -90,7 +89,7 @@ You may copy the needed configuration lines from the default FCKeditor configura
)
);
$output .= t('Security
-Note that enabling file uploads is a security risk. That\'s why there is a
+
Note that enabling file uploads is a security risk. That\'s why there is a
separate permission in Administer > User Management > Access Control for enabling the file
browser to certain groups.
');
// the rest is untranslated for the moment
@@ -212,7 +211,7 @@ function fckeditor_settings_form() {
'#type' => 'textfield',
'#title' => t('Minimum rows'),
'#default_value' => variable_get('fckeditor_minimum_rows', 5),
- '#description' => t("Textareas must have a minimum of rows before FCKeditor will be triggered. Enter '1' if you do not want to use this feature."),
+ '#description' => t("FCKeditor will be triggered if the textarea has more rows than entered here. Enter '1' if you do not want to use this feature."),
);
/**
* get excluded fields - so we can have normal textareas too
@@ -225,14 +224,14 @@ function fckeditor_settings_form() {
'#cols' => 60,
'#rows' => 5,
'#default_value' => variable_get("fckeditor_exclude", ''),
- '#description' => t("Names (HTML ID's) of fields that may not have an FCKeditor (separated by commas, spaces or newlines. You may also use * for a wildcard)"),
+ '#description' => t("Names (HTML ID's) of fields that may not have an FCKeditor (separated by commas, spaces or newlines. You may also use * as a wildcard character)"),
);
$form['fckeditor_exclude_settings']['fckeditor_exclude_toggle'] = array(
'#type' => 'radios',
'#title' => t('Use inclusion or exclusion mode'),
'#default_value' => variable_get('fckeditor_exclude_toggle', '0'),
'#options' => array('0'=>t('Exclude fields'), '1'=>t('Include fields'), '2'=>t('Path only')),
- '#description' => t('Choose what to do with the above values. "Exclude fields" wil disable the editor on all fields matching the above, "Include fields" will only load the editor for the fields mentioned above and "Path only" will match the all textareas at the mentioned paths.'),
+ '#description' => t('Choose what to do with the above values. "Exclude fields" will disable the editor on all fields matching the above, "Include fields" will only load the editor for the fields mentioned above and "Path only" will match all textareas at the mentioned paths.'),
);
$form['fckeditor_special_settings'] = array(
@@ -399,10 +398,8 @@ var ".$js_id." = new FCKeditor( '".$element['#id']."' );
$element['#suffix'] .= " (" . t('Open rich editor') . ")";
}
else {
- // if no popup mode, add the editor
- $element['#suffix'] .= "\n";
+ // if no popup mode, add the editor initialization to the footer
+ drupal_add_js('if (Drupal.jsEnabled) {$(document).ready(function() {'.$js_id.'.ReplaceTextarea();});}', 'inline', 'footer');
}
}