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 ed75b4d83..0c7cb02de 100644 --- a/app/models/journal.rb +++ b/app/models/journal.rb @@ -1,4 +1,4 @@ -# encoding: utf-8 +#coding=utf-8 # Redmine - project management software # Copyright (C) 2006-2013 Jean-Philippe Lang # @@ -253,7 +253,7 @@ class Journal < ActiveRecord::Base color:"#173177" }, keyword1:{ - value:self.author.try(:realname), + value:self.user.try(:realname), color:"#173177" }, keyword2:{ @@ -261,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 fad647e7b..edf1d2309 100644 --- a/app/models/journals_for_message.rb +++ b/app/models/journals_for_message.rb @@ -1,5 +1,4 @@ #coding=utf-8 -# fq # 数据库字段中带有m前缀和is_readed是二次开发添加,之前的字段基本复用 # 注意reply_id 是提到人的id,不是留言id, Base中叫做 at_user class JournalsForMessage < ActiveRecord::Base @@ -314,7 +313,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:{ 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 # 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;}