Merge branch 'develop' into huang_k8s

app/views/account/authentication.html.erb

@@ -1,3 +1,4 @@
+<%# if false %>
 <div class="panel-user-right-con clearfix">
   <% if !@user.authentication && (@apply_user_auth.nil? || @apply_user_auth && (@apply_user_auth.status == 2 || @apply_user_auth.status == 1)) %>
       <% unless @apply_user_auth && @apply_user_auth.status == 1 %>
@@ -118,6 +119,8 @@
     <%= render :partial => 'has_authentication' %>
   <% end %>
 </div>
+
+<%# end%>
 <!--实名认证-->
 <!--实名认证-未认证--->
 <%if false%>
@@ -133,7 +136,7 @@
 </div>
 
 <!--实名认证-认证信息--->
-<div class="panel-certification pr">
+<div class="panel-certification pr" style="height:100%; ">
   <div class="panel-cer-title clearfix">
     <p class="font-18 shiming-title fl mt5">实名认证</p>
     <p class="fr color-grey">
@@ -196,6 +199,8 @@
       </li>
     </ul>
   </div>
-
+    <div class="example">
+        <img src="" class="example-img" width="100" height="100"/>
+    </div>
 </div>
 <% end%>

app/views/subjects/new.html.erb

@@ -5,7 +5,7 @@
     &gt; <span>新建</span>
   </p>
   <div class="edu-con-top user_bg_shadow">
-    <span class="ml15 color-grey font-16">新建实训套件</span>
+    <span class="ml15 color-grey3 font-16">新建实训套件</span>
   </div>
   <div class="edu-bg createmain mb20 pt30 user_bg_shadow">
     <%= labelled_form_for @subject do |f| %>

app/views/subjects/show.html.erb

@@ -7,7 +7,7 @@
             <a href="<%= edit_subject_path(@subject) %>"><i class="fa fa-pencil fr mt10 mr5 color-grey-c edit-produce"></i></a>
         <% end %>
       </p>
-      <div class="mt15 color-dark-grey <%= @subject.description.blank? ? 'color-light-grey' : '' %>">
+      <div class="mt15 color-grey <%= @subject.description.blank? ? 'color-light-grey' : '' %>">
         <%= @subject.description.blank? ? "暂未填写" : @subject.description %>
       </div>
     </div>
@@ -55,14 +55,14 @@
               <a href="javascript:void(0);" onclick="delete_confirm_box_2('<%= stage_path(stage) %>', '确定要删除该阶段吗？');"><i class="fa fa-trash fr mt10 mr10 color-grey-c edit"></i></a>
           <% end %>
         </p>
-        <p class="ml20 color-dark-grey pr20 mt10 mb10"><%= stage.description %></p>
+        <p class="ml20 color-grey pr20 mt10 mb10"><%= stage.description %></p>
         <% stage.stage_shixuns.each_with_index do |stage_shixun, index| %>
             <% 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>
                 <!--<i class="fa fa-gamepad color-light-green font-20"></i>-->
-                <span class="font-bd color-grey3"><%= shixun.name %></span>
+                <span class="color-grey3"><%= shixun.name %></span>
               </li>
               <li class="fl li-width15">
                 <i class="fa fa-tasks color-light-green font-16 mr5" title="实训任务"></i>
@@ -167,15 +167,13 @@
         if($("#new_stage_form").length == 1){
             notice_box("请先保存正在编辑的内容");
         } else{
-            var counttage=$(".lesson-saved-list-stage").length;
-            var count=$(".lesson-edit-content .stage-item").length;
-            count++;
-            count=count+counttage;
+            var counttage=$(".lesson-saved-list-item").length;
+            counttage++;
             var edithtml="";
             edithtml+='<%= form_for('', :url => {:controller => 'stages', :action => 'create', :subject => @subject.id}, :method => 'post', :html => {:id => 'new_stage_form'}) do |f| %>';
             edithtml+="<div class=\"stage-item mb20 clearfix\">";
             edithtml+="<div class=\"stage clearfix mb20\">";
-            edithtml+="<li class=\"fl font-16 font-bd\">阶段<span class=\"font-16 font-bd\">"+count+"</span></li>";
+            edithtml+="<li class=\"fl font-16 font-bd\">阶段<span class=\"font-16 font-bd\">"+counttage+"</span></li>";
             edithtml+="<li class=\"fr\">";
             edithtml+="<a class=\"task-btn color_white bc-grey mr5 del-editstage\" onclick=\"deleditstage(this);\">删除</a>";
             edithtml+="<a class=\"course-bth-blue\" onclick=\"saveeidtsatge();\">保存</a>";

public/stylesheets/css/edu-user.css

@@ -151,7 +151,7 @@ a.btn-focus:hover{color: #FFFFFF!important;background:#FC7033;border: 1px solid
 .-task-desc div{position: absolute;top: 10px;right: -7px;}
 
 /* 个人资料 20170324byLB */
-.panel-user-left{ width:20%; min-width:240px; background:#eaebec; height:800px;}
+.panel-user-left{ width:20%; min-width:240px; background:#eaebec; min-height:672px;}
 .panel-user-right{width:80%; background:#fff;}
 .panel-user-info{ width:100%; height:240px; }
 .panel-user-img img{ display: block; width:240px; height:240px;}
@@ -229,4 +229,6 @@ input.new_loggin_input_test{ -webkit-box-shadow: 0 0 0px 1000px white inset;  ou
 .panel-cer-content{margin: 15px 40px;}
 .rz-label{width: 20%;min-width: 90px;text-align: right;line-height: 40px}
 .shilie{position: absolute;top: 0px;left: 0px;width:120px;}
+.example{position: absolute;top:0px;left: 0px;width: 100%;background: rgba(0,0,0,0.6);height: 100%;}
+.example-img{}