diff --git a/public/assets/kindeditor/kindeditor.js b/public/assets/kindeditor/kindeditor.js
index 5503af1fe..0354ed467 100644
--- a/public/assets/kindeditor/kindeditor.js
+++ b/public/assets/kindeditor/kindeditor.js
@@ -815,7 +815,8 @@ function _formatHtml(html, htmlTags, urlType, wellFormatted, indentChar) {
 				startNewline = endNewline = '';
 			}
 		}
-		if (attr !== '') {
+        //blockquote 单独加上style 之后再改成接口 给别的加上默认的
+		if (attr !== '' || (tagName === 'blockquote')) {
 			var attrMap = _getAttrList(full);
 			if (tagName === 'font') {
 				var fontStyleMap = {}, fontStyle = '';
@@ -877,6 +878,9 @@ function _formatHtml(html, htmlTags, urlType, wellFormatted, indentChar) {
 				}
 			});
 			attr = '';
+            if (tagName === 'blockquote') {
+                attrMap['style'] = "margin: 0 0 0 40px; border: none; padding: 0px;background: none;background-color: ;";
+            }
 			_each(attrMap, function(key, val) {
 				if (key === 'style' && val === '') {
 					return;
diff --git a/public/assets/kindeditor/plugins/code/previewcode.css b/public/assets/kindeditor/plugins/code/previewcode.css
index f9f7c4b78..0db8eb45b 100644
--- a/public/assets/kindeditor/plugins/code/previewcode.css
+++ b/public/assets/kindeditor/plugins/code/previewcode.css
@@ -46,7 +46,7 @@
 .ke-content div.ref .ref_body {margin:0;padding:2px;line-height:20px;color:#666;font-size:9pt;}
 
 
-.ke-content blockquote {margin:15px 10px;border:2px solid #eee;padding:5px 5px 5px 35px;}
+.ke-content blockquote{background: none;border: none;padding: 0px;margin: 0 0 0 40px;}
 span.at {color:#269ac9;}
 span.at a{color:#269ac9;text-decoration: none;}
 
diff --git a/public/assets/kindeditor/plugins/table/table.js b/public/assets/kindeditor/plugins/table/table.js
index 74b14b118..3f3cbb27c 100644
--- a/public/assets/kindeditor/plugins/table/table.js
+++ b/public/assets/kindeditor/plugins/table/table.js
@@ -284,7 +284,7 @@ KindEditor.plugin('table', function(K) {
 						for (var i = 0; i < rows; i++) {
 							html += '<tr>';
 							for (var j = 0; j < cols; j++) {
-								html += '<td style="border:'+ border+'px solid;border-color:' + borderColor+';text-overflow:inherit;overflow: hidden;white-space: nowrap" >' + (K.IE ? '&nbsp;' : '<br />') + '</td>';
+								html += '<td style="border:'+ border+'px solid;border-color:' + borderColor+';>' + (K.IE ? '&nbsp;' : '<br />') + '</td>';
 							}
 							html += '</tr>';
 						}
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 468bf64e9..7b8f664e9 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -1347,6 +1347,43 @@ function pop_up_box(value,tWidth,tTop,tLeft){
     }
 }
 
+//显示的时候根据当前网址是http 还是https 选择视频显示方式直接显示还是弹框
+function autoMedia(id){
+    var rootPath = getRootPath();
+
+    function _mediaType(src) {
+        if (/\.(rm|rmvb)(\?|$)/i.test(src)) {
+            return 'audio/x-pn-realaudio-plugin';
+        }
+        if (/\.(swf|flv)(\?|$)/i.test(src)) {
+            return 'application/x-shockwave-flash';
+        }
+        return 'video/x-ms-asf-plugin';
+    }
+
+    if (rootPath.indexOf("https") < 0){
+        $("#"+id+" img").each(function(){
+            if ($(this).attr("class") == "mediaIco"){
+                var href = $(this).parent().attr("href");
+                //正则取地址
+                if (href){
+                    var url = href.split("open('")[1].split("',")[0];
+                    if (url != ""){
+                        var type = _mediaType(url);
+                        //1.video/x-ms-asf-plugin 类型的视频播放不了,2.audio/x-pn-realaudio-plugin没试过3.application/x-shockwave-flash可以播放
+                        if (type != "video/x-ms-asf-plugin"){
+                            var width = 550;
+                            var height = 400;
+                            var html = '<embed src="'+url+'" allowFullScreen="true" quality="high" width="'+width+'" height="'+height+'" align="middle" allowScriptAccess="always" type="'+type+'"></embed>';
+                            $(this).parent().replaceWith(html);
+                        }
+                    }
+                }
+            }
+        });
+    }
+}
+
 //yk 自动识别URL 并加上链接
 function autoUrl(id){
     if ($("#"+id).children().length > 0 ){
@@ -1387,6 +1424,8 @@ function autoUrl(id){
         });
         $("#"+id).html(html);
     }
+    if(!(!!window.ActiveXObject || "ActiveXObject" in window)){
+        autoMedia(id);
+    }
 }
 
-
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index 98976d044..5c37f2fbf 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -152,7 +152,7 @@ a.postTypeGrey:hover {color:#269ac9;}
 .homepagePostIntro ul li{list-style-type: disc;margin-left: 40px;}
 .homepagePostIntro td,.homepagePostIntro tr {border: 1px solid; border-color: inherit;}
 .homepagePostIntro a{color: #136ec2;}
-.homepagePostIntro blockquote{background: none;}
+.homepagePostIntro blockquote{background: none;border: none;padding: 0px;margin: 0 0 0 40px;}
 .homepagePostDeadline {font-size:12px; color:#888888; float:left; margin-top: 2px;}
 .homepagePostDate {font-size:12px; color:#888888;margin-bottom: 5px;}
 .homepagePostReply {width:710px; margin:0px auto; background-color:#f1f1f1; margin-top:10px;}
@@ -195,7 +195,7 @@ a.postOptionLink2:hover {color:#ffffff; background-color:#269ac9;}
 .homepagePostReplyContent ul li{list-style-type: disc;margin-left: 20px;}
 .homepagePostReplyContent td,.homepagePostReplyContent tr {border: 1px solid; border-color: inherit;}
 .homepagePostReplyContent a{color: #136ec2;}
-.homepagePostReplyContent blockquote{background: none;}
+.homepagePostReplyContent blockquote{background: none;border: none;padding: 0px;margin: 0 0 0 40px;}
 .table_maxWidth table {max-width: 642px;}
 .homepagePostProjectState {width:52px; height:20px; line-height:20px; border-radius:1px; background-color:#28be6c; color:#ffffff; text-align:center; vertical-align:middle; font-size:12px; display:inline-block; margin-left:5px;}
 .homepagePostAssignTo {float:left; font-size:14px; color:#269ac9;}
@@ -1144,7 +1144,7 @@ a.link_file_a2{ background:url(../images/pic_file.png) 0 -15px no-repeat; paddin
 .postDetailDes ul li{list-style-type: disc;margin-left: 40px;}
 .postDetailDes td,.postDetailDes tr {border: 1px solid; border-color: inherit;}
 .postDetailDes a{color: #136ec2;}
-.postDetailDes blockquote{background: none;}
+.postDetailDes blockquote{background: none;border: none;padding: 0px;margin: 0 0 0 40px;}
 .homepagePostIntro p,.homepagePostIntro div,.homepagePostIntro em, .homepagePostIntro span{text-align: justify; text-justify:inter-ideograph; word-break: normal !important; word-wrap: break-word !important; }
 .postDetailCreater {color:#888888; font-size:12px; float:left; margin-right:25px;}
 .postDetailDate {color:#888888; font-size:12px; float:left;}
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index 240b7e9ac..cece47704 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -683,7 +683,7 @@ a.postTypeGrey:hover {color:#269ac9;}
 .homepagePostIntro ul li{list-style-type: disc;margin-left: 40px;}
 .homepagePostIntro td,.homepagePostIntro tr {border: 1px solid; border-color: inherit;}
 .homepagePostIntro a{color: #136ec2;}
-.homepagePostIntro blockquote{background: none;}
+.homepagePostIntro blockquote{background: none;border: none;padding: 0px;margin: 0 0 0 40px;}
 .homepagePostReplyBanner {width:718px; height:33px; border:1px solid #e4e4e4; line-height:33px; vertical-align:middle; font-size:12px; color:#888888; position: relative;}
 .borderBottomNone {border-bottom:none !important;}
 .homepagePostReplyBanner {width:718px; height:33px; border:1px solid #e4e4e4; line-height:33px; vertical-align:middle; font-size:12px; color:#888888;}
@@ -724,7 +724,7 @@ a.postOptionLink:hover {color:#ffffff; background-color:#269ac9;}
 .homepagePostReplyContent ul li{list-style-type: disc;margin-left: 40px;}
 .homepagePostReplyContent td,.homepagePostReplyContent tr {border: 1px solid; border-color: inherit;}
 .homepagePostReplyContent a{color: #136ec2;}
-.homepagePostReplyContent blockquote{background: none;}
+.homepagePostReplyContent blockquote{background: none;border: none;padding: 0px;margin: 0 0 0 40px;}
 .table_maxWidth table {max-width: 642px;}
 .homepagePostProjectState {width:52px; height:20px; line-height:20px; border-radius:1px; background-color:#28be6c; color:#ffffff; text-align:center; vertical-align:middle; font-size:12px; display:inline-block; margin-left:5px;}
 .homepagePostAssignTo {float:left; font-size:14px; color:#269ac9;}
@@ -870,7 +870,7 @@ a.sortArrowActiveU {background:url(images/post_image_list.png) -17px -20px no-re
 .postDetailDes ul li{list-style-type: disc;margin-left: 40px;}
 .postDetailDes td,.postDetailDes tr {border: 1px solid; border-color: inherit;}
 .postDetailDes a{color: #136ec2;}
-.postDetailDes blockquote{background: none;}
+.postDetailDes blockquote{background: none;border: none;padding: 0px;margin: 0 0 0 40px;}
 .homepagePostIntro p,.homepagePostIntro div,.homepagePostIntro em, .homepagePostIntro span{text-align: justify; text-justify:inter-ideograph; word-break: normal !important; word-wrap: break-word !important; } /*line-height: 18px !important;*/
 .postDetailCreater {color:#888888; font-size:12px; float:left; margin-right:25px;}
 .postDetailDate {color:#888888; font-size:12px; float:left;}
diff --git a/public/stylesheets/project.css b/public/stylesheets/project.css
index 5af57bc5f..17e0c3554 100644
--- a/public/stylesheets/project.css
+++ b/public/stylesheets/project.css
@@ -978,7 +978,7 @@ a:hover.Reply_pic{border:1px solid #64bdd9;}
 .homepagePostIntro ul li{list-style-type: disc;margin-left: 40px;}
 .homepagePostIntro td,.homepagePostIntro tr {border: 1px solid; border-color: inherit;}
 .homepagePostIntro a{color: #136ec2;}
-.homepagePostIntro blockquote{background: none;}
+.homepagePostIntro blockquote{background: none;border: none;padding: 0px;margin: 0 0 0 40px;}
 .topBorder {
     border-top: 1px solid #E4E4E4;
 }
@@ -1121,7 +1121,7 @@ a:hover.BlueCirBtnMini{ background:#269ac9; color:#fff;}
 .postDetailDes ul li{list-style-type: disc;margin-left: 40px;}
 .postDetailDes td,.postDetailDes tr {border: 1px solid; border-color: inherit;}
 .postDetailDes a{color: #136ec2;}
-.postDetailDes blockquote{background: none;}
+.postDetailDes blockquote{background: none;border: none;padding: 0px;margin: 0 0 0 40px;}
 .homepagePostIntro p,.homepagePostIntro div,.homepagePostIntro em, .homepagePostIntro span{text-align: justify; text-justify:inter-ideograph; word-break: normal !important; word-wrap: break-word !important;}
 .postDetailCreater {color:#888888; font-size:12px; float:left; margin-right:25px;}
 .postDetailDate {color:#888888; font-size:12px; float:left;}
diff --git a/public/stylesheets/public.css b/public/stylesheets/public.css
index c44b58b76..20385b3e9 100644
--- a/public/stylesheets/public.css
+++ b/public/stylesheets/public.css
@@ -617,7 +617,7 @@ a.postTypeGrey:hover {color:#269ac9;}
 .homepagePostIntro ul li{list-style-type: disc;margin-left: 40px;}
 .homepagePostIntro td,.homepagePostIntro tr {border: 1px solid; border-color: inherit;}
 .homepagePostIntro a{color: #136ec2;}
-.homepagePostIntro blockquote{background: none;}
+.homepagePostIntro blockquote{background: none;border: none;padding: 0px;margin: 0 0 0 40px;}
 .homepagePostDeadline {font-size:12px; color:#888888; float:left; margin-top: 2px;}
 .homepagePostDate {font-size:12px; color:#888888;margin-bottom: 5px;}
 .homepagePostReplyBanner {width:708px; height:33px; border:1px solid #e4e4e4; line-height:33px; vertical-align:middle; font-size:12px; color:#888888; position: relative;}
@@ -655,7 +655,7 @@ a.postReplyCancel:hover {color:#ffffff;}
 .homepagePostReplyContent ul li{list-style-type: disc;margin-left: 40px;}
 .homepagePostReplyContent td,.homepagePostReplyContent tr {border: 1px solid; border-color: inherit;}
 .homepagePostReplyContent a{color: #136ec2;}
-.homepagePostReplyContent blockquote{background: none;}
+.homepagePostReplyContent blockquote{background: none;border: none;padding: 0px;margin: 0 0 0 40px;}
 .table_maxWidth table {max-width: 642px;}
 .homepagePostProjectState {width:42px; height:20px; line-height:20px; border-radius:1px; background-color:#28be6c; color:#ffffff; text-align:center; vertical-align:middle; font-size:12px; display:inline-block; margin-left:5px;}
 .homepagePostAssignTo {float:left; font-size:14px; color:#15bccf;}