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;
*/
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':
return t('<p style="font-size:x-small">$Revision$ $Date$</p>' .
'<p>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.</p>
<p>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.</p>
- <p>Lastly, only users with the <code>access tinymce</code> <a href="%url">permission</a> will be able to use TinyMCE.</p>', array('%url' => url('admin/access'))
+ <p>Lastly, only users with the <code>access tinymce</code> <a href="!url">permission</a> will be able to use TinyMCE.</p>', array('!url' => url('admin/user/access'))
);
}
}
function tinymce_perm() {
$array = array('administer tinymce', 'access tinymce');
$tinymce_mod_path = drupal_get_path('module', 'tinymce');
-
+
if (is_dir($tinymce_mod_path . '/tinymce/jscripts/tiny_mce/plugins/imagemanager/')) {
$array[] = 'access tinymce imagemanager';
}
if (is_dir($tinymce_mod_path . '/tinymce/jscripts/tiny_mce/plugins/filemanager/')) {
$array[] = 'access tinymce filemanager';
}
-
+
return $array;
}
$type = array();
if (user_access('access tinymce')) {
- // Set resizable to false to avoid drupal.js resizable function from taking control of the textarea
- $type['textarea'] = array('#process' => array('tinymce_process_textarea' => array()), '#resizable' => FALSE);
+ // Let TinyMCE potentially process each textarea.
+ $type['textarea'] = array('#process' => array('tinymce_process_textarea' => array()));
}
return $type;
static $is_running = FALSE;
global $user;
static $profile_name;
-
+
//$element is an array of attributes for the textarea but there is no just 'name' value, so we extract this from the #id field
$textarea_name = substr($element['#id'], strpos($element['#id'], '-') + 1);
// we're gonna render tinymce.
if (!$profile_name) {
$profile_name = db_result(db_query('SELECT s.name FROM {tinymce_settings} s INNER JOIN {tinymce_role} r ON r.name = s.name WHERE r.rid IN (%s)', implode(',', array_keys($user->roles))));
+ if (!$profile_name) {
+ return $element;
+ }
}
$profile = tinymce_profile_load($profile_name);
$init = tinymce_config($profile);
// If $init array is empty no need to execute rest of code since there are no textareas to theme with TinyMCE
if (count($init) < 1) {
- // we set this textarea to use drupal resizable since tinymce won't be controling this textarea
- $element['#resizable'] = TRUE;
return $element;
}
$disable = t('disable rich-text');
$tinymce_invoke = <<<EOD
-<script type="text/javascript">
+
tinyMCE.init({
$tinymce_settings
});
-</script>
+
+EOD;
+
+$tinymce_gz_invoke = <<<EOD
+
+ tinyMCE_GZ.init({
+ $tinymce_settings
+ });
+
EOD;
$js_toggle = <<<EOD
-<script type="text/javascript">
+
function mceToggle(id, linkid) {
element = document.getElementById(id);
link = document.getElementById(linkid);
link.blur();
}
}
-</script>
+
EOD;
$status = tinymce_user_get_status($user, $profile);
var img_assist_default_link = img_assist.innerHTML;
if ('$img_assist_link' == 'yes') {
img_assist.innerHTML = tinyMCE.getEditorId('edit-$textarea_name') == null ? '' : img_assist_default_link;
- }
+ }
else {
img_assist.innerHTML = tinyMCE.getEditorId('edit-$textarea_name') == null ? img_assist_default_link : '';
}
if (!$is_running) {
$is_running = TRUE;
$tinymce_mod_path = drupal_get_path('module', 'tinymce');
-
+
if (is_dir($tinymce_mod_path . '/tinymce/jscripts/tiny_mce/plugins/imagemanager/') && user_access('access tinymce imagemanager') ) {
// if tinymce imagemanager is installed
drupal_add_js($tinymce_mod_path . '/tinymce/jscripts/tiny_mce/plugins/imagemanager/jscripts/mcimagemanager.js');
}
-
+
if (is_dir($tinymce_mod_path . '/tinymce/jscripts/tiny_mce/plugins/filemanager/') && user_access('access tinymce filemanager') ) {
// if tinymce filemanager is installed
drupal_add_js($tinymce_mod_path . '/tinymce/jscripts/tiny_mce/plugins/filemanager/jscripts/mcfilemanager.js');
}
-
- // TinyMCE Compressor
- if (file_exists($tinymce_mod_path . '/tinymce/jscripts/tiny_mce/tiny_mce_gzip.php')) {
+
+ // TinyMCE Compressor 1.0.9 and greater
+ if (file_exists($tinymce_mod_path . '/tinymce/jscripts/tiny_mce/tiny_mce_gzip.js')) {
+ drupal_add_js($tinymce_mod_path . '/tinymce/jscripts/tiny_mce/tiny_mce_gzip.js');
+ drupal_add_js($tinymce_gz_invoke, 'inline');
+ }
+ // TinyMCE Compressor (versions < 1.0.9)
+ elseif (file_exists($tinymce_mod_path . '/tinymce/jscripts/tiny_mce/tiny_mce_gzip.php')) {
drupal_add_js($tinymce_mod_path . '/tinymce/jscripts/tiny_mce/tiny_mce_gzip.php');
}
else {
// 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('<style type="text/css" media="all">.mceEditor img { display: inline; }</style>');
}
// 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') {
// Make sure to append to #suffix so it isn't completely overwritten
$element['#suffix'] .= $wysiwyg_link;
}
+ // Set resizable to false to avoid drupal.js resizable function from taking control of the textarea
+ $element['#resizable'] = FALSE;
}
return $element;
// because the settings are saved as strings we need to test for the string 'true'
if ($profile->settings['user_choose'] == 'true') {
$form['tinymce'] = array(
- '#type' => 'fieldset',
- '#title' => t('TinyMCE rich-text settings'),
- '#weight' => 10,
- '#collapsible' => TRUE,
+ '#type' => 'fieldset',
+ '#title' => t('TinyMCE rich-text settings'),
+ '#weight' => 10,
+ '#collapsible' => TRUE,
'#collapsed' => TRUE
);
-
+
$form['tinymce']['tinymce_status'] = array(
- '#type' => 'select',
+ '#type' => 'select',
'#title' => t('Default state'),
- '#default_value' => isset($user->tinymce_status) ? $user->tinymce_status : (isset($profile->settings['default']) ? $profile->settings['default'] : 'false'),
- '#options' => array('false' => 'false', 'true' => 'true'),
+ '#default_value' => isset($user->tinymce_status) ? $user->tinymce_status : (isset($profile->settings['default']) ? $profile->settings['default'] : 'false'),
+ '#options' => array('false' => t('disabled'), 'true' => t('enabled')),
'#description' => t('Should rich-text editing be enabled or disabled by default in textarea fields?')
- );
-
+ );
+
return array('tinymce' => $form);
}
}
break;
}
- /*
- // Example, add some extra features when using the advanced theme.
- switch ($theme_name) {
- case 'advanced':
- $init['extended_valid_elements'] = array('a[href|target|name|title|onclick]');
- break;
+ /* Example, add some extra features when using the advanced theme.
+
+ // If $init is available, we can extend it
+ if (isset($init)) {
+ switch ($theme_name) {
+ case 'advanced':
+ $init['extended_valid_elements'] = array('a[href|target|name|title|onclick]');
+ break;
+ }
}
+
*/
- // Always return $init; !!
+ // Always return $init
return $init;
}
function _tinymce_get_buttons($skip_metadata = TRUE) {
include_once(drupal_get_path('module', 'tinymce'). '/plugin_reg.php');
$plugins = _tinymce_plugins();
-
+
if ($skip_metadata == FALSE && is_array($plugins)) {
foreach ($plugins as $name => $plugin) {
$file = drupal_get_path('module', 'tinymce'). '/tinymce/jscripts/tiny_mce/plugins/'. $name .'/editor_plugin_src.js';
*/
function tinymce_admin($arg = NULL) {
- $edit = $_POST['edit'];
+ $edit = $_POST;
$op = $_POST['op'];
$op = $arg && !$op ? $arg : $op;
//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 <strong>%tinymce-directory</strong>. Please <a href="http://tinymce.moxiecode.com/">download TinyMCE</a>, 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 <strong>!tinymce-directory</strong>. Please <a href="http://tinymce.moxiecode.com/">download TinyMCE</a>, 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();
}
*/
function tinymce_config($profile) {
global $user;
-
+
// Drupal theme path.
$themepath = path_to_theme() . '/';
$host = base_path();
// Is tinymce on by default?
$status = tinymce_user_get_status($user, $profile);
-
+
$init['mode'] = $status == 'true' ? 'exact' : 'none';
$init['theme'] = $settings['theme'] ? $settings['theme'] : 'advanced';
$init['relative_urls'] = 'false';
$init['entity_encoding'] = 'raw';
$init['verify_html'] = $settings['verify_html'] ? $settings['verify_html'] : 'false';
$init['preformatted'] = $settings['preformatted'] ? $settings['preformatted'] : 'false';
- $init['convert_fonts_to_styles'] = $settings['convert_fonts_to_styles'] ? $settings['convert_fonts_to_styles'] : 'false';
+ $init['convert_fonts_to_spans'] = $settings['convert_fonts_to_spans'] ? $settings['convert_fonts_to_spans'] : 'false';
+ $init['remove_linebreaks'] = $settings['remove_linebreaks'] ? $settings['remove_linebreaks'] : 'true';
+ $init['apply_source_formatting'] = $settings['apply_source_formatting'] ? $settings['apply_source_formatting'] : 'true';
+ $init['theme_advanced_resize_horizontal'] = 'false';
+ $init['theme_advanced_resizing_use_cookie'] = 'false';
+
$tinymce_mod_path = drupal_get_path('module', 'tinymce');
if (is_dir($tinymce_mod_path . '/tinymce/jscripts/tiny_mce/plugins/imagemanager/') && user_access('access tinymce imagemanager')) {
// we probably need more security than this
$init['file_browser_callback'] = "mcImageManager.filebrowserCallBack";
}
-
+
if ($init['theme'] == 'advanced') {
$init['plugins'] = array();
$init['theme_advanced_toolbar_location'] = $settings['toolbar_loc'] ? $settings['toolbar_loc'] : 'bottom';
}
}
- if ($settings['css_classes']) $init['theme_advanced_styles'] = $settings['css_classes'];
+ if ($settings['css_classes']) $init['theme_advanced_styles'] = str_replace('"','',$settings['css_classes']);
if ($settings['css_setting'] == 'theme') {
$css = $themepath . 'style.css';
/**
* 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
}
}
if (!$orig_roles) {
- drupal_set_message(t('You must <a href="%access-control-url">assign</a> 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 <a href="!access-control-url">assign</a> 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');
}
$form['basic'] = array(
- '#type' => 'fieldset',
- '#title' => t('Basic setup'),
- '#collapsible' => TRUE,
+ '#type' => 'fieldset',
+ '#title' => t('Basic setup'),
+ '#collapsible' => TRUE,
'#collapsed' => TRUE
);
-
+
$form['basic']['name'] = array(
- '#type' => 'textfield',
- '#title' => t('Profile name'),
- '#default_value' => $edit->name,
- '#size' => 40,
- '#maxlength' => 128,
- '#description' => t('Enter a name for this profile. This name is only visible within the tinymce administration page.'),
+ '#type' => 'textfield',
+ '#title' => t('Profile name'),
+ '#default_value' => $edit->name,
+ '#size' => 40,
+ '#maxlength' => 128,
+ '#description' => t('Enter a name for this profile. This name is only visible within the tinymce administration page.'),
'#required' => TRUE
);
-
+
$form['basic']['rids'] = array(
- '#type' => 'checkboxes',
- '#title' => t('Roles allowed to use this profile'),
- '#default_value' => array_keys((array) $edit->rids),
- '#options' => $roles,
- '#description' => t('Check at least one role. Only roles with \'access tinymce\' permission will be shown here.'),
+ '#type' => 'checkboxes',
+ '#title' => t('Roles allowed to use this profile'),
+ '#default_value' => array_keys((array) $edit->rids),
+ '#options' => $roles,
+ '#description' => t('Check at least one role. Only roles with \'access tinymce\' permission will be shown here.'),
'#required' => TRUE
);
-
+
$form['basic']['default'] = array(
- '#type' => 'select',
+ '#type' => 'select',
'#title' => t('Default state'),
- '#default_value' => $edit->settings['default'] ? $edit->settings['default'] : 'false',
- '#options' => array('false' => 'false', 'true' => 'true'),
+ '#default_value' => $edit->settings['default'] ? $edit->settings['default'] : 'false',
+ '#options' => array('false' => t('disabled'), 'true' => t('enabled')),
'#description' => t('Default editor state for users in this profile. Users will be able to override this state if the next option is enabled.'),
);
-
+
$form['basic']['user_choose'] = array(
- '#type' => 'select',
+ '#type' => 'select',
'#title' => t('Allow users to choose default'),
- '#default_value' => $edit->settings['user_choose'] ? $edit->settings['user_choose'] : 'false',
- '#options' => array('false' => 'false', 'true' => 'true'),
+ '#default_value' => $edit->settings['user_choose'] ? $edit->settings['user_choose'] : 'false',
+ '#options' => array('false' => t('false'), 'true' => t('true')),
'#description' => t('If allowed, users will be able to choose their own TinyMCE default state by visiting their profile page.'),
);
-
+
$form['basic']['show_toggle'] = array(
- '#type' => 'select',
+ '#type' => 'select',
'#title' => t('Show disable/enable rich text editor toggle'),
- '#default_value' => $edit->settings['show_toggle'] ? $edit->settings['show_toggle'] : 'true',
- '#options' => array('false' => 'false', 'true' => 'true'),
+ '#default_value' => $edit->settings['show_toggle'] ? $edit->settings['show_toggle'] : 'true',
+ '#options' => array('false' => t('false'), 'true' => t('true')),
'#description' => t('Whether or not to show the disable/enable rich text editor toggle below the textarea. If false, editor defaults to the global default or user default (see above).'),
);
-
+
// This line upgrades previous versions of TinyMCE for user who previously selected a theme other than advanced.
if ($edit->settings['theme'] != 'advanced') $edit->settings['theme'] = 'advanced';
-
+
$form['basic']['theme'] = array(
- '#type' => 'hidden',
+ '#type' => 'hidden',
'#value' => $edit->settings['theme'] ? $edit->settings['theme'] : 'advanced'
);
-
+
$form['basic']['language'] = array(
- '#type' => 'select',
- '#title' => t('Language'),
- '#default_value' => $edit->settings['language'] ? $edit->settings['language'] : 'en',
- '#options' => drupal_map_assoc(array('ar', 'ca', 'cs', 'cy', 'da', 'de', 'el', 'en', 'es', 'fa', 'fi', 'fr', 'fr_ca', 'he', 'hu', 'is', 'it', 'ja', 'ko', 'nb', 'nl', 'nn', 'pl', 'pt', 'pt_br', 'ru', 'ru_KOI8-R', 'ru_UTF-8', 'sk', 'sv', 'th', 'zh_cn', 'zh_tw', 'zh_tw_utf8')),
+ '#type' => 'select',
+ '#title' => t('Language'),
+ '#default_value' => $edit->settings['language'] ? $edit->settings['language'] : 'en',
+ '#options' => drupal_map_assoc(array('ar', 'ca', 'cs', 'cy', 'da', 'de', 'el', 'en', 'es', 'fa', 'fi', 'fr', 'fr_ca', 'he', 'hu', 'is', 'it', 'ja', 'ko', 'nb', 'nl', 'nn', 'pl', 'pt', 'pt_br', 'ru', 'ru_KOI8-R', 'ru_UTF-8', 'si', 'sk', 'sv', 'th', 'zh_cn', 'zh_tw', 'zh_tw_utf8')),
'#description' => t('The language for the TinyMCE interface. Language codes based on the <a href="http://www.loc.gov/standards/iso639-2/englangn.html">ISO-639-2</a> format.')
);
-
+
$form['basic']['safari_message'] = array(
- '#type' => 'select',
+ '#type' => 'select',
'#title' => t('Safari browser warning'),
- '#default_value' => $edit->settings['safari_message'] ? $edit->settings['safari_message'] : 'false',
- '#options' => array('false' => 'false', 'true' => 'true'),
+ '#default_value' => $edit->settings['safari_message'] ? $edit->settings['safari_message'] : 'false',
+ '#options' => array('false' => t('false'), 'true' => t('true')),
'#description' => t('TinyMCE support for the Safari web browser is experimental and a warning message is displayed when that browser is detected. You can disable this message here.')
);
$form['visibility'] = array(
- '#type' => 'fieldset',
- '#title' => t('Visibility'),
- '#collapsible' => TRUE,
+ '#type' => 'fieldset',
+ '#title' => t('Visibility'),
+ '#collapsible' => TRUE,
'#collapsed' => TRUE
);
-
+
$access = user_access('use PHP for block visibility');
// If the visibility is set to PHP mode but the user doesn't have this block permission, don't allow them to edit nor see this PHP code
if ($edit->settings['access'] == 2 && !$access) {
$form['visibility'] = array();
$form['visibility']['access'] = array(
- '#type' => 'value',
+ '#type' => 'value',
'#value' => 2
);
$form['visibility']['access_pages'] = array(
- '#type' => 'value',
+ '#type' => 'value',
'#value' => $edit->settings['access_pages']
);
}
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', '<front>')));
+ $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', '<front>')));
if ($access) {
$options[] = t('Show if the following PHP code returns <code>TRUE</code> (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', '<?php ?>')));
+ $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', '<?php ?>')));
}
$form['visibility']['access'] = array(
- '#type' => 'radios',
- '#title' => t('Show tinymce on specific pages'),
- '#default_value' => isset($edit->settings['access']) ? $edit->settings['access'] : 1,
+ '#type' => 'radios',
+ '#title' => t('Show tinymce on specific pages'),
+ '#default_value' => isset($edit->settings['access']) ? $edit->settings['access'] : 1,
'#options' => $options
);
$form['visibility']['access_pages'] = array(
- '#type' => 'textarea',
- '#title' => t('Pages'),
- '#default_value' => isset($edit->settings['access_pages']) ? $edit->settings['access_pages'] : tinymce_help('admin/settings/tinymce#pages'),
+ '#type' => 'textarea',
+ '#title' => t('Pages'),
+ '#default_value' => isset($edit->settings['access_pages']) ? $edit->settings['access_pages'] : tinymce_help('admin/settings/tinymce#pages'),
'#description' => $description
);
}
$form['buttons'] = array(
- '#type' => 'fieldset',
- '#title' => t('Buttons and plugins'),
- '#collapsible' => TRUE,
- '#collapsed' => TRUE,
- '#tree' => TRUE,
+ '#type' => 'fieldset',
+ '#title' => t('Buttons and plugins'),
+ '#collapsible' => TRUE,
+ '#collapsed' => TRUE,
+ '#tree' => TRUE,
'#theme' => 'tinymce_profile_form_buttons'
);
}
$form['appearance'] = array(
- '#type' => 'fieldset',
- '#title' => t('Editor appearance'),
- '#collapsible' => TRUE,
+ '#type' => 'fieldset',
+ '#title' => t('Editor appearance'),
+ '#collapsible' => TRUE,
'#collapsed' => TRUE
);
-
+
$form['appearance']['toolbar_loc'] = array(
- '#type' => 'select',
- '#title' => t('Toolbar location'),
- '#default_value' => $edit->settings['toolbar_loc'],
- '#options' => array('bottom' => 'bottom', 'top' => 'top'),
+ '#type' => 'select',
+ '#title' => t('Toolbar location'),
+ '#default_value' => $edit->settings['toolbar_loc'],
+ '#options' => array('bottom' => t('bottom'), 'top' => t('top')),
'#description' => t('Show toolbar at the top or bottom of the editor area?')
);
-
+
$form['appearance']['toolbar_align'] = array(
- '#type' => 'select',
- '#title' => t('Toolbar alignment'),
- '#default_value' => $edit->settings['toolbar_align'],
- '#options' => array('center' => 'center', 'left' => 'left', 'right' => 'right'),
+ '#type' => 'select',
+ '#title' => t('Toolbar alignment'),
+ '#default_value' => $edit->settings['toolbar_align'],
+ '#options' => array('center' => t('center'), 'left' => t('left'), 'right' => t('right')),
'#description' => t('Align tool icons left, center, or right within the toolbar.')
);
-
+
$form['appearance']['path_loc'] = array(
- '#type' => 'select',
- '#title' => t('Path location'),
- '#default_value' => $edit->settings['path_loc'] ? $edit->settings['path_loc'] : 'bottom',
- '#options' => array('none' => 'none', 'top' => 'top', 'bottom' => 'bottom'),
+ '#type' => 'select',
+ '#title' => t('Path location'),
+ '#default_value' => $edit->settings['path_loc'] ? $edit->settings['path_loc'] : 'bottom',
+ '#options' => array('none' => t('none'), 'top' => t('top'), 'bottom' => t('bottom')),
'#description' => t('Path to html elements (i.e. "body>table>tr>td"). Show at top, bottom, or not at all.')
);
-
+
$form['appearance']['resizing'] = array(
- '#type' => 'select',
- '#title' => t('Enable resizing button'),
+ '#type' => 'select',
+ '#title' => t('Enable resizing button'),
'#default_value' => isset($edit->settings['resizing']) ? $edit->settings['resizing'] : 'true',
- '#options' => array('false' => 'false', 'true' => 'true'),
+ '#options' => array('false' => t('false'), 'true' => t('true')),
'#description' => t(' This option gives you the ability to enable/disable the resizing button. If enabled the <strong>Path location toolbar</strong> must be set to "top" or "bottom" in order to display the resize icon.')
);
-
+
$form['appearance']['block_formats'] = array(
- '#type' => 'textfield',
- '#title' => t('Block formats'),
- '#default_value' => $edit->settings['block_formats'] ? $edit->settings['block_formats'] : 'p,address,pre,h1,h2,h3,h4,h5,h6',
- '#size' => 40,
- '#maxlength' => 250,
+ '#type' => 'textfield',
+ '#title' => t('Block formats'),
+ '#default_value' => $edit->settings['block_formats'] ? $edit->settings['block_formats'] : 'p,address,pre,h1,h2,h3,h4,h5,h6',
+ '#size' => 40,
+ '#maxlength' => 250,
'#description' => t('Comma separated list of HTML block formats. You can only remove elements, not add.')
);
$form['output'] = array(
- '#type' => 'fieldset',
- '#title' => t('Cleanup and output'),
- '#collapsible' => TRUE,
+ '#type' => 'fieldset',
+ '#title' => t('Cleanup and output'),
+ '#collapsible' => TRUE,
'#collapsed' => TRUE
);
-
+
$form['output']['verify_html'] = array(
- '#type' => 'select',
- '#title' => t('Verify HTML'),
- '#default_value' => $edit->settings['verify_html'],
- '#options' => array('true' => 'true', 'false' => 'false'),
+ '#type' => 'select',
+ '#title' => t('Verify HTML'),
+ '#default_value' => $edit->settings['verify_html'],
+ '#options' => array('false' => t('false'), 'true' => t('true')),
'#description' => t('Should the HTML contents be verified or not? Verifying will strip <head> tags, so choose false if you will be editing full page HTML.')
);
-
+
$form['output']['preformatted'] = array(
- '#type' => 'select',
- '#title' => t('Preformatted'),
- '#default_value' => $edit->settings['preformatted'],
- '#options' => array('false' => 'false', 'true' => 'true'),
+ '#type' => 'select',
+ '#title' => t('Preformatted'),
+ '#default_value' => $edit->settings['preformatted'],
+ '#options' => array('false' => t('false'), 'true' => t('true')),
'#description' => t('If this option is set to true, the editor will insert TAB characters on tab and preserve other whitespace characters just like a PRE HTML element does.')
);
-
- $form['output']['convert_fonts_to_styles'] = array(
- '#type' => 'select',
- '#title' => t('Convert <font> tags to styles'),
- '#default_value' => $edit->settings['convert_fonts_to_styles'],
- '#options' => array('true' => 'true', 'false' => 'false'),
+
+ $form['output']['convert_fonts_to_spans'] = array(
+ '#type' => 'select',
+ '#title' => t('Convert <font> tags to styles'),
+ '#default_value' => $edit->settings['convert_fonts_to_spans'],
+ '#options' => array('true' => t('true'), 'false' => t('false')),
'#description' => t('If you set this option to true, font size, font family, font color and font background color will be replaced by inline styles.')
);
+ $form['output']['remove_linebreaks'] = array(
+ '#type' => 'select',
+ '#title' => t('Remove linebreaks'),
+ '#default_value' => $edit->settings['remove_linebreaks'],
+ '#options' => array('true' => 'true', 'false' => 'false'),
+ '#description' => t('Set this option to false to prevent TinyMCE from removing linebreaks from existing nodes. True avoids conflicts with some filters.')
+ );
+
+ $form['output']['apply_source_formatting'] = array(
+ '#type' => 'select',
+ '#title' => t('Apply source formatting'),
+ '#default_value' => $edit->settings['apply_source_formatting'],
+ '#options' => array('true' => 'true', 'false' => 'false'),
+ '#description' => t('This option makes TinyMCE apply source formatting. Set this to true for a cleaner HTML source. Choose false to avoid conflicts with some filters.')
+ );
+
$form['css'] = array(
- '#type' => 'fieldset',
- '#title' => t('CSS'),
- '#collapsible' => TRUE,
+ '#type' => 'fieldset',
+ '#title' => t('CSS'),
+ '#collapsible' => TRUE,
'#collapsed' => TRUE
);
-
+
$form['css']['css_setting'] = array(
- '#type' => 'select',
- '#title' => t('Editor CSS'),
- '#default_value' => $edit->settings['css_setting'] ? $edit->settings['css_setting'] : 'theme',
- '#options' => array('theme' => 'use theme css', 'self' => 'define css', 'none' => 'tinyMCE default'),
+ '#type' => 'select',
+ '#title' => t('Editor CSS'),
+ '#default_value' => $edit->settings['css_setting'] ? $edit->settings['css_setting'] : 'theme',
+ '#options' => array('theme' => t('use theme css'), 'self' => t('define css'), 'none' => t('tinyMCE default')),
'#description' => t('Defines the CSS to be used in the editor area.<br />use theme css - load style.css from current site theme.<br/>define css - enter path for css file below.<br />tinyMCE default - uses default CSS from editor.')
);
-
+
$form['css']['css_path'] = array(
- '#type' => 'textfield',
- '#title' => t('CSS path'),
- '#default_value' => $edit->settings['css_path'],
- '#size' => 40,
- '#maxlength' => 255,
- '#description' => t('Enter path to CSS file (example: "css/editor.css").<br />Macros: %h (host name: http://www.example.com/), %t (path to theme: theme/yourtheme/)<br />Be sure to select "define css" above.')
+ '#type' => 'textfield',
+ '#title' => t('CSS path'),
+ '#default_value' => $edit->settings['css_path'],
+ '#size' => 40,
+ '#maxlength' => 255,
+ '#description' => t('Enter path to CSS file (<em>example: "css/editor.css"</em>) or a list of css files seperated by a comma (<em>example: /themes/garland/style.css,http://domain.com/customMCE.css</em>).<br />Macros: %h (host name: http://www.example.com/), %t (path to theme: theme/yourtheme/)<br />Be sure to select "define css" above.')
);
-
+
$form['css']['css_classes'] = array(
- '#type' => 'textfield',
- '#title' => t('CSS classes'),
- '#default_value' => $edit->settings['css_classes'],
- '#size' => 40,
- '#maxlength' => 255,
+ '#type' => 'textfield',
+ '#title' => t('CSS classes'),
+ '#default_value' => $edit->settings['css_classes'],
+ '#size' => 40,
+ '#maxlength' => 255,
'#description' => t('Adds CSS classes to the "styles" droplist. Format is: <title>=<class>;<br/> Example: Header 1=header1;Header 2=header2;Header 3=header3 (note: no trailing \';\')<br />Leave blank to automatically import list of CSS classes from style sheet.')
);
$form['submit'] = array(
- '#type' => 'submit',
+ '#type' => 'submit',
'#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;
}
// 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
$roles = user_roles();
$header = array(t('Profile'), t('Roles'), t('Operations'));
foreach ($profiles as $p) {
- $rows[] = array(array('data' => $p->name, 'valign' => 'top'), array('data' => implode("<br />\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'));
+ $rows[] = array(array('data' => filter_xss($p->name), 'valign' => 'top'), array('data' => implode("<br />\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('<p><a href="%create-profile-url">Create new profile</a></p>', array('%create-profile-url' => url('admin/settings/tinymce/add')));
+ $output .= t('<p><a href="!create-profile-url">Create new profile</a></p>', array('!create-profile-url' => url('admin/settings/tinymce/add')));
}
else {
- drupal_set_message(t('No profiles found. Click here to <a href="%create-profile-url">create a new profile</a>.', array('%create-profile-url' => url('admin/settings/tinymce/add'))));
+ drupal_set_message(t('No profiles found. Click here to <a href="!create-profile-url">create a new profile</a>.', array('!create-profile-url' => url('admin/settings/tinymce/add'))));
}
return $output;
projects / project/tinymce.git / blobdiff