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
silverstripe · Feb 2, 2011 · 5759314 · 5759314
1 parent c15b86a
commit 5759314
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 3 deletions.
diff --git a/code/sitefeatures/PageComment.php b/code/sitefeatures/PageComment.php
@@ -179,7 +179,7 @@ function deletecomment() {
 		}
 	}
 
-		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
@@ -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
@@ -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;
+}
diff --git 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",