Only in tinymce: .svn Common subdirectories: tinymce.47/plugins and tinymce/plugins Common subdirectories: tinymce.47/po and tinymce/po Only in tinymce: tinymce Only in tinymce: tinymce.info diff -bdu tinymce.47/tinymce.module tinymce/tinymce.module --- tinymce.47/tinymce.module Tue Apr 25 15:23:47 2006 +++ tinymce/tinymce.module Thu Nov 23 00:09:49 2006 @@ -1,5 +1,5 @@ , // Richard Bennett and Jeff Robbins @@ -14,8 +14,9 @@ function tinymce_menu($may_cache) { $items = array(); if ($may_cache) { - $items[] = array('path' => 'admin/settings/tinymce', 'title' => t('tinymce'), + $items[] = array('path' => 'admin/settings/tinymce', 'title' => t('TinyMCE'), 'callback' => 'tinymce_admin', + 'description' => t('Configure the rich editor.'), 'access' => user_access('administer tinymce')); } return $items; @@ -26,8 +27,6 @@ */ function tinymce_help($section) { switch ($section) { - case 'admin/modules#description': - return t('The TinyMCE Javascript HTML WYSIWYG editor.'); case 'admin/settings/tinymce#pages': return "node/*\nuser/*\ncomment/*"; case 'admin/settings/tinymce': @@ -35,7 +34,7 @@ return t('

$Revision: 1.90 $ $Date: 2006/04/25 11:23:47 $

' . '

TinyMCE adds what-you-see-is-what-you-get (WYSIWYG) html editing to textareas. This editor can be enabled/disabled without reloading the page by clicking a link below each textarea.

Profiles can be defined based on user roles. A TinyMCE profile can define which pages receive this TinyMCE capability, what buttons or themes are enabled for the editor, how the editor is displayed, and a few other editor functions.

-

Lastly, only users with the access tinymce permission will be able to use TinyMCE.

', array('%url' => url('admin/access')) +

Lastly, only users with the access tinymce permission will be able to use TinyMCE.

', array('!url' => url('admin/user/access')) ); } } @@ -117,15 +116,15 @@ $disable = t('disable rich-text'); $tinymce_invoke = << + tinyMCE.init({ $tinymce_settings }); - + EOD; $js_toggle = << + function mceToggle(id, linkid) { element = document.getElementById(id); link = document.getElementById(linkid); @@ -150,7 +149,7 @@ link.blur(); } } - + EOD; $status = tinymce_user_get_status($user, $profile); @@ -204,12 +203,12 @@ // For some crazy reason IE will only load this JS file if the absolute reference is given to it. drupal_add_js($tinymce_mod_path . '/tinymce/jscripts/tiny_mce/tiny_mce.js'); } - drupal_set_html_head($js_toggle); + drupal_add_js($js_toggle, 'inline'); // We have to do this becuase of some unfocused CSS in certain themes. See http://drupal.org/node/18879 for details drupal_set_html_head(''); } // Load a TinyMCE init for each textarea. - if ($init) drupal_set_html_head($tinymce_invoke); + if ($init) drupal_add_js($tinymce_invoke, 'inline'); //settings are saved as strings, not booleans if ($profile->settings['show_toggle'] == 'true') { @@ -421,7 +420,7 @@ */ function tinymce_admin($arg = NULL) { - $edit = $_POST['edit']; + $edit = $_POST; $op = $_POST['op']; $op = $arg && !$op ? $arg : $op; @@ -463,7 +462,7 @@ //Check if TinyMCE is installed. $tinymce_loc = drupal_get_path('module', 'tinymce') .'/tinymce/'; if (!is_dir($tinymce_loc)) { - drupal_set_message(t('Could not find the TinyMCE engine installed at %tinymce-directory. Please download TinyMCE, uncompress it and copy the folder into %tinymce-path.', array('%tinymce-path' => drupal_get_path('module', 'tinymce'), '%tinymce-directory' => $tinymce_loc)), 'error'); + drupal_set_message(t('Could not find the TinyMCE engine installed at !tinymce-directory. Please download TinyMCE, uncompress it and copy the folder into !tinymce-path.', array('!tinymce-path' => drupal_get_path('module', 'tinymce'), '!tinymce-directory' => $tinymce_loc)), 'error'); } $output = tinymce_profile_overview(); } @@ -623,7 +622,7 @@ /** * Return an HTML form for profile configuration. */ -function tinymce_profile_form($edit) { +function tinymce_profile_form_build($edit) { $edit = (object) $edit; // Only display the roles that currently don't have a tinymce profile. One @@ -638,7 +637,7 @@ } } if (!$orig_roles) { - drupal_set_message(t('You must assign at least one role with the \'access tinymce\' permission before creating a profile.', array('%access-control-url' => url('admin/access'))), 'error'); + drupal_set_message(t('You must assign at least one role with the \'access tinymce\' permission before creating a profile.', array('!access-control-url' => url('admin/user/access'))), 'error'); } else if (!$roles) { drupal_set_message(t('You will not be allowed to create a new profile since all user roles have already been assigned profiles. Either remove an existing tinymce profile from at least one role or assign another role the \'access tinymce\' permission.'), 'error'); @@ -750,11 +749,11 @@ } else { $options = array(t('Show on every page except the listed pages.'), t('Show on only the listed pages.')); - $description = t("Enter one page per line as Drupal paths. The '*' character is a wildcard. Example paths are '%blog' for the blog page and %blog-wildcard for every personal blog. %front is the front page.", array('%blog' => theme('placeholder', 'blog'), '%blog-wildcard' => theme('placeholder', 'blog/*'), '%front' => theme('placeholder', ''))); + $description = t("Enter one page per line as Drupal paths. The '*' character is a wildcard. Example paths are '!blog' for the blog page and !blog-wildcard for every personal blog. !front is the front page.", array('!blog' => theme('placeholder', 'blog'), '!blog-wildcard' => theme('placeholder', 'blog/*'), '!front' => theme('placeholder', ''))); if ($access) { $options[] = t('Show if the following PHP code returns TRUE (PHP-mode, experts only).'); - $description .= t('If the PHP-mode is chosen, enter PHP code between %php. Note that executing incorrect PHP-code can break your Drupal site.', array('%php' => theme('placeholder', ''))); + $description .= t('If the PHP-mode is chosen, enter PHP code between !php. Note that executing incorrect PHP-code can break your Drupal site.', array('!php' => theme('placeholder', ''))); } $form['visibility']['access'] = array( '#type' => 'radios', @@ -922,7 +921,7 @@ '#default_value' => $edit->settings['css_path'], '#size' => 40, '#maxlength' => 255, - '#description' => t('Enter path to CSS file (example: "css/editor.css").
Macros: %h (host name: http://www.example.com/), %t (path to theme: theme/yourtheme/)
Be sure to select "define css" above.') + '#description' => t('Enter path to CSS file (example: "css/editor.css").
Macros: !h (host name: http://www.example.com/), !t (path to theme: theme/yourtheme/)
Be sure to select "define css" above.') ); $form['css']['css_classes'] = array( @@ -939,8 +938,16 @@ '#value' => $btn ); - $output .= drupal_get_form('tinymce_profile_form', $form); + return $form; +} +/** + * Return an HTML form for profile configuration. + */ +function tinymce_profile_form($edit) { + + $output .= drupal_get_form('tinymce_profile_form_build', $edit); + return $output; } @@ -952,7 +959,7 @@ // Flatten forms array foreach (element_children($form) as $key) { - $buttons[] = form_render($form[$key]); + $buttons[] = drupal_render($form[$key]); } //split checkboxes into rows with 3 columns @@ -1010,10 +1017,10 @@ $rows[] = array(array('data' => $p->name, 'valign' => 'top'), array('data' => implode("
\n", $p->rids)), array('data' => l(t('edit'), 'admin/settings/tinymce/edit/'. urlencode($p->name)) . ' '. l(t('delete'), 'admin/settings/tinymce/delete/'. urlencode($p->name)), 'valign' => 'top')); } $output .= theme('table', $header, $rows); - $output .= t('

Create new profile

', array('%create-profile-url' => url('admin/settings/tinymce/add'))); + $output .= t('

Create new profile

', array('!create-profile-url' => url('admin/settings/tinymce/add'))); } else { - drupal_set_message(t('No profiles found. Click here to create a new profile.', array('%create-profile-url' => url('admin/settings/tinymce/add')))); + drupal_set_message(t('No profiles found. Click here to create a new profile.', array('!create-profile-url' => url('admin/settings/tinymce/add')))); } return $output; Only in tinymce: tinymce_compressor_php