diff --git a/public/assets/wechat/project_invite_code.html b/public/assets/wechat/project_invite_code.html
new file mode 100644
index 000000000..a17b8fe85
--- /dev/null
+++ b/public/assets/wechat/project_invite_code.html
@@ -0,0 +1,16 @@
+
+
+
+
{{project.name}}
+
+
邀请码：{{project.invite_code}}
+
+
+
+
+
+
1.点击右上角"发送给朋友"，邀请朋友加入项目
+ 2.长按二维码，通过“识别图中二维码”功能加入项目
+ 3.通过“加入项目”菜单输入邀请码加入项目（长按邀请码可以复制哦~）
+
+
\ No newline at end of file
diff --git a/public/assets/wechat/project_list.html b/public/assets/wechat/project_list.html
new file mode 100644
index 000000000..1d385dabf
--- /dev/null
+++ b/public/assets/wechat/project_list.html
@@ -0,0 +1,38 @@
+
+
+
项目列表
+
+
+
我创建的项目
+
+
+ {{project.name}}
+ >
+ {{project.member_count}}人
+
+
+
+
+
+
+
+
我参与的项目
+
+
+ {{project.name}}
+ >
+ {{project.member_count}}人
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/public/assets/wechat/send_class_list.html b/public/assets/wechat/send_class_list.html
index 72a52fc3f..b6d250d5d 100644
--- a/public/assets/wechat/send_class_list.html
+++ b/public/assets/wechat/send_class_list.html
@@ -19,6 +19,6 @@
-
发送
+
发送
diff --git a/public/assets/wechat/templates/comment_reply.html b/public/assets/wechat/templates/comment_reply.html
new file mode 100644
index 000000000..f5699abca
--- /dev/null
+++ b/public/assets/wechat/templates/comment_reply.html
@@ -0,0 +1,30 @@
+
+
+
+
+
+
+ {{journal.parents_reply_top[i].user.realname}}
+
+
{{journal.parents_reply_top[i].lasted_comment}}
+
+
+
+
+
+
+
+
diff --git a/public/images/sy/icons_sy.png b/public/images/sy/icons_sy.png
index 09cdd32cb..645dc4e35 100644
Binary files a/public/images/sy/icons_sy.png and b/public/images/sy/icons_sy.png differ
diff --git a/public/images/syllabus/icons_syllabus.png b/public/images/syllabus/icons_syllabus.png
index 7f6c4987c..4afdb729f 100644
Binary files a/public/images/syllabus/icons_syllabus.png and b/public/images/syllabus/icons_syllabus.png differ
diff --git a/public/javascripts/wechat/controllers/activity.js b/public/javascripts/wechat/controllers/activity.js
index 8847e8e10..678733a82 100644
--- a/public/javascripts/wechat/controllers/activity.js
+++ b/public/javascripts/wechat/controllers/activity.js
@@ -122,12 +122,14 @@ app.controller('ActivityController',
}
break;
}
+ rms.save("tab_num",$scope.currentTab);
}
- $scope.currentTab = 1;
+
+ $scope.currentTab = rms.get('tab_num') || 1;
if($scope.activities.length<=0){
- $scope.loadActData(1,0);
+ $scope.loadActData('tab_num',0);
} else {
$timeout(function(){
window.scrollTo(0, rms.get("yoffset"));
@@ -136,7 +138,7 @@ app.controller('ActivityController',
//跳到详情页
$scope.goDetail = function(type, act_id,id){
- rms.save("yoffset", document.documentElement.scrollTop);
+ rms.save("yoffset", document.documentElement.scrollTop || document.body.scrollTop);
rms.save("activities",$scope.activities);
rms.save("course_activities",$scope.course_activities);
rms.save("project_activities",$scope.project_activities);
diff --git a/public/javascripts/wechat/controllers/blog.js b/public/javascripts/wechat/controllers/blog.js
index 40902fa12..5fb61151d 100644
--- a/public/javascripts/wechat/controllers/blog.js
+++ b/public/javascripts/wechat/controllers/blog.js
@@ -20,15 +20,15 @@ app.controller('BlogController',
$scope.page = 0;
}
else{
- $scope.blog.blog_comment_children = $scope.blog.blog_comment_children.concat(data.data.blog_comment_children);
+ $scope.blog.all_children = $scope.blog.all_children.concat(data.data.all_children);
}
- $scope.has_more = $scope.blog.blog_comment_children.length < $scope.blog.comment_count;
+ $scope.has_more = $scope.blog.all_children.length < $scope.blog.comment_count;
console.log($scope.has_more);
}
else{
comment_id = data.data.id;
- for (var i in $scope.blog.blog_comment_children) {
- var comment = $scope.blog.blog_comment_children[i];
+ for (var i in $scope.blog.all_children) {
+ var comment = $scope.blog.all_children[i];
if(comment.id == comment_id){
// comment.parents_reply_top = comment.parents_reply_top.concat(data.data.parents_reply_top);
comment.parents_reply_top = data.data.parents_reply_top.concat(comment.parents_reply_top);
diff --git a/public/javascripts/wechat/controllers/class.js b/public/javascripts/wechat/controllers/class.js
index 75e1709cc..490ecc033 100644
--- a/public/javascripts/wechat/controllers/class.js
+++ b/public/javascripts/wechat/controllers/class.js
@@ -2,7 +2,7 @@ app.controller('ClassController', ['$scope', 'config','$http', 'auth','$location
var vm = $scope;
var courseid = $routeParams.id;
-
+ var tag = $routeParams.tag;
var getUsers = function(){
@@ -126,7 +126,13 @@ app.controller('ClassController', ['$scope', 'config','$http', 'auth','$location
if (response.data.status == 0){
vm.course = response.data.data;
resetMenu(vm.course.current_user_is_teacher);
- vm.tab(1);
+ if(tag){
+ vm.tab(4);
+ tag = null;
+ }
+ else{
+ vm.tab(1);
+ }
}
else{
vm.alertService.showMessage('提示', response.data.message);
@@ -139,11 +145,19 @@ app.controller('ClassController', ['$scope', 'config','$http', 'auth','$location
var resetMenu = function(is_teacher){
vm.isTeacher = is_teacher;
if(is_teacher){
- vm.menus = ["课件", "作业", "小测验", "学生管理"];
+ vm.menus = ["课件", "作业", "测验", "成员管理"];
} else {
vm.menus = ['课件', "我的同学"];
}
}
+ vm.onSetting = function(user){
+ rms.save('current_edit_member', user);
+ $location.path("/edit_class_member").search({id: courseid,user_id: user.id});
+ };
+
+
+
+
}]);
\ No newline at end of file
diff --git a/public/javascripts/wechat/controllers/discussion.js b/public/javascripts/wechat/controllers/discussion.js
index 7e0811a0d..60bfb3ee3 100644
--- a/public/javascripts/wechat/controllers/discussion.js
+++ b/public/javascripts/wechat/controllers/discussion.js
@@ -6,7 +6,33 @@ app.controller('DiscussionController', ['$scope', '$http', '$routeParams', 'auth
type: 'messages',
replyType: 'Message',
loadCallback: function(data){
- $scope.discussion = data.data;
+ console.log(data.data);
+
+ //回复级别 0 一级回复 1 二级回复
+ replytype = data.type;
+ page = data.page;
+
+ if (replytype == 0){
+ if (page == 0){
+ $scope.discussion = data.data;
+ $scope.page = 0;
+ }
+ else{
+ $scope.discussion.all_children = $scope.discussion.all_children.concat(data.data.all_children);
+ }
+ $scope.has_more = $scope.discussion.all_children.length < $scope.discussion.comment_count;
+ console.log($scope.has_more);
+ }
+ else{
+ comment_id = data.data.id;
+ for (var i in $scope.discussion.all_children) {
+ var comment = $scope.discussion.all_children[i];
+ if(comment.id == comment_id){
+// comment.parents_reply_top = comment.parents_reply_top.concat(data.data.parents_reply_top);
+ comment.parents_reply_top = data.data.parents_reply_top.concat(comment.parents_reply_top);
+ }
+ }
+ }
},
replyCallback: function(){
}
diff --git a/public/javascripts/wechat/controllers/edit_class.js b/public/javascripts/wechat/controllers/edit_class.js
index 5f377e594..0a09ce1e3 100644
--- a/public/javascripts/wechat/controllers/edit_class.js
+++ b/public/javascripts/wechat/controllers/edit_class.js
@@ -47,7 +47,7 @@ app.controller('EditClassController', ['$scope', '$http', 'auth', 'config', 'ale
token: auth.token()
}).then(function(response){
if(response.data.status!=0){
- vm.alertService_1.showMessage('出错了', response.data.message);
+ vm.alertService_1.showMessage('提示', response.data.message);
} else {
vm.alertService_1.showMessage('提示', '删除班级成功', function(){
vm.syllabus.courses.splice(index, 1);
diff --git a/public/javascripts/wechat/controllers/edit_class_member.js b/public/javascripts/wechat/controllers/edit_class_member.js
new file mode 100644
index 000000000..cddc183c5
--- /dev/null
+++ b/public/javascripts/wechat/controllers/edit_class_member.js
@@ -0,0 +1,72 @@
+
+
+app.controller('EditClassMemberController', ['$scope', '$http', 'auth', 'config', 'alertService','$location','$routeParams','rms', function($scope, $http, auth, config, alertService, $location,$routeParams, rms){
+ var vm = $scope;
+
+// vm.current_edit_member = rms.get('current_edit_member');
+ vm.current_edit_member = null;
+
+ vm.alertService = alertService.create();
+
+ var course_id = $routeParams.id;
+ var user_id = $routeParams.user_id;
+ if(!vm.current_edit_member){
+ $http.post(config.apiUrl+'courses/get_member_info', {
+ token: auth.token(),
+ id: course_id,
+ user_id:user_id
+ }).then(function(response){
+ if(response.data.status!=0){
+ vm.alertService.showMessage('提示', response.data.message);
+ } else {
+ course_id = response.data.course_id;
+ user_id = response.data.user_id;
+ vm.current_edit_member = response.data.member_info;
+ vm.current_roles_id = vm.current_edit_member.roles_id;
+ }
+ });
+ }
+
+ console.log(vm.current_edit_member);
+
+ vm.cancel = function(){
+ vm.alertService.showMessage('提示', '您确定不对角色进行变更吗？', function(){
+// rms.save("project_master_members",[]);
+// rms.save("project_develop_members",[]);
+// rms.save("project_report_members",[]);
+ window.history.back();
+// $location.path("/project").search({id: project_id});
+ });
+ };
+
+ vm.edit_member_role = function(){
+ if(vm.current_roles_id == vm.current_edit_member.roles_id){
+ vm.alertService.showMessage('提示', "该用户当前已是该角色");
+ return;
+ }
+
+ $http.post(config.apiUrl+'courses/edit_member_role', {
+ token: auth.token(),
+ id: course_id,
+ user_id:vm.current_edit_member.user.id,
+ role_id:vm.current_edit_member.roles_id
+ }).then(function(response){
+ if(response.data.status!=0){
+ vm.alertService.showMessage('提示', response.data.message);
+ } else {
+ vm.alertService.showMessage('提示', '修改角色成功', function(){
+// window.history.back();
+
+ $location.path("/class").search({id: course_id,tag:1});
+ });
+ }
+ });
+
+
+ };
+
+ vm.selectRole = function(role_id){
+ vm.current_edit_member.roles_id = role_id;
+ }
+
+}] );
\ No newline at end of file
diff --git a/public/javascripts/wechat/controllers/edit_project_member.js b/public/javascripts/wechat/controllers/edit_project_member.js
new file mode 100644
index 000000000..1063c0b13
--- /dev/null
+++ b/public/javascripts/wechat/controllers/edit_project_member.js
@@ -0,0 +1,80 @@
+
+
+app.controller('EditProjectMemberController', ['$scope', '$http', 'auth', 'config', 'alertService','$location','$routeParams','rms', function($scope, $http, auth, config, alertService, $location,$routeParams, rms){
+ var vm = $scope;
+
+// vm.current_edit_member = rms.get('current_edit_member');
+
+ vm.current_edit_member = null;
+
+ vm.alertService = alertService.create();
+
+ var project_id = $routeParams.id;
+ var user_id = $routeParams.user_id;
+ if(!vm.current_edit_member){
+ $http.post(config.apiUrl+'projects/get_member_info', {
+ token: auth.token(),
+ id: project_id,
+ user_id:user_id
+ }).then(function(response){
+ if(response.data.status!=0){
+ vm.alertService.showMessage('提示', response.data.message);
+ } else {
+ project_id = response.data.project_id;
+ user_id = response.data.user_id;
+ vm.current_edit_member = response.data.member_info;
+ vm.current_roles_id = vm.current_edit_member.roles_id;
+ }
+ });
+ }
+
+ console.log(vm.current_edit_member);
+
+ vm.cancel = function(){
+ vm.alertService.showMessage('提示', '您确定不对角色进行变更吗？', function(){
+// rms.save("project_master_members",[]);
+// rms.save("project_develop_members",[]);
+// rms.save("project_report_members",[]);
+ window.history.back();
+// $location.path("/project").search({id: project_id});
+ });
+ };
+
+ vm.edit_member_role = function(){
+ if(vm.current_roles_id == vm.current_edit_member.roles_id){
+ vm.alertService.showMessage('提示', "该用户当前已是该角色");
+ return;
+ }
+
+ $http.post(config.apiUrl+'projects/edit_member_role', {
+ token: auth.token(),
+ id: project_id,
+ user_id:vm.current_edit_member.user.id,
+ role_id:vm.current_edit_member.roles_id
+ }).then(function(response){
+ if(response.data.status!=0){
+ vm.alertService.showMessage('提示', response.data.message);
+ } else {
+ vm.alertService.showMessage('提示', '修改角色成功', function(){
+ rms.save('project_activities_page',0);
+ rms.save("project_activities",[]);
+ rms.save("project_has_more",false);
+ rms.save("project",null);
+ rms.save("project_master_members",[]);
+ rms.save("project_develop_members",[]);
+ rms.save("project_report_members",[]);
+ rms.save('tab_num',null);
+// window.history.back();
+ $location.path("/project").search({id: project_id,tag:1});
+ });
+ }
+ });
+
+
+ };
+
+ vm.selectRole = function(role_id){
+ vm.current_edit_member.roles_id = role_id;
+ }
+
+}] );
\ No newline at end of file
diff --git a/public/javascripts/wechat/controllers/homework.js b/public/javascripts/wechat/controllers/homework.js
index 58f70db5a..2898fc27f 100644
--- a/public/javascripts/wechat/controllers/homework.js
+++ b/public/javascripts/wechat/controllers/homework.js
@@ -6,8 +6,33 @@ app.controller('HomeworkController', ['$scope', '$http', '$routeParams', 'auth',
type: 'whomeworks',
replyType: 'HomeworkCommon',
loadCallback: function(data){
- console.log(data);
- $scope.homework = data.data;
+ console.log(data.data);
+
+ //回复级别 0 一级回复 1 二级回复
+ replytype = data.type;
+ page = data.page;
+
+ if (replytype == 0){
+ if (page == 0){
+ $scope.homework = data.data;
+ $scope.page = 0;
+ }
+ else{
+ $scope.homework.all_children = $scope.homework.all_children.concat(data.data.all_children);
+ }
+ $scope.has_more = $scope.homework.all_children.length < $scope.homework.comment_count;
+ console.log($scope.has_more);
+ }
+ else{
+ comment_id = data.data.id;
+ for (var i in $scope.homework.all_children) {
+ var comment = $scope.homework.all_children[i];
+ if(comment.id == comment_id){
+// comment.parents_reply_top = comment.parents_reply_top.concat(data.data.parents_reply_top);
+ comment.parents_reply_top = data.data.parents_reply_top.concat(comment.parents_reply_top);
+ }
+ }
+ }
},
replyCallback: function(){
}
diff --git a/public/javascripts/wechat/controllers/invite_code.js b/public/javascripts/wechat/controllers/invite_code.js
index 0c8bbe09e..3908d1b40 100644
--- a/public/javascripts/wechat/controllers/invite_code.js
+++ b/public/javascripts/wechat/controllers/invite_code.js
@@ -15,20 +15,4 @@ app.controller('InviteCodeController', ['$scope','$http', '$routeParams','config
}
);
- vm.share = function(){
- window.WeixinJSBridge.invoke('sendAppMessage',{
- 'appid': 'wxf694495398c7d470', // 公众号appID
- 'type': 'link', // 非必填，music,vido或link,默认为link。
- 'data_url': '', // 非必填，连接地址,如音乐的mp3数据地址,供内置播放器使用
- 'img_url': 'http://pnewsapp.tc.qq.com/newsapp_bt/0/9963967/640', // 缩略图地址
- 'img_height':370, // 缩略图高度
- 'img_width':550, // 缩略图宽度
- 'link':'http://view.inews.qq.com/a/WXN2013101101385701', // 链接地址
- 'desc':'desc', // 描述
- 'title':'title' // 标题
- },function(res){
- //alert(res.err_msg);
- });
- }
-
}]);
diff --git a/public/javascripts/wechat/controllers/journals.js b/public/javascripts/wechat/controllers/journals.js
index 76b4f8cf6..23f3b908b 100644
--- a/public/javascripts/wechat/controllers/journals.js
+++ b/public/javascripts/wechat/controllers/journals.js
@@ -5,7 +5,34 @@ app.controller('JournalsController', ['$scope', '$http', '$routeParams', 'auth',
type: 'journal_for_messages',
replyType: 'JournalsForMessage',
loadCallback: function(data){
- $scope.message = data.data;
+ console.log(data.data);
+
+ //回复级别 0 一级回复 1 二级回复
+ replytype = data.type;
+ page = data.page;
+
+ if (replytype == 0){
+ if (page == 0){
+ $scope.message = data.data;
+ $scope.page = 0;
+ }
+ else{
+ $scope.message.all_children = $scope.message.all_children.concat(data.data.all_children);
+ }
+ $scope.has_more = $scope.message.all_children.length < $scope.message.comment_count;
+ console.log($scope.has_more);
+ }
+ else{
+ comment_id = data.data.id;
+ for (var i in $scope.message.all_children) {
+ var comment = $scope.message.all_children[i];
+ if(comment.id == comment_id){
+// comment.parents_reply_top = comment.parents_reply_top.concat(data.data.parents_reply_top);
+ comment.parents_reply_top = data.data.parents_reply_top.concat(comment.parents_reply_top);
+ }
+ }
+ }
+
},
replyCallback: function(){
}
diff --git a/public/javascripts/wechat/controllers/myresource.js b/public/javascripts/wechat/controllers/myresource.js
index 15428bb34..b5489c065 100644
--- a/public/javascripts/wechat/controllers/myresource.js
+++ b/public/javascripts/wechat/controllers/myresource.js
@@ -1,6 +1,7 @@
app.controller('MyResourceController', ['$scope', '$http', 'auth', 'config', '$location', 'rms', function($scope, $http, auth, config, $location,rms){
var vm = $scope;
- vm.menus = ['课件', '作业', '测验'];
+// vm.menus = ['课件', '作业', '测验'];
+ vm.menus = ['课件', '作业'];
vm.resources = [];
vm.homeworks = [];
@@ -137,8 +138,11 @@ app.controller('MyResourceController', ['$scope', '$http', 'auth', 'config', '$l
}
break;
}
+ rms.save("resource_tab_num",vm.currentTab);
}
- vm.tab(1);
+ var currentTab = rms.get('resource_tab_num') || 1;
+
+ vm.tab(currentTab);
}] );
diff --git a/public/javascripts/wechat/controllers/new_project.js b/public/javascripts/wechat/controllers/new_project.js
new file mode 100644
index 000000000..6eb6a1caa
--- /dev/null
+++ b/public/javascripts/wechat/controllers/new_project.js
@@ -0,0 +1,47 @@
+
+
+app.controller('NewProjectController', ['$scope', '$http', 'auth', 'config', 'alertService','$location','rms', function($scope, $http, auth, config, alertService, $location,rms){
+ var vm = $scope;
+
+ vm.alertService = alertService.create();
+
+ vm.project = {
+ name:""
+ };
+
+ vm.addClass = function(){
+ vm.syllabus.courses.push({});
+ };
+
+ vm.deleteClass = function(index){
+ vm.syllabus.courses.splice(index, 1);
+ }
+
+ vm.newProject = function (frm, project) {
+ frm.$setSubmitted();
+ console.log(project);
+
+ if(!frm.$valid){
+ console.log(frm.$error);
+ return;
+ }
+
+ $http.post(config.apiUrl+"projects/create", {
+ token: auth.token(),
+ name: project.name
+ }).then(function(response){
+ if(response.data.status!=0){
+ vm.alertService.showMessage('出错了', response.data.message);
+ } else {
+ vm.alertService.showMessage('提示', '新建项目成功', function(){
+// window.history.back();
+ rms.save('projects',[]);
+ $location.path("/project_list");
+ });
+ }
+ console.log(response.data.data);
+ });
+
+ }
+
+}] );
\ No newline at end of file
diff --git a/public/javascripts/wechat/controllers/project.js b/public/javascripts/wechat/controllers/project.js
new file mode 100644
index 000000000..0d6ca99f2
--- /dev/null
+++ b/public/javascripts/wechat/controllers/project.js
@@ -0,0 +1,204 @@
+app.controller('ProjectController', ['$scope', 'config','$http','$timeout', 'auth','$location','$routeParams','alertService','rms','common', function($scope, config, $http,$timeout, auth, $location, $routeParams,alertService,rms,common){
+ $scope.replaceUrl = function(url){
+ return url;
+ };
+
+ var vm = $scope;
+ var projectid = $routeParams.id;
+ var tag = $routeParams.tag;
+
+ vm.project_activities_page = rms.get('project_activities_page') || 0;
+ vm.project_activities = rms.get("project_activities") || [];
+ vm.project_has_more = rms.get("project_has_more");
+
+ vm.project = rms.get("project") || null;
+
+
+// vm.project_members_page = rms.get('project_members_page') || 0;
+ vm.project_master_members = rms.get("project_master_members") || [];
+ vm.project_develop_members = rms.get("project_develop_members") || [];
+ vm.project_report_members = rms.get("project_report_members") || [];
+
+// vm.project_members_has_more = rms.get("project_members_has_more");
+
+ vm.alertService = alertService.create();
+
+ //跳入邀请界面
+ vm.invite = function(){
+ vm.alertService.showMessage('提示', "该功能将在近日开放，敬请期待！");
+
+
+// $location.path("/project_invite_code").search({id: projectid});
+ };
+
+ //获取项目动态
+ vm.getActivities = function(page){
+ $http({
+ method: 'POST',
+ url: apiUrl + "projects/activities?id=" + projectid,
+ data:{token:auth.token(),page:page}
+ }).then(function successCallback(response) {
+ console.log(response.data);
+ if(response.data.status == 0){
+ vm.project_activities_page = response.data.page;
+ if(response.data.page > 0)
+ {
+ vm.project_activities = vm.project_activities.concat(response.data.data);
+ }
+ else{
+ vm.project_activities = response.data.data;
+ vm.project_activities_page = 0;
+ vm.project_has_more = (response.data.count + response.data.page * 10) < response.data.all_count;
+ }
+ }
+ else{
+ vm.alertService.showMessage('提示', response.data.message);
+ }
+
+
+ }, function errorCallback(response) {
+ });
+ }
+
+ vm.getMembers = function(page){
+ $http({
+ method: 'POST',
+ url: apiUrl + "projects/members?id=" + projectid,
+ data:{token:auth.token(),page:page}
+ }).then(function successCallback(response) {
+ console.log(response.data);
+ if(response.data.status == 0){
+// vm.project_members_page = response.data.page;
+// if(response.data.page > 0)
+// {
+// vm.project_members = vm.project_members.concat(response.data.data);
+// }
+// else{
+// vm.project_members = response.data.data;
+// vm.project_members_page = 0;
+// vm.project_members_has_more = (response.data.count + response.data.page * 10) < response.data.all_count;
+// }
+ vm.project_master_members = response.data.master_members;
+ vm.project_develop_members = response.data.develop_members;
+ vm.project_report_members = response.data.report_members;
+
+ }
+ else{
+ vm.alertService.showMessage('提示', response.data.message);
+ }
+
+
+ }, function errorCallback(response) {
+ });
+ }
+
+ //跳到详情页
+ vm.goDetail = function(type, act_id,id){
+ rms.save("yoffset", document.documentElement.scrollTop);
+ rms.save("project_activities",vm.project_activities);
+ rms.save("project",vm.project);
+ $location.path('/'+type+'/'+act_id);
+ }
+
+ //切换 按钮
+ vm.tab = function(index){
+ vm.currentTab = index;
+ vm.searchText = '';
+
+ if(index == 1 && vm.project_activities.length <= 0 ){
+ vm.getActivities(0);
+ }
+ else if(index == 2 && vm.project_master_members.length <= 0){
+ vm.getMembers(0);
+ }
+
+ rms.save("tab_num",vm.currentTab);
+ };
+
+ //初始化TAB按钮
+ var resetMenu = function(can_setting){
+ if(can_setting){
+ vm.menus = ["项目动态", "成员管理"];
+ } else {
+ vm.menus = ['项目动态', "我的伙伴"];
+ }
+ }
+ if(vm.project){
+ resetMenu(vm.project.can_setting);
+ }
+
+ vm.currentTab = rms.get('tab_num');
+
+ //
+ if(!vm.currentTab){
+ $http.get(config.apiUrl+ 'projects/'+projectid+"?token="+auth.token()).then(
+ function(response) {
+ console.log(response.data);
+
+ if (response.data.status == 0){
+ vm.project = response.data.data;
+ resetMenu(vm.project.can_setting);
+ if(tag){
+ vm.tab(2);
+ tag = null;
+ }
+ else{
+ vm.tab(1);
+ }
+ }
+ else{
+ vm.alertService.showMessage('提示', response.data.message,function(){
+ window.history.back();
+ });
+
+ }
+ }
+ );
+ vm.currentTab = 1;
+ vm.tab(vm.currentTab);
+ } else {
+ $timeout(function(){
+ window.scrollTo(0, rms.get("yoffset"));
+ });
+ }
+
+ vm.addPraise = function(act){
+ for(var i in vm.project_activities){
+ if(vm.project_activities[i].act_id == act.act_id){
+ vm.project_activities[i].praise_count += 1;
+ vm.project_activities[i].has_praise = true;
+ break;
+ }
+ }
+
+ common.addCommonPraise(act);
+ };
+
+ vm.decreasePraise = function(act){
+ for(var i in vm.project_activities){
+ if(vm.project_activities[i].act_id == act.act_id){
+ vm.project_activities[i].praise_count -= 1;
+ vm.project_activities[i].has_praise = false;
+ break;
+ }
+ }
+
+ common.decreaseCommonPraise(act);
+ };
+
+ vm.onSetting = function(data){
+ rms.save('current_edit_member', data);
+
+ rms.save('project_activities_page',vm.project_activities_page);
+ rms.save("project_activities",vm.project_activities);
+ rms.save("project_has_more",vm.project_has_more);
+
+ rms.save("project",vm.project);
+ rms.save("project_master_members",vm.project_master_members);
+ rms.save("project_develop_members",vm.project_develop_members);
+ rms.save("project_report_members",vm.project_report_members);
+
+ $location.path("/edit_project_member").search({id: projectid,user_id: data.user.id});
+ };
+
+}]);
\ No newline at end of file
diff --git a/public/javascripts/wechat/controllers/project_invite_code.js b/public/javascripts/wechat/controllers/project_invite_code.js
new file mode 100644
index 000000000..eb3032650
--- /dev/null
+++ b/public/javascripts/wechat/controllers/project_invite_code.js
@@ -0,0 +1,34 @@
+/**
+ * Created by guange on 16/6/22.
+ */
+
+
+app.controller('ProjectInviteCodeController', ['$scope','$http', '$routeParams','config','auth', function($scope, $http, $routeParams, config, auth){
+ var vm = $scope;
+
+ vm.project = {};
+ var projectid = $routeParams.id;
+ $http.get(config.apiUrl+ 'projects/'+projectid+"?token="+auth.token()).then(
+ function(response){
+ console.log(response.data);
+ vm.project = response.data.data;
+ }
+ );
+
+ vm.share = function(){
+ window.WeixinJSBridge.invoke('sendAppMessage',{
+ 'appid': 'wxf694495398c7d470', // 公众号appID
+ 'type': 'link', // 非必填，music,vido或link,默认为link。
+ 'data_url': '', // 非必填，连接地址,如音乐的mp3数据地址,供内置播放器使用
+ 'img_url': 'http://pnewsapp.tc.qq.com/newsapp_bt/0/9963967/640', // 缩略图地址
+ 'img_height':370, // 缩略图高度
+ 'img_width':550, // 缩略图宽度
+ 'link':'http://view.inews.qq.com/a/WXN2013101101385701', // 链接地址
+ 'desc':'desc', // 描述
+ 'title':'title' // 标题
+ },function(res){
+ //alert(res.err_msg);
+ });
+ }
+
+}]);
diff --git a/public/javascripts/wechat/controllers/project_list.js b/public/javascripts/wechat/controllers/project_list.js
new file mode 100644
index 000000000..058b7dde2
--- /dev/null
+++ b/public/javascripts/wechat/controllers/project_list.js
@@ -0,0 +1,79 @@
+/**
+ * Created by guange on 16/6/27.
+ */
+
+
+app.controller('ProjectListController', ['$scope', 'config', 'auth', '$http', '$location', 'alertService','rms',
+ function ($scope, config, auth, $http, $location, alertService,rms) {
+ var vm = $scope;
+// vm.projects = rms.get('projects') || [];
+ vm.projects = [];
+
+ vm.alertService_1 = alertService.create();
+ vm.alertService_3 = alertService.create();
+
+ var loadProjectList = function () {
+ $http.get(config.apiUrl + "projects?token=" + auth.token()).then(
+ function (response) {
+ console.log(response.data);
+ vm.projects = response.data.data;
+ rms.save('projects', vm.projects);
+ }
+ );
+ };
+
+ if(vm.projects.length<=0){
+ loadProjectList();
+ }
+
+ vm.goProject = function (project_id) {
+
+ rms.save('project_activities_page',0);
+ rms.save("project_activities",[]);
+ rms.save("project_has_more",false);
+ rms.save("project",null);
+ rms.save('project_members_page',0);
+ rms.save("project_members",[]);
+ rms.save("project_members_has_more",false);
+ rms.save('tab_num',null);
+ console.log(project_id);
+ $location.path("/project").search({id: project_id});
+ };
+
+ vm.newProject = function () {
+ $location.path("/new_project");
+ };
+
+ vm.joinProject = function () {
+ vm.alertService_1.showMessage('提示', "该功能将在近日开放，敬请期待！");
+
+// vm.alertService_3.showMessage('提示', '请输入6位项目邀请码(不区分大小写)', function(){
+// if (vm.alertService_3.invite && vm.alertService_3.invite.length == 6) {
+// $http.post(config.apiUrl + "projects/join", {
+// token: auth.token(),
+// invite_code: vm.alertService_3.invite
+// }).then(function (response) {
+// console.log(response.data);
+// if (response.data.status != 0) {
+// vm.alertService_1.showMessage('提示', response.data.message);
+// } else {
+// vm.alertService_1.showMessage('提示', '加入项目成功');
+// vm.alertService_3.invite = "";
+// loadProjectList();
+// }
+// });
+// } else {
+// if(vm.alertService_3.invite){
+// vm.alertService_1.showMessage('提示', '邀请码格式不正确');
+// }
+// }
+// });
+ };
+
+ vm.onSetting = function (project) {
+ console.log(project);
+ rms.save('current_edit_project', project);
+ $location.path("/edit_project").search({id: project.id});
+ }
+
+ }]);
\ No newline at end of file
diff --git a/public/javascripts/wechat/controllers/send_class_list.js b/public/javascripts/wechat/controllers/send_class_list.js
index eee462ee3..bc81cfc08 100644
--- a/public/javascripts/wechat/controllers/send_class_list.js
+++ b/public/javascripts/wechat/controllers/send_class_list.js
@@ -49,14 +49,20 @@ app.controller('SendClassListController', ['$scope', '$http','$routeParams', 'co
var tip = "";
if (vm.myresource_sendIndex == 1){
tip = "课件已发送到目标班级。";
+ vm.alertService.showMessage('发送成功', tip, function () {
+ rms.save('page',0);
+ rms.save("resources",[]);
+ rms.save("has_more",false);
+ window.history.back();
+ });
}
else if(vm.myresource_sendIndex == 2){
tip = "题目已发送到目标班级的作业列表，但需要您访问Trustie网站设置发布和截止时间，以激活相应作业，谢谢。";
+ vm.alertService.showMessage('发送成功', tip, function () {
+ window.history.back();
+ });
}
- vm.alertService.showMessage('发送成功', tip, function () {
- window.history.back();
- });
} else {
vm.alertService.showMessage('发送出错', response.data.message);
}
diff --git a/public/javascripts/wechat/directives/comment_reply.js b/public/javascripts/wechat/directives/comment_reply.js
new file mode 100644
index 000000000..05b8b55b6
--- /dev/null
+++ b/public/javascripts/wechat/directives/comment_reply.js
@@ -0,0 +1,9 @@
+app.directive('commentReply', ['config', function(config){
+ return {
+ templateUrl: config.rootPath+ 'templates/comment_reply.html',
+ scope: {
+ i: "=",
+ journal: "="
+ }
+ }
+}]);
\ No newline at end of file
diff --git a/public/javascripts/wechat/directives/ellipsis.js b/public/javascripts/wechat/directives/ellipsis.js
new file mode 100644
index 000000000..a5dcfa293
--- /dev/null
+++ b/public/javascripts/wechat/directives/ellipsis.js
@@ -0,0 +1,25 @@
+/**
+ * Created by Tim on 7/22/16.
+ */
+//app.directive('ellipsisShow',["$timeout",function(timer){
+// return{
+// restrict: 'A',
+// scope: {},
+// link: function(scope, element){
+// timer(function() {
+// var textSplit = element.text().split(" ");
+// var newContent = [];
+// element.text("");
+// for (var i = 0; i < textSplit.length; i++) {
+// newContent = newContent + " " + textSplit[i];
+// element.text(newContent);
+// if(element[0].scrollHeight >= 100){
+// newContent = newContent + " " + textSplit[i+1] + " " + textSplit[i+2] + " " + textSplit[i+3] + " " + textSplit[i+4] + "...";
+// element.text(newContent);
+// break;
+// }
+// }
+// });
+// }
+// }
+//}]);
\ No newline at end of file
diff --git a/public/javascripts/wechat/directives/input_auto.js b/public/javascripts/wechat/directives/input_auto.js
index 1f2550882..9cd77188b 100644
--- a/public/javascripts/wechat/directives/input_auto.js
+++ b/public/javascripts/wechat/directives/input_auto.js
@@ -6,7 +6,7 @@ app.directive('inputAuto',function(){
var copyContainer = element.parent().children().children().eq(0);
var sendButton = element.next();
element.on('input',function(){
- console.log(sendButton);
+ //console.log(sendButton);
copyContainer.html(element[0].value);
var textHeight = copyContainer[0].scrollHeight-10;
element.css('height', textHeight + 'px');
diff --git a/public/javascripts/wechat/others/factory.js b/public/javascripts/wechat/others/factory.js
index a329c2906..89e2b700f 100644
--- a/public/javascripts/wechat/others/factory.js
+++ b/public/javascripts/wechat/others/factory.js
@@ -60,7 +60,7 @@ app.factory('auth', ['$http','$routeParams', '$q', 'session', 'config',function(
}
var getToken = function(){
- return session.get("token");
+ return 'token';//session.get("token");
}
return {get_bind: isBind, token: getToken};
}]);
@@ -89,7 +89,7 @@ app.factory('rms', function(){
return {save: save, get: get};
});
-app.factory('common', ['$http', 'auth', '$routeParams','rms', function($http, auth, $routeParams,rms){
+app.factory('common', ['$http', 'auth', '$routeParams','rms','config', function($http, auth, $routeParams,rms,config){
var addCommonReply = function(id, type, data, cb){
if(!data.comment || data.comment.length<=0){
@@ -117,6 +117,33 @@ app.factory('common', ['$http', 'auth', '$routeParams','rms', function($http, au
if(typeof cb === 'function'){
cb();
}
+
+ //保证内外回复数一致
+ activities = rms.get("activities") || [];
+ course_activities = rms.get("course_activities") || [];
+ project_activities = rms.get("project_activities") || [];
+ for(var i in activities){
+ if(activities[i].act_id == id){
+ activities[i].reply_count += 1;
+ break;
+ }
+ }
+ for(var i in course_activities){
+ if(course_activities[i].act_id == id){
+ course_activities[i].reply_count += 1;
+ break;
+ }
+ }
+ for(var i in project_activities){
+ if(project_activities[i].act_id == id){
+ project_activities[i].reply_count += 1;
+ break;
+ }
+ }
+ rms.save("activities",activities);
+ rms.save("course_activities",course_activities);
+ rms.save("project_activities",project_activities);
+
}, function errorCallback(response) {
});
};
@@ -132,6 +159,7 @@ app.factory('common', ['$http', 'auth', '$routeParams','rms', function($http, au
return $http({
method: 'POST',
url: apiUrl+ type + "/" + id,
+ dataType: 'jsonp',
data:{token:auth.token(),type:replytype,page:page}
})
};
@@ -268,7 +296,9 @@ app.factory('common', ['$http', 'auth', '$routeParams','rms', function($http, au
});
};
+ args.scope.commentreply_path = config.rootPath+ 'templates/comment_reply.html';
+
}
return {init: init, addCommonReply: addCommonReply, loadCommonData: loadCommonData, addCommonPraise: addCommonPraise, decreaseCommonPraise: decreaseCommonPraise};
-}]);
\ No newline at end of file
+}]);
diff --git a/public/javascripts/wechat/others/routes.js b/public/javascripts/wechat/others/routes.js
index a40951bcc..8596ee706 100644
--- a/public/javascripts/wechat/others/routes.js
+++ b/public/javascripts/wechat/others/routes.js
@@ -8,8 +8,8 @@ app.config(['$routeProvider',"$httpProvider", "$locationProvider",'config', func
var makeRoute = function(path, ctrl){
return {
templateUrl: rootPath + path,
- controller: ctrl,
- resolve: resolve
+ controller: ctrl
+ //resolve: resolve
}
}
//$locationProvider.html5Mode(true);
@@ -34,9 +34,15 @@ app.config(['$routeProvider',"$httpProvider", "$locationProvider",'config', func
.when('/new_class', makeRoute('new_class.html', 'NewClassController'))
.when('/edit_class', makeRoute('edit_class.html', 'EditClassController'))
.when('/class_list', makeRoute('class_list.html', 'ClassListController'))
+ .when('/edit_class_member', makeRoute('edit_class_member.html', 'EditClassMemberController'))
.when('/myresource', makeRoute('myresource.html', 'MyResourceController'))
.when('/invite_code', {templateUrl: rootPath + 'invite_code.html', controller: 'InviteCodeController'})
.when('/send_class_list', makeRoute('send_class_list.html', 'SendClassListController'))
+ .when('/project_list', makeRoute('project_list.html', 'ProjectListController'))
+ .when('/project', makeRoute('project.html', 'ProjectController'))
+ .when('/edit_project_member', makeRoute('edit_project_member.html', 'EditProjectMemberController'))
+ .when('/new_project', makeRoute('new_project.html', 'NewProjectController'))
+ .when('/project_invite_code', {templateUrl: rootPath + 'project_invite_code.html', controller: 'ProjectInviteCodeController'})
.otherwise({
redirectTo: '/activites'
});
@@ -57,6 +63,14 @@ app.config(['$routeProvider',"$httpProvider", "$locationProvider",'config', func
return rejection;
},
response: function (response) {
+ // var data = response.data;
+ // if(data && data.status==405){
+ // var rootScope = $injector.get('$rootScope');
+ // var state = $injector.get('$rootScope').$state.current.name;
+ // rootScope.stateBeforLogin = state;
+ // rootScope.$state.go("login");
+ // return $q.reject(response);
+ // }
$rootScope.activeCalls -= 1;
return response;
},
diff --git a/public/stylesheets/css/common.css b/public/stylesheets/css/common.css
index 888cb3ca3..7db3c4370 100644
--- a/public/stylesheets/css/common.css
+++ b/public/stylesheets/css/common.css
@@ -51,6 +51,10 @@ a.btn_message_free{ background:#ff5722; display:block; text-align:center; color
.break_word{word-break: break-all;word-wrap: break-word;}
.break_word_firefox{white-space: pre-wrap !important;word-break: break-all;}
+/*显隐*/
+.undis {display:none;}
+.dis {display:inline-block;}
+
/* font & color */
h2{ font-size:18px;} /*color:#269ac9;*/
h3{ font-size:14px;}/* color:#e8770d;*/
@@ -520,7 +524,6 @@ a:hover.bgreen_n_btn{background:#08a384;}
.upbtn{ margin:40px 0 0 15px; display:block; padding:2px 5px; border:1px solid #eaeaea;}
.upbtn:hover{color:#64bdd9;cursor: pointer;}
.upload_file{margin-left: -60px;margin-top: 40px;width: 50px;position: absolute;height: 24px;opacity: 0;cursor: pointer}
-.undis{display:none;}
.red_btn_cir{ background:#e74c3c; padding:1px 10px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal;font-size:12px;white-space:nowrap;}
.green_btn_cir{ background:#28be6c; padding:1px 10px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal;font-size:12px;white-space:nowrap;}
.green_homework_btn_cir{ background:#28be6c; padding:1px 3px; -moz-border-radius:2px; -webkit-border-radius:2px; border-radius:2px; color:#fff; font-weight:normal;font-size:12px;white-space:nowrap;}
@@ -545,6 +548,7 @@ a:hover.Blue-btn{ background:#3598db; color:#fff;}
/*20160725 项目申请按钮*/
a.sy_btn_grey{
+ display:inline-block;
color: #333;
background: #e1e1e1;
text-align: center;
@@ -559,13 +563,13 @@ a.sy_btn_grey{
}
a:hover.sy_btn_grey{ background: #c3c3c3;}
a.sy_btn_blue{
- display:block;
- width:80px;
- height: 30px;
- text-align:center;
+ display:inline-block;
color: #fff;
background: #3b94d6;
+ text-align: center;
font-size: 12px;
+ padding:0 15px;
+ height: 30px;
line-height: 30px;
-webkit-border-radius:3px;
-moz-border-radius:3px;
diff --git a/public/stylesheets/css/courses.css b/public/stylesheets/css/courses.css
index ccf161725..7a1a0dabb 100644
--- a/public/stylesheets/css/courses.css
+++ b/public/stylesheets/css/courses.css
@@ -54,8 +54,6 @@ a:hover.UsersApBtn{border:1px solid #888888; }
/* 代码查重弹框 */
a.Blue-btn{ display:block; margin-right:15px;width:65px; height:22px; background-color:#ffffff; line-height:24px; vertical-align:middle; text-align:center; border:1px solid #3598db; color:#3598db; -moz-border-radius:5px; -webkit-border-radius:5px; border-radius:5px;}
a:hover.Blue-btn{ background:#3598db; color:#fff;}
-.fl{ float:left;}
-.fr{ float:right;}
.blue-border-box{ width:500px; padding:20px; margin:0 auto; background:#fff;}
.box-con h4{ font-size:14px; font-weight: bold; width:450px; text-align:center;}
.box-con{ width:450px; margin:0 auto; text-align:center;}
@@ -138,10 +136,6 @@ span.author { font-size: 0.9em; color: #888; }
.ReplyToMessageInputContainer {width: 582px;float: left;}
.ReplyToMessageContainer {border-bottom:1px solid #e3e3e3; width:632px; margin:0px auto; margin-top:15px; min-height:60px;}
-/*课程列表界面样式*/
-a.course-title{ font-size:14px; font-weight: bold; color:#000;white-space:nowrap; overflow:hidden; text-overflow:ellipsis; display:block; width:590px;}
-a:hover.course-title{ color:#269ac9;}
-
/*我的课程*/
.courses_top{ height:27px; border-bottom:3px solid #ebebeb;}
.courses_h2{ font-size:16px; font-weight:bold; color:#64bddb; border-bottom:3px solid #64bddb; padding-bottom:3px; padding-right:3px;}
diff --git a/public/stylesheets/css/org.css b/public/stylesheets/css/org.css
index 028254e04..3677c8bd8 100644
--- a/public/stylesheets/css/org.css
+++ b/public/stylesheets/css/org.css
@@ -27,8 +27,6 @@ a.saveBtn:hover {background-color:#297fb8;}
.orgMemContainer {width:268px;}
.orgMemberAdd {float:right;}
.orgAddSearch {border:1px solid #dddddd; outline:none; width:180px; height:22px; color:#9b9b9b;}
-.undis {display:none;}
-.dis {display:inline-block;}
a.org_member_btn{ padding:1px 5px; background:#15bccf; color:#fff;}
diff --git a/public/stylesheets/css/public.css b/public/stylesheets/css/public.css
index 82e27aa1f..cc27955d5 100644
--- a/public/stylesheets/css/public.css
+++ b/public/stylesheets/css/public.css
@@ -471,8 +471,6 @@ a:hover.AnnexBtn{background: url(../images/homepage_icon2.png) -90px -343px no-r
a.postRouteLink {font-weight:bold; color:#484848;}
a.postRouteLink:hover {text-decoration:underline;}
-.homepagePostSetting {position:absolute; width:20px; height:20px; right:0px; top:0px;}
-.homepagePostSetting ul li:hover ul {display:block;}
.resourceSendO {width:65px; line-height:2; font-size:12px; color:#616060; background-color:#ffffff; border:1px solid #eaeaea; border-radius:3px; position:absolute; left:-48px; top:20px; padding:2px 0px; display:none;}
.ReplyToMessageContainer {border-bottom:1px solid #e3e3e3; width:632px; margin:0px auto; margin-top:15px; min-height:60px;}
@@ -499,7 +497,6 @@ ul.wlist li a:hover{ background:#15bccf; color:#fff; text-decoration:none;}
.wlist_select a{background-color: #64bdd9;cursor: default;}
/*博客列表界面样式*/
-a{text-decoration:none}
.listbox{ width:730px; background-color:#fff; border:1px solid #ddd; padding:10px; }
/*.bloglistbox{ min-height:690px;}*/
.list-h2{ font-size:16px; font-weight:bold; color:#000; padding-bottom:5px;}
@@ -517,12 +514,24 @@ a:hover.list-title{ color:#269ac9;}
.list-file{ padding:10px 0; border-bottom:1px dashed #ddd;}
.list-file li{ line-height:1.9;}
.list-info span{ margin-left:5px;}
-.pages a{ display:block; border:1px solid #d1d1d1; color:#000; float:left; width:30px; text-align:center; padding:3px 0; line-height:1.9; margin-right:5px; }
-.pages a:hover{ background-color:#269ac9; color:#fff;}
+ /*20160727大纲新增样式*/
+.list_title{padding:10px 0; border-bottom:1px solid #ddd;}
+.sortTxt{ color:#000;}
+.sortTxt:hover{ color:#28be6c;}
+a.sort_no{ background: url(/images/syllabus/icons_syllabus.png) -16px -12px no-repeat; width:12px; height:17px; display:block;cursor:pointer; }
+a.list-title{ font-size:14px; font-weight: bold; color:#000; white-space:nowrap; overflow:hidden; text-overflow:ellipsis; display:block;}
+
+/*翻页*/
+.pages a{ display:block; border:1px solid #d1d1d1; color:#888; float:left; width:30px; text-align:center; padding:3px 0; line-height:1.9; margin-right:5px; }
+.pages a:hover{ background-color:#3b94d6; border:1px solid #3b94d6; color:#fff;}
a.pages-big{ width:50px;}
-.pages .active{ background-color:#269ac9; color:#fff;}
+.pages .active{ background-color:#3b94d6; border:1px solid #3b94d6; color:#fff;}
.pages{width:330px; margin:20px auto 10px;}
+/*课程列表界面样式*/
+a.course-title{ font-size:14px; font-weight: bold; color:#000;white-space:nowrap; overflow:hidden; text-overflow:ellipsis; display:block; width:590px;}
+a:hover.course-title{ color:#269ac9;}
+
/*视频播放默认图标*/
.mediaIco{margin: 30px 0 30px 20px;width: 200px;}
a.st_img { display:block;width:32px; height:32px; border:1px solid #CCC; padding:1px;}
@@ -543,8 +552,6 @@ a:hover.st_img { border:1px solid #1c9ec7; }
.searchCourseImage {width:75px; margin-right:10px;}
.searchContentDes {width:883px;}
.searchTag {font-size:12px; color:#ffffff; background-color:#7ec8e4; height:16px; min-height:16px; max-height:16px; float:left; line-height:16px; padding:0px 3px;}
-.undis {display:none;}
-.dis {display:inline-block;}
.numRed {color:#FF6600;}
.pageRoll {float:right; border-left:1px solid #dddddd; margin-top:15px;}
.pageCell {border:1px solid #dddddd; padding:5px 12px; float:left; margin-left:-1px; position:relative;}
@@ -938,10 +945,10 @@ a:hover.member_btn{ background:#329cbd;}
.search_form_course{margin-top:8px;margin-left:8px;}
/*信息*/
-.project_info{ background:#fff; padding:10px; padding-right:0px;width:222px; padding-right:8px; margin-bottom:10px;}
+.project_info{ background:#fff; padding:10px 8px; width:224px; margin-bottom:10px;}
.pr_info_id{ width:137px; color:#5a5a5a; font-size:14px; margin-top:5px;}
.pr_info_logo{ border:1px solid #eaeaea; width:60px; height:60px; padding:1px;}
-.pr_info_logo:hover{ border:1px solid #64bdd9; }
+.pr_info_logo:hover{ border:1px solid #297fb8; }
.pr_info_join{}
a.pr_join_a{ color:#fff; display:block; padding:0 5px 0 3px; padding-top:2px; height:20px; margin-right:5px; float:left; text-align:center; background-color:#269ac9; float:left; }
a.pr_join_a_quit{ color:#fff; display:block; padding:0 2px 0 3px; padding-top:2px; height:20px; margin-right:5px; float:left; text-align:center; background-color:#269ac9; float:left; }
@@ -977,6 +984,8 @@ a:hover.pr_join_a{ background:#298fbd;}
.lg-foot:hover{ color:#787b7e; border:1px solid #d4d4d4;}
/****标签(和资源库的tag样式一致)***/
.project_Label{ width:220px; padding:10px; background:#fff; margin-top:10px; padding-top:5px; margin-bottom:10px;}
+/*.project_Label{ width:218px; padding:10px; background:#fff; margin-top:10px; padding-top:5px; margin-bottom:10px; border:1px solid #dddddd;}*/
+.project_Label_New {width:218px; padding-left:10px; background:#fff; margin-top:15px; margin-bottom:10px;}
a.yellowBtn{ display:inline-block;color:#0d90c3; height:22px;}
.submit{height:21px;border:0; cursor:pointer; background:url(../images/btn.png) no-repeat 0 0;width:42px; margin-top:2px; margin-left:3px; }
.isTxt{background:#fbfbfb url(../images/inputBg.png) repeat-x left top;height:22px;line-height:22px;border:1px solid #c1c1c1;padding:0 5px;color:#666666;}
diff --git a/public/stylesheets/css/structure.css b/public/stylesheets/css/structure.css
index be8bbc65b..fa55e1282 100644
--- a/public/stylesheets/css/structure.css
+++ b/public/stylesheets/css/structure.css
@@ -103,8 +103,11 @@ div#menu ul ul ul li a{ width:185px; overflow:hidden; white-space: nowrap; text-
.homepageNewsPubTypeHomework {width:270px; font-size:12px; color:#888888; display: block; white-space:nowrap;}
.homepageNewsContent {width:355px; max-width:365px; margin-right:10px; font-size:12px; color:#4b4b4b; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;max-height: 49px; }
.homepageSystenMessageContent {width:281px; max-width:291px; margin-right:10px; font-size:12px; color:#4b4b4b; display:block; overflow:hidden;text-overflow:ellipsis;max-height: 49px; }
+
.homepageHomeworkContentWarn {width:110px; max-width:365px; margin-right:10px; font-size:12px; color:red; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;max-height: 49px; }
.homepageHomeworkContent {width:235px; max-width:365px; margin-right:10px; font-size:12px; color:#4b4b4b; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;max-height: 49px; }
+.homepageHomeworkContentWarn2 {width:60px; max-width:365px; margin-right:10px; font-size:12px; color:red; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;max-height: 49px; }
+.homepageHomeworkContent2 {width:285px; max-width:365px; margin-right:10px; font-size:12px; color:#4b4b4b; display:block; overflow:hidden; white-space: nowrap; text-overflow:ellipsis;max-height: 49px; }
.homepageNewsTime {width:75px; font-size:12px; color:#888888; display:block; text-align:right;}
.loadMore {font-size:14px;width:748px; text-align:center; display:block; border:1px solid #dddddd; background-color:#ffffff; float:right;padding:5px 0; letter-spacing: 1px;}
@@ -239,9 +242,9 @@ a.postReplyCancel:hover {color:#ffffff;}
.whiteSettingIcon {background:url(/images/hwork_icon.png) -5px -302px no-repeat; width:20px; height:20px;}
.whiteSettingIcon:hover {background:url(/images/homepage_icon.png) -93px -44px no-repeat;}
a.postOptionLink {color:#616060; display:block; width:55px; padding:0px 15px;text-align:center;}
-a.postOptionLink:hover {color:#ffffff; background-color:#269ac9;}
+a.postOptionLink:hover {color:#ffffff; background-color:#3b94d6;}
a.postOptionLink2 {color:#616060; display:block; width:35px; padding:0px 15px;}
-a.postOptionLink2:hover {color:#ffffff; background-color:#269ac9;}
+a.postOptionLink2:hover {color:#ffffff; background-color:#3b94d6;}
.homepagePostReplyPortrait {float:left; width:33px;}
.imageFuzzy {filter:alpha(opacity=50); -moz-opacity:0.5; -khtml-opacity:0.5;opacity: 0.5;}
.homepagePostReplyDes {float:left; width:642px; margin-left:15px;}
@@ -337,7 +340,6 @@ a.projectsLineGrey:hover {color:#ffffff;}
a.homepageMenuText {color:#484848; font-size:16px; margin-left:20px;}
a.homepageMenuControl {float:left; width:180px;}
.homepageLeftLabelContainer {width:238px; border:1px solid #dddddd; background-color:#ffffff; margin-top:10px;}
-.project_Label_New {width:218px; padding-left:10px; background:#fff; margin-top:15px; margin-bottom:10px;}
.homepageLabelText {color:#484848; font-size:16px; margin-left:10px; margin-bottom:12px; display:block;}
.homepageRightBanner {width:718px; margin:0px auto; float:right; background-color: #ffffff; padding:10px 15px; border:1px solid #dddddd;}
.homepageRightBannerImg{width:1000px; margin:0px auto; height: 60px; margin-top: 10px; background:url(/images/TeachersDay.jpg)}
diff --git a/public/stylesheets/sy_public.css b/public/stylesheets/sy_public.css
index 77c782698..f52fc6699 100644
--- a/public/stylesheets/sy_public.css
+++ b/public/stylesheets/sy_public.css
@@ -15,6 +15,7 @@ a.sy_cmore{ font-size:12px; color:#888; font-weight:normal;}
a:hover.sy_cmore{color: #ee4a1f;}
/* 按钮*/
a.btn_orange_big{
+ display:inline-block;
border: 1px solid #ee4a1f;
color: #ee4a1f;
text-align: center;
@@ -32,6 +33,7 @@ a:hover.btn_orange_big{
color: #fff;
}
a.btn_green_big{
+ display:inline-block;
border: 1px solid #60b25e;
color: #60b25e;
text-align: center;
@@ -49,6 +51,7 @@ a:hover.btn_green_big{
color: #fff;
}
a.sy_btn_green{
+ display:inline-block;
color: #fff;
background: #60b25e;
text-align: center;
@@ -62,6 +65,7 @@ a.sy_btn_green{
border-radius:3px;
}
a:hover.sy_btn_green{ background: #51a74f;}
+
/*a.sy_btn_grey{*/
/*color: #333;*/
/*background: #e1e1e1;*/
@@ -98,51 +102,7 @@ a:hover.sy_btn_green{ background: #51a74f;}
border-bottom:1px solid #ddd;
}
.sy_category span{ float: left;}
-a.sortupbtn{
- background: url(../images/sy/liststyle.png) 0 3px no-repeat;
- width:12px;
- height:17px;
- display:block;
- margin-right:10px;
- cursor:pointer;
-}
-a.sortdownbtn{
- background: url(../images/sy/liststyle.png) 0 -12px no-repeat;
- width:12px;
- height:17px;
- display:block;
- cursor:pointer;
-}
-/* 翻页 */
-.pages a{
- display:block;
- border:1px solid #d1d1d1;
- color:#888;
- float:left;
- width:30px;
- text-align:center;
- padding:3px 0;
- line-height:1.9;
- margin-right:5px;
-}
-.pages a:hover{
- background-color:#3b94d6;
- border:1px solid #3b94d6;
- color:#fff;
-}
-a.pages-big{
- width:50px;
-}
-.pages .active{
- background-color:#3b94d6;
- border:1px solid #3b94d6;
- color:#fff;
-}
-.pages{
- width:330px;
- margin:20px auto 10px;
-}
/* 输入框 */
.sy_right_box input,.sy_right_box select{
border:1px solid #ccc;
diff --git a/public/stylesheets/syllabus.css b/public/stylesheets/syllabus.css
index 3b856ad67..dad467c68 100644
--- a/public/stylesheets/syllabus.css
+++ b/public/stylesheets/syllabus.css
@@ -1,19 +1,3 @@
-/****标签(和资源库的tag样式一致)***/
-.project_Label{ width:218px; padding:10px; background:#fff; margin-top:10px; padding-top:5px; margin-bottom:10px; border:1px solid #dddddd;}
-.project_Label_New {width:218px; padding-left:10px; background:#fff; margin-top:15px; margin-bottom:10px;}
-a.yellowBtn{ display:inline-block;color:#0d90c3; height:22px;}
-.submit{height:21px;border:0; cursor:pointer; background:url(../images/btn.png) no-repeat 0 0;width:42px; margin-top:2px; margin-left:3px; }
-.isTxt{background:#fbfbfb url(../images/inputBg.png) repeat-x left top;height:22px;line-height:22px;border:1px solid #c1c1c1;padding:0 5px;color:#666666;}
-.re_tag{ width: auto; padding:0 5px; padding-top:2px; border:1px solid #f8df8c; background:#fffce6; margin-right:5px; }
-.re_tag a{ color:#0d90c3;}
-.tag_h{ }
-.tag_h span,.tag_h a{ margin-bottom:5px;}
-/*信息*/
-.project_info{ background:#fff; padding:10px 8px; width:222px; margin-bottom:10px; border:1px solid #dddddd;}
-.pr_info_id{ width:130px; color:#5a5a5a; font-size:14px; margin-top:5px;}
-.pr_info_logo{ border:1px solid #eaeaea; width:60px; height:60px; padding:1px;}
-.pr_info_logo:hover{ border:1px solid #297fb8; }
-
/*课程大纲*/
input.syllabus_input{
border:none;
@@ -110,38 +94,9 @@ input.syllabus_input_min{
.syllabus_class_list_more{padding:8px; text-align:center;border-left:1px solid #e7e7e7;border-bottom:1px solid #e7e7e7;}
.syllabus_class_list_more:hover{ background:#ececec;}
.syllabus_class_list_more a{ color:#ff7e00;}
-.syllabus_class_title{ font-size:14px; color:#333; width:500px; margin-bottom:3px; white-space:nowrap; overflow:hidden; text-overflow:ellipsis; }
+.syllabus_class_title{ font-size:14px; color:#333; max-width:480px; margin-bottom:3px; white-space:nowrap; overflow:hidden; text-overflow:ellipsis; }
.syllabus_class_w{ width:650px;}
-.dis {display:block;}
-.undis {display:none;}
-/*班级列表界面(用的博客列表的样式)*/
-.listbox{ width:730px; background-color:#fff; border:1px solid #ddd; padding:10px; }
-.bloglistbox{ min-height:690px;}
-.list-h2{ font-size:16px; font-weight:bold; color:#000; padding-bottom:5px;}
-.category2{ }
-.list_title{padding:10px 0; border-bottom:1px solid #ddd;}
-.category2 a,.category2 span{ float:left; margin-right:5px;}
-.grayTxt{ color:#9093a6;}
-.sortTxt{ color:#000;}
-.sortTxt:hover{ color:#28be6c;}
-a.sortupbtn{ background: url(../images/syllabus/icons_syllabus.png) 0 3px no-repeat; width:12px; height:17px; display:block; margin-right:10px; cursor:pointer;}
-a.sortdownbtn{ background: url(../images/syllabus/icons_syllabus.png) 0 -12px no-repeat; width:12px; height:17px; display:block;cursor:pointer; }
-a.sort_no{ background: url(../images/syllabus/icons_syllabus.png) -16px -12px no-repeat; width:12px; height:17px; display:block;cursor:pointer; }
-.item_list{ display:block; width:5px; height:5px;-webkit-border-radius: 25px;border-radius:25px; background-color:#adadad; margin:10px 10px 0 0;}
-a.list-title{ font-size:14px; font-weight: bold; color:#000;white-space:nowrap; overflow:hidden; text-overflow:ellipsis; display:block;}
-a:hover.list-title{ color:#269ac9;}
-.c_red{ font-weight:normal; font-size:12px;}
-.list-file{ padding:10px 0; border-bottom:1px dashed #ddd;}
-.list-file li{ line-height:1.9;}
-.list-info span{ margin-left:5px;}
-.pages a{ display:block; border:1px solid #d1d1d1; color:#888; float:left; width:30px; text-align:center; padding:3px 0; line-height:1.9; margin-right:5px; }
-.pages a:hover{ background-color:#3b94d6; border:1px solid #3b94d6; color:#fff;}
-a.pages-big{ width:50px;}
-.pages .active{ background-color:#3b94d6; border:1px solid #3b94d6; color:#fff;}
-.pages{width:330px; margin:20px auto 10px;}
-a.course-title{ font-size:14px; font-weight: bold; color:#000;white-space:nowrap; overflow:hidden; text-overflow:ellipsis; display:block; width:590px;}
-a:hover.course-title{ color:#269ac9;}
/*新建页面*/
.name_input{ border:1px solid #64bdd9; height:16px; width:310px; background:#fff; margin-bottom:10px; padding:5px;}
@@ -208,12 +163,6 @@ a:hover.course-title{ color:#269ac9;}
.sy_tab_nomal {
border-bottom:none;
}
-.undis {
- display:none;
-}
-.dis {
- display:block;
-}
/* 课程大纲 */
.icons_tishi{
width: 110px;
@@ -324,22 +273,22 @@ a:hover.sy_teachers_name{
border:1px solid #e5e5e5;
position: relative;
}
-.homepagePostSetting {
+.sy_class_setting {
position:absolute;
width:20px;
height:20px;
right:10px;
top:10px;
}
-.homepagePostSetting ul li:hover ul {
+.sy_class_setting ul li:hover ul {
display:block;
}
-.homepagePostSettingIcon {
- background:url(../images/sy/icons_sy.png) 1px -408px no-repeat;
+.sy_class_setting_icon {
+ background:url(../images/homepage_icon.png) -93px -5px no-repeat;
width:20px;
height:20px;
}
-.homepagePostSettiongText {
+.sy_class_setting_text {
width:75px;
text-align: center;
line-height:2;
@@ -355,16 +304,16 @@ a:hover.sy_teachers_name{
display:none;
box-shadow: 0px 2px 8px rgba(146, 153, 169, 0.5);
}
-.homepagePostSettingIcon:hover {
- background:url(../images/sy/icons_sy.png) -28px -408px no-repeat;
+.sy_class_setting_icon:hover {
+ background:url(../images/homepage_icon.png) -93px -44px no-repeat;
}
-a.postOptionLink {
+a.sy_class_option {
color:#616060;
display:block;
width:55px;
padding:0px 10px;
}
-a.postOptionLink:hover {
+a.sy_class_option:hover {
color:#fff;
background-color:#3b94d6;
}
@@ -403,6 +352,27 @@ a.postOptionLink:hover {
padding-left:10px;
line-height: 22px;
}
+.hw_icon_private{
+ display:block;
+ width:30px;
+ height:22px;
+ background:url(../images/sy/icons_sy.png) 0 -458px no-repeat;
+ color:#fff;
+ font-size:12px;
+ padding-left:10px;
+ line-height: 22px;
+}
+.hw_icon_open{
+ display:block;
+ width:30px;
+ height:22px;
+ background:url(../images/sy/icons_sy.png) 0 -436px no-repeat;
+ color:#fff;
+ font-size:12px;
+ padding-left:10px;
+ line-height: 22px;
+}
+
.sy_class_titbox{margin-bottom:5px; padding-top:10px; }
a.sy_btn_orange{
display:block;
diff --git a/public/stylesheets/weui/weixin.css b/public/stylesheets/weui/weixin.css
index c3a38415a..c67cd2a75 100644
--- a/public/stylesheets/weui/weixin.css
+++ b/public/stylesheets/weui/weixin.css
@@ -27,10 +27,12 @@ blockquote {border:1px solid #d4d4d4; padding: 0.6em; margin: 5px 0.4em 5px 1.4e
.mt70 {margin-top:70px;}
.mb5 {margin-bottom:5px;}
.mb10 {margin-bottom:10px;}
+.mb15 {margin-bottom:15px;}
.mb20 {margin-bottom:20px;}
.mb50 {margin-bottom:50px;}
.ml5 {margin-left:5px;}
.ml10 {margin-left:10px;}
+.ml40 {margin-left:40px;}
.mr5 {margin-right:5px;}
.mr10 {margin-right:10px;}
.ml15 {margin-left:15px;}
@@ -84,6 +86,8 @@ a.underline {text-decoration:underline;}
.bg-blue:not(.btn-disabled):active {background-color:#2780c2;}
.btn-disabled {background-color:#ccc !important;}
.btn2 {width:145px; height:35px; color:#fff; font-size:15px; line-height:35px; text-align:center; vertical-align:middle; margin:18px auto 20px auto; border-radius:50px; display:block;}
+.btn3 {width:145px; height:35px; color:#fff; font-size:15px; line-height:35px; text-align:center; vertical-align:middle; border-radius:50px; display:block;}
+.fixed-bottom-btn {position:fixed; bottom:5px; left:50%; transform:translate(-50%,0);}
/*tab*/
.tab-wrap {position:relative; width:100%; line-height:38px; display:-webkit-box; display:-moz-box; display:-ms-flexbox; display:-webkit-flex; display:flex; font-size:13px; background-color:#fff;}
@@ -107,7 +111,7 @@ a.underline {text-decoration:underline;}
.fl {float:left;}
.fr {float:right;}
.cl {clear:both; overflow:hidden;}
-.post-content {width:100%; font-size:14px; line-height:20px; height:100px; overflow:hidden; word-break:break-all; word-wrap:break-word;}
+.post-content {width:100%; font-size:14px; line-height:20px; height:100px; overflow:hidden; word-break:normal; word-wrap:break-word; text-align:justify;}
.post-all-content a {color:#136ec2;}
.post-interactive {width:100%; height:35px; line-height:35px; vertical-align:middle; border-top:1px solid #e6e6e6; background-color:#f8f9fb;}
.post-interactive-column,
@@ -118,12 +122,12 @@ a.underline {text-decoration:underline;}
.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-wrap {width:100%; position:fixed; bottom:0; background-color:#fff;}
.post-input-wrap2 {width:100%;}
-.post-reply-row {padding:10px 15px; color:#9a9a9a; background-color:#fff;}
+.post-reply-row {margin:10px 15px; color:#9a9a9a; background-color:#fff; border-bottom:1px solid #f0f0f0;}
.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; overflow:hidden; padding-bottom:15px; border-bottom:1px solid #ccc;}
+.post-reply-content {font-size:13px; word-break:break-all; word-wrap:break-word; overflow:hidden; text-align:justify;}
.post-reply-content img {max-width:100%;}
.post-reply-content a {color:#136ec2;}
.post-reply-date, .post-reply-trigger {font-size:13px;}
@@ -144,6 +148,8 @@ a.underline {text-decoration:underline;}
.post-dynamic-title {font-size:15px;}
.post-dynamic-from {width:50%; 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;}
/* loading 弹框*/
.loading-bg {position:fixed; width:100%; height:100%; left:0; top:0; z-index:99; background:rgba(206, 206, 206, 0.3); overflow:hidden;}
@@ -191,13 +197,14 @@ a.underline {text-decoration:underline;}
.class-detail-search {width:100%; height:33px; color:#999; background-color:#fff; border:none; outline:none;}
.border-top {border-top:1px solid #ccc;}
.class-detail-row {width:100%; line-height:18px; padding:10px 0; border-bottom:1px solid #ccc; background-color:#fff;}
-.class-member-row {width:100%; line-height:18px; padding:5px 0; border-bottom:1px solid #ccc; background-color:#fff;}
+.class-member-row {width:100%; line-height:18px; padding:5px 0; border-bottom:1px solid #ccc; background-color:#fff; position:relative;}
.class-test-tip {text-align:center; font-size:13px; color:#444; padding-top:40px;}
-.img-circle {border-radius:50%;}
+.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%;}
.other-from-width {max-width:80%;}
+.course-name-width {width:68%;}
/*20160614班级列表*/
.course-diff-row {width:100%; height:28px; line-height:28px; vertical-align:middle; background-color:#fff; border-bottom:1px solid #ccc;}
@@ -212,7 +219,8 @@ a.underline {text-decoration:underline;}
.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:#555; height:16px; line-height:16px; vertical-align:middle; border:none; outline:none; padding:8px 0;}
-.class-list-setting {position:absolute; top:10px; right:10px;}
+.class-list-setting {position:absolute; top:11px; right:10px;}
+.class-setting-wrap {width:38px; height:38px; position:absolute; top:0; right:0;}
/*20160616登录注册*/
.login-wrap {padding:0 10px;}
@@ -227,6 +235,11 @@ a.underline {text-decoration:underline;}
/*二级回复*/
.mult-reply-container{ border:solid 1px #f3ddb3; background:#fffef4; padding:4px;color:#999;}
-.mult-reply-content{ color:#707070; font-size:13px;}
+.mult-reply-content{ color:#555; font-size:13px;}
.mult-reply-hide{ text-align:center; display:block; font-size:14px; color:#aaa; border-bottom:1px solid #F3DDB3; padding:8px 0;}
-.mult-reply-arrow{ color:#aaa; margin-right:10px; font-size:14px; font-weight:bold;}
\ No newline at end of file
+.mult-reply-arrow{ color:#aaa; margin-right:10px; font-size:14px; font-weight:bold;}
+
+
+/*20160729项目说明*/
+.project-intro {line-height:2; width:140px; margin-left:auto; margin-right:auto;}
+.project-intro li {list-style:disc; margin-left:20px;}
\ No newline at end of file
-
- 
- 
+ 
+
+