Merge remote-tracking branch 'origin/szzh' into szzh

app/controllers/homework_common_controller.rb

@@ -147,6 +147,9 @@ class HomeworkCommonController < ApplicationController
     else
       @statue = 3
     end
+    @user_activity_id = params[:user_activity_id].to_i
+    @is_in_course = params[:is_in_course].to_i
+    @course_activity = params[:course_activity].to_i
   end
 
   #关闭匿评
@@ -162,6 +165,9 @@ class HomeworkCommonController < ApplicationController
     # 匿评关闭消息邮件通知
     send_message_anonymous_comment(@homework, m_status = 3)
     Mailer.send_mail_anonymous_comment_close(@homework).deliver
+    @user_activity_id = params[:user_activity_id].to_i
+    @is_in_course = params[:is_in_course].to_i
+    @course_activity = params[:course_activity].to_i
     respond_to do |format|
       format.js
     end
@@ -188,6 +194,9 @@ class HomeworkCommonController < ApplicationController
       @homework.student_works.map { |work| @cur_size += work.student_works_scores.where(:reviewer_role => 3).count}
     end
     @percent = format("%.2f",(@cur_size.to_f / ( @totle_size == 0 ? 1 : @totle_size)) * 100)
+    @user_activity_id = params[:user_activity_id].to_i
+    @is_in_course = params[:is_in_course].to_i
+    @course_activity = params[:course_activity].to_i
     respond_to do |format|
       format.js
     end

app/controllers/student_work_controller.rb

@@ -89,7 +89,9 @@ class StudentWorkController < ApplicationController
       else
         student_in_group = '(' + group_students.map{|user| user.id}.join(',')  + ')'
       end
-      if @is_teacher || @homework.homework_detail_manual.nil?   #老师 || 超级管理员 显示所有列表
+      #老师 || 超级管理员 || 禁用匿评&&作业截止&&已提交作品 显示所有列表
+      if @is_teacher || @homework.homework_detail_manual.nil? ||
+          (@homework.anonymous_comment == 1 && Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.now.strftime("%Y-%m-%d") && !@homework.student_works.where(:user_id => User.current.id).empty?)
         @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").joins(:user).where("users.id in #{student_in_group}").order("#{@order} #{@b_sort}"),@name
         @show_all = true
       elsif @homework.homework_detail_manual.comment_status == 1  #学生 && 未开启匿评 只看到自己的
@@ -110,7 +112,7 @@ class StudentWorkController < ApplicationController
       end
       @student_work_count = (search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").joins(:user).where("users.id in #{student_in_group}").order("#{@order} #{@b_sort}"),@name).count
     else
-      if @is_teacher || @homework.homework_detail_manual.nil?   #老师 || 超级管理员 显示所有列表
+      if @is_teacher || @homework.homework_detail_manual.nil? || (@homework.anonymous_comment == 1 && Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.now.strftime("%Y-%m-%d") && !@homework.student_works.where(:user_id => User.current.id).empty?)   #老师 || 超级管理员 显示所有列表
         @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").order("#{@order} #{@b_sort}"),@name
         @show_all = true
       elsif @homework.homework_detail_manual.comment_status == 1  #学生 && 未开启匿评 只看到自己的
@@ -166,6 +168,7 @@ class StudentWorkController < ApplicationController
 
   def create
     if params[:student_work]
+      @submit_result = true
       student_work = StudentWork.find(params[:student_work_id]) if params[:student_work_id]
       student_work ||= StudentWork.new
       student_work.name = params[:student_work][:name]
@@ -181,7 +184,6 @@ class StudentWorkController < ApplicationController
       else
         student_work.late_penalty = 0
       end
-
       if student_work.save
         course_activity = CourseActivity.where("course_act_type='HomeworkCommon' and course_act_id =#{@homework.id}").first
         if course_activity
@@ -196,21 +198,13 @@ class StudentWorkController < ApplicationController
         @student_work = StudentWork.where(homework_common_id: @homework.id, user_id: User.current.id).first
         respond_to do |format|
           format.js
-=begin
-          format.html {
-            flash[:notice] = l(:notice_successful_create)
-            redirect_to student_work_index_url(:homework => @homework.id)
-          }
-=end
         end
         return
       end
     end
+    @submit_result = false
     respond_to do |format|
-      format.html {
-        flash[:notice] = l(:notice_failed_create)
-        redirect_to new_student_work_url(:homework => @homework.id)
-      }
+      format.js
     end
   end
 

app/controllers/words_controller.rb

@@ -272,6 +272,7 @@ class WordsController < ApplicationController
             format.js{
               @user_activity_id = params[:user_activity_id]
               @is_in_course = params[:is_in_course]
+              @course_activity = params[:course_activity]
               @homework_common_id = params[:homework_common_id]
             }
           end

app/helpers/application_helper.rb

@@ -2307,15 +2307,15 @@ module ApplicationHelper
   end
 
   #获取匿评相关连接代码
-  def homework_anonymous_comment homework
+  def homework_anonymous_comment (homework, is_in_course, user_activity_id = -1, course_activity = -1)
     if Time.parse(homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d")
       link = link_to "启动匿评","javascript:void(0)", :class => "postOptionLink", :title => "作业截止日期之前不可以启动匿评"
     elsif homework.student_works.count >= 2 && homework.homework_detail_manual#作业份数大于2
       case homework.homework_detail_manual.comment_status
       when 1
-        link = link_to '启动匿评',  alert_anonymous_comment_homework_common_path(homework), id: "#{homework.id}_start_anonymous_comment", remote: true, disable_with: '加载中...',:class => 'postOptionLink'
+        link = link_to '启动匿评',  alert_anonymous_comment_homework_common_path(homework,:is_in_course=>is_in_course,:user_activity_id=>user_activity_id,:course_activity=>course_activity), id: "#{homework.id}_start_anonymous_comment", remote: true, disable_with: '加载中...',:class => 'postOptionLink'
       when 2
-        link = link_to '关闭匿评', alert_anonymous_comment_homework_common_path(homework), id: "#{homework.id}_stop_anonymous_comment", remote: true,:class => 'postOptionLink'
+        link = link_to '关闭匿评', alert_anonymous_comment_homework_common_path(homework,:is_in_course=>is_in_course,:user_activity_id=>user_activity_id,:course_activity=>course_activity), id: "#{homework.id}_stop_anonymous_comment", remote: true,:class => 'postOptionLink'
       when 3
         # link = link_to "匿评结束","javascript:void(0)", :class => "postOptionLink", :title => "匿评结束"
       end
@@ -2372,10 +2372,12 @@ module ApplicationHelper
             link_to "作品匿评", student_work_index_path(:homework => homework.id), :class => 'c_blue', :title => "开启匿评后不可修改作品"
           elsif homework.homework_detail_manual && homework.homework_detail_manual.comment_status == 3
             link_to "匿评结束", student_work_index_path(:homework => homework.id), :class => 'c_blue', :title => "匿评已结束"
-          elsif homework.homework_type == 2 #编程作业不能修改作品
-            link_to "修改作品(#{homework.student_works.count})",  new_student_work_path(:homework => homework.id),:class => 'c_blue'
+          elsif homework.homework_type == 2 && Time.parse(homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d")#编程作业不能修改作品
+            link_to "修改作品(#{homework.student_works.count})", new_student_work_path(:homework => homework.id),:class => 'c_blue'
+          elsif Time.parse(homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d")
+            link_to "修改作品(#{homework.student_works.count})", edit_student_work_path(work.id),:class => 'c_blue'
           else
-            link_to "修改作品(#{homework.student_works.count})",  edit_student_work_path(work.id),:class => 'c_blue'
+            link_to "查看作品(#{homework.student_works.count})", student_work_index_path(:homework => homework.id), :class => 'c_blue', :title => "作业截止后不可修改作品"
           end
         end
       end

app/helpers/homework_common_helper.rb

@@ -57,12 +57,12 @@ module HomeworkCommonHelper
   end
 
   #根据传入作业确定跳转到开启匿评还是关闭匿评功能
-  def alert_anonyoms_path homework,homework_detail_manual
+  def alert_anonyoms_path homework,homework_detail_manual,user_activity_id,is_in_course,course_activity
     link = ""
     if homework_detail_manual.comment_status == 1
-      link = start_anonymous_comment_homework_common_url homework.id
+      link = start_anonymous_comment_homework_common_url homework.id,:user_activity_id=>user_activity_id,:is_in_course=>is_in_course,:course_activity=>course_activity
     elsif homework_detail_manual.comment_status == 2
-      link = stop_anonymous_comment_homework_common_url homework.id
+      link = stop_anonymous_comment_homework_common_url homework.id,:user_activity_id=>user_activity_id,:is_in_course=>is_in_course,:course_activity=>course_activity
     end
     link
   end

app/views/homework_common/_alert_anonyoms.html.erb

@@ -34,7 +34,7 @@
         </p>
     <% end %>
     <div class="ni_btn">
-      <a href="javascript:" class="tijiao" onclick="clickOK('<%= alert_anonyoms_path @homework,@homework_detail_manual%>');" style="margin-bottom: 20px;" >
+      <a href="javascript:" class="tijiao" onclick="clickOK('<%= alert_anonyoms_path @homework,@homework_detail_manual,@user_activity_id,@is_in_course,@course_activity%>');" style="margin-bottom: 20px;" >
         确&nbsp;&nbsp;定
       </a>
       <a href="javascript:" class="tijiao" onclick="clickCanel();" style="margin-bottom: 20px;">

app/views/homework_common/start_anonymous_comment.js.erb

@@ -1,12 +1,19 @@
 <% if @statue == 1%>
-alert('启动成功');
-$("#<%= @homework.id %>_start_anonymous_comment").replaceWith('<%= escape_javascript(link_to "关闭匿评", alert_anonymous_comment_homework_common_path(@homework), remote: true, id:"#{@homework.id}_stop_anonymous_comment",:class => "postOptionLink")%>');
+    alert('启动成功');
+    <% if @user_activity_id == -1 %>
+        $("#homework_common_<%= @homework.id %>").replaceWith("<%= escape_javascript(render :partial => "users/user_homework_detail",:locals => {:homework_common => @homework, :is_in_course => @is_in_course})%>");
+        init_activity_KindEditor_data(<%= @homework.id%>,"","87%");
+    <% else %>
+        $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_homework', :locals => {:activity => @homework,:user_activity_id =>@user_activity_id,:course_activity=>@course_activity}) %>");
+        init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%");
+    <% end %>
+/*$("#<%#= @homework.id %>_start_anonymous_comment").replaceWith('<%#= escape_javascript(link_to "关闭匿评", alert_anonymous_comment_homework_common_path(@homework), remote: true, id:"#{@homework.id}_stop_anonymous_comment",:class => "postOptionLink")%>');*/
 <% elsif @statue == 2 %>
-alert('启动失败\n作业总数大于等于2份时才能启动匿评');
+    alert('启动失败\n作业总数大于等于2份时才能启动匿评');
 <% elsif @statue == 3%>
-alert("已开启匿评，请务重复开启");
+    alert("已开启匿评，请务重复开启");
 <% elsif @statue == 4%>
-alert("您没有权限开启匿评");
+    alert("您没有权限开启匿评");
 <% elsif @statue == 5%>
-alert("作业提交截止之后才能启动匿评");
+    alert("作业提交截止之后才能启动匿评");
 <% end %>

app/views/homework_common/stop_anonymous_comment.js.erb

@@ -1,2 +1,10 @@
-$("#<%= @homework.id %>_stop_anonymous_comment").replaceWith('');
-alert('关闭成功');
+alert('关闭成功');
+<% if @user_activity_id == -1 %>
+$("#homework_common_<%= @homework.id %>").replaceWith("<%= escape_javascript(render :partial => "users/user_homework_detail",:locals => {:homework_common => @homework, :is_in_course => @is_in_course})%>");
+init_activity_KindEditor_data(<%= @homework.id%>,"","87%");
+<% else %>
+$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_homework', :locals => {:activity => @homework,:user_activity_id =>@user_activity_id,:course_activity=>@course_activity}) %>");
+init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%");
+<% end %>
+/*
+$("#<%#= @homework.id %>_stop_anonymous_comment").replaceWith('');*/

app/views/projects/settings/_new_repositories.html.erb

@@ -72,10 +72,12 @@
               <%= repository.identifier %></span></td>
             <td class="w150"><span class="rep_history_grey"><%=h repository.scm_name %></span></td>
             <%if repository.scm_name=="Git"%>
-                <td class="w362 pl5" style="white-space:nowrap;overflow:hidden;text-overflow:ellipsis; text-align: left" title="http://<%=  repository.login.to_s %>_<%= repository.identifier.to_s%>@<%= ip %>
-              <%=h repository.url.slice(project_path_cut, repository.url.length) %>">
+                <% rep_url = "http://" + repository.login.to_s + '_'+ repository.identifier.to_s + "@" + ip.to_s + h( repository.url.slice(project_path_cut, repository.url.length)) %>
+                <td class="w362 pl5" style="white-space:nowrap;overflow:hidden;text-overflow:ellipsis; text-align: left">
                 <span class="rep_history_grey">
-                  <%=truncate( 'http://' <<  repository.login.to_s << '_'<<   repository.identifier.to_s << '@'<< ip.to_s << h( repository.url.slice(project_path_cut, repository.url.length)),:length=>60) %>
+                  <textarea id="copy_rep_content2_<%= repository.id %>" class="cloneUrl2 fl" type="input" ><%= rep_url %></textarea>
+                  <a href="javascript:void(0);" onclick="jsCopy2(<%= repository.id %>)"><span class="vl_copy2" title="点击复制版本库地址"></span></a>
+                  <%#= rep_url %>
                 </span>
                 </td><!--Modified by tanxianbo-->
             <%else %>

app/views/repositories/_dir_list_content.html.erb

@@ -21,7 +21,7 @@
           {:action => (entry.is_dir? ? 'show' : 'entry'), :id => @project, :repository_id => @repository.identifier_param, :path => to_path_param(ent_path), :rev => @rev},
           :class => (entry.is_dir? ? 'icon icon-folder' : "icon icon-file #{Redmine::MimeType.css_class_of(ent_name)}")%>
 </td>
-<td class="size"><%= (entry.size ? number_to_human_size(entry.size) : "?") unless entry.is_dir? %></td>
+<!--<td class="size"><%#= (entry.size ? number_to_human_size(entry.size) : "?") unless entry.is_dir? %></td>-->
   <!--<td class="size"><%#= (entry.size ? number_to_human_size(entry.size) : "?") unless entry.is_dir? %></td>-->
 <% if @repository.report_last_commit %>
 <td class="revision"><%= link_to_revision(entry.changeset, @repository) if entry.changeset %></td>

app/views/student_work/_programing_work_show.html.erb

@@ -6,7 +6,7 @@
       <%=format_time work.created_at %>
     </li>
 
-    <% if work.user == User.current && @homework.homework_detail_manual.comment_status == 1 %>
+    <% if work.user == User.current && Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d") %>
         <!-- 我的作业 && 匿评作业 && 未开启匿评，显示编辑和删除按钮 -->
         <li class="fr" >
           <%= link_to("", student_work_path(work),:method => 'delete', :confirm => l(:text_are_you_sure), :class => "pic_del")  %>

app/views/student_work/_show.html.erb

@@ -6,7 +6,7 @@
       <%=format_time work.created_at %>
     </li>
 
-    <% if work.user == User.current && @homework.homework_detail_manual.comment_status == 1 %>
+    <% if work.user == User.current && Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.now.strftime("%Y-%m-%d") %>
         <!-- 我的作业 && 匿评作业 && 未开启匿评，显示编辑和删除按钮 -->
         <li class="fr" >
           <%= link_to("", student_work_path(work),:method => 'delete', :confirm => l(:text_are_you_sure), :class => "pic_del")  %>

app/views/student_work/_student_work_list.html.erb

@@ -36,7 +36,7 @@
     <% end%>
     <div class="cl"></div>
     <div id="about_hwork_<%= student_work.id%>">
-      <% if student_work.user == User.current %>
+      <% if student_work.user == User.current && !@is_evaluation %>
         <% if @homework.homework_type == 2%>
             <%=render :partial => 'programing_work_show', :locals=> {:work => student_work, :score =>student_work_score(student_work,User.current),:student_work_scores => student_work.student_works_scores.order("updated_at desc")} %>
         <% else %>

app/views/student_work/_work_information.html.erb

@@ -1,6 +1,6 @@
 <div id="popbox02">
   <div class="ni_con">
-    <span class="f16 fontBlue fb">您上传的作品信息</span>
+    <span class="f16 fontBlue fb">请您确认刚刚上传的作品信息</span>
     <p class="f14 mt5">
       <span class="fb">作品名称：</span><%=@student_work.name%>
     </p>
@@ -10,7 +10,7 @@
     <p class="mt5">
       <span class="fl fb mr30">附</span><span class="fb fl">件：</span>
       <% if @student_work.attachments.count == 0%>
-        <%= "无附件"%>
+        <span class="fl c_red"><%= "无附件"%></span>
       <% else %>
         <div class="fl">
             <% @student_work.attachments.each do |attachment| %>
@@ -21,9 +21,15 @@
     </p>
     <div class="cl"></div>
     <div class="ni_btn mt10">
-      <a href="javascript:" class="tijiao" onclick="clickOK('<%= student_work_index_url(:homework => @homework.id)%>');" style="margin-bottom: 15px; margin-left: 55px;" >
+      <a href="javascript:" class="tijiao" onclick="clickOK();" style="margin-bottom: 15px; margin-left: 55px;" >
         确&nbsp;&nbsp;定
       </a>
     </div>
   </div>
-</div>
+</div>
+
+<script type="text/javascript">
+  function clickOK() {
+      window.location.href = '<%= student_work_index_url(:homework => @homework.id)%>';
+  }
+</script>

app/views/student_work/create.js.erb

@@ -1,7 +1,16 @@
-$('#ajax-modal').html('<%= escape_javascript(render :partial => 'student_work/work_information') %>');
-showModal('ajax-modal', '500px');
-$('#ajax-modal').siblings().remove();
-$('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
-        "<a href='javascript:' onclick='clickCanel();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
-$('#ajax-modal').parent().css("top","").css("left","");
-$('#ajax-modal').parent().addClass("anonymos");
+<% if @submit_result%>
+    $('#ajax-modal').html('<%= escape_javascript(render :partial => 'student_work/work_information') %>');
+    showModal('ajax-modal', '500px');
+    $('#ajax-modal').siblings().remove();
+    $('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
+            "<a href='javascript:' onclick='clickCanel();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
+    $('#ajax-modal').parent().css("top","").css("left","");
+    $('#ajax-modal').parent().addClass("anonymos");
+<% else %>
+    window.location.href = '<%= new_student_work_url(:homework => @homework.id)%>';
+<% end %>
+
+function clickCanel() {
+    hideModal('#popbox02');
+    window.location.href = '<%= student_work_index_url(:homework => @homework.id)%>';
+}

app/views/student_work/index.html.erb

@@ -162,6 +162,9 @@
         </div>
         <div class="mt5">
           <div class="fontGrey2 db fl">截止时间：<%= @homework.end_time %>&nbsp;23:59</div>
+          <% if @homework.homework_detail_manual.comment_status == 0 %>
+            <div class="fontGrey2 db fl ml10">发布时间：<%= @homework.publish_time %>&nbsp;00:00</div>
+          <% end %>
           <% if @homework.homework_detail_manual%>
               <% if @homework.homework_detail_manual.comment_status == 1%>
                   <% end_time = @homework.end_time.to_time.to_i + 24*60*60 - 1 %>

app/views/users/_course_homework.html.erb

@@ -93,7 +93,7 @@
                         <%= link_to("匿评设置", start_evaluation_set_homework_common_path(activity),:class => "postOptionLink", :remote => true) if activity.homework_detail_manual.comment_status == 1%>
                       </li>
                       <li>
-                        <%= homework_anonymous_comment activity %>
+                        <%= homework_anonymous_comment activity,-1,user_activity_id,course_activity %>
                       </li>
                   <% end %>
                   <% if activity.anonymous_comment == 0 && (comment_status == 0 || comment_status == 1)%>
@@ -167,6 +167,7 @@
         <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
           <%= form_for('new_form',:url =>  {:controller => 'words', :action => 'leave_homework_message', :id => activity.id},:method => "post", :remote => true) do |f|%>
               <%= hidden_field_tag 'user_activity_id',params[:user_activity_id],:value =>user_activity_id %>
+              <%= hidden_field_tag 'course_activity',params[:course_activity],:value =>course_activity %>
               <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= user_activity_id%>' name="homework_message"></textarea>
               <div nhname='toolbar_container_<%= user_activity_id%>' style="float:left;padding-top:3px; margin-left: 5px;"></div>
               <a id="new_message_submit_btn_<%= user_activity_id%>" href="javascript:void(0)" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>

app/views/users/_user_homework_detail.html.erb

@@ -56,14 +56,14 @@
               <%= 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%>&nbsp;23:59
         </div>
+        <% if homework_common.homework_detail_manual.comment_status == 0 %>
+            <div class="homepagePostDeadline ml15">
+              <%= l(:label_publish_time)%>：<%= homework_common.publish_time%>&nbsp;00:00
+            </div>
+        <% end %>
       </div>
       <div class="homepagePostIntro break_word upload_img list_style maxh360 lh18 table_maxWidth" id="homework_description_<%= homework_common.id%>">
         <div id="intro_content_<%= homework_common.id%>">
@@ -98,9 +98,9 @@
                         <%= link_to("匿评设置", start_evaluation_set_homework_common_path(homework_common),:class => "postOptionLink", :remote => true)%>
                     </li>
                   <% end %>
-                  <% if homework_common.anonymous_comment == 0 &&(comment_status == 0 || comment_status == 1)%>
+                  <% if homework_common.anonymous_comment == 0%>
                     <li>
-                        <%= homework_anonymous_comment homework_common %>
+                        <%= homework_anonymous_comment(homework_common, is_in_course) %>
                     </li>
                   <% end %>
                   <% if homework_common.anonymous_comment == 0 && (comment_status == 0 || comment_status == 1)%>

app/views/words/leave_homework_message.js.erb

@@ -1,5 +1,5 @@
 <% if @user_activity_id %>
-    $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_homework', :locals => {:activity => @homework_common,:user_activity_id =>@user_activity_id}) %>");
+    $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_homework', :locals => {:activity => @homework_common,:user_activity_id =>@user_activity_id,:course_activity => @course_activity}) %>");
     init_activity_KindEditor_data(<%= @user_activity_id%>,"","87%");
 <% elsif @homework_common_id && @is_in_course %>
     $("#homework_common_<%= @homework_common_id %>").replaceWith("<%= escape_javascript(render :partial => 'users/user_homework_detail', :locals => {:homework_common => @homework_common,:is_in_course => @is_in_course}) %>");

lib/tasks/gitlab_to_git.rake

@@ -4,7 +4,7 @@ namespace :rep_fault do
   desc "set ossean's type value"
   task :rep_update => :environment do
     rep = Repository.find(400)
-    rep.type = "Repository::Gitlab"
+    rep.type = "Repository::Git"
     rep.save
   end
 

public/javascripts/course.js

@@ -663,7 +663,7 @@ function regex_homework_end_publish_time()
     var myDate = new Date();
     if($.trim($("#homework_publish_time").val()) == "")
     {
-        $("#homework_publish_time").val(myDate.toLocaleDateString());
+        $("#homework_publish_time").val(formate_date(myDate));
     }
     var publish_time = Date.parse($("#homework_publish_time").val());
     var end_time = Date.parse($("#homework_end_time").val());
@@ -695,6 +695,21 @@ function regex_homework_end_time()
     }
 }
 
+function formate_date(date){
+    var str = "";
+    var year = date.getFullYear();
+    var month = date.getMonth() + 1;
+    var day = date.getDate();
+    if(month < 10) {
+        month = '0' + month;
+    }
+    if(day < 10) {
+        day = '0' + day;
+    }
+    str = year + '-' + month + '-' + day;
+    return str;
+}
+
 //验证发送到课程
 function regex_course_id(){
     var course_id = $("#course_id").val();

public/javascripts/new_user.js

@@ -97,7 +97,7 @@ function regex_homework_end_publish_time()
     var myDate = new Date();
     if($.trim($("#homework_publish_time").val()) == "")
     {
-        $("#homework_publish_time").val(myDate.toLocaleDateString());
+        $("#homework_publish_time").val(formate_date(myDate));
     }
     var end_time = Date.parse($("#homework_end_time").val());
     var publish_time = Date.parse($("#homework_publish_time").val());
@@ -129,6 +129,21 @@ function regex_homework_end_time()
     }
 }
 
+function formate_date(date){
+    var str = "";
+    var year = date.getFullYear();
+    var month = date.getMonth() + 1;
+    var day = date.getDate();
+    if(month < 10) {
+        month = '0' + month;
+    }
+    if(day < 10) {
+        day = '0' + day;
+    }
+    str = year + '-' + month + '-' + day;
+    return str;
+}
+
 //验证发送到课程
 function regex_course_id(){
     var course_id = $("#course_id").val();

public/javascripts/project.js

@@ -517,8 +517,9 @@ function jsCopy(){
     e.select();
     document.execCommand("Copy");
 }
-function jsCopy2(){
-    var e=document.getElementById("copy_rep_content2");
+function jsCopy2(id){
+    //alert("copy_rep_content2_" + id);
+    var e=document.getElementById("copy_rep_content2_" + id);
     e.select();
     document.execCommand("Copy");
 }

public/stylesheets/repository.css

@@ -207,11 +207,13 @@
 }
 
 .cloneUrl {width:235px; height:21px; border:1px solid #dddddd; outline:none; overflow:hidden; line-height:21px; resize:none;white-space:nowrap;}
+.cloneUrl2 {width:328px; height:21px; border:1px solid #dddddd; outline:none; overflow:hidden; line-height:21px; resize:none;white-space:nowrap;}
 .clone_btn {width:30px; height:21px; border-top:1px solid #dddddd; border-bottom:1px solid #dddddd; border-right:1px solid #dddddd; outline:none; float:left; background-image:linear-gradient(#FCFCFC, #EEE); text-align:center;}
 .vl_btn {height:21px; padding:0px 5px; vertical-align:middle; border:1px solid #dddddd; float:left; line-height:21px; background-image:linear-gradient(#FCFCFC, #EEE);}
 .vl_btn_2 {height:21px; padding:0px 5px; vertical-align:middle; border-top:1px solid #dddddd; border-bottom:1px solid #dddddd; border-right:1px solid #dddddd; float:left; line-height:21px;}
 .recordBanner {width:670px; height:30px; background-color:#f1f1f1; color:#666666; line-height:30px; vertical-align:middle;}
 .vl_copy {background:url(../images/vlicon/clone_url.png) 0px 0px no-repeat; padding-left:22px;}
+.vl_copy2 {background:url(../images/vlicon/clone_url.png) 0px 0px no-repeat; padding-left:22px;}
 .vl_zip {background:url(../images/vlicon/download_icon.png) 0px 0px no-repeat; padding-left:22px;}
 .vl_fork {background:url(../images/vlicon/fork_icon.png) 0px -2px no-repeat; padding-left:22px;}
 .vl_commit {background:url(../images/vlicon/commit_icon.png) 0px -2px no-repeat; padding-left:22px;weight:20px;height: 24px;}