From f2b2062b9c3cc6de962daa507174cf016f55ee4f Mon Sep 17 00:00:00 2001 From: Tim Date: Tue, 29 Sep 2015 16:01:01 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E8=B4=B4=E5=90=A7=E7=82=B9=E8=B5=9E?= =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E5=86=8D=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/memos/_praise_tread.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/memos/_praise_tread.html.erb b/app/views/memos/_praise_tread.html.erb index 32b4a0ac0..5850cf50a 100644 --- a/app/views/memos/_praise_tread.html.erb +++ b/app/views/memos/_praise_tread.html.erb @@ -7,13 +7,13 @@ <% if @is_valuate.size > 0 %> <% @flag = @is_valuate.first.praise_or_tread %> <% if @flag == 1 %> - <%= get_praise_num(obj)%> + <%= get_praise_num(obj)%> <% end %> <% else %> <% if user_id == obj.author_id %> - <%= get_praise_num(obj)%> + <%= get_praise_num(obj)%> <% else %> From a3ce43c3d5c7ae8234b931e4e41050eca457927b Mon Sep 17 00:00:00 2001 From: sw <939547590@qq.com> Date: Tue, 29 Sep 2015 16:01:23 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=8E=BB=E6=8E=89=E4=B8=8E=E6=88=91?= =?UTF-8?q?=E7=9B=B8=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/news_controller.rb | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/app/controllers/news_controller.rb b/app/controllers/news_controller.rb index d5c248f77..5d83c1320 100644 --- a/app/controllers/news_controller.rb +++ b/app/controllers/news_controller.rb @@ -175,19 +175,19 @@ class NewsController < ApplicationController update_kindeditor_assets_owner ids,@news.id,OwnerTypeHelper::NEWS end # ������ض�̬�ļ�¼add start - teachers = searchTeacherAndAssistant(@course) - for teacher in teachers - if(teacher.user_id != User.current.id) - notify = ActivityNotify.new() - notify.activity_container_id = @course.id - notify.activity_container_type = 'Course' - notify.activity_id = @news.id - notify.activity_type = 'News' - notify.notify_to = teacher.user_id - notify.is_read = 0 - notify.save() - end - end + # teachers = searchTeacherAndAssistant(@course) + # for teacher in teachers + # if(teacher.user_id != User.current.id) + # notify = ActivityNotify.new() + # notify.activity_container_id = @course.id + # notify.activity_container_type = 'Course' + # notify.activity_id = @news.id + # notify.activity_type = 'News' + # notify.notify_to = teacher.user_id + # notify.is_read = 0 + # notify.save() + # end + # end # ������ض�̬�ļ�¼add end render_attachment_warning_if_needed(@news) flash[:notice] = l(:notice_successful_create) From 3c01969db16ec49b0bd8142cbf57956782fbfad4 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Tue, 29 Sep 2015 16:06:04 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=BC=A9=E8=BF=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/stylesheets/prettify.css | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/public/stylesheets/prettify.css b/public/stylesheets/prettify.css index c7d16ffd4..2e750f076 100644 --- a/public/stylesheets/prettify.css +++ b/public/stylesheets/prettify.css @@ -75,3 +75,7 @@ li.L9 { background: #eee } /*.prettyprint .dec,*/ /*.prettyprint .var { color: #A6E22E; }*/ /*.prettyprint .pln { color: #66D9EF; }*/ +.memo-content pre { + white-space:pre !important; + word-wrap: break-word; +} \ No newline at end of file From 9d122886a92afbd4f4081270ae8e5c286009a558 Mon Sep 17 00:00:00 2001 From: lizanle <491823689@qq.com> Date: Tue, 29 Sep 2015 16:10:43 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=B8=96=E5=AD=90?= =?UTF-8?q?=E4=BC=9A=E5=88=A0=E9=99=A4=E8=B4=B4=E5=90=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/memos/show.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/views/memos/show.html.erb b/app/views/memos/show.html.erb index aaf5a5846..4224d0987 100644 --- a/app/views/memos/show.html.erb +++ b/app/views/memos/show.html.erb @@ -33,7 +33,7 @@ function del_confirm(){ if(confirm('确认删除么?')){ - $("#del_link").click(); + $("#del_memo_link").click(); }else{ } @@ -52,7 +52,7 @@ From 26624c8009f8b72b8416821670538334ceab4c3f Mon Sep 17 00:00:00 2001 From: cxt Date: Tue, 29 Sep 2015 16:20:35 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=8A=A8=E6=80=81=E5=9B=9E=E5=A4=8D?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=A1=86=E7=9A=84=E2=80=9C=E6=88=91=E8=A6=81?= =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E2=80=9D=E7=9A=84=E9=9A=90=E8=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/assets/kindeditor/plugins/emoticons/emoticons.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/public/assets/kindeditor/plugins/emoticons/emoticons.js b/public/assets/kindeditor/plugins/emoticons/emoticons.js index c89e0c6ee..b9dfec431 100644 --- a/public/assets/kindeditor/plugins/emoticons/emoticons.js +++ b/public/assets/kindeditor/plugins/emoticons/emoticons.js @@ -13,7 +13,7 @@ KindEditor.plugin('emoticons', function(K) { allowPreview = self.allowPreviewEmoticons === undefined ? true : self.allowPreviewEmoticons, currentPageNum = 1; self.clickToolbar(name, function() { - this.edit.focus();//û ȡ _getSel()Ϊ + this.edit.focus();//���û����� �����ȡ�������� ����_getSel()Ϊ�� ���� var rows = 5, cols = 9, total = 135, startNum = 0, cells = rows * cols, pages = Math.ceil(total / cells), colsHalf = Math.floor(cols / 2), @@ -55,6 +55,9 @@ KindEditor.plugin('emoticons', function(K) { K(this).removeClass('ke-on'); }); cell.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(''); + } self.insertHtml('').hideMenu().focus(); e.stop(); });