diff options
| author | Brett Profitt <brett.profitt@gmail.com> | 2011-08-25 10:00:38 -0700 |
|---|---|---|
| committer | Brett Profitt <brett.profitt@gmail.com> | 2011-08-25 10:00:38 -0700 |
| commit | dccc333c765bb28da55b4a55d9c916acdb88413a (patch) | |
| tree | bdd26a0b4cd85241a19b7fcb2c0770f0ac3eb9f0 /mod/tinymce | |
| parent | ec7b94a64aef23b85866ecdac8e8acc712d29bb6 (diff) | |
| parent | 003cb81c7888f4d2fd763e5814027c6f8d71186f (diff) | |
| download | elgg-dccc333c765bb28da55b4a55d9c916acdb88413a.tar.gz elgg-dccc333c765bb28da55b4a55d9c916acdb88413a.tar.bz2 | |
Merge branch 'master' of github.com:brettp/Elgg
Diffstat (limited to 'mod/tinymce')
| -rw-r--r-- | mod/tinymce/css/elgg_tinymce.css | 5 | ||||
| -rw-r--r-- | mod/tinymce/start.php | 4 | ||||
| -rw-r--r-- | mod/tinymce/tinymce_content.css | 1 | ||||
| -rw-r--r-- | mod/tinymce/views/default/js/tinymce.php | 6 | ||||
| -rw-r--r-- | mod/tinymce/views/default/tinymce/css.php | 3 |
5 files changed, 13 insertions, 6 deletions
diff --git a/mod/tinymce/css/elgg_tinymce.css b/mod/tinymce/css/elgg_tinymce.css new file mode 100644 index 000000000..503e78c35 --- /dev/null +++ b/mod/tinymce/css/elgg_tinymce.css @@ -0,0 +1,5 @@ +/* CSS for TinyMCE content iframe */ +body, td, pre { + color: #333; + font: 80%/1.4 "Lucida Grande",Verdana,sans-serif; +}
\ No newline at end of file diff --git a/mod/tinymce/start.php b/mod/tinymce/start.php index 3b662308a..ee7154d22 100644 --- a/mod/tinymce/start.php +++ b/mod/tinymce/start.php @@ -5,6 +5,8 @@ * @package ElggTinyMCE */ +elgg_register_event_handler('init', 'system', 'tinymce_init'); + function tinymce_init() { elgg_extend_view('css/elgg', 'tinymce/css'); elgg_extend_view('css/admin', 'tinymce/css'); @@ -30,5 +32,3 @@ function tinymce_longtext_menu($hook, $type, $items, $vars) { return $items; } - -elgg_register_event_handler('init', 'system', 'tinymce_init', 9999); diff --git a/mod/tinymce/tinymce_content.css b/mod/tinymce/tinymce_content.css deleted file mode 100644 index af7c9bde7..000000000 --- a/mod/tinymce/tinymce_content.css +++ /dev/null @@ -1 +0,0 @@ -body, td, pre {color:#000; font-family:"Lucida Grande",Arial,Tahoma,Verdana,sans-serif; font-size:13px; margin:8px;} diff --git a/mod/tinymce/views/default/js/tinymce.php b/mod/tinymce/views/default/js/tinymce.php index 092983d1d..55e0c7ae1 100644 --- a/mod/tinymce/views/default/js/tinymce.php +++ b/mod/tinymce/views/default/js/tinymce.php @@ -56,17 +56,17 @@ elgg.tinymce.init = function() { //show the number of words ed.onLoadContent.add(function(ed, o) { var strip = (tinyMCE.activeEditor.getContent()).replace(/(<([^>]+)>)/ig,""); - var text = " <?php echo elgg_echo('tinymce:word_count'); ?>" + strip.split(' ').length + ' '; + var text = elgg.echo('tinymce:word_count') + strip.split(' ').length + ' '; tinymce.DOM.setHTML(tinymce.DOM.get(tinyMCE.activeEditor.id + '_path_row'), text); }); ed.onKeyUp.add(function(ed, e) { var strip = (tinyMCE.activeEditor.getContent()).replace(/(<([^>]+)>)/ig,""); - var text = " <?php echo elgg_echo('tinymce:word_count'); ?>" + strip.split(' ').length + ' '; + var text = elgg.echo('tinymce:word_count') + strip.split(' ').length + ' '; tinymce.DOM.setHTML(tinymce.DOM.get(tinyMCE.activeEditor.id + '_path_row'), text); }); }, - content_css: elgg.config.wwwroot + 'mod/tinymce/tinymce_content.css' + content_css: elgg.config.wwwroot + 'mod/tinymce/css/elgg_tinymce.css' }); } diff --git a/mod/tinymce/views/default/tinymce/css.php b/mod/tinymce/views/default/tinymce/css.php index 5d008024f..b12cae82c 100644 --- a/mod/tinymce/views/default/tinymce/css.php +++ b/mod/tinymce/views/default/tinymce/css.php @@ -26,3 +26,6 @@ -moz-border-radius: 4px; border-radius: 4px; } +.mceLast .mceStatusbar { + padding-left: 5px; +} |