Merge branch 'dev_cs' into develop

app/views/account/_user_auth_form.html.erb

@@ -8,7 +8,7 @@
 </div>
 <div class="panel-cer-content">
   <p class="border-error-result pt5 pb5"><i class="fa fa-lightbulb-o color-yellow ml10 mr10 font-16"></i>以下信息通过审核后将不能再次修改，提交后请耐心等待核查</p>
-  <p class="color-yellow mt5">温馨提示：尊敬的用户，您提交的数据将会被加密，请放心填写。</p>
+  <p class="color-orange04 mt5">温馨提示：尊敬的用户，您提交的数据将会被加密，请放心填写。</p>
   <%= form_for :user, :url => apply_auth_account_path, :method => :post, :html => {:id => 'my_user_auth_form'} do |f| %>
       <ul>
         <li class="clearfix mt10">

app/views/account/authentication.html.erb

@@ -22,7 +22,7 @@
           </p>
         </div>
         <div class="panel-cer-content">
-          <p class="border-dash-orange pt5 pb5 mb20"><i class="fa fa-exclamation-circle color-yellow2 ml10 mr5 font-16"></i><span class="color-yellow2 mr15">认证中</span>我们将在1个工作日内完成审核，通过审核后页面会显示“已认证”</p>
+          <p class="border-dash-orange pt5 pb5 mb20"><i class="fa fa-exclamation-circle u-color-light-red ml10 mr5 font-16"></i><span class="u-color-light-red mr15">认证中</span>我们将在1个工作日内完成审核，通过审核后页面会显示“已认证”</p>
           <table class="edu-pop-table edu-txt-center" cellspacing="0" cellpadding="0">
             <thead>
             <tr>
@@ -103,7 +103,7 @@
           </p>
         </div>
         <div class="panel-cer-content">
-          <p class="pt5 pb5 mb20"><i class="fa fa-check-circle color-green ml10 mr5 font-16"></i><span class="color-green mr15">已认证</span></p>
+          <p class="pt5 pb5 mb20"><i class="fa fa-check-circle color-light-green ml10 mr5 font-16"></i><span class="color-light-green mr15">已认证</span></p>
 
           <table class="edu-pop-table edu-txt-center" cellspacing="0" cellpadding="0">
             <thead>

app/views/account/professional_certification.html.erb

@@ -22,7 +22,7 @@
           </p>
         </div>
         <div class="panel-cer-content">
-          <p class="border-dash-orange pt5 pb5 mb20"><i class="fa fa-exclamation-circle color-yellow2 ml10 mr5 font-16"></i><span class="color-yellow2 mr15">认证中</span>我们将在1个工作日内完成审核，通过审核后页面会显示“已认证”</p>
+          <p class="border-dash-orange pt5 pb5 mb20"><i class="fa fa-exclamation-circle u-color-light-red ml10 mr5 font-16"></i><span class=" u-color-light-red mr15">认证中</span>我们将在1个工作日内完成审核，通过审核后页面会显示“已认证”</p>
           <table class="edu-pop-table edu-txt-center" cellspacing="0" cellpadding="0">
             <thead>
             <tr>
@@ -111,7 +111,7 @@
           </p>
         </div>
         <div class="panel-cer-content">
-          <p class="pt5 pb5 mb20"><i class="fa fa-check-circle color-green ml10 mr5 font-16"></i><span class="color-green mr15">已认证</span></p>
+          <p class="pt5 pb5 mb20"><i class="fa fa-check-circle color-light-green ml10 mr5 font-16"></i><span class="color-light-green mr15">已认证</span></p>
 
           <table class="edu-pop-table edu-txt-center" cellspacing="0" cellpadding="0">
             <thead>

app/views/account/security_settings.html.erb

@@ -6,7 +6,7 @@
         <li class="font-14 mt10">&nbsp;</li>
         <li><a href="<%= change_or_bind_path(:type => 'phone') %>" class="task-btn task-btn-blue">绑定</a></li>
     <% else %>
-        <li class="font-14 mt10 color-grey"><i class="fa fa-check-circle color-green mr5"></i>已绑定</li>
+        <li class="font-14 mt10 color-grey"><i class="fa fa-check-circle color-light-green mr5"></i>已绑定</li>
         <li class="font-14 mt10 t_l color-grey">您绑定的手机：<%= @user.user_phone %></li>
         <li><a href="<%= change_or_bind_path(:type => 'phone') %>" class="task-btn">更改</a></li>
     <% end %>
@@ -18,7 +18,7 @@
         <li class="font-14 mt10">&nbsp;</li>
         <li><a href="<%= change_or_bind_path(:type => 'mail') %>" class="task-btn task-btn-blue">绑定</a></li>
     <% else %>
-        <li class="font-14 mt10 color-grey"><i class="fa fa-check-circle color-green mr5"></i>已绑定</li>
+        <li class="font-14 mt10 color-grey"><i class="fa fa-check-circle color-light-green mr5"></i>已绑定</li>
         <li class="font-14 mt10 t_l color-grey">您绑定的邮箱：<%= @user.user_mail %></li>
         <li><a href="<%= change_or_bind_path(:type => 'mail') %>" class="task-btn">更改</a></li>
     <% end %>

app/views/challenges/_edit_task_pass.html.erb

@@ -27,8 +27,8 @@
           <ul id="select_more">
             <% @challenge.challenge_questions.each_with_index do |question, index| %>
                 <li class="clearfix mb10">
-                  <label class="panel-form-label fl"><span class="mr10"><%= (question.position+ 65).chr %>.</span></label>
-                  <div class="fl panel-box-sizing panel-form-width-690 <%= question.right_key ? 'background-blue color_white' : 'task-bg-grey' %>">
+                  <label class="panel-form-label fl <%= question.right_key ? 'color-orange03' : '' %>"><span class="mr10"><%= (question.position+ 65).chr %>.</span></label>
+                  <div class="fl panel-box-sizing panel-form-width-690 task-bg-grey">
                     <!--<input type="checkbox" name="select_more[]" value=""  class="ml-3 mr5 magic-checkbox" >-->
                     <label><%= question.option_name %></label>
                   </div>

app/views/courses/index.html.erb

@@ -2,13 +2,13 @@
   <div class="task-index-head mt20 mb20">
     <div class="task-index-head-top-course">
       <h2 class="fl task-inde-head-title">在线课堂</h2>
-      <%= link_to "+&nbsp;新建".html_safe, new_course_path, :class => "task-btn task-btn-green fr mt6" %>
-      <%= link_to "加入课堂", join_private_courses_courses_path, :remote => true, :method => "post", :class => "task-btn task-btn-green fr mt6 mr10"  %>
       <div class="cl"></div>
     </div>
     <ul class="task-index-head-info clearfix">
       <li><span class="color-orange font-bd" id="all_syllabuses"><%= @syllabuses_num %></span><br/><span >全部</span></li>
       <li><span class="color-orange font-bd" id="my_syllabuses"><%= @create_syllabuses_count + @join_syllabuses_count %></span><br/><span>我的课堂</span></li>
+      <%= link_to "+&nbsp;新建".html_safe, new_course_path, :class => "color-light-green fr mt15" %>
+      <%= link_to "+&nbsp;加入课堂".html_safe, join_private_courses_courses_path, :remote => true, :method => "post", :class => "color-light-green fr mt15 mr15"  %>
       <!--      <li><span class="color-orange font-bd"><%#= @create_syllabuses_count %></span><br/><span>你已创建</span></li>-->
     </ul>
   </div>

app/views/games/_choice_question.html.erb

@@ -35,10 +35,13 @@
         if(st == "1"){
             //$(nThis).hasClass("card-check") ? $(nThis).removeClass("card-check") : $(nThis).addClass("card-check");
             $(nThis).toggleClass("card-check");
+            $(nThis).toggleClass("color_white");
         } else if (st == "2"){
             var choice = $(".color_white");
             choice.removeClass("card-check");
+            choice.removeClass("color_white");
             $(nThis).addClass("card-check");
+            $(nThis).toggleClass("color_white");
         }
     }
 </script>

app/views/games/_game_show.html.erb

@@ -64,10 +64,10 @@
       </div>
     </div>
     <div class="-layout-h -padding-h-16 -horizontal -footer-left pr">
-      <ul class="-layout -task-ml80">
+      <ul class="-task-ml80">
         <%= render :partial => "games/shixun_comment_block" %>
-        <li class="comment_position" style="right: 150px"><a href="javascript:void(0);" onclick="send_dis_to_shixun()" class="course-bth-blue color_white">发送</a></li>
-        <li class="comment_position">
+        <li class="fl mt10 ml15"><a href="javascript:void(0);" onclick="send_dis_to_shixun()" class="course-bth-blue color_white">发送</a></li>
+        <li class="fl ml20 mt15">
             <span title="<%= @praise.nil? ? "点赞" : "取消点赞" %>" onclick="game_praise()" id="game_praise_tread" class="pt5 color-grey mr20">
               <i class="fa fa-thumbs-up font-20 mr3 <%= @praise.nil? ? "" : "color-light-green" %>" alt="赞" ></i><span class="font-12 font-bd" id="game_praise_count"><%= @praise_count %></span>
             </span>

app/views/games/_shixun_comment_block.html.erb

@@ -1,4 +1,4 @@
-<li class="comment-input" id="shixun_comment_block">
+<li class="comment-input fl" id="shixun_comment_block">
   <%= form_for('', :url => {:controller => 'discusses', :action => 'create', :dis_id => @shixun.id, :dis_type => "Shixun"}, :method => "post", :remote => true, :html => {:id => 'new_comment_form'}) do |f| %>
     <textarea id="comment_news" name="content" placeholder="我想说点什么~" MultiLine = True ScrollBars = 2 type="text"></textarea>
     <input type="hidden" id="dis_reply_id" name="reply_id" value="">

app/views/my/account.html.erb

@@ -276,7 +276,7 @@
           <p class="fl task-bg-grey02 panel-box-sizing">
             <span class="fl w150"><%= @user.try(:lastname) + @user.try(:firstname) %></span>
             <% if @user.authentication %>
-                <span class="color-green">
+                <span class="color-light-green">
                     <span class="fl account-info-span">
                       <i class="fa fa-user" aria-hidden="true"></i>
                     </span>
@@ -285,7 +285,7 @@
             <% else %>
                 <% apply_auth = ApplyUserAuthentication.where(:user_id => @user.id, :auth_type => 1).last %>
                 <% if apply_auth && apply_auth.status == 0 %>
-                    <span class="color-orange02">
+                    <span class="color-orange04">
                         <span class="fl account-info-span">
                           <i class="fa fa-user" aria-hidden="true"></i>
                         </span>
@@ -320,7 +320,7 @@
           <p class="fl task-bg-grey02 panel-box-sizing">
             <span class="fl w150"><%= @user.user_extensions.show_identity %></span>
             <% if @user.professional_certification %>
-                <span class="color-green">
+                <span class="color-light-green">
                   <span class="fl account-info-span">
                     <i class="fa fa-list-alt" aria-hidden="true"></i>
                   </span>
@@ -329,7 +329,7 @@
             <% else %>
                 <% apply_auth = ApplyUserAuthentication.where(:user_id => @user.id, :auth_type => 2).last %>
                 <% if apply_auth && apply_auth.status == 0 %>
-                    <span class="color-orange02">
+                    <span class="color-orange04">
                       <span class="fl account-info-span">
                         <i class="fa fa-list-alt" aria-hidden="true"></i>
                       </span>

app/views/shixuns/index.html.erb

@@ -2,13 +2,13 @@
   <div class="task-index-head mt20 mb20 user_bg_shadow">
     <div class="task-index-head-top">
       <h2 class="fl task-inde-head-title">全部实训</h2>
-      <%= link_to "+&nbsp;新建".html_safe, new_shixun_path, :class => "task-btn task-btn-green fr mt6" %>
       <div class="cl"></div>
     </div>
     <ul class="task-index-head-info clearfix">
       <li><span class="color-orange font-bd"><%= @shixun_all_count %></span><br/><span>全部</span></li>
       <li><span class="color-orange font-bd"><%= @current_user_had_passed %></span><br/><span>你已通过</span></li>
       <li><span class="color-orange font-bd"><%= @shixun_my_score %></span><br/><span>累计经验值</span></li>
+      <%= link_to "+&nbsp;新建".html_safe, new_shixun_path, :class => "color-light-green fr mt15 mr15" %>
     </ul>
   </div>
 

app/views/subjects/index.html.erb

@@ -3,12 +3,12 @@
   <div class="task-index-head mt20 mb20">
     <div class="header-color">
       <h2 class="fl task-inde-head-title">实训套件</h2>
-      <%= link_to "+&nbsp;新建".html_safe, new_subject_path(), :class => "task-btn task-btn-green fr mt6" %>
       <div class="cl"></div>
     </div>
     <ul class="task-index-head-info clearfix">
       <li><span class="color-orange font-bd"><%= @subjects_all_count %></span><br/><span >全部</span></li>
       <li><span class="color-orange font-bd"><%= @subject_created_count %></span><br/><span>我已创建</span></li>
+      <%= link_to "+&nbsp;新建".html_safe, new_subject_path(), :class => "color-light-green fr mt15" %>
     </ul>
   </div>
   <!--<div class="clearfix mb15 fl">-->

app/views/subjects/show.html.erb

@@ -60,7 +60,7 @@
             <% shixun = stage_shixun.shixun %>
             <div class="clearfix pt10 pb10 pl20 stage-info-line pr20" id="stage_shixun_<%= shixun.id %>" style="cursor: pointer;" onclick="shixun_link('<%= shixun.identifier %>')">
               <li class="fl li-width63">
-                <span class="panel-inner-icon fl mr10 mt5 color_white font-12"><%= index + 1 %></span>
+                <span class="panel-inner-icon18 fl mr10 mt5 color_white font-12"><%= index + 1 %></span>
                 <!--<i class="fa fa-gamepad color-light-green font-20"></i>-->
                 <span class="color-grey3"><%= shixun.name %></span>
               </li>

public/stylesheets/css/edu-common.css

@@ -12,7 +12,7 @@ table,tr,td{border:0;}
 ol,ul,li{ list-style-type:none}
 a:link,a:visited{text-decoration:none;color:#898989; }
 a:hover {color:#29bd8b;}
-input,textarea,select{ background: #fff; border:1px solid #ccc; color:#666;}
+input,textarea,select{ background: #fff; border:1px solid #eee; color:#666;}
 textarea{resize: none;}
 /*侧滚动条*/
 ::-webkit-scrollbar  {   width:10px;    height:10px;   background-color: #F5F5F5;  }
@@ -45,6 +45,9 @@ textarea{resize: none;}
 .color-orange{color:#ee4a1f!important;}
 .color-orange02{color:#f79f88!important;}
 .color-orange03{color:#ff7500!important;}
+.color-orange04{color: #ee4a20!important;}/*温馨提示公用颜色*/
+.u-color-light-red{color: #FF6666}
+.u-color-light-grey{color: #CCCCCC}
 .color-yellow{color:#f0ad4e!important;}
 .color-yellow2{color:#ff9933!important;}
 .color-light-grey{color:#afafaf!important;}

public/stylesheets/css/edu-public.css

@@ -297,8 +297,8 @@ input::-ms-input-placeholder,textarea::-ms-input-placeholder {color:#cccccc;}
 
 /*圆形绿色背景---------22*/
 .panel-inner-icon{width: 22px;height: 22px;line-height: 22px;border-radius: 50%;background: #29bd8b;display: block;text-align: center}
-/*------------------15*/
-.panel-inner-icon{width: 18px;height: 18px;line-height: 18px;border-radius: 50%;background: #29bd8b;display: block;text-align: center}
+/*------------------18*/
+.panel-inner-icon18{width: 18px;height: 18px;line-height: 18px;border-radius: 50%;background: #29bd8b;display: block;text-align: center}
 
 /*---------------块右上角的三角形，颜色为浅橙色*/
 .triangle-topright {position: absolute;right: -1px;top:0px;width: 0;height: 0;border-top: 35px solid #FF9E6A;border-left: 60px solid transparent;z-index: 1}

public/stylesheets/css/edu-user.css

@@ -210,8 +210,7 @@ input.new_loggin_input_test{ -webkit-box-shadow: 0 0 0px 1000px white inset;  ou
 
 /*头部排版更改*/
 .lector{display: block;width: auto;padding: 0px 8px;background: #5ECFBA;color: #ffffff;font-size: 14px;margin-right: 15px;border-radius: 4px;margin-top: 3px;}
-.u-color-light-red{color: #FF6666}
-.u-color-light-grey{color: #CCCCCC}
+
 .user-info-span{border-radius: 50%;float:left;background: #F3F5F7;text-align: center;width: 23px;height: 23px;line-height: 23px;margin-top: 3px;margin-right: 5px}
 .color-grey-6{color:#888888;}