From 5759314893f44e62e1048b789750e9c0623485d8 Mon Sep 17 00:00:00 2001 From: Will Rossiter Date: Fri, 23 Jan 2009 05:18:11 +0000 Subject: [PATCH] BUGFIX: show flash icon and box if flash file exists. MINOR: created a default editor.css file which has base css styles for the CMS. git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/branches/2.3@70691 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- code/sitefeatures/PageComment.php | 2 +- css/cms_right.css | 3 ++- css/editor.css | 19 +++++++++++++++++++ javascript/tinymce.template.js | 2 +- 4 files changed, 23 insertions(+), 3 deletions(-) create mode 100644 css/editor.css diff --git a/code/sitefeatures/PageComment.php b/code/sitefeatures/PageComment.php index 5071bf84..8a63626f 100755 --- a/code/sitefeatures/PageComment.php +++ b/code/sitefeatures/PageComment.php @@ -179,7 +179,7 @@ class PageComment_Controller extends Controller { } } - function approve() { + function approve() { if(Permission::check('CMS_ACCESS_CMSMain')) { $comment = DataObject::get_by_id("PageComment", $this->urlParams['ID']); $comment->NeedsModeration = false; diff --git a/css/cms_right.css b/css/cms_right.css index 6d6cd76b..617d33ba 100644 --- a/css/cms_right.css +++ b/css/cms_right.css @@ -136,6 +136,7 @@ .right form textarea { font-size: 12px; } + .right form .mceEditor select.mceNativeListBox { background: #fff; padding-top: 2px; @@ -169,7 +170,7 @@ .right form .mceEditor select.mceNativeListBox { background: #fff; } - + .right form input.checkbox, .right form .optionset input, .right form .htmleditor select, diff --git a/css/editor.css b/css/editor.css new file mode 100644 index 00000000..71863561 --- /dev/null +++ b/css/editor.css @@ -0,0 +1,19 @@ +/** + * Default Editor Styles for the CMS + */ + +.typography .mceItemFlash { + border: 1px dotted #f00; +} + +body.mceContentBody { + min-height: 200px; + font-size: 62.5%; +} +body.mceContentBody a.broken { + background-color: #FF7B71; + border: 1px red solid; + color: #fff; + padding: 1px; + text-decoration: underline; +} \ No newline at end of file diff --git a/javascript/tinymce.template.js b/javascript/tinymce.template.js index c7dc84b8..32ce3fe1 100755 --- a/javascript/tinymce.template.js +++ b/javascript/tinymce.template.js @@ -14,7 +14,7 @@ if((typeof tinyMCE != 'undefined')) { width: "100%", auto_resize : false, theme : "advanced", - content_css : "$ContentCSS", + content_css : "cms/css/editor.css, $ContentCSS", body_class : 'typography', document_base_url: "$BaseURL", urlconverter_callback : "nullConverter",