From ddf630c4b30a4264dfec23466b1c8dc8af886717 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Wed, 29 Jun 2011 07:15:07 -0400 Subject: moved tinymce content css into its own directory --- mod/tinymce/views/default/js/tinymce.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mod/tinymce/views/default') diff --git a/mod/tinymce/views/default/js/tinymce.php b/mod/tinymce/views/default/js/tinymce.php index 092983d1d..d195cc871 100644 --- a/mod/tinymce/views/default/js/tinymce.php +++ b/mod/tinymce/views/default/js/tinymce.php @@ -66,7 +66,7 @@ elgg.tinymce.init = function() { 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' }); } -- cgit v1.2.3 From b31332e3aa9b90ae3ee55e14ec7d568b3be5dd42 Mon Sep 17 00:00:00 2001 From: Cash Costello Date: Wed, 29 Jun 2011 07:28:42 -0400 Subject: Fixes #3537 using elgg.echo() for i18n of word count --- mod/tinymce/views/default/js/tinymce.php | 4 ++-- mod/tinymce/views/default/tinymce/css.php | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'mod/tinymce/views/default') diff --git a/mod/tinymce/views/default/js/tinymce.php b/mod/tinymce/views/default/js/tinymce.php index d195cc871..55e0c7ae1 100644 --- a/mod/tinymce/views/default/js/tinymce.php +++ b/mod/tinymce/views/default/js/tinymce.php @@ -56,13 +56,13 @@ elgg.tinymce.init = function() { //show the number of words ed.onLoadContent.add(function(ed, o) { var strip = (tinyMCE.activeEditor.getContent()).replace(/(<([^>]+)>)/ig,""); - var text = " " + 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 = " " + 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); }); }, 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; +} -- cgit v1.2.3