diff --git a/Gemfile b/Gemfile index eef93c371..fe7d46d01 100644 --- a/Gemfile +++ b/Gemfile @@ -6,7 +6,7 @@ unless RUBY_PLATFORM =~ /w32/ if RUBY_PLATFORM =~ /darwin/ gem "rmagick", "= 2.15.4" ## osx must be this version else - gem "rmagick", "= 2.13.1" ## centos yum install ImageMagick-devel + #gem "rmagick", "= 2.13.1" ## centos yum install ImageMagick-devel end gem 'certified' end diff --git a/public/assets/wechat/activities.html b/public/assets/wechat/activities.html index ef3346e20..a51a0f5f0 100644 --- a/public/assets/wechat/activities.html +++ b/public/assets/wechat/activities.html @@ -6,43 +6,47 @@
我的动态
+
+ 所有动态 + 课程动态 + 项目动态 +
+
-
-
- - +
+
+ +
{{act.latest_update}}
- -
+ +
迟交扣分:{{act.homework_common_detail.late_penalty}}分 匿评开启时间:{{act.homework_common_detail.evaluation_start}}
缺评扣分:{{act.homework_common_detail.absence_penalty}}分/作品 匿评关闭时间:{{act.homework_common_detail.evaluation_end}}
-
-
- 普通作业 - 编程作业 - 分组作业 - {{act.latest_update}} - 回复 - {{act.reply_count}} -
-
{{act.praise_count}}
-
{{act.praise_count}}
-
+ +
+
+
{{act.praise_count}}
+
{{act.praise_count}}
+ +
@@ -52,28 +56,33 @@
-
-
- - +
+
+ +
{{act.latest_update}}
- -
+ +
-
-
- {{act.activity_type_name}} - {{act.latest_update}} - 回复 - {{act.reply_count}} -
-
{{act.praise_count}}
-
{{act.praise_count}}
-
+ +
+
+
{{act.praise_count}}
+
{{act.praise_count}}
+ +
@@ -83,28 +92,34 @@
-
-
- - +
+
+ +
{{act.latest_update}}
- -
+ +
-
- {{act.activity_type_name}} - {{act.latest_update}} - 回复 - {{act.reply_count}} -
-
{{act.praise_count}}
-
{{act.praise_count}}
-
+ +
+
+
{{act.praise_count}}
+
{{act.praise_count}}
+ +
@@ -115,7 +130,7 @@
-
+
@@ -130,30 +145,35 @@
-
-
- - +
+
+ +
{{act.latest_update}}
- -
+ +
状态:{{act.issue_detail.issue_status}} 优先级:{{act.issue_detail.issue_priority}}
指派给:{{act.issue_detail.issue_assigned_to}} 完成度:{{act.issue_detail.done_ratio}}%
-
-
- {{act.activity_type_name}} - {{act.latest_update}} - 回复 - {{act.reply_count}} -
-
{{act.praise_count}}
-
{{act.praise_count}}
-
+ +
+
+
{{act.praise_count}}
+
{{act.praise_count}}
+
+ +
@@ -164,28 +184,33 @@
-
-
- - +
+
+ +
{{act.latest_update}}
- -
+ +
-
-
- {{act.activity_type_name}} - {{act.latest_update}} - 回复 - {{act.reply_count}} -
-
{{act.praise_count}}
-
{{act.praise_count}}
-
+ +
+
+
{{act.praise_count}}
+
{{act.praise_count}}
+
+ +
@@ -195,7 +220,7 @@
-
+
@@ -210,27 +235,33 @@
-
-
- - -
+
+
+ +
{{act.latest_update}}
-
+
-
- {{act.latest_update}} - 回复 - {{act.reply_count}} -
-
{{act.praise_count}}
-
{{act.praise_count}}
-
+ +
+
+
{{act.praise_count}}
+
{{act.praise_count}}
+ +
@@ -241,27 +272,34 @@
-
-
- - +
+
+ +
{{act.latest_update}}
- -
+ +
-
- {{act.latest_update}} - 回复 - {{act.reply_count}} -
-
{{act.praise_count}}
-
{{act.praise_count}}
-
+ +
+
+
{{act.praise_count}}
+
{{act.praise_count}}
+
+ +
diff --git a/public/assets/wechat/course_discussion.html b/public/assets/wechat/course_discussion.html index cc188f978..142a474fd 100644 --- a/public/assets/wechat/course_discussion.html +++ b/public/assets/wechat/course_discussion.html @@ -4,51 +4,57 @@
-
+
-
{{discussion.subject}}
- - - - - - - -
发布者:{{discussion.user.realname}}
来   源:{{discussion.course_project_name}}  |  课程问答区
-
+
+
- {{discussion.created_on}} +
{{discussion.subject}}
+
{{discussion.course_project_name}}-课程问答区{{discussion.created_on}}
+
+
+
+
+
{{discussion.praise_count}}
+
{{discussion.praise_count}}
+
+
-
-
-
回复 ({{discussion.replies_count}})
-
已赞 ({{discussion.praise_count}})
-
赞 ({{discussion.praise_count}})
-
-
-
-
- -
-
{{journal.lasted_comment}}
-
回复
+
+
+
+
+ +
{{journal.lasted_comment}}
+
+
+
-
-
-
+ +
-
- + + + +
- - -
diff --git a/public/assets/wechat/course_notice.html b/public/assets/wechat/course_notice.html index e3346ea93..780aa43a8 100644 --- a/public/assets/wechat/course_notice.html +++ b/public/assets/wechat/course_notice.html @@ -3,51 +3,57 @@
-
+
-
{{news.title}}
- - - - - - - -
发布者:{{news.author.realname}}
来   源:{{news.course_name}}  |  课程通知
+
+ +
+
{{news.title}}
+
{{news.course_name}}-课程通知{{news.created_on}}
- {{news.created_on}} +
+
+
{{news.praise_count}}
+
{{news.praise_count}}
+
+
-
-
回复 ({{news.comments_count}})
-
已赞 ({{news.praise_count}})
-
赞 ({{news.praise_count}})
-
-
-
-
-
- -
-
{{comments.created_on}}
-
回复
+
+
+
+
+ +
{{comments.created_on}}
+
+
+
-
-
-
+ +
-
- + + + +
- - -
diff --git a/public/stylesheets/weui/weixin.css b/public/stylesheets/weui/weixin.css index 5b1c1df95..1b2e295f5 100644 --- a/public/stylesheets/weui/weixin.css +++ b/public/stylesheets/weui/weixin.css @@ -109,9 +109,10 @@ a.underline {text-decoration:underline;} .post-interactive-reply, .post-interactive-praise {width:50%; text-align:center; float:left; font-size:13px;} .more-wrap {width:100%;} -.more-events {width:98%; font-size:13px; text-align:center; margin:0 auto; padding: 5px 0; border:1px solid #e6e6e6; border-radius:3px; background-color:#f8f9fb; } +.more-events {width:100%; font-size:13px; text-align:center; margin:0 auto; padding: 5px 0; border-top:1px solid #e6e6e6; border-bottom:1px solid #e6e6e6; border-radius:3px; background-color:#f8f9fb; } .border-bottom {border-bottom:1px solid #e6e6e6;} .post-reply-wrap {width:100%;} +.post-reply-wrap:first-child {border-top:1px solid #ccc;} .post-input-wrap {width:100%; position:fixed; bottom:0;} .post-input-wrap2 {width:100%;} .post-reply-row {padding:10px 15px; color:#9a9a9a; background-color:#fff;}