From 0262e3b8ab9b72f2456c6b61e9ded940e0aef0c5 Mon Sep 17 00:00:00 2001 From: txz Date: Fri, 8 Apr 2016 18:46:46 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=9B=9E=E5=A4=8D=E9=95=BF=E5=8D=95?= =?UTF-8?q?=E8=AF=8D=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/assets/wechat/activities.html | 1 + public/stylesheets/weui/weixin.css | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/public/assets/wechat/activities.html b/public/assets/wechat/activities.html index da1e10a81..b6315eb39 100644 --- a/public/assets/wechat/activities.html +++ b/public/assets/wechat/activities.html @@ -67,6 +67,7 @@
点击展开 +
{{act.latest_update}}
diff --git a/public/stylesheets/weui/weixin.css b/public/stylesheets/weui/weixin.css index e7e73389f..33e4e51ae 100644 --- a/public/stylesheets/weui/weixin.css +++ b/public/stylesheets/weui/weixin.css @@ -26,7 +26,7 @@ a.c-grey {color:#707070;} a:link,a:visited{text-decoration:none;} a:hover,a:active{cursor:pointer;} a.link-blue {color:#269ac9;} -a.underline {text-decoration: underline;} +a.underline {text-decoration:underline;} .border-radius {border-radius:5px;} .max-width-60 {max-width:60px;} .max-width-130 {max-width:130px;} @@ -56,7 +56,7 @@ a.underline {text-decoration: underline;} .post-reply-row {padding:10px; color:#9a9a9a;} .post-reply-avatar {width:45px; height:30px; text-align:center; margin-right:10px;} .post-reply-user {font-size:13px; text-align:left; margin-bottom:10px;} -.post-reply-content {font-size:13px; text-align:left; word-break:break-all; word-wrap:break-word;} +.post-reply-content {font-size:13px; text-align:left; word-break:break-all; word-wrap:break-word; overflow:hidden;} .post-reply-date {font-size:13px;} .post-reply-trigger {font-size:13px;} .post-reply-input {width:100%; height:28px; line-height:28px; border:1px solid #e6e6e6; outline:none; border-radius:3px;} From 440ba27fa4e4d4bfe30d1e4bba249cc8dd4a682c Mon Sep 17 00:00:00 2001 From: cxt Date: Fri, 8 Apr 2016 18:52:26 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=9B=9E=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/blog_comment.rb | 1 + app/models/homework_common.rb | 1 + app/models/journal.rb | 5 +++-- app/models/journals_for_message.rb | 1 + app/models/mailer.rb | 1 + 5 files changed, 7 insertions(+), 2 deletions(-) diff --git a/app/models/blog_comment.rb b/app/models/blog_comment.rb index 945a3c5c2..7e368064b 100644 --- a/app/models/blog_comment.rb +++ b/app/models/blog_comment.rb @@ -1,3 +1,4 @@ +#encoding: utf-8 class BlogComment < ActiveRecord::Base # attr_accessible :title, :body require 'net/http' diff --git a/app/models/homework_common.rb b/app/models/homework_common.rb index 670a8341b..bdf61dbd0 100644 --- a/app/models/homework_common.rb +++ b/app/models/homework_common.rb @@ -1,3 +1,4 @@ +#encoding: utf-8 #老师布置的作业表 #homework_type: 0:普通作业;1:匿评作业;2:编程作业 class HomeworkCommon < ActiveRecord::Base diff --git a/app/models/journal.rb b/app/models/journal.rb index b62cf8d97..24b3db172 100644 --- a/app/models/journal.rb +++ b/app/models/journal.rb @@ -1,3 +1,4 @@ +#encoding: utf-8 # Redmine - project management software # Copyright (C) 2006-2013 Jean-Philippe Lang # @@ -252,7 +253,7 @@ class Journal < ActiveRecord::Base color:"#173177" }, keyword1:{ - value:self.author.try(:realname), + value:self.user.try(:realname), color:"#173177" }, keyword2:{ @@ -260,7 +261,7 @@ class Journal < ActiveRecord::Base color:"#173177" }, keyword3:{ - value:self.description.html_safe, + value:self.notes.html_safe, color:"#173177" }, remark:{ diff --git a/app/models/journals_for_message.rb b/app/models/journals_for_message.rb index 82820990f..b70176d9e 100644 --- a/app/models/journals_for_message.rb +++ b/app/models/journals_for_message.rb @@ -1,3 +1,4 @@ +#encoding: utf-8 # fq # 数据库字段中带有m前缀和is_readed是二次开发添加，之前的字段基本复用 # 注意reply_id 是提到人的id，不是留言id, Base中叫做 at_user diff --git a/app/models/mailer.rb b/app/models/mailer.rb index 93aa21a78..58492be31 100644 --- a/app/models/mailer.rb +++ b/app/models/mailer.rb @@ -1,3 +1,4 @@ +#encoding: utf-8 # Redmine - project management software # Copyright (C) 2006-2013 Jean-Philippe Lang # From 845b1cdab8d18152da1e5c2278c2cf8d2eae0aff Mon Sep 17 00:00:00 2001 From: cxt Date: Fri, 8 Apr 2016 19:54:33 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=A8=A1=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/models/journals_for_message.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/journals_for_message.rb b/app/models/journals_for_message.rb index b70176d9e..7959ac7a1 100644 --- a/app/models/journals_for_message.rb +++ b/app/models/journals_for_message.rb @@ -314,7 +314,7 @@ class JournalsForMessage < ActiveRecord::Base unless uw.nil? data = { touser:uw.openid, - template_id:"3e5Dj2GIx8MOcMyRKpTUEQnM7Tg0ASSCNc01NS9HCGI", + template_id:"A_3f5v90-zK73V9Kijm-paDkl9S-NuM8Cf-1UJi92_c", url:"http://weixin.qq.com/download", topcolor:"#FF0000", data:{