Merge branch 'weixin_guange' of https://git.trustie.net/jacknudt/trustieforge into weixin_guange

public/assets/wechat/class.html

@@ -234,7 +234,7 @@
         <p ng-show="resources_tag == true && resources.length<=0" class="class-test-tip">暂无课件，<br />
             请登录Trustie网站，在PC浏览器中上传课件。</p>
     </div>
-    <div ng-class="{'undis': !showClassMate}">
+    <div class="mb50" ng-class="{'undis': !showClassMate}">
         <div class="member-banner f13 c-grey3">授课老师</div>
 
         <div class="class-member-row f13 c-grey3" ng-repeat="teacher in teachers|filter:searchText">
@@ -258,6 +258,10 @@
             <img src="/images/wechat/setting.png" ng-show = "course.is_creator" width="15" class="class-list-setting" ng-click="onSetting(student)" />
             <div class="cl"></div>
         </div>
+
+        <div class="bottom-tab-wrap mt10">
+            <a ng-show="isTeacher" ng-click="goPublishNotice()" class="weixin-tab link-blue2 border-top">退出班级</a>
+        </div>
     </div>
 
     <div ng-class="{'undis': !showHomework}">

public/assets/wechat/edit_class_member.html

@@ -1,14 +1,18 @@
 <div class="post-container">
     <div loading-spinner></div>
     <div ng-show="current_edit_member"  class="post-container" style="padding-bottom:50px;">
-        <div class="blue-title">角色变更</div>
+        <div class="blue-title">成员管理</div>
         <div class="class-detail-row f13 c-grey3"><img ng-src="{{current_edit_member.user.img_url}}" width="30" class="fl ml10 img-circle mt4" /><span class="fl mt10 ml10">{{current_edit_member.user.realname == "" ? current_edit_member.user.name : current_edit_member.user.realname}}</span><img ng-src="/images/wechat/{{current_edit_member.user.gender==0 ? 'male' : 'female'}}.png" width="15" class="fl ml10 mt10" /><div class="cl"></div> </div>
-        <div class="course-list-row f13 c-grey3 mt10"><span class="fl ml10">角色</span></div>
-        <ul class="class-list f13 c-grey3">
+        <div class="course-list-row f13 c-grey3 mt10" ng-click="current_edit_member.show = !current_edit_member.show"><span class="fl ml10">角色变更</span></div>
+        <ul class="class-list f13 c-grey3" ng-class="{'undis':current_edit_member.show}">
             <li><span class="fl ml10 class-list-name hidden">教师</span><span ng-click="selectRole(9)" ng-class="['login-box', 'fr', 'mr10', 'mt12', {'bg-grey':assistant,'checked': teacher}]"></span></li>
             <li><span class="fl ml10 class-list-name hidden">助教</span><span ng-click="selectRole(7)" ng-class="['login-box', 'fr', 'mr10', 'mt12', {'bg-grey':teacher, 'checked': assistant}]"></span></li>
             <li class="border-bottom-none"><span class="fl ml10 class-list-name hidden">学生</span><span ng-click="selectRole(10)" ng-class="['login-box', 'fr', 'mr10', 'mt12', {'checked': student}]"></span></li>
         </ul>
+        <div class="course-list-row f13 c-grey3 mt10" ng-click="current_edit_member.show = !current_edit_member.show"><span class="fl ml10">删除成员</span></div>
+        <ul class="class-list f13 c-grey3" ng-class="{'undis':!current_edit_member.show}">
+            <li class="border-bottom-none"><span class="fl ml10 class-list-name hidden">删除</span><input type="radio" name="delete" class="fr mr10 mt12" checked="checked" /></li>
+        </ul>
         <div class="bottom-tab-wrap mt10">
             <a href="javascript:void(0);" ng-click="cancel()" class="weixin-tab c-grey border-top">取消</a>
             <a href="javascript:void(0);" ng-click="edit_member_role()" class="weixin-tab link-blue2 border-top">确定</a>

public/assets/wechat/edit_project_member.html

@@ -1,14 +1,18 @@
 <div class="post-container">
     <div loading-spinner></div>
     <div ng-show="current_edit_member"  class="post-container" style="padding-bottom:50px;">
-    <div class="blue-title">角色变更</div>
+    <div class="blue-title">成员管理</div>
     <div class="class-detail-row f13 c-grey3"><img ng-src="{{current_edit_member.user.img_url}}" width="30" class="fl ml10 img-circle mt4" /><span class="fl mt10 ml10">{{current_edit_member.user.real_name == "" ? current_edit_member.user.name : current_edit_member.user.real_name}}</span><img ng-src="/images/wechat/{{current_edit_member.user.gender==0 ? 'male' : 'female'}}.png" width="15" class="fl ml10 mt10" /><div class="cl"></div> </div>
-    <div class="course-list-row f13 c-grey3 mt10"><span class="fl ml10">角色</span></div>
-    <ul class="class-list f13 c-grey3">
+    <div class="course-list-row f13 c-grey3 mt10" ng-click="current_edit_member.show = !current_edit_member.show"><span class="fl ml10">角色变更</span></div>
+    <ul class="class-list f13 c-grey3" ng-class="{'undis':current_edit_member.show}">
         <li><span class="fl ml10 class-list-name hidden">管理人员</span><span ng-click="selectRole(3)" ng-class="['login-box', 'fr', 'mr10', 'mt12','img-circle', {'checked': current_edit_member.roles_id == 3}]"></span></li>
         <li><span class="fl ml10 class-list-name hidden">开发人员</span><span ng-click="selectRole(4)" ng-class="['login-box', 'fr', 'mr10', 'mt12','img-circle', {'checked': current_edit_member.roles_id == 4}]"></span></li>
         <li class="border-bottom-none"><span class="fl ml10 class-list-name hidden">报告人员</span><span ng-click="selectRole(5)" ng-class="['login-box', 'fr', 'mr10', 'mt12','img-circle', {'checked': current_edit_member.roles_id == 5}]"></span></li>
     </ul>
+    <div class="course-list-row f13 c-grey3 mt10" ng-click="current_edit_member.show = !current_edit_member.show"><span class="fl ml10">删除成员</span></div>
+    <ul class="class-list f13 c-grey3" ng-class="{'undis':!current_edit_member.show}">
+        <li class="border-bottom-none"><span class="fl ml10 class-list-name hidden">删除</span><input type="radio" name="delete" class="fr mr10 mt12" checked="checked" /></li>
+    </ul>
     <div class="bottom-tab-wrap mt10">
         <a href="javascript:void(0);" ng-click="cancel()" class="weixin-tab c-grey border-top">取消</a>
         <a href="javascript:void(0);" ng-click="edit_member_role()" class="weixin-tab link-blue2 border-top">确定</a>

public/assets/wechat/project.html

@@ -103,7 +103,7 @@
         </div>
     </div>
 
-    <div ng-show="project" ng-class="{'undis': currentTab != 2}">
+    <div ng-show="project" class="mb50" ng-class="{'undis': currentTab != 2}">
         <div class="class-search-wrap">
             <div class="class-search-inner"> <img src="/images/wechat/search.png" width="18" class="class-search-icon" />
                 <input class="class-detail-search" ng-model="searchText" placeholder="输入关键词进行搜索" />
@@ -138,6 +138,9 @@
             <img src="/images/wechat/setting.png" ng-show = "master.user.id != project.user_id && project.can_setting " width="15" class="class-list-setting" ng-click="onSetting(report)" />
             <div class="cl"></div>
         </div>
+        <div class="bottom-tab-wrap mt10">
+            <a ng-click="goPublishNotice()" class="weixin-tab link-blue2 border-top">退出项目</a>
+        </div>
     </div>
 
     <my-alert message="alertService.message" title="alertService.title" visible="alertService.visible" cb="alertService.cb"></my-alert>