加入班级提示

db/schema.rb

@@ -592,9 +592,9 @@ ActiveRecord::Schema.define(:version => 20160729124833) 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

public/assets/wechat/join_class.html

@@ -3,12 +3,21 @@
     <div class="post-container" style="padding-bottom:50px;">
         <div class="blue-title">欢迎加入班级</div>
         <div class="course-list-row f13 c-grey3 mt30"><span class="fl ml15 c-grey3">班级邀请码</span><input class="new-class-input ml25" ng-model="invite_code" required placeholder="请输入5位邀请码" /></div>
-        <div class="course-list-row f13 c-grey3 mt10"><span class="fl ml10">角色</span></div>
+        <div class="course-list-row f13 c-grey3 mt10"><span class="fl ml15">角色</span></div>
         <ul class="class-list f13 c-grey3">
             <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="f12 c-grey6 mt10 ml15">
+            <span class="f13 fb c-grey3">提示</span>
+            <ul class="mb15 mt5 ml10 new-tip">
+                <li><span class="project-intro-dot">•</span>教师、教辅角色需要班级管理员审批</li>
+                <li><span class="project-intro-dot">•</span>学生角色无需管理员审批</li>
+            </ul>
+        </div>
+
         <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="joinClass()" class="weixin-tab link-blue2 border-top">确定</a>

public/assets/wechat/join_project.html

@@ -3,7 +3,7 @@
     <div class="post-container" style="padding-bottom:50px;">
         <div class="blue-title">欢迎加入项目</div>
         <div class="course-list-row f13 c-grey3 mt30"><span class="fl ml15 c-grey3">项目邀请码</span><input class="new-class-input ml25" ng-model="syllabus.title" required placeholder="请输入6位邀请码" /></div>
-        <div class="course-list-row f13 c-grey3 mt10"><span class="fl ml10">角色</span></div>
+        <div class="course-list-row f13 c-grey3 mt10"><span class="fl ml15">角色</span></div>
         <ul class="class-list f13 c-grey3">
             <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': role_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': role_id == 4}]"></span></li>

public/stylesheets/weui/weixin.css

@@ -244,3 +244,7 @@ a.underline {text-decoration:underline;}
 .project-intro {line-height:2; width:120px; margin-left:auto; margin-right:auto;}
 .project-intro li {position:relative;}
 .project-intro-dot {font-size:25px; font-weight:bold; position:absolute; left:-10px; top:-13px;}
+
+/*新建说明*/
+.new-tip {line-height:2;}
+.new-tip li {position:relative; padding-left:10px;}