Merge branch 'szzh' into dev_hjq

Conflicts:
	app/views/organizations/_org_left_subfield_list.html.erb

app/controllers/courses_controller.rb

@@ -399,6 +399,25 @@ class CoursesController < ApplicationController
 
   end
 
+  def private_or_public
+    if @course.is_public == 0
+      @course.update_attributes(:is_public => 1)
+    else
+      @course.update_attributes(:is_public => 0)
+    end
+    if @course.is_public == 0
+      course_status = CourseStatus.find_by_course_id(@course.id)
+      course_status.destroy if course_status
+    elsif @course.is_public == 1
+      course_status = CourseStatus.find_by_course_id(@course.id)
+      course_status.destroy if course_status
+      course_status = CourseStatus.create(:course_id => @course.id,  :grade => 0)
+    end
+    respond_to do |format|
+      format.js
+    end
+  end
+
   def search_member
     if User.current.allowed_to?(:as_teacher,@course) || User.current.admin
       q = "#{params[:name].strip}"

app/controllers/exercise_controller.rb

@@ -485,7 +485,7 @@ class ExerciseController < ApplicationController
           ea.answer_text = params[:answer_text]
           if ea.save
             @percent = get_percent(@exercise,User.current)
-            render :json => {:text => pv.vote_text,:percent => format("%.2f", @percent)}
+            render :json => {:text => ea.answer_text,:percent => format("%.2f", @percent)}
           else
             render :json => {:text => "failure"}
           end

app/controllers/issues_controller.rb

@@ -81,7 +81,8 @@ class IssuesController < ApplicationController
       @status_id = params[:status_id]
       @subject = params[:subject]
       @issue_count = @query.issue_count
-      @issue_pages = Paginator.new @issue_count, @limit, params['page'].to_i + 1
+      @issue_pages = Paginator.new @issue_count, @limit, params['page']
+      params[:page] = (params[:page] || 1).to_i + 1 #页码需要加1
       @offset ||= @issue_pages.offset
       @issues = @query.issues(:include => [:assigned_to, :tracker, :priority, :category, :fixed_version],
                               :order => sort_clause,

app/views/courses/private_or_public.js.erb

@@ -0,0 +1,8 @@
+$("#project_info_<%=@course.id %>").html('<%=escape_javascript(render :partial=>'layouts/project_info') %>');
+if(document.getElementById("course_is_public")) {
+    <% if @course.is_public == 0%>
+        $("#course_is_public").attr("checked",false);
+    <% elsif @course.is_public == 1 %>
+        $("#course_is_public").attr("checked",true);
+    <% end %>
+}

app/views/courses/settings.html.erb

@@ -66,19 +66,19 @@
           <li class=" mb5 ml80">
             <label >公开&nbsp;&nbsp;：</label>
             <input <%= @course.is_public == 1 ? 'checked' : ''%> id="course_is_public" name="course[is_public]"  type="checkbox">
-            <span class="c_grey">（打钩为公开，不打钩则不公开，若不公开，仅课程成员可见该课程。）</span>
+            <span class="c_grey">（选中后课外用户可见该课程，否则仅对课内成员可见）</span>
             <div class="cl"></div>
           </li>
           <li class=" mb5 ml30">
             <label >学生列表公开&nbsp;&nbsp;：</label>
             <input <%= @course.open_student == 1 ? 'checked' : ''%> id="course_open_student" name="course[open_student]"  type="checkbox" style="margin-left: 1px;"/>
-            <span class="c_grey">（打钩为"学生列表公开"，不打钩为不公开，若不公开，则课程外部人员看不到学生列表）</span>
+            <span class="c_grey">（选中后课外用户可见学生列表，否则仅对课内成员可见）</span>
             <div class="cl"></div>
           </li>
           <li class=" mb5 ml30">
             <label >学生上传资源&nbsp;&nbsp;：</label>
             <input <%= @course.publish_resource == 1 ? 'checked' : ''%> id="course_publish_resource" name="course[publish_resource]"  type="checkbox" style="margin-left: 1px;"/>
-            <span class="c_grey">（打钩为"允许学生上传资源"，不打钩为"不允许学生上传资源"）</span>
+            <span class="c_grey">（选中后允许学生上传课程资源，否则不允许）</span>
             <div class="cl"></div>
           </li>
           <li class=" ml90" >

app/views/exercise/_exercise_student.html.erb

@@ -100,6 +100,9 @@
                                               {
                                                   obj.checked = false;
                                               }
+                                          },
+                                          error: function () {
+                                              alert("网络异常，答题失败，请确认网络正常连接后再答题。");
                                           }
                                       });
                                   }
@@ -154,6 +157,9 @@
                                               {
                                                   obj.checked = false;
                                               }
+                                          },
+                                          error: function () {
+                                              alert("网络异常，答题失败，请确认网络正常连接后再答题。");
                                           }
                                       });
                                   }
@@ -196,6 +202,9 @@
                               success: function (data) {
                                   var dataObj = eval(data);
                                   obj.value = dataObj.text;
+                              },
+                              error: function () {
+                                  alert("网络异常，答题失败，请确认网络正常连接后再答题。");
                               }
                           });
 

app/views/files/_org_subfield_list.html.erb

@@ -30,7 +30,7 @@
               <% if User.current.logged? %>
                   <% if !@org_subfield.attachments.all.include?file %>
                     <%= link_to("选入栏目",quote_resource_show_org_subfield_org_subfield_file_path(:org_subfield_id => @org_subfield.id, :id => file.id),:class => "f_l re_select c_lorange",:remote => true) %>
-                  <% else %>
+                  <% elsif @org_subfield.organization.org_subfields.where("field_type='Resource'").count > 1 %>
                     <%= link_to("选入组织其他栏目",quote_resource_show_org_subfield_org_subfield_file_path(:org_subfield_id => @org_subfield.id, :id => file.id),:class => "f_l re_select c_lorange",:remote => true) %>
                   <% end %>
                   <%= file_preview_tag(file, class: 'f_l re_open', style:'text-align: center;') %>

app/views/issues/_list.html.erb

@@ -40,14 +40,14 @@
      <%= render :partial => 'users/project_issue', :locals => {:activity => issue, :user_activity_id => issue.id} %>
  <% end %>
  <% if issues.count == 10%>
-     <!--<div id="show_more_issues" class="loadMore mt10 f_grey">点击展开更多<%#=link_to "",  project_issues_path({:project_id => project.id,:page => issue_pages.page}.merge(params)),:id => "more_issues_link",:remote => "true",:class => "none" %></div>-->
-     <%= link_to "点击展开更多",project_issues_path({:project_id => project.id,:page => issue_pages.page}.merge(params)),:id => "show_more_issues",:remote => "true",:class => "loadMore mt10 f_grey"%>
+     <div id="show_more_issues" class="loadMore mt10 f_grey">展开更多<%=link_to "",  project_issues_path({:project_id => project.id}.merge(params)),:id => "more_issues_link",:remote => "true",:class => "none" %></div>
+     <%#= link_to "点击展开更多",user_activities_path(@user.id,:type => type,:page => page),:id => "show_more_activities",:remote => "true",:class => "loadMore mt10 f_grey"%>
  <% end%>
  <!--<ul class="wlist">-->
    <!--<%#= pagination_links_full issue_pages, issue_count, :per_page_links => false, :remote => true, :flag => true %>-->
  <!--</ul>-->
- <!--<script type="text/javascript">
+ <script type="text/javascript">
      $("#show_more_issues").mouseover(function(){
          $("#more_issues_link").click();
      });
- </script>-->
+ </script>

app/views/layouts/_project_info.html.erb

@@ -0,0 +1,92 @@
+<% is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course)) %>
+<% teacher_num = searchTeacherAndAssistant(@course).count %>
+<% student_num = studentCount(@course) %>
+<% course_file_num = visable_attachemnts_incourse(@course).count%>
+<div class="pr_info_logo fl mr10 mb5">
+<!--<a href="#"><img src="images/courses/pic_courses.jpg" width="60" height="60" alt="logo" /></a>-->
+<%= image_tag(url_to_avatar(@course), :width => "60", :height => "60") %>
+</div>
+<div class="pr_info_id fl mb5 f14"><%= @course.is_public == 0 ? "私有课程" : "公开课程" %></div>
+<div class="pr_info_id fl f14">
+ID:<%= @course.id%>
+</div>
+<!--<div class="pr_info_id fl mb5 f14">
+      ID:<%#= @course.id%>
+    </div>
+    <div class="pr_info_join fl">
+      <%# if is_teacher%>
+          <%#= link_to "<span class='pr_setting'></span>#{l(:button_configure)}".html_safe, {:controller => 'courses', :action => 'settings', :id => @course}, :class => "pr_join_a" %>
+          <%#= set_course_time @course%>
+          <%#= link_to "<span class='pr_copy'></span>#{l(:button_copy)}".html_safe, copy_course_course_path(@course.id), :class => "pr_join_a" %>
+      <%# else%>
+          <div id="join_in_course_header"><%#= join_in_course_header(@course, User.current) %></div>
+      <%# end%>
+    </div>-->
+<div class="cl"></div>
+
+<!--<div >-->
+<!--<a class="pr_info_name fl c_dark fb break_word" href="http://<%#= Setting.host_course%>/courses/<%#= @course.id%>" target="_blank">-->
+<!--<%#= @course.name %>-->
+<!--</a>-->
+<!--<%# if @course.is_public == 0%>-->
+<!--<span class="img_private ">-->
+<!--<%#= l(:field_is_private)%>-->
+<!--</span>-->
+<!--<%# end %>-->
+<!--<%#if @course.tea_id == User.current.id && @course.outline == 0 %>-->
+<!--<span>-->
+<!--<a href="javascript:void(0)" onclick="course_outline('<%#= @course.id%>');">设置大纲</a>-->
+<!--</span>-->
+<!--<%# else%>-->
+<!--<span>-->
+<!--<a href="javascript:void(0)" onclick="course_outline('<%#= @course.id%>');">设置大纲</a>-->
+<!--</span>-->
+<!--<%# end %>-->
+<!--</div>-->
+<div >
+<a class="pr_info_name fl c_dark fb break_word" href="http://<%= Setting.host_course%>/courses/<%= @course.id%>" target="_blank"></a>
+<div>
+  <a class="pr_info_name c_dark fb break_word fl" href="http://<%= Setting.host_course%>/courses/<%= @course.id%>" target="_blank">
+    <%= @course.name %>
+  </a>
+  <%# if @course.is_public == 0%>
+  <!--<span class="img_private "></span>-->
+  <!--<span class="img_private mr5 fl">
+              <%#= l(:field_is_private)%>
+            </span>-->
+  <%# end %>
+  <span id="course_outline_bar">
+      <%if User.current && @course.tea_id == User.current.id && (@course.outline == 0 ||  BlogComment.where(:id=>@course.outline).count == 0) %>
+          <a href="javascript:void(0);" title="设置课程大纲" onclick="course_outline('<%= @course.id%>')" class="mr5 syllabusSetting fl"> </a>
+       <% elsif User.current && @course.tea_id == User.current.id && @course.outline != 0 && BlogComment.where(:id=>@course.outline).count != 0%>
+          <a href="<%=syllabus_course_path(@course) %>" title="课程大纲" class="mr5 syllabusIcon fl"> </a>
+        <% elsif User.current && @course.tea_id != User.current.id && !@course.is_public? && User.current.member_of_course?(@course)  && @course.outline != 0%>
+          <a href="<%=syllabus_course_path(@course) %>" title="课程大纲" class="mr5 syllabusIcon fl"> </a>
+        <% elsif User.current && @course.tea_id != User.current.id && @course.is_public? && @course.outline != 0%>
+          <a href="<%=syllabus_course_path(@course) %>" title="课程大纲" class="mr5 syllabusIcon fl"> </a>
+        <%else%>
+        <%end %>
+  </span>
+</div>
+</div>
+<div class="cl"></div>
+<div class="pr_info_foot ">
+<%= l(:label_account_identity_teacher)%>（<%= course_teacher_link teacher_num %>）
+<span>|&nbsp;</span>
+<%= l(:label_account_identity_student)%>（<%= course_student_link student_num %>）
+<span>|&nbsp;</span>
+<%= l(:project_module_attachments)%>（<%= link_to course_file_num, course_files_path(@course), :class => 'info_foot_num c_blue',:id=>'courses_files_count_info' %>）</div>
+<div class="cl"></div>
+<% if is_teacher %>
+  <div class="homepagePostSetting mt5 mr5">
+    <ul>
+      <li class="homepagePostSettingIcon">
+        <ul class="homepagePostSettiongText boxShadow">
+          <li><%= link_to "课程配置", {:controller => 'courses', :action => 'settings', :id => @course}, :class => "postOptionLink" %></li>
+          <li><%= link_to @course.is_public == 0 ? "设为公开" : "设为私有", {:controller => 'courses', :action => 'private_or_public', :id => @course},:remote=>true,:confirm=>"您确定要设置为"+(@course.is_public == 0 ? "公开" : "私有")+"吗", :class => "postOptionLink" %></li>
+          <!--<li><%#= link_to "复制学期", copy_course_course_path(@course.id), :class => "postOptionLink" %></li>-->
+        </ul>
+      </li>
+    </ul>
+  </div>
+<% end %>

app/views/layouts/base_courses.html.erb

@@ -1,6 +1,4 @@
 <%# course_model %>
-<% teacher_num = searchTeacherAndAssistant(@course).count %>
-<% student_num = studentCount(@course) %>
 <% course_file_num = visable_attachemnts_incourse(@course).count%>
 <% is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course)) %>
 <!DOCTYPE html>
@@ -51,78 +49,8 @@
 <div id="Container">
   <div id="content">
     <div id="LSide" class="fl">
-      <div class="project_info">
-        <div class="pr_info_logo fl mr10 mb5">
-          <!--<a href="#"><img src="images/courses/pic_courses.jpg" width="60" height="60" alt="logo" /></a>-->
-          <%= image_tag(url_to_avatar(@course), :width => "60", :height => "60") %>
-        </div>
-        <div class="pr_info_id fl mb5 f14">
-          ID:<%= @course.id%>
-        </div>
-        <div class="pr_info_join fl">
-          <% if is_teacher%>
-              <%= link_to "<span class='pr_setting'></span>#{l(:button_configure)}".html_safe, {:controller => 'courses', :action => 'settings', :id => @course}, :class => "pr_join_a" %>
-              <%= set_course_time @course%>
-              <%#= link_to "<span class='pr_copy'></span>#{l(:button_copy)}".html_safe, copy_course_course_path(@course.id), :class => "pr_join_a" %>
-          <% else%>
-              <div id="join_in_course_header"><%= join_in_course_header(@course, User.current) %></div>
-          <% end%>
-        </div>
-        <div class="cl"></div>
-
-        <!--<div >-->
-          <!--<a class="pr_info_name fl c_dark fb break_word" href="http://<%#= Setting.host_course%>/courses/<%#= @course.id%>" target="_blank">-->
-            <!--<%#= @course.name %>-->
-          <!--</a>-->
-          <!--<%# if @course.is_public == 0%>-->
-                <!--<span class="img_private ">-->
-                  <!--<%#= l(:field_is_private)%>-->
-                <!--</span>-->
-          <!--<%# end %>-->
-          <!--<%#if @course.tea_id == User.current.id && @course.outline == 0 %>-->
-            <!--<span>-->
-              <!--<a href="javascript:void(0)" onclick="course_outline('<%#= @course.id%>');">设置大纲</a>-->
-            <!--</span>-->
-          <!--<%# else%>-->
-            <!--<span>-->
-              <!--<a href="javascript:void(0)" onclick="course_outline('<%#= @course.id%>');">设置大纲</a>-->
-            <!--</span>-->
-          <!--<%# end %>-->
-        <!--</div>-->
-        <div >
-          <a class="pr_info_name fl c_dark fb break_word" href="http://<%= Setting.host_course%>/courses/<%= @course.id%>" target="_blank"></a>
-            <div>
-              <a class="pr_info_name c_dark fb break_word fl" href="http://<%= Setting.host_course%>/courses/<%= @course.id%>" target="_blank">
-                <%= @course.name %>
-              </a>
-              <% if @course.is_public == 0%>
-                <!--<span class="img_private "></span>-->
-                <span class="img_private mr5 fl">
-                  <%= l(:field_is_private)%>
-                </span>
-              <% end %>
-              <span id="course_outline_bar">
-              <%if User.current && @course.tea_id == User.current.id && (@course.outline == 0 ||  BlogComment.where(:id=>@course.outline).count == 0) %>
-                  <a href="javascript:void(0);" title="设置课程大纲" onclick="course_outline('<%= @course.id%>')" class="mr5 syllabusSetting fl"> </a>
-               <% elsif User.current && @course.tea_id == User.current.id && @course.outline != 0 && BlogComment.where(:id=>@course.outline).count != 0%>
-                  <a href="<%=syllabus_course_path(@course) %>" title="课程大纲" class="mr5 syllabusIcon fl"> </a>
-                <% elsif User.current && @course.tea_id != User.current.id && !@course.is_public? && User.current.member_of_course?(@course)  && @course.outline != 0%>
-                  <a href="<%=syllabus_course_path(@course) %>" title="课程大纲" class="mr5 syllabusIcon fl"> </a>
-                <% elsif User.current && @course.tea_id != User.current.id && @course.is_public? && @course.outline != 0%>
-                  <a href="<%=syllabus_course_path(@course) %>" title="课程大纲" class="mr5 syllabusIcon fl"> </a>
-                <%else%>
-               <%end %>
-               </span>
-            </div>
-         </div>
-        <div class="cl"></div>
-        <div class="pr_info_foot ">
-          <%= l(:label_account_identity_teacher)%>（<%= course_teacher_link teacher_num %>）
-          <span>|&nbsp;</span>
-          <%= l(:label_account_identity_student)%>（<%= course_student_link student_num %>）
-          <span>|&nbsp;</span>
-          <%= l(:project_module_attachments)%>（<%= link_to course_file_num, course_files_path(@course), :class => 'info_foot_num c_blue',:id=>'courses_files_count_info' %>）</div>
-        <div class="cl"></div>
+      <div class="project_info" style="position: relative" id="project_info_<%=@course.id %>">
+        <%=render :partial=>'layouts/project_info' %>
       </div><!--课程信息 end-->
       <div class="info_box">
         <ul>

app/views/organizations/_join_project_menu.html.erb

@@ -29,7 +29,7 @@
   <div class="fl">
     <%=form_tag url_for(:controller => 'organizations', :action => 'join_projects', :organization_id => organization_id),:method => 'post', :id => 'join_projects_form', :remote => true,:class=>"resourcesSearchBox" do %>
         <input type="text" name="projects" placeholder="搜索您已加入的项目的名称" class="searchCourse" />
-        <div id="search_projects_result_list" class="mb8"></div>
+        <div id="search_projects_result_list" class="mb8 maxHeight100"></div>
         <div class="courseSendSubmit">
           <a href="javascript:void(0);" onclick="org_join_projects(<%= organization_id %>);" class="sendSourceText">关联</a>
         </div>

app/views/organizations/_org_left_subfield_list.html.erb

@@ -3,7 +3,7 @@
 </div>
 <div class="homepageLeftMenuBlock">
   <a href="javascript:void(0);" class="homepageMenuText" onclick="$('#homepageLeftMenuProjects').slideToggle();">项目</a>
-  <% if User.current.logged? %>
+  <% if User.current.logged? and User.current.admin_of_org?(organization) %>
     <%=link_to "", join_project_menu_organization_path(organization),:remote => true, :method => "post", :class => "homepageMenuSetting fr", :title => "关联项目"%>
   <% end %>
 </div>
@@ -15,7 +15,7 @@
 </div>
 <div class="homepageLeftMenuBlock">
   <a href="javascript:void(0);" class="homepageMenuText" onclick="$('#homepageLeftMenuCourses').slideToggle();">课程</a>
-  <% if User.current.logged? %>
+  <% if User.current.logged? and User.current.admin_of_org?(organization) %>
     <%=link_to "", join_course_menu_organization_path(organization),:remote => true, :method => "post", :class => "homepageMenuSetting fr", :title => "关联课程"%>
   <% end %>
 </div>

app/views/student_work/_evaluation_un_work.html.erb

@@ -74,7 +74,7 @@
   <!-- 成绩 -->
   <% score = student_work.respond_to?("score") ? student_work.score : (student_work.final_score || 0) - student_work.absence_penalty - student_work.late_penalty%>
   <li class="hworkList50 <%= score_color score%> student_final_scor_info">
-    <%= score.nil? ? "--" : format("%.1f",score)%>
+    <%= score.nil? ? "--" : format("%.1f",score<0 ? 0 : score)%>
     <% unless score.nil?%>
         <div class="infoNi none width180">
           作品最终评分为

app/views/student_work/_revise_attachment.html.erb

@@ -9,7 +9,7 @@
           <%= render :partial => 'work_attachments_status', :locals => {:attachments => work.attachments.where("attachtype = 7"), :status => 2} %>
           <span class="tit_fb">追加时间：</span><%=format_time revise_attachment.created_on.to_s %>&nbsp;&nbsp;(<%=revise_attachment_status @homework,revise_attachment %>)<br />
           <% unless revise_attachment.description == "" %>
-            <span class="tit_fb">附件描述：</span><p class="showHworkP"><%=revise_attachment.description %></p>
+            <span class="tit_fb">追加理由：</span><p class="showHworkP"><%=revise_attachment.description %></p>
           <% end %>
         </div>
         <div class="cl"></div>
@@ -24,7 +24,7 @@
               <%= render :partial => 'work_attachments_status', :locals => {:attachments => work.attachments.where("attachtype = 7"), :status => 1} %>
               <span class="tit_fb">追加时间：</span><%=format_time revise_attachment.created_on.to_s %><br />
               <% unless revise_attachment.description == "" %>
-                  <span class="tit_fb">附件描述：</span><p class="showHworkP"><%=revise_attachment.description %></p>
+                  <span class="tit_fb">追加理由：</span><p class="showHworkP"><%=revise_attachment.description %></p>
               <% end %>
             </div>
         <% end %>

app/views/student_work/index.html.erb

@@ -170,7 +170,11 @@
           <div class="cl"></div>
         </div>
         <div class="mt5">
-          <div class="fontGrey2 db fl">截止时间：<%= @homework.end_time %>&nbsp;23:59</div>
+          <% if @homework.homework_detail_manual && @homework.homework_detail_manual.comment_status < 2 %>
+            <div class="fontGrey2 db fl">提交截止时间：<%= @homework.end_time %>&nbsp;23:59</div>
+          <% elsif @homework.homework_detail_manual && @homework.homework_detail_manual.comment_status >= 2 %>
+              <div class="fontGrey2 db fl">匿评截止时间：<%= @homework.homework_detail_manual.evaluation_end %>&nbsp;23:59</div>
+          <% end %>
           <% if @homework.homework_detail_manual.comment_status == 0 %>
             <div class="fontGrey2 db fl ml10">发布时间：<%= @homework.publish_time %>&nbsp;00:00</div>
           <% end %>

app/views/users/_course_homework.html.erb

@@ -86,7 +86,11 @@
               分组人数：<%=activity.homework_detail_group.min_num %>-<%=activity.homework_detail_group.max_num %> 人
             </div>
         <% end %>
-        <div class="homepagePostDeadline">截止时间：<%= activity.end_time.to_s %>&nbsp;23:59</div>
+        <% if activity.homework_detail_manual && activity.homework_detail_manual.comment_status < 2 %>
+            <div class="homepagePostDeadline">提交截止时间：<%= activity.end_time.to_s %>&nbsp;23:59</div>
+        <% elsif activity.homework_detail_manual && activity.homework_detail_manual.comment_status >= 2 %>
+            <div class="homepagePostDeadline">匿评截止时间：<%= activity.homework_detail_manual.evaluation_end.to_s %>&nbsp;23:59</div>
+        <% end %>
       </div>
       <div class="homepagePostIntro break_word upload_img list_style maxh360 lh18 table_maxWidth" id="activity_description_<%= user_activity_id%>">
         <div id="intro_content_<%= user_activity_id%>">

app/views/users/_user_homework_detail.html.erb

@@ -84,9 +84,11 @@
               分组人数：<%=homework_common.homework_detail_group.min_num %>-<%=homework_common.homework_detail_group.max_num %> 人
             </div>
         <% end %>
-        <div class="homepagePostDeadline">
-          <%= l(:label_end_time)%>：<%= homework_common.end_time%>&nbsp;23:59
-        </div>
+        <% if homework_common.homework_detail_manual && homework_common.homework_detail_manual.comment_status < 2 %>
+            <div class="homepagePostDeadline">提交截止时间：<%= homework_common.end_time.to_s %>&nbsp;23:59</div>
+        <% elsif homework_common.homework_detail_manual && homework_common.homework_detail_manual.comment_status >= 2 %>
+            <div class="homepagePostDeadline">匿评截止时间：<%= homework_common.homework_detail_manual.evaluation_end.to_s %>&nbsp;23:59</div>
+        <% end %>
         <% if homework_common.homework_detail_manual.comment_status == 0 %>
             <div class="homepagePostDeadline ml15">
               <%= l(:label_publish_time)%>：<%= homework_common.publish_time%>&nbsp;00:00

config/routes.rb

@@ -928,6 +928,7 @@ RedmineApp::Application.routes.draw do
       post 'join_in/join_group', :to => 'courses#join_group', :as => 'join_group'
       delete 'join_in/join_group', :to => 'courses#unjoin_group'
       get 'copy_course'
+      get 'private_or_public'
       match 'course_activity', :to => 'courses#course_activity',  :via => :get, :as => "course_activity"
       get 'course_outline'
       post 'search_course_outline'

public/stylesheets/courses.css

@@ -1239,3 +1239,5 @@ div.disable_link {background-color: #c1c1c1 !important;}
 .support{ background:url(../images/public_icon.png) -66px -45px no-repeat; width:18px; height:21px;}
 .function{ background:url(../images/public_icon.png) -66px -70px no-repeat; width:18px; height:21px;}
 .weekly{ background:url(../images/public_icon.png) -66px -95px no-repeat; width:18px; height:21px;}
+
+.boxShadow {box-shadow:0px 2px 8px rgba(146, 153, 169, 0.5);}