Skip to content
Snippets Groups Projects
Commit 1cb00fc2 authored by Tim Steiner's avatar Tim Steiner
Browse files

[gh-234] Merging from testing into staging

git-svn-id: file:///tmp/wdn_thm_drupal/branches/drupal-7.x/staging@1115 20a16fea-79d4-4915-8869-1ea9d5ebf173
parent 1c1c7c8d
No related branches found
No related tags found
No related merge requests found
...@@ -204,7 +204,7 @@ function unl_wysiwyg_plugin($editor) { ...@@ -204,7 +204,7 @@ function unl_wysiwyg_plugin($editor) {
'options' => array( 'options' => array(
'skin' => 'unl', 'skin' => 'unl',
'table_styles' => 'ZenTable Bright (yellow)=zentable bright;ZenTable Cool (blue)=zentable cool;ZenTable Energetic (orange)=zentable energetic;ZenTable Soothing (green)=zentable soothing;ZenTable Primary (red)=zentable primary;ZenTable Neutral (gray)=zentable neutral;', 'doctype' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">', 'table_styles' => 'ZenTable Bright (yellow)=zentable bright;ZenTable Cool (blue)=zentable cool;ZenTable Energetic (orange)=zentable energetic;ZenTable Soothing (green)=zentable soothing;ZenTable Primary (red)=zentable primary;ZenTable Neutral (gray)=zentable neutral;', 'doctype' => '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">',
'valid_elements' => '*[*],script[src|type=text/javascript]', 'valid_elements' => '*[*],script[charset|defer|id|src|type=text/javascript]',
), ),
) )
// Wysiwyg wrapper plugin AJAX callback. // Wysiwyg wrapper plugin AJAX callback.
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment