Merge branch 'develop' into gitlab_guange

app/helpers/courses_helper.rb

@@ -36,7 +36,7 @@ module CoursesHelper
   #生成课程老师成员链接
   def course_teacher_link teacher_num
     if User.current.member_of_course?(@course) || User.current.admin?
-      link_to "#{teacher_num}", course_member_path(@course, :role => 1), :class => 'info_foot_num c_blue'
+      link_to "#{teacher_num}", course_member_path(@course, :role => 1), :class => 'info_foot_num c_blue', :id => 'teacher_number'
     else
       content_tag 'span',teacher_num, :class => 'info_foot_num c_blue'
     end
@@ -45,7 +45,7 @@ module CoursesHelper
   #生成课程学生列表连接
   def course_student_link student_num
     if (User.current.logged? && @course.open_student == 1) || (User.current.member_of_course?(@course)) || User.current.admin?
-      link_to "#{student_num}", course_member_path(@course, :role => 2), :class => 'info_foot_num c_blue'
+      link_to "#{student_num}", course_member_path(@course, :role => 2), :class => 'info_foot_num c_blue', :id => "student_number"
     else
       content_tag 'span',student_num, :class => 'info_foot_num c_blue'
     end

app/views/layouts/_new_feedback.html.erb

@@ -24,9 +24,9 @@
         <div class="mt5">
           <!--<a target="hiddentab" href="http://wpa.qq.com/msgrd?v=1&uin=1554253403&site=qq&menu=yes" style="color: #269ac9;">-->
             <%#= l(:label_technical_support) %>
-          <!--白&nbsp;&nbsp;&nbsp;羽</a>-->
+          <!--白&nbsp;&nbsp;&nbsp;羽</a> http://shang.qq.com/wpa/qunwpa?idkey=4fe2d63a4527cddce038f04f0b1d728a62082074fb4a74870a5444ee1a6910ad-->
-          <a target="_blank" href="http://shang.qq.com/wpa/qunwpa?idkey=4fe2d63a4527cddce038f04f0b1d728a62082074fb4a74870a5444ee1a6910ad" style="color: #269ac9;">
+          <a  href="javascript:void(0);" style="color: #269ac9;">
-            请加入：师姐答疑群</a>
+           <p style="text-align: center"> 请加入师姐答疑群</p>  <p style="text-align: center">173184401</p> </a>
         </div>
       </div>
       <div class="side_bottom"></div>

app/views/layouts/base_projects.html.erb

@@ -76,7 +76,7 @@
 
         <!--参数-->
         <div class="pr_info_foot">
-          <%= l(:label_member) %>（<%= link_to "#{@project.members.count}", project_member_path(@project), :class => 'info_foot_num c_blue' %>）
+          <%= l(:label_member) %>（<%= link_to "#{@project.members.count}", project_member_path(@project), :class => 'info_foot_num c_blue', :id => 'project_members_number' %>）
           <span>|&nbsp;</span>
           <%= l(:label_user_watcher) %>（<%= link_to "#{@project.watcher_users.count}", {:controller=>"projects", :action=>"watcherlist", :id => @project.id}, :class => 'info_foot_num c_blue'  %>）
           <% attaments_num = @project.attachments.count+Attachment.where(["`container_type` = 'Version' and `container_id` in (?)",@project.versions.map{ |v| v.id}]).all.count  %>

app/views/layouts/new_base_user.html.erb

@@ -46,7 +46,7 @@
         </div>
         <div class="fl ml10">
           <p class="homepageImageName hidden db mb5">
-            <%= @user.realname %>
+            <%= @user.realname.blank? ? @user.login : @user.realname %>
           </p>
           <% if (@user.user_extensions && (@user.user_extensions.identity != 2) ) %>
               <span class="<%= @user.user_extensions.gender == 1 ? 'homepageImageSexWomen' : 'homepageImageSexMan' %> "></span>

app/views/members/create.js.erb

@@ -4,6 +4,7 @@
     <% else%>
         $('#pro_st_tbc_03').html('<%= escape_javascript(render :partial => 'projects/settings/new_members') %>');
         hideOnLoad();
+        $("#project_members_number").html("<%= @project.members.count %>");
         alert("<%= @succes_message%>");
     <% end%>
 <%elsif @course%>
@@ -11,6 +12,8 @@
         alert("<%= @create_member_error_messages%>");
     <% else%>
         $('#course_members_setting').html('<%= escape_javascript(render :partial => 'courses/course_members') %>');
+        $("#teacher_number").html("<%= searchTeacherAndAssistant(@course).count %>");
+        $("#student_number").html("<%= studentCount(@course) %>");
         alert("添加成功");
     <% end%>
     hideOnLoad();

app/views/members/destroy.js.erb

@@ -1,7 +1,10 @@
   <%if @project%>
     $('#pro_st_tbc_03').html('<%= escape_javascript(render :partial => 'projects/settings/new_members') %>');
+    $("#project_members_number").html("<%= @project.members.count %>");
 //    $('#tab-content-members').html('<%#= escape_javascript(render :partial => 'projects/settings/members') %>');
   <%elsif @course%>
     $('#course_members_setting').html('<%= escape_javascript(render :partial => 'courses/course_members') %>');
+    $("#teacher_number").html("<%= searchTeacherAndAssistant(@course).count %>")
+    $("#student_number").html("<%= studentCount(@course) %>");
   <%end%>
 hideOnLoad();

app/views/my/account.html.erb

@@ -170,7 +170,7 @@
           <li><input id="new_password_confirmation" name="new_password_confirmation" class="w210" type="password" required="true" nh_required="1"></li>
           <li class="ml2">
             <a href="javascript:;" id="my_password_form_link" class="blue_btn fl">确认</a>
-            <!--<input type="submit" id="my_password_form_btn" style="display:none;"/>-->
+            <input type="submit" id="my_password_form_btn" style="display:none;"/>
             <!--<a href="javascript:void(0);" class="grey_btn ml10 fl">取消</a>-->
           </li>
         </ul>

app/views/users/_user_homework_detail.html.erb

@@ -41,6 +41,11 @@
               <%= homework_common.language_name%>
             </div>
         <% end %>
+        <% if homework_common.homework_detail_manual.comment_status == 0 %>
+            <div class="homepagePostDeadline mr15">
+              <%= l(:label_publish_time)%>：<%= homework_common.publish_time%>
+            </div>
+        <% end %>
         <div class="homepagePostDeadline">
           <%= l(:label_end_time)%>：<%= homework_common.end_time%>
         </div>

config/locales/zh.yml

@@ -2024,6 +2024,7 @@ zh:
   label_creat: 创建
   #api end
 
+  label_publish_time: 发布时间
   label_end_time: 截止时间
   label_send_email: 确定发送
   label_input_email: 请输入邮箱地址(必填)

public/javascripts/course.js

@@ -666,6 +666,7 @@ function regex_homework_end_publish_time()
         $("#homework_publish_time").val(myDate.toLocaleDateString());
     }
     var publish_time = Date.parse($("#homework_publish_time").val());
+    var end_time = Date.parse($("#homework_end_time").val());
     if(end_time < publish_time)
     {
         $("#homework_end_time_span").text("截止日期不能小于发布日期");
@@ -1258,4 +1259,4 @@ function course_outline(id){
 //    $('#course_outline_search').on('input',function(){
 //        alert('<%= @course.id%>')
 //    })
-//})
+//})