Commit a09d7c1c authored by sun's avatar sun

#308912 by sun: Fixed alignment of editor buttons in TinyMCE 3.

parent db918ad8
......@@ -6,6 +6,7 @@ Wysiwyg x.x-x.x, xxxx-xx-xx
Wysiwyg 6.x-x.x, xxxx-xx-xx
---------------------------
#308912 by sun: Fixed alignment of editor buttons in TinyMCE 3.
#316507 by sun: Fixed TinyMCE 3 not detached properly from AJAX contents.
#320559 by markus_petrux, sun: Added confirmation form to delete profiles.
......
/* $Id$ */
/**
* TinyMCE 2.x
*
* Align all buttons and separators in a single row, so they wrap into multiple
* rows if required.
*/
.mceToolbarTop a, .mceToolbarBottom a {
float: left;
}
.mceSeparatorLine {
float: left;
margin-top: 3px;
}
.mceSelectList {
float: left;
margin-bottom: 1px;
}
/* Place table plugin buttons into new row */
#mce_editor_0_table, #mce_editor_1_table {
clear: left;
}
/* $Id$ */
/**
* TinyMCE 3.x
*
* Align all buttons and separators in a single row, so they wrap into multiple
* rows if required.
*/
.mceToolbar td {
display: inline;
}
.mceToolbar a {
float: left;
}
.mceSeparator {
float: left;
}
.mceListBox {
float: left;
margin-bottom: 1px;
}
......@@ -37,11 +37,13 @@ function wysiwyg_tinymce_editor() {
'2.1' => array(
// 'include files' => array('tinymce-2.inc'),
'js files' => array('tinymce-2.js'),
'css files' => array('tinymce-2.css'),
'download url' => 'http://sourceforge.net/project/showfiles.php?group_id=103281&package_id=111430&release_id=557383',
),
'3.2' => array(
// 'include files' => array('tinymce-3.inc'),
'js files' => array('tinymce-3.js'),
'css files' => array('tinymce-3.css'),
// 'plugin callback' => 'wysiwyg_tinymce_3_plugins',
'libraries' => array(
'' => array(
......@@ -63,8 +65,6 @@ function wysiwyg_tinymce_editor() {
// 'editor path' => wysiwyg_get_path('tinymce'), // Assumed by default.
// 'js path' => wysiwyg_get_path('editors/js'), // Assumed by default.
// 'css path' => wysiwyg_get_path('editors/css'), // Assumed by default.
// @todo Not yet implemented.
// 'css files' => array('tinymce.css'),
);
return $editor;
}
......
/* $Id$ */
/* TinyMCE 2.x */
.mceToolbarTop a, .mceToolbarBottom a { float: left; }
.mceSeparatorLine { float: left; margin-top: 3px; }
.mceSelectList { float: left; margin-bottom: 1px; }
#mce_editor_0_table, #mce_editor_1_table { clear: left; }
......@@ -253,12 +253,21 @@ function wysiwyg_load_editor($profile) {
drupal_add_js($editor['library path'] . '/' . $file);
}
// Load JavaScript integration files for this editor.
$files = array();
if (isset($editor['js files'])) {
$files = $editor['js files'];
}
foreach ($files as $file) {
drupal_add_js($editor['js path'] . '/' . $file, 'module', 'footer');
}
// Load CSS stylesheets for this editor.
$files = array();
if (isset($editor['css files'])) {
$files = $editor['css files'];
}
foreach ($files as $file) {
drupal_add_css($editor['css path'] . '/' . $file, 'module', 'screen');
}
$status = wysiwyg_user_get_status($profile);
drupal_add_js(array('wysiwyg' => array(
......@@ -302,10 +311,6 @@ function wysiwyg_load_editor($profile) {
// last.
drupal_add_js(wysiwyg_get_path('wysiwyg.js'), 'module', 'footer');
// Add our stylesheet to stack editor buttons into one row.
// @todo This is TinyMCE 2.x specific at the moment.
drupal_add_css(wysiwyg_get_path('wysiwyg.css'));
$settings_added = TRUE;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment