diff --git a/Gemfile b/Gemfile index cbeade2a3..1305320cf 100644 --- a/Gemfile +++ b/Gemfile @@ -50,10 +50,10 @@ gem 'elasticsearch-model' gem 'elasticsearch-rails' #rails 3.2.22.2 bug - gem "test-unit", "~>3.0" + # gem "test-unit", "~>3.0" ### profile - gem 'oneapm_rpm' + # gem 'oneapm_rpm' group :development do gem 'grape-swagger' diff --git a/public/assets/wechat/activities.html b/public/assets/wechat/activities.html index 2d45f4d17..09490b766 100644 --- a/public/assets/wechat/activities.html +++ b/public/assets/wechat/activities.html @@ -40,7 +40,7 @@
- +
{{act.praise_count}}
@@ -75,7 +75,7 @@
- +
{{act.praise_count}}
@@ -111,7 +111,7 @@
- +
{{act.praise_count}}
@@ -147,7 +147,7 @@
- + @@ -405,7 +405,7 @@
- +
{{act.praise_count}}
@@ -440,7 +440,7 @@
- +
{{act.praise_count}}
@@ -476,7 +476,7 @@
- +
{{act.praise_count}}
@@ -512,7 +512,7 @@
- + diff --git a/public/assets/wechat/app.html b/public/assets/wechat/app.html index 099384593..232f07494 100644 --- a/public/assets/wechat/app.html +++ b/public/assets/wechat/app.html @@ -41,6 +41,7 @@ + diff --git a/public/assets/wechat/blog_detail.html b/public/assets/wechat/blog_detail.html index 7aa629bb7..91a5fff59 100644 --- a/public/assets/wechat/blog_detail.html +++ b/public/assets/wechat/blog_detail.html @@ -25,7 +25,7 @@
{{blog.title}}
博客{{blog.created_at}}
-
+
diff --git a/public/assets/wechat/class.html b/public/assets/wechat/class.html index f8947b029..6678456b6 100644 --- a/public/assets/wechat/class.html +++ b/public/assets/wechat/class.html @@ -1,6 +1,6 @@
-
邀请码
+
邀请码
diff --git a/public/assets/wechat/class_publishissue.html b/public/assets/wechat/class_publishissue.html index f4dd40552..5a65beabf 100644 --- a/public/assets/wechat/class_publishissue.html +++ b/public/assets/wechat/class_publishissue.html @@ -1,7 +1,7 @@
-
{{current_course.name}}
+
标题
diff --git a/public/assets/wechat/class_publishnotice.html b/public/assets/wechat/class_publishnotice.html index d27e378d3..e56c762a6 100644 --- a/public/assets/wechat/class_publishnotice.html +++ b/public/assets/wechat/class_publishnotice.html @@ -1,7 +1,7 @@
-
{{current_course.name}}
+
标题
diff --git a/public/assets/wechat/course_discussion.html b/public/assets/wechat/course_discussion.html index 91aa58fcf..7a818bb79 100644 --- a/public/assets/wechat/course_discussion.html +++ b/public/assets/wechat/course_discussion.html @@ -24,8 +24,8 @@
{{discussion.subject}}
-
{{discussion.course_project_name}} - 班级讨论区{{discussion.created_on}}
-
+
{{discussion.syllabus_title}}·{{discussion.course_project_name}} - 班级讨论区{{discussion.created_on}}
+
diff --git a/public/assets/wechat/course_notice.html b/public/assets/wechat/course_notice.html index 247cd1fd0..c13a7b532 100644 --- a/public/assets/wechat/course_notice.html +++ b/public/assets/wechat/course_notice.html @@ -23,8 +23,8 @@
{{news.title}}
-
{{news.course_name}} - 课程通知{{news.created_on}}
-
+
{{news.syllabus_title}}·{{news.course_name}} - 课程通知{{news.created_on}}
+
diff --git a/public/assets/wechat/edit_userinfo.html b/public/assets/wechat/edit_userinfo.html index 48d207d4c..b0a00bba2 100644 --- a/public/assets/wechat/edit_userinfo.html +++ b/public/assets/wechat/edit_userinfo.html @@ -12,6 +12,7 @@
姓名
+
姓名不能为空
性别 @@ -28,11 +29,10 @@
邮箱 -
- 电子邮箱地址不能为空 - - 电子邮箱地址不合法 -
+
+
+ 电子邮箱地址不能为空 + 电子邮箱地址不合法
提示 diff --git a/public/assets/wechat/homework_detail.html b/public/assets/wechat/homework_detail.html index e5f73faa9..161c3be94 100644 --- a/public/assets/wechat/homework_detail.html +++ b/public/assets/wechat/homework_detail.html @@ -23,8 +23,8 @@
{{homework.name}}
-
{{homework.course_name}} - 普通作业编程作业分组作业{{homework.publish_time}}
-
+
{{homework.syllabus_title}}·{{homework.course_name}} - 普通作业编程作业分组作业{{homework.publish_time}}
+
迟交扣分:{{homework.late_penalty}}分 匿评开启时间:{{homework.evaluation_start}}
缺评扣分:{{homework.absence_penalty}}分/作品 diff --git a/public/assets/wechat/invite_code.html b/public/assets/wechat/invite_code.html index 3aaa00bbe..c6d3b425f 100644 --- a/public/assets/wechat/invite_code.html +++ b/public/assets/wechat/invite_code.html @@ -1,7 +1,7 @@
- +
邀请码:{{course.invite_code}}
diff --git a/public/assets/wechat/issue_detail.html b/public/assets/wechat/issue_detail.html index f4eed4bd9..278b545a5 100644 --- a/public/assets/wechat/issue_detail.html +++ b/public/assets/wechat/issue_detail.html @@ -26,7 +26,7 @@
{{issue.subject}}
{{issue.project_name}} - 项目问题{{issue.created_on}}
-
+
状   态:{{issue.issue_status}} 优先级:{{issue.issue_priority}}
指派给:{{issue.issue_assigned_to}} diff --git a/public/assets/wechat/jour_message_detail.html b/public/assets/wechat/jour_message_detail.html index a1db224a6..736ad419b 100644 --- a/public/assets/wechat/jour_message_detail.html +++ b/public/assets/wechat/jour_message_detail.html @@ -24,7 +24,7 @@
留言{{message.created_on}}
-
+
diff --git a/public/assets/wechat/myresource.html b/public/assets/wechat/myresource.html index 1848dad60..df04a184f 100644 --- a/public/assets/wechat/myresource.html +++ b/public/assets/wechat/myresource.html @@ -13,7 +13,7 @@
{{r.filename}}发送
- 大小:{{r.attafile_size}}
+ 大小:{{r.attafile_size}}
更多
@@ -24,7 +24,7 @@
{{r.homework_name}}发送
-
+
更多
diff --git a/public/assets/wechat/project_discussion.html b/public/assets/wechat/project_discussion.html index dcb5a68a6..7fca33657 100644 --- a/public/assets/wechat/project_discussion.html +++ b/public/assets/wechat/project_discussion.html @@ -25,7 +25,7 @@
{{discussion.subject}}
{{discussion.course_project_name}} - 项目讨论区{{discussion.created_on}}
-
+
diff --git a/public/assets/wechat/review_class_member.html b/public/assets/wechat/review_class_member.html index e066c48f0..b1f0dacc5 100644 --- a/public/assets/wechat/review_class_member.html +++ b/public/assets/wechat/review_class_member.html @@ -2,7 +2,7 @@
-
{{current_course.name}}
+
{{current_review_member.realname == "" ? current_review_member.name : current_review_member.realname}}
角色
    @@ -29,7 +29,7 @@
-
{{current_course.name}}
+
{{tip_2}}
diff --git a/public/javascripts/wechat/directives/img_preview.js b/public/javascripts/wechat/directives/img_preview.js new file mode 100644 index 000000000..08f33d381 --- /dev/null +++ b/public/javascripts/wechat/directives/img_preview.js @@ -0,0 +1,22 @@ +/** + * Created by ttang on 2016/9/20. + */ +app.directive('imgPreview',["$timeout",'wx',function(timer,wx){ + return{ + restrict: 'A', + scope: {}, + link: function(scope, element){ + timer(function(){ + var srcList = []; + $.each($(".post-all-content img"),function(i,item){ + if(item.src){ + srcList.push(item.src); + $(item).click(function(e){ + wx.previewImage(this.src,srcList); + }); + } + }); + }) + } + } +}]); \ No newline at end of file diff --git a/public/stylesheets/weui/weixin.css b/public/stylesheets/weui/weixin.css index cf44a3814..aa4cff972 100644 --- a/public/stylesheets/weui/weixin.css +++ b/public/stylesheets/weui/weixin.css @@ -43,6 +43,7 @@ blockquote {border:1px solid #d4d4d4; padding: 0.6em; margin: 5px 0.4em 5px 1.4e .mr25 {margin-right:25px;} .ml55 {margin-left:55px;} .mr55 {margin-right:55px;} +.ml65 {margin-left:65px;} .c-red {color:#e81a1a;} .c-blue {color:#269ac9;} .c-grey {color:#9a9a9a !important;} @@ -147,7 +148,7 @@ a.underline {text-decoration:underline;} .post-dynamic-author {width:50%; height:30px; line-height:30px; font-size:14px; color:#5b5b5b; vertical-align:middle;} .post-dynamic-time {height:30px; line-height:30px; vertical-align:middle;} .post-dynamic-title {font-size:15px;} -.post-dynamic-from {width:50%; font-size:13px;} +.post-dynamic-from {width:55%; font-size:13px;} .post-box-shadow {box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5);} .post-reply-author {width:50%; height:20px; line-height:20px; font-size:12px; color:#5d5d5d; vertical-align:middle;} .post-reply-time {height:20px; line-height:20px; vertical-align:middle;} @@ -203,7 +204,7 @@ a.underline {text-decoration:underline;} .img-circle {border-radius:50% !important;} .member-banner {height:24px; line-height:24px; text-align:center; vertical-align:middle; background-color:#dfdfdf;} .resource-width {width:76%;} -.courseware-from-width {max-width:57%;} +.courseware-from-width {max-width:50%;} .other-from-width {max-width:80%;} .course-name-width {width:68%;}