diff --git a/db/schema.rb b/db/schema.rb
index d2947c19d..619ccb7bb 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -562,9 +562,9 @@ ActiveRecord::Schema.define(:version => 20160630112733) do
t.integer "excellent_option", :default => 0
t.integer "is_copy", :default => 0
t.integer "visits", :default => 0
+ t.integer "syllabus_id"
t.string "invite_code"
t.string "qrcode"
- t.integer "syllabus_id"
end
add_index "courses", ["invite_code"], :name => "index_courses_on_invite_code", :unique => true
diff --git a/public/assets/wechat/activities.html b/public/assets/wechat/activities.html
index 037ef8277..60075ad2e 100644
--- a/public/assets/wechat/activities.html
+++ b/public/assets/wechat/activities.html
@@ -136,7 +136,7 @@
-
{{act.author.realname}}创建了{{act.course_project_name}} | 课程
+
{{act.author.realname}}创建了{{act.course_project_name}} | 班级
{{act.latest_update}}
diff --git a/public/javascripts/wechat/controllers/class.js b/public/javascripts/wechat/controllers/class.js
index d5de23859..87703b681 100644
--- a/public/javascripts/wechat/controllers/class.js
+++ b/public/javascripts/wechat/controllers/class.js
@@ -130,7 +130,7 @@ app.controller('ClassController', ['$scope', 'config','$http', 'auth','$location
if(is_teacher){
vm.menus = ["课件", "作业", "小测验", "学生管理"];
} else {
- vm.menus = ['课堂资源', "我的同学"];
+ vm.menus = ['课件', "我的同学"];
}
}
diff --git a/public/stylesheets/weui/weixin.css b/public/stylesheets/weui/weixin.css
index 7c1b59dd6..1f758d296 100644
--- a/public/stylesheets/weui/weixin.css
+++ b/public/stylesheets/weui/weixin.css
@@ -199,7 +199,7 @@ a.underline {text-decoration:underline;}
.students-amount {height:14px; line-height:14px; vertical-align:middle; padding:2px 5px; background-color:#e6e6e6; border-radius:10px;}
.new-class-btn {font-size:15px; color:#fff; background-color:#3b94d6; padding:10px 40px; border-radius:20px; display:inline-block; margin:0 auto;}
.join-class-btn {font-size:15px; color:#444; background-color:#ccc; padding:10px 40px; border-radius:20px; display:inline-block; margin:0 auto;}
-.new-class-input {width:60%; color:#aaa; height:35px; line-height:35px; vertical-align:middle; border:none; outline:none;}
+.new-class-input {width:60%; color:#555; height:35px; line-height:35px; vertical-align:middle; border:none; outline:none;}
/*20160616登录注册*/
.login-wrap {padding:0 10px;}