Merge branch 'cs_optimize_txz' into develop

app/views/layouts/_new_feedback.html.erb

@@ -3,6 +3,7 @@
 <div class="scrollsidebar" id="scrollsidebar">
   <div class="side_content">
     <div class="side_list">
+      <div class="qr-code-border borderBottomNone"><img src="/images/wechat/trustie_QR.jpg" width="150" style="display:block;" /> </div>
       <div class="side_title">
         <a title="<%= l(:button_hide) %>" class="close_btn">
           <span>

public/assets/wechat/join_class.html

@@ -13,6 +13,7 @@
         <div class="f12 c-grey6 mt10 ml15">
             <span class="f13 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>
                 <li><span class="project-intro-dot">•</span>学生角色无需管理员审批</li>
             </ul>

public/assets/wechat/join_project.html

@@ -12,6 +12,7 @@
         <div class="f12 c-grey6 mt10 ml15">
             <span class="f13 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>
                 <li><span class="project-intro-dot">•</span>报告人员角色无需管理员审批</li>
             </ul>

public/stylesheets/css/public.css

@@ -116,6 +116,7 @@ a.resourcesTypeUser {background:url(../images/homepage_icon.png) -178px -453px n
 .softwareIcon {background:url(/images/hwork_icon.png) -5px -254px no-repeat; padding-left:23px;}
 
 /*意见反馈*/
+.qr-code-border {border:2px solid #269ac9;}
 html{ overflow-x:hidden;}
 .scrollsidebar{ position: fixed; bottom:1px; right:1px; background:none; }
 .side_content{width:154px; height:auto; overflow:hidden; float:left; }

public/stylesheets/syllabus.css

@@ -74,8 +74,8 @@ input.syllabus_input_min{
 
 /*课程大纲-课程列表*/
 .icon_course{ background: url(../images/syllabus/icons_syllabus.png) 0 -35px no-repeat; width:18px; height:15px; display:block;}
-.icons_sy_open{background: url(../images/syllabus/icons_syllabus.png) 0 -53px no-repeat; width:20px; height:23px; display:block;  cursor:pointer; }
+.icons_sy_open{background: url(../images/syllabus/icons_syllabus.png) 0 -50px no-repeat; width:20px; height:23px; display:block;  cursor:pointer; }
-.icons_sy_close{background: url(../images/syllabus/icons_syllabus.png) -26px -53px no-repeat; width:20px; height:23px; display:block;  }
+.icons_sy_close{background: url(../images/syllabus/icons_syllabus.png) -26px -52px no-repeat; width:20px; height:23px; display:block;  }
 .syllabus_courses_box {position:relative;}
 .icons_sy_setting{background: url(../images/syllabus/icons_syllabus.png) -51px -33px no-repeat; width:20px; height:20px; display:block; position:absolute; right:10px; top:10px; }
 .icons_sy_setting:hover{background: url(../images/syllabus/icons_syllabus.png) -25px -33px no-repeat; }