From e073d581691cdc77b35b841d0496b23bc02fdb6c Mon Sep 17 00:00:00 2001 From: yuanke <249218296@qq.com> Date: Wed, 9 Mar 2016 10:16:27 +0800 Subject: [PATCH 01/17] =?UTF-8?q?KE=E7=9A=84=E5=87=A0=E4=B8=AA=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9=201.=E6=88=91=E8=A6=81=E5=9B=9E?= =?UTF-8?q?=E5=A4=8D=202.=E6=AE=B5=E8=90=BD=E9=A2=9C=E8=89=B2=203.?= =?UTF-8?q?=E5=8F=98=E7=B2=97=E6=BB=9A=E5=8A=A8=E6=9D=A1=E7=A7=BB=E5=8A=A8?= =?UTF-8?q?=204.=E6=B2=A1=E9=BB=98=E8=AE=A4=E5=AD=97=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/assets/kindeditor/kindeditor.js | 2 +- public/assets/kindeditor/plugins/code/previewcode.css | 1 + public/assets/kindeditor/plugins/image/image.js | 3 +++ public/assets/kindeditor/plugins/media/media.js | 3 +++ public/assets/kindeditor/plugins/preview/preview.js | 2 +- public/assets/kindeditor/plugins/table/table.js | 3 +++ public/stylesheets/new_user.css | 6 +++--- 7 files changed, 15 insertions(+), 5 deletions(-) diff --git a/public/assets/kindeditor/kindeditor.js b/public/assets/kindeditor/kindeditor.js index 6065a563f..6da24733c 100644 --- a/public/assets/kindeditor/kindeditor.js +++ b/public/assets/kindeditor/kindeditor.js @@ -2765,7 +2765,7 @@ _extend(KCmd, { sel.addRange(rng); if (doc !== document) { var pos = K(rng.endContainer).pos(); - win.scrollTo(pos.x, pos.y); + //win.scrollTo(pos.x, pos.y); } } win.focus(); diff --git a/public/assets/kindeditor/plugins/code/previewcode.css b/public/assets/kindeditor/plugins/code/previewcode.css index c8e5df4e1..7ccc0a6f9 100644 --- a/public/assets/kindeditor/plugins/code/previewcode.css +++ b/public/assets/kindeditor/plugins/code/previewcode.css @@ -1,5 +1,6 @@ .ke-content { font-size: 10pt; + font-family:Tahoma; } .ke-content pre { font-size:9pt; diff --git a/public/assets/kindeditor/plugins/image/image.js b/public/assets/kindeditor/plugins/image/image.js index 1c3f0dd45..82646d73a 100644 --- a/public/assets/kindeditor/plugins/image/image.js +++ b/public/assets/kindeditor/plugins/image/image.js @@ -98,6 +98,9 @@ KindEditor.plugin('image', function(K) { yesBtn : { name : self.lang('yes'), click : function(e) { + if(/^\s*<\w*\s*\w*\=\"\w*\"\s*\w*\=\"\w*\:\s*\#\d*\;\s*\w*\-\w*\:\s*\w*\;\"\>[\u4e00-\u9fa5]*<\/\w*\>\s*$/.test(self.edit.html())){ + self.edit.html(''); + } // Bugfix: http://code.google.com/p/kindeditor/issues/detail?id=319 if (dialog.isLoading) { return; diff --git a/public/assets/kindeditor/plugins/media/media.js b/public/assets/kindeditor/plugins/media/media.js index 6d0d3a387..e108d8595 100644 --- a/public/assets/kindeditor/plugins/media/media.js +++ b/public/assets/kindeditor/plugins/media/media.js @@ -47,6 +47,9 @@ KindEditor.plugin('media', function(K) { yesBtn : { name : self.lang('yes'), click : function(e) { + if(/^\s*<\w*\s*\w*\=\"\w*\"\s*\w*\=\"\w*\:\s*\#\d*\;\s*\w*\-\w*\:\s*\w*\;\"\>[\u4e00-\u9fa5]*<\/\w*\>\s*$/.test(self.edit.html())){ + self.edit.html(''); + } var url = K.trim(urlBox.val()), width = widthBox.val(), height = heightBox.val(); diff --git a/public/assets/kindeditor/plugins/preview/preview.js b/public/assets/kindeditor/plugins/preview/preview.js index ef6e2cf16..c32c5a1c9 100644 --- a/public/assets/kindeditor/plugins/preview/preview.js +++ b/public/assets/kindeditor/plugins/preview/preview.js @@ -25,7 +25,7 @@ KindEditor.plugin('preview', function(K) { doc.open(); doc.write(self.fullHtml()); doc.close(); - K(doc.body).css('background-color', '#FFF'); + K(doc.body).css({'background-color': '#FFF','word-break':'break-all','word-wrap':'wrap-all'}); iframe[0].contentWindow.focus(); }); }); diff --git a/public/assets/kindeditor/plugins/table/table.js b/public/assets/kindeditor/plugins/table/table.js index 634e9b7fc..ba72a0ff8 100644 --- a/public/assets/kindeditor/plugins/table/table.js +++ b/public/assets/kindeditor/plugins/table/table.js @@ -129,6 +129,9 @@ KindEditor.plugin('table', function(K) { yesBtn : { name : self.lang('yes'), click : function(e) { + if(/^\s*<\w*\s*\w*\=\"\w*\"\s*\w*\=\"\w*\:\s*\#\d*\;\s*\w*\-\w*\:\s*\w*\;\"\>[\u4e00-\u9fa5]*<\/\w*\>\s*$/.test(self.edit.html())){ + self.edit.html(''); + } var rows = rowsBox.val(), cols = colsBox.val(), width = widthBox.val(), diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index a923ae86f..d2ec8a8b9 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -32,9 +32,9 @@ table{ background:#fff;} .min_search{ width:150px; height:20px; border:1px solid #d0d0d0; color:#666; background:url(../images/public_icon.png) 135px -193px no-repeat; cursor:pointer;} .db {display:block;} /* font & color */ -h2{ font-size:18px; color:#269ac9;} -h3{ font-size:14px; color:#e8770d;} -h4{ font-size:14px; color:#3b3b3b;} +h2{ font-size:18px; } /*color:#269ac9;*/ +h3{ font-size:14px;}/* color:#e8770d;*/ +h4{ font-size:14px; }/*color:#3b3b3b;*/ .f12{font-size:12px; font-weight:normal;} .f14{font-size:14px;} .f16{font-size:16px;} From 5dcd3b682603834a8bfdf1891d62ed0b13f189b3 Mon Sep 17 00:00:00 2001 From: yuanke <249218296@qq.com> Date: Wed, 9 Mar 2016 15:32:08 +0800 Subject: [PATCH 02/17] =?UTF-8?q?=E8=A7=A3=E5=86=B3KE=E5=B7=A5=E5=85=B7?= =?UTF-8?q?=E6=A0=8F=E4=B8=80=E8=A1=8C=E4=B8=8E=E4=B8=A4=E8=A1=8C=E6=98=BE?= =?UTF-8?q?=E7=A4=BA=E4=B8=8D=E4=B8=80=E8=87=B4=E7=9A=84=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/javascripts/create_kindeditor.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/public/javascripts/create_kindeditor.js b/public/javascripts/create_kindeditor.js index fc2ac8938..99f080165 100644 --- a/public/javascripts/create_kindeditor.js +++ b/public/javascripts/create_kindeditor.js @@ -11,10 +11,16 @@ function sd_create_editor(params){ height:"33px",// == undefined ? "30px":paramsHeight+"px", minHeight:"33px",// == undefined ? "30px":paramsHeight+"px", width:params.width, + /* items:['emoticons','fontname', 'forecolor', 'hilitecolor', 'bold', '|', 'justifyleft', 'justifycenter', 'insertorderedlist','insertunorderedlist', '|', 'formatblock', 'fontsize', '|','indent', 'outdent', - '|','imagedirectupload','more'], + '|','imagedirectupload','more'],*/ + items : ['code','emoticons','fontname', + 'forecolor', 'hilitecolor', 'bold', '|', 'justifyleft', 'justifycenter', 'insertorderedlist','insertunorderedlist', '|', + 'formatblock', 'fontsize', '|','indent', 'outdent', + '|','imagedirectupload','table', 'media', 'preview',"more" + ], afterChange:function(){//按键事件 var edit = this.edit; var body = edit.doc.body; From 1c6deadfd7cb7251f07337c8e128fa39d2825cb3 Mon Sep 17 00:00:00 2001 From: luoquan <545501972@qq.com> Date: Thu, 10 Mar 2016 10:58:43 +0800 Subject: [PATCH 03/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9KE=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E7=9A=84=E5=86=85=E5=AE=B9=E4=B8=8E=E5=8F=91=E5=B8=83=E7=9A=84?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E5=AF=B9=E5=85=B6=E4=B8=8D=E4=B8=80=E8=87=B4?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/stylesheets/new_user.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css index a923ae86f..050ac1341 100644 --- a/public/stylesheets/new_user.css +++ b/public/stylesheets/new_user.css @@ -702,7 +702,7 @@ a.postOptionLink:hover {color:#ffffff; background-color:#269ac9;} .imageFuzzy {filter:alpha(opacity=50); -moz-opacity:0.5; -khtml-opacity:0.5;opacity: 0.5;} .homepagePostReplyDes {float:left; width:642px; margin-left:15px;} .homepagePostReplyPublisher {font-size:12px; color:#888888; margin-bottom:5px;} -.homepagePostReplyContent {font-size:12px; color:#484848; margin-bottom:12px;} +.homepagePostReplyContent {font-size:12px; color:#484848; margin:3px 5px 12px 5px;font: 14px/1.5 "sans serif",tahoma,verdana,helvetica;font-family: 微软雅黑, 宋体;} .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;} From 352f06887ff4af20a66d8139f90652c640f1c943 Mon Sep 17 00:00:00 2001 From: luoquan <545501972@qq.com> Date: Thu, 10 Mar 2016 11:01:58 +0800 Subject: [PATCH 04/17] 0 --- test/unit/poll_votes_test.rb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/test/unit/poll_votes_test.rb b/test/unit/poll_votes_test.rb index 77ab9121e..04d266f1d 100644 --- a/test/unit/poll_votes_test.rb +++ b/test/unit/poll_votes_test.rb @@ -1,7 +1,7 @@ -require 'test_helper' - -class PollVotesTest < ActiveSupport::TestCase - # test "the truth" do - # assert true - # end -end +require 'test_helper' + +class PollVotesTest < ActiveSupport::TestCase + # test "the truth" do + # assert true + # end +end From a6da304b56219f66ca8f096ab582c0bd9118c1e5 Mon Sep 17 00:00:00 2001 From: luoquan <545501972@qq.com> Date: Thu, 10 Mar 2016 11:10:05 +0800 Subject: [PATCH 05/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9KE=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E6=8D=A2=E8=A1=8C=E5=90=8E=E5=8F=91=E5=B8=83=E5=AF=B9=E4=B8=8D?= =?UTF-8?q?=E9=BD=90=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kindeditor/plugins/code/previewcode.css | 97 ++++++++++--------- 1 file changed, 49 insertions(+), 48 deletions(-) diff --git a/public/assets/kindeditor/plugins/code/previewcode.css b/public/assets/kindeditor/plugins/code/previewcode.css index c8e5df4e1..03f0b69a8 100644 --- a/public/assets/kindeditor/plugins/code/previewcode.css +++ b/public/assets/kindeditor/plugins/code/previewcode.css @@ -1,49 +1,50 @@ -.ke-content { - font-size: 10pt; -} -.ke-content pre { - font-size:9pt; - font-family:Courier New,Arial; - border:1px solid #ddd; - border-left:5px solid #6CE26C; - background:#f6f6f6; - padding:5px; -} - -.ke-content code { - margin: 0 2px; - padding: 0 5px; - white-space: nowrap; - border: 1px solid #DDD; - background-color: #F6F6F6; - border-radius: 3px; -} - -.ke-content pre>code { - margin: 0; - padding: 0; - white-space: pre; - border: none; - background: transparent; -} - -.ke-content pre code { - background-color: transparent; - border: none; -} - -.ke-content p { - /*margin: 0 0 15px 0;*/ - /*margin-bottom:15pt;*/ - line-height:1.5; - /*letter-spacing: 1px;*/ -} - -.ke-content div.ref {border:1px solid #ddd;margin:0 0 10px 0;padding:2px;font-size:9pt;background:#ffe;} -.ke-content div.ref h4 {margin:0;padding:1px 3px;background:#CC9966;color:#fff;font-size:9pt;font-weight:normal;} -.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;background:#f4f5f7 url('../img/blockquote.gif') no-repeat left top;color:#060;font-size:9pt;} -span.at {color:#269ac9;} +.ke-content { + font-size: 12px; + font: 14px/1.5 "sans serif",tahoma,verdana,helvetica;font-family: 微软雅黑, 宋体; +} +.ke-content pre { + font-size:9pt; + font-family:Courier New,Arial; + border:1px solid #ddd; + border-left:5px solid #6CE26C; + background:#f6f6f6; + padding:5px; +} + +.ke-content code { + margin: 0 2px; + padding: 0 5px; + white-space: nowrap; + border: 1px solid #DDD; + background-color: #F6F6F6; + border-radius: 3px; +} + +.ke-content pre>code { + margin: 0; + padding: 0; + white-space: pre; + border: none; + background: transparent; +} + +.ke-content pre code { + background-color: transparent; + border: none; +} + +.ke-content p { + /*margin: 0 0 15px 0;*/ + /*margin-bottom:15pt;*/ + line-height:1.5; + /*letter-spacing: 1px;*/ +} + +.ke-content div.ref {border:1px solid #ddd;margin:0 0 10px 0;padding:2px;font-size:9pt;background:#ffe;} +.ke-content div.ref h4 {margin:0;padding:1px 3px;background:#CC9966;color:#fff;font-size:9pt;font-weight:normal;} +.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;background:#f4f5f7 url('../img/blockquote.gif') no-repeat left top;color:#060;font-size:9pt;} +span.at {color:#269ac9;} span.at a{color:#269ac9;text-decoration: none;} \ No newline at end of file From 5ea618b52082db27d8251342338aedf0c769a4f8 Mon Sep 17 00:00:00 2001 From: yuanke <249218296@qq.com> Date: Thu, 10 Mar 2016 11:16:39 +0800 Subject: [PATCH 06/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9KE=E6=8F=92=E5=85=A5?= =?UTF-8?q?=E5=9B=BE=E7=89=87=E6=B2=A1=E6=98=BE=E7=A4=BA=E5=AE=8C=E5=85=A8?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/assets/kindeditor/kindeditor.js | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/public/assets/kindeditor/kindeditor.js b/public/assets/kindeditor/kindeditor.js index 6da24733c..2d164f0ba 100644 --- a/public/assets/kindeditor/kindeditor.js +++ b/public/assets/kindeditor/kindeditor.js @@ -5646,6 +5646,26 @@ _plugin('core', function(K) { }else{ //TODO 暂时什么也不做 } + var _bod = $(self.cmd.doc.body); + var body = self.cmd.doc.body; + var _bw = _bod.width(),_bh = Math.max((K.IE ? body.scrollHeight : (K.GECKO ? body.offsetHeight+26:body.offsetHeight))); + var _bsh = 0; + _bod.children().each(function(){ + _bsh += $(this).height(); + }); + var _imgbase = _bod.find("img"); + _imgbase[0].onload = function(){ + var _iw=_imgbase.width(),_ih = _imgbase.height(); + var _alh = _bsh + _ih; + var _rhig = _alh > _bh ? _alh : _bh; + switch(self.resizeType){ + case 1: + var _defh = self.toolbar.div.height() + self.statusbar.height(); + _defh = _defh > 0 ? _defh + 6 : _defh; + self.resize(null,_rhig + _defh); + break; + } + } } else { alert(data.message); } From 9b5cd8f8807688ac78cd53c0c4fdf25ce32b7fe8 Mon Sep 17 00:00:00 2001 From: yuanke <249218296@qq.com> Date: Thu, 10 Mar 2016 11:28:56 +0800 Subject: [PATCH 07/17] =?UTF-8?q?KE=E8=A1=A8=E6=A0=BC=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/assets/kindeditor/plugins/table/table.js | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/public/assets/kindeditor/plugins/table/table.js b/public/assets/kindeditor/plugins/table/table.js index ba72a0ff8..c96ab0326 100644 --- a/public/assets/kindeditor/plugins/table/table.js +++ b/public/assets/kindeditor/plugins/table/table.js @@ -228,8 +228,10 @@ KindEditor.plugin('table', function(K) { } if (borderColor !== '') { table.attr('borderColor', borderColor); + table.css("border-color",borderColor); } else { table.removeAttr('borderColor'); + table.css("border-color","none"); } self.hideDialog().focus(); self.cmd.range.moveToBookmark(bookmark); @@ -251,7 +253,10 @@ KindEditor.plugin('table', function(K) { if (border !== ''){ style += 'border:'+border+'px solid;'; } - + if (borderColor !== ''){ + style += 'border-color:'+borderColor+';'; + } + style += 'table-layout: '+'fixed;'; var html = '
' + (K.IE ? ' ' : ' ') + ' | ';
+ html += ' ';
}
html += '';
}
From 7f7979e9559a4f0ba1ebcf4e9a2f1b4e4627fe16 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Thu, 10 Mar 2016 15:12:16 +0800
Subject: [PATCH 08/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=9E=E5=A4=8D?=
=?UTF-8?q?=E6=97=B6=E5=8F=AF=E5=A4=9A=E6=AC=A1=E7=82=B9=E5=87=BB=E5=8F=91?=
=?UTF-8?q?=E9=80=81=E6=8C=89=E9=92=AE=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/views/blog_comments/_simple_ke_reply_form.html.erb | 2 +-
app/views/blogs/_article.html.erb | 2 +-
app/views/courses/syllabus.html.erb | 2 +-
app/views/issues/_issue_replies.html.erb | 2 +-
app/views/issues/_issue_reply_ke_form.html.erb | 2 +-
app/views/memos/show.html.erb | 2 +-
app/views/messages/_reply_message.html.erb | 2 +-
app/views/org_document_comments/_simple_ke_reply_form.html.erb | 2 +-
app/views/organizations/_org_course_homework.html.erb | 2 +-
app/views/organizations/_org_course_message.html.erb | 2 +-
app/views/organizations/_org_course_news.html.erb | 2 +-
app/views/organizations/_org_project_issue.html.erb | 2 +-
app/views/organizations/_org_subfield_message.html.erb | 2 +-
app/views/organizations/_org_subfield_news.html.erb | 2 +-
app/views/organizations/_project_message.html.erb | 2 +-
app/views/organizations/_show_org_document.html.erb | 2 +-
app/views/projects/_project_news.html.erb | 2 +-
app/views/users/_course_homework.html.erb | 2 +-
app/views/users/_course_journalsformessage.html.erb | 2 +-
app/views/users/_course_message.html.erb | 2 +-
app/views/users/_course_news.html.erb | 2 +-
app/views/users/_project_issue_reply.html.erb | 2 +-
app/views/users/_project_message.html.erb | 2 +-
app/views/users/_project_news.html.erb | 2 +-
app/views/users/_user_blog.html.erb | 2 +-
app/views/users/_user_homework_detail.html.erb | 2 +-
app/views/users/_user_journalsformessage.html.erb | 2 +-
27 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/app/views/blog_comments/_simple_ke_reply_form.html.erb b/app/views/blog_comments/_simple_ke_reply_form.html.erb
index e222d8e56..0d989c50a 100644
--- a/app/views/blog_comments/_simple_ke_reply_form.html.erb
+++ b/app/views/blog_comments/_simple_ke_reply_form.html.erb
@@ -10,7 +10,7 @@
-
+
<% end%>
diff --git a/app/views/blogs/_article.html.erb b/app/views/blogs/_article.html.erb
index 05f69055f..858fefb08 100644
--- a/app/views/blogs/_article.html.erb
+++ b/app/views/blogs/_article.html.erb
@@ -200,7 +200,7 @@
-
+
<% end%>
diff --git a/app/views/courses/syllabus.html.erb b/app/views/courses/syllabus.html.erb
index e12876ce9..e9d735900 100644
--- a/app/views/courses/syllabus.html.erb
+++ b/app/views/courses/syllabus.html.erb
@@ -192,7 +192,7 @@
-
+
<% end%>
diff --git a/app/views/issues/_issue_replies.html.erb b/app/views/issues/_issue_replies.html.erb
index 4c5c922f0..a1a567101 100644
--- a/app/views/issues/_issue_replies.html.erb
+++ b/app/views/issues/_issue_replies.html.erb
@@ -74,7 +74,7 @@
<%= render :partial => 'attachments/issue_reply', :locals => {:container => @issue} %>
-
+
<% end %>
diff --git a/app/views/issues/_issue_reply_ke_form.html.erb b/app/views/issues/_issue_reply_ke_form.html.erb
index e84d5905c..16bdade05 100644
--- a/app/views/issues/_issue_reply_ke_form.html.erb
+++ b/app/views/issues/_issue_reply_ke_form.html.erb
@@ -16,7 +16,7 @@
-
+
<% end %>
diff --git a/app/views/memos/show.html.erb b/app/views/memos/show.html.erb
index 16bc5c742..4feb998cf 100644
--- a/app/views/memos/show.html.erb
+++ b/app/views/memos/show.html.erb
@@ -113,7 +113,7 @@
<%= hidden_field_tag :quote,"",:required => false,:style => 'display:none' %>
-
+
<% end%>
diff --git a/app/views/messages/_reply_message.html.erb b/app/views/messages/_reply_message.html.erb
index 2d957dbda..d0cec9e62 100644
--- a/app/views/messages/_reply_message.html.erb
+++ b/app/views/messages/_reply_message.html.erb
@@ -8,7 +8,7 @@
-
+
<% end%>
diff --git a/app/views/org_document_comments/_simple_ke_reply_form.html.erb b/app/views/org_document_comments/_simple_ke_reply_form.html.erb
index 44eb71500..6280db653 100644
--- a/app/views/org_document_comments/_simple_ke_reply_form.html.erb
+++ b/app/views/org_document_comments/_simple_ke_reply_form.html.erb
@@ -7,7 +7,7 @@
-
+
<% end%>
diff --git a/app/views/organizations/_org_course_homework.html.erb b/app/views/organizations/_org_course_homework.html.erb
index 499ea6357..a437acc7e 100644
--- a/app/views/organizations/_org_course_homework.html.erb
+++ b/app/views/organizations/_org_course_homework.html.erb
@@ -356,7 +356,7 @@
<%= hidden_field_tag 'course_activity',params[:course_activity],:value =>course_activity %>
-
+
<% end%>
diff --git a/app/views/organizations/_org_course_message.html.erb b/app/views/organizations/_org_course_message.html.erb
index 99229634e..4873fbba9 100644
--- a/app/views/organizations/_org_course_message.html.erb
+++ b/app/views/organizations/_org_course_message.html.erb
@@ -144,7 +144,7 @@
-
+
<% end%>
diff --git a/app/views/organizations/_org_course_news.html.erb b/app/views/organizations/_org_course_news.html.erb
index ecdf728f8..213fc0e0b 100644
--- a/app/views/organizations/_org_course_news.html.erb
+++ b/app/views/organizations/_org_course_news.html.erb
@@ -110,7 +110,7 @@
-
+
<% end%>
diff --git a/app/views/organizations/_org_project_issue.html.erb b/app/views/organizations/_org_project_issue.html.erb
index 855a8053c..e403e86a3 100644
--- a/app/views/organizations/_org_project_issue.html.erb
+++ b/app/views/organizations/_org_project_issue.html.erb
@@ -127,7 +127,7 @@
-
+
<% end%>
diff --git a/app/views/organizations/_org_subfield_message.html.erb b/app/views/organizations/_org_subfield_message.html.erb
index aa2493c5f..a89b37b46 100644
--- a/app/views/organizations/_org_subfield_message.html.erb
+++ b/app/views/organizations/_org_subfield_message.html.erb
@@ -147,7 +147,7 @@
-
+
<% end%>
diff --git a/app/views/organizations/_org_subfield_news.html.erb b/app/views/organizations/_org_subfield_news.html.erb
index edbdfa16b..5a96a1449 100644
--- a/app/views/organizations/_org_subfield_news.html.erb
+++ b/app/views/organizations/_org_subfield_news.html.erb
@@ -130,7 +130,7 @@
-
+
<% end%>
diff --git a/app/views/organizations/_project_message.html.erb b/app/views/organizations/_project_message.html.erb
index 3b459f366..fef6a5651 100644
--- a/app/views/organizations/_project_message.html.erb
+++ b/app/views/organizations/_project_message.html.erb
@@ -122,7 +122,7 @@
-
+
<% end%>
diff --git a/app/views/organizations/_show_org_document.html.erb b/app/views/organizations/_show_org_document.html.erb
index 2584e4209..d053341e1 100644
--- a/app/views/organizations/_show_org_document.html.erb
+++ b/app/views/organizations/_show_org_document.html.erb
@@ -119,7 +119,7 @@
-
+
diff --git a/app/views/projects/_project_news.html.erb b/app/views/projects/_project_news.html.erb
index 518ee3a2b..c3d4d5bfb 100644
--- a/app/views/projects/_project_news.html.erb
+++ b/app/views/projects/_project_news.html.erb
@@ -110,7 +110,7 @@
-
+
<% end%>
diff --git a/app/views/users/_course_homework.html.erb b/app/views/users/_course_homework.html.erb
index 9dd5eaa7a..5529998a7 100644
--- a/app/views/users/_course_homework.html.erb
+++ b/app/views/users/_course_homework.html.erb
@@ -356,7 +356,7 @@
<%= hidden_field_tag 'course_activity',params[:course_activity],:value =>course_activity %>
-
+
<% end%>
diff --git a/app/views/users/_course_journalsformessage.html.erb b/app/views/users/_course_journalsformessage.html.erb
index 6b28fb568..79d609182 100644
--- a/app/views/users/_course_journalsformessage.html.erb
+++ b/app/views/users/_course_journalsformessage.html.erb
@@ -96,7 +96,7 @@
<%= hidden_field_tag 'user_activity_id',params[:user_activity_id],:value =>user_activity_id %>
-
+
<% end%>
diff --git a/app/views/users/_course_message.html.erb b/app/views/users/_course_message.html.erb
index bb2a31dcc..df084357a 100644
--- a/app/views/users/_course_message.html.erb
+++ b/app/views/users/_course_message.html.erb
@@ -178,7 +178,7 @@
-
+
<% end%>
diff --git a/app/views/users/_course_news.html.erb b/app/views/users/_course_news.html.erb
index 15dd486ec..560b76fd4 100644
--- a/app/views/users/_course_news.html.erb
+++ b/app/views/users/_course_news.html.erb
@@ -135,7 +135,7 @@
-
+
<% end%>
diff --git a/app/views/users/_project_issue_reply.html.erb b/app/views/users/_project_issue_reply.html.erb
index adebd74ad..d76913e23 100644
--- a/app/views/users/_project_issue_reply.html.erb
+++ b/app/views/users/_project_issue_reply.html.erb
@@ -76,7 +76,7 @@
-
+
<% end%>
diff --git a/app/views/users/_project_message.html.erb b/app/views/users/_project_message.html.erb
index 30183c4d1..dd2c832cf 100644
--- a/app/views/users/_project_message.html.erb
+++ b/app/views/users/_project_message.html.erb
@@ -154,7 +154,7 @@
-
+
<% end%>
diff --git a/app/views/users/_project_news.html.erb b/app/views/users/_project_news.html.erb
index 9e02c4cf4..7f5d185e5 100644
--- a/app/views/users/_project_news.html.erb
+++ b/app/views/users/_project_news.html.erb
@@ -132,7 +132,7 @@
-
+
<% end%>
diff --git a/app/views/users/_user_blog.html.erb b/app/views/users/_user_blog.html.erb
index 244951dfa..032f6b9a9 100644
--- a/app/views/users/_user_blog.html.erb
+++ b/app/views/users/_user_blog.html.erb
@@ -122,7 +122,7 @@
-
+
<% end%>
diff --git a/app/views/users/_user_homework_detail.html.erb b/app/views/users/_user_homework_detail.html.erb
index 9f3847735..0c34993b7 100644
--- a/app/views/users/_user_homework_detail.html.erb
+++ b/app/views/users/_user_homework_detail.html.erb
@@ -360,7 +360,7 @@
<%= hidden_field_tag 'is_in_course',params[:is_in_course],:value =>is_in_course %>
-
+
<% end%>
diff --git a/app/views/users/_user_journalsformessage.html.erb b/app/views/users/_user_journalsformessage.html.erb
index f49a65262..c53f90273 100644
--- a/app/views/users/_user_journalsformessage.html.erb
+++ b/app/views/users/_user_journalsformessage.html.erb
@@ -139,7 +139,7 @@
<%= hidden_field_tag 'is_activity',params[:is_activity],:value =>is_activity %>
-
+
<% end%>
From 28b481cf36a1b6597860921d3afc62671143b6e2 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Thu, 10 Mar 2016 15:37:07 +0800
Subject: [PATCH 09/17] =?UTF-8?q?=E4=BF=AE=E6=94=B9KE=E7=82=B9=E5=87=BB?=
=?UTF-8?q?=E4=B8=8A=E4=BC=A0=E5=9B=BE=E7=89=87=E6=97=B6=E9=80=89=E6=8B=A9?=
=?UTF-8?q?=E9=9D=9E=E5=9B=BE=E7=89=87=E6=A0=BC=E5=BC=8F=E6=97=B6=E7=9A=84?=
=?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
public/assets/kindeditor/kindeditor.js | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/public/assets/kindeditor/kindeditor.js b/public/assets/kindeditor/kindeditor.js
index 2d164f0ba..bb52ee067 100644
--- a/public/assets/kindeditor/kindeditor.js
+++ b/public/assets/kindeditor/kindeditor.js
@@ -5667,7 +5667,8 @@ _plugin('core', function(K) {
}
}
} else {
- alert(data.message);
+ //alert(data.message);
+ alert("仅支持如下图片格式:bmp,jpeg,jpg,png,gif,BMP,JPEG,JPG,PNG,GIF");
}
},
afterError : function(str) {
From 2d14b26c11939adda46bb1f1a6eddb61e0a600a9 Mon Sep 17 00:00:00 2001
From: luoquan <545501972@qq.com>
Date: Fri, 11 Mar 2016 09:52:11 +0800
Subject: [PATCH 10/17] =?UTF-8?q?=E8=BF=98=E5=8E=9F=E8=A1=8C=E8=B7=9D?=
=?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../plugins/lineheight/lineheight.js | 78 ++++++++++---------
1 file changed, 40 insertions(+), 38 deletions(-)
diff --git a/public/assets/kindeditor/plugins/lineheight/lineheight.js b/public/assets/kindeditor/plugins/lineheight/lineheight.js
index ae679d788..823ebdeaf 100644
--- a/public/assets/kindeditor/plugins/lineheight/lineheight.js
+++ b/public/assets/kindeditor/plugins/lineheight/lineheight.js
@@ -1,38 +1,40 @@
-/*******************************************************************************
-* KindEditor - WYSIWYG HTML Editor for Internet
-* Copyright (C) 2006-2011 kindsoft.net
-*
-* @author Roddy