From cdb7004820fe395c456e7d13d722d026b34c1086 Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Tue, 13 Sep 2016 16:46:14 +0800
Subject: [PATCH] =?UTF-8?q?=E7=8F=AD=E7=BA=A7=E4=B8=BB=E9=A1=B5=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E7=BC=93=E5=AD=98=E5=A2=9E=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../courses/_course_activity_users.html.erb   |   4 +-
 app/views/files/_course_file.html.erb         |  86 +++++-----
 app/views/files/_resource_detail.html.erb     |  20 ++-
 app/views/layouts/_course_base_info.html.erb  |  47 ++---
 app/views/layouts/base_courses.html.erb       | 162 +++++++++---------
 .../users/_user_homework_detail.html.erb      |   2 +
 config/environments/development.rb            |   2 +-
 7 files changed, 173 insertions(+), 150 deletions(-)

diff --git a/app/views/courses/_course_activity_users.html.erb b/app/views/courses/_course_activity_users.html.erb
index 8b2d8546b..247710b4d 100644
--- a/app/views/courses/_course_activity_users.html.erb
+++ b/app/views/courses/_course_activity_users.html.erb
@@ -23,7 +23,7 @@
           总得分为以上得分之和</div>
       </div>
       <% contributor_course_scor(course.id).each do |contributor_score| %>
-          <% cache [:user_contributor_score,contributor_score.id.to_s+"-"+contributor_score.updated_at.to_i.to_s+"-"+contributor_score.user.updated_on.to_i.to_s] do%>
+          <%# cache [:user_contributor_score,contributor_score.id.to_s+"-"+contributor_score.updated_at.to_i.to_s+"-"+contributor_score.user.updated_on.to_i.to_s] do%>
               <% total_score = contributor_score.resource_num.to_i * 5 + contributor_score.message_num.to_i * 2 +
                       contributor_score.message_reply_num.to_i * 1 + contributor_score.journal_num.to_i * 1 +
                       + contributor_score.homework_journal_num.to_i * 1 + contributor_score.news_reply_num.to_i * 1 +
@@ -62,7 +62,7 @@
                     </div>
                   </li>
               <% end %>
-          <% end %>
+          <%# end %>
       <% end %>
       <div class="cl"></div>
       </ul>
diff --git a/app/views/files/_course_file.html.erb b/app/views/files/_course_file.html.erb
index 045eec6f7..aca9fc43a 100644
--- a/app/views/files/_course_file.html.erb
+++ b/app/views/files/_course_file.html.erb
@@ -70,22 +70,24 @@
 </script>
 
 <div class="homepageRight mt0 ml10">
-  <div class="homepageRightBanner">
-    <div class="NewsBannerName">资源库</div>
-    <ul class="resourcesSelect">
-      <li class="resourcesSelected"><a href="javascript:void(0);" class="resourcesIcon"></a>
-        <ul class="resourcesType">
-          <li><a href="javascript:void(0);" onclick="search_tag_attachment('<%= search_tag_attachment_course_files_path(@course)%>','','<%= @q%>','<%= @course.id%>');" class="resourcesTypeAll resourcesGrey">全部</a></li>
-          <li><a href="javascript:void(0);" onclick="search_tag_attachment('<%= search_tag_attachment_course_files_path(@course)%>','课件','<%= @q%>','<%= @course.id%>');" class="homepagePostTypeAssignment postTypeGrey">课件</a></li>
-          <li><a href="javascript:void(0);" onclick="search_tag_attachment('<%= search_tag_attachment_course_files_path(@course)%>','软件','<%= @q%>','<%= @course.id%>');" class="softwareIcon postTypeGrey">软件</a></li>
-          <li><a href="javascript:void(0);" onclick="search_tag_attachment('<%= search_tag_attachment_course_files_path(@course)%>','媒体','<%= @q%>','<%= @course.id%>');" class="mediaIcon resourcesGrey">媒体</a></li>
-          <li><a href="javascript:void(0);" onclick="search_tag_attachment('<%= search_tag_attachment_course_files_path(@course)%>','代码','<%= @q%>','<%= @course.id%>');" class="codeIcon resourcesGrey">代码</a></li>
-          <li><a href="javascript:void(0);" onclick="search_tag_attachment('<%= search_tag_attachment_course_files_path(@course)%>','论文','<%= @q%>','<%= @course.id%>');" class="thesisIcon resourcesGrey">论文</a></li>
-          <li><a href="javascript:void(0);" onclick="search_tag_attachment('<%= search_tag_attachment_course_files_path(@course,:other=>true)%>','其他','<%= @q%>','<%= @course.id%>');" class="othersIcon resourcesGrey">其它</a></li>
+  <% cache [:course_resource_right_menu,@course.id.to_s] do%>
+      <div class="homepageRightBanner">
+        <div class="NewsBannerName">资源库</div>
+        <ul class="resourcesSelect">
+          <li class="resourcesSelected"><a href="javascript:void(0);" class="resourcesIcon"></a>
+            <ul class="resourcesType">
+              <li><a href="javascript:void(0);" onclick="search_tag_attachment('<%= search_tag_attachment_course_files_path(@course)%>','','<%= @q%>','<%= @course.id%>');" class="resourcesTypeAll resourcesGrey">全部</a></li>
+              <li><a href="javascript:void(0);" onclick="search_tag_attachment('<%= search_tag_attachment_course_files_path(@course)%>','课件','<%= @q%>','<%= @course.id%>');" class="homepagePostTypeAssignment postTypeGrey">课件</a></li>
+              <li><a href="javascript:void(0);" onclick="search_tag_attachment('<%= search_tag_attachment_course_files_path(@course)%>','软件','<%= @q%>','<%= @course.id%>');" class="softwareIcon postTypeGrey">软件</a></li>
+              <li><a href="javascript:void(0);" onclick="search_tag_attachment('<%= search_tag_attachment_course_files_path(@course)%>','媒体','<%= @q%>','<%= @course.id%>');" class="mediaIcon resourcesGrey">媒体</a></li>
+              <li><a href="javascript:void(0);" onclick="search_tag_attachment('<%= search_tag_attachment_course_files_path(@course)%>','代码','<%= @q%>','<%= @course.id%>');" class="codeIcon resourcesGrey">代码</a></li>
+              <li><a href="javascript:void(0);" onclick="search_tag_attachment('<%= search_tag_attachment_course_files_path(@course)%>','论文','<%= @q%>','<%= @course.id%>');" class="thesisIcon resourcesGrey">论文</a></li>
+              <li><a href="javascript:void(0);" onclick="search_tag_attachment('<%= search_tag_attachment_course_files_path(@course,:other=>true)%>','其他','<%= @q%>','<%= @course.id%>');" class="othersIcon resourcesGrey">其它</a></li>
+            </ul>
+          </li>
         </ul>
-      </li>
-    </ul>
-  </div>
+      </div>
+  <% end %>
   <div class="cl"></div>
   <% unless User.current.logged? %>
       <div class="syllabusbox_tishi mt10">
@@ -95,34 +97,36 @@
       </div>
   <% end %>
   <div class="resources mt10 pr" style="padding-bottom:5px;">
-    <div class="reTop mb5">
-      <%= form_tag( search_course_files_path(@course), method: 'get',:class => "re_search",:remote=>true) do %>
-          <%= text_field_tag 'name', params[:name], name: "name", :class => 'researchBox fl',:style=>"padding: 0px"%>
-          <%= submit_tag "课内搜索", :class => "blueBtn mr5 fl",:name => "incourse",:id => "incourse" %>
-          <%#= submit_tag "全站搜索", :class => "blueBtn mr5 fl",:name => "insite",:id => "insite" %>
-          <% if is_course_teacher(User.current,@course) || (@course.publish_resource==1 && User.current.member_of_course?(@course) ) %>
-              <input class="blueBtn fr mr5" value="上传资源" onclick="course_files_upload();">
-              <%= link_to("导入资源", import_resources_user_path(User.current, :type => 6, :course_id => @course.id), :class => "blue-btn fr mr5", :remote => true) %>
+    <% cache [:course_resource_head,@course.id.to_s] do%>
+        <div class="reTop mb5">
+          <%= form_tag( search_course_files_path(@course), method: 'get',:class => "re_search",:remote=>true) do %>
+              <%= text_field_tag 'name', params[:name], name: "name", :class => 'researchBox fl',:style=>"padding: 0px"%>
+              <%= submit_tag "课内搜索", :class => "blueBtn mr5 fl",:name => "incourse",:id => "incourse" %>
+              <%#= submit_tag "全站搜索", :class => "blueBtn mr5 fl",:name => "insite",:id => "insite" %>
+              <% if is_course_teacher(User.current,@course) || (@course.publish_resource==1 && User.current.member_of_course?(@course) ) %>
+                  <input class="blueBtn fr mr5" value="上传资源" onclick="course_files_upload();">
+                  <%= link_to("导入资源", import_resources_user_path(User.current, :type => 6, :course_id => @course.id), :class => "blue-btn fr mr5", :remote => true) %>
+              <% end %>
           <% end %>
-      <% end %>
 
-      <!-- show_window('light','fade','20%','35%')-->
-      <!--<a href="javascript:void(0)" class="re_fabu f_r b_lblue" onclick="show_upload();">上传资源</a>-->
-    </div>
-    <div>
-      <div class="fileTagWrap" id="files_tag">
-        <%= render :partial => "files/tag_yun", :locals => {:tag_list => @tag_list,:course => @course,:tag_name => @tag_name}%>
-      </div>
-      <div class="cl"></div>
-      <div class="re_con_top">
-        <p class="f_l  fontBlue f_b f_14" id="tip_attachment_count">
-          <%= render :partial => "files/tip_attachment_count" %>
-        </p>
-        <p class="f_r" style="color: #808080" id="course_filter_order">
-          <%= render :partial => 'course_file_filter_order', :locals => {:remote => @is_remote, :sort => @sort, :order => @order} %>
-        </p>
-      </div>
-    </div>
+          <!-- show_window('light','fade','20%','35%')-->
+          <!--<a href="javascript:void(0)" class="re_fabu f_r b_lblue" onclick="show_upload();">上传资源</a>-->
+        </div>
+        <div>
+          <div class="fileTagWrap" id="files_tag">
+            <%= render :partial => "files/tag_yun", :locals => {:tag_list => @tag_list,:course => @course,:tag_name => @tag_name}%>
+          </div>
+          <div class="cl"></div>
+          <div class="re_con_top">
+            <p class="f_l  fontBlue f_b f_14" id="tip_attachment_count">
+              <%= render :partial => "files/tip_attachment_count" %>
+            </p>
+            <p class="f_r" style="color: #808080" id="course_filter_order">
+              <%= render :partial => 'course_file_filter_order', :locals => {:remote => @is_remote, :sort => @sort, :order => @order} %>
+            </p>
+          </div>
+        </div>
+    <% end %>
     <div class="cl"></div>
     <% if !User.current.member_of_course?(@course) && show_attachment_tip(@course.id, "Course") %>
         <div class="resource_tip_box fontGrey2">
diff --git a/app/views/files/_resource_detail.html.erb b/app/views/files/_resource_detail.html.erb
index b60814afd..00ac20b87 100644
--- a/app/views/files/_resource_detail.html.erb
+++ b/app/views/files/_resource_detail.html.erb
@@ -27,17 +27,19 @@
             <span class="grey_homework_btn_cir ml5"><%=file.publish_time %>&nbsp;&nbsp;0点发布</span>
         <% end %>
       </div>
-      <div class="mt5">
-        <span class="fontGrey2 mr15 fl">上传时间：<%= format_time(file.created_on)%></span>
-        <% if file.tag_list.length > 0%>
-            <span class="fontGrey2 fl mr15">上传类型：<%= file.tag_list[0] %></span>
-        <% end %>
-        <p class="f_l mb5 fontGrey2">文件大小：<%= number_to_human_size(file.filesize) %></p>
-        <p class="fl ml15 fontGrey2">下载<%= file.downloads%>&nbsp;&nbsp;|&nbsp;&nbsp;引用<%= file.quotes.nil? ? 0:file.quotes  %> </p>
-      </div>
+      <% cache [:resource_detail,file.id.to_s] do%>
+          <div class="mt5">
+            <span class="fontGrey2 mr15 fl">上传时间：<%= format_time(file.created_on)%></span>
+            <% if file.tag_list.length > 0%>
+                <span class="fontGrey2 fl mr15">上传类型：<%= file.tag_list[0] %></span>
+            <% end %>
+            <p class="f_l mb5 fontGrey2">文件大小：<%= number_to_human_size(file.filesize) %></p>
+            <p class="fl ml15 fontGrey2">下载<%= file.downloads%>&nbsp;&nbsp;|&nbsp;&nbsp;引用<%= file.quotes.nil? ? 0:file.quotes  %> </p>
+          </div>
+      <% end %>
       <%# unless file.description.blank? %>
           <div class="cl"></div>
-          <% if User.current.admin? || ( User.current.logged? && ((is_course_teacher(User.current,@course) || file.author_id == User.current.id) && course_contains_attachment?(@course,file)) && ((delete_allowed || User.current.id == file.author_id) && file.container_id == @course.id && file.container_type == "Course")) %>
+          <% if (User.current.admin? || ( User.current.logged? && ((is_course_teacher(User.current,@course) || file.author_id == User.current.id) && course_contains_attachment?(@course,file)) && ((delete_allowed || User.current.id == file.author_id) && file.container_id == @course.id && file.container_type == "Course"))) %>
             <div>
               <div id="file_description_show_<%= file.id %>" class="fontGrey2 mb4">
                     <%= render :partial => 'files/file_description', :locals => {:file => file} %>
diff --git a/app/views/layouts/_course_base_info.html.erb b/app/views/layouts/_course_base_info.html.erb
index 24e61e0f0..1f2770ce3 100644
--- a/app/views/layouts/_course_base_info.html.erb
+++ b/app/views/layouts/_course_base_info.html.erb
@@ -1,7 +1,7 @@
 <% is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course)) %>
-<% teacher_num = TeacherAndAssistantCount(@course) %>
-<% student_num = studentCount(@course) %>
-<% course_file_num = visable_attachemnts_incourse(@course).count %>
+<%# teacher_num = TeacherAndAssistantCount(@course) %>
+<%# student_num = studentCount(@course) %>
+<%# course_file_num = visable_attachemnts_incourse(@course).count %>
 <p class="sy_cgrey mb10 mr20">
   <%= link_to(@course.teacher.show_name, user_path(@course.teacher), :class => 'sy_cgrey') %>
   &nbsp;&gt;&nbsp;
@@ -29,6 +29,8 @@
 <% end %>
 
 <div class="cl"></div>
+<!-- logo 根据是否是老师显示不同-->
+<% cache [:course_logo,@course.id.to_s+"-"+is_teacher.to_s] do%>
 <div class="sy_class_logo fl">
   <div class="pr" style="width: 96px; height:96px;">
      <% if is_teacher%>
@@ -41,6 +43,9 @@
   <% end %>
   </div>
 </div>
+<% end %>
+<!--邀请码根据是否是成员显示不同-->
+<% cache [:course_invite,@course.id.to_s+"-"+(User.current.admin? || User.current.member_of_course?(@course)).to_s] do%>
 <div class="sy_class_id fl">
   <p>邀 请 码<br />
     <span class="sy_corange">
@@ -52,24 +57,26 @@
     </span>
   </p>
 </div>
+<% end %>
 <div class="sy_class_info fl ml15">
-  <div  class="sy_class_titbox">
-    <h3 class="fl sy_class_title"><%=@course.name %></h3>
-    <span class="<%= @course.is_public == 0 ? 'hw_icon_private' : 'hw_icon_open' %> fl mr20 mt3"></span>
-    <p class="sy_cgrey fl mt3">
-      <span class=" mr15">教师：<%= course_teacher_link teacher_num %></span>
-      <span class=" mr15">学生：<%= course_student_link student_num %></span>
-      <span class=" mr15">资源：<%= link_to course_file_num, course_files_path(@course), :class => 'sy_cblue',:id=>'courses_files_count_info' %></span>
-    </p>
-    <div class="cl"></div>
-  </div>
-  <% cache [:course_title,@course.id,@course.updated_at.to_i] do%>
-  <p class="sy_cgrey mb5">
-    <span class=" mr15">主讲老师：<%= link_to(@course.teacher.show_name, user_path(@course.teacher), :class => 'sy_cblue') %></span>
-    <span class=" mr15">学时：<span  class="sy_cblack"><%= @course.class_period %>学时</span></span>
-    <span class=" mr15">学期：<span  class="sy_cblack"><%= current_time_and_term @course %></span></span>
-    <span class=" mr15">单位：<span class="sy_cblack"><%= get_occupation_from_user(@course.teacher).blank? ? '无' : get_occupation_from_user(@course.teacher) %></span></span>
-  </p>
+  <!--中间的头部-->
+  <% cache [:course_righthead,@course.id.to_s] do%>
+      <div  class="sy_class_titbox">
+        <h3 class="fl sy_class_title"><%=@course.name %></h3>
+        <span class="<%= @course.is_public == 0 ? 'hw_icon_private' : 'hw_icon_open' %> fl mr20 mt3"></span>
+        <p class="sy_cgrey fl mt3">
+          <span class=" mr15">教师：<%= course_teacher_link TeacherAndAssistantCount(@course) %></span>
+          <span class=" mr15">学生：<%= course_student_link studentCount(@course) %></span>
+          <span class=" mr15">资源：<%= link_to visable_attachemnts_incourse(@course).count, course_files_path(@course), :class => 'sy_cblue',:id=>'courses_files_count_info' %></span>
+        </p>
+        <div class="cl"></div>
+      </div>
+      <p class="sy_cgrey mb5">
+        <span class=" mr15">主讲老师：<%= link_to(@course.teacher.show_name, user_path(@course.teacher), :class => 'sy_cblue') %></span>
+        <span class=" mr15">学时：<span  class="sy_cblack"><%= @course.class_period %>学时</span></span>
+        <span class=" mr15">学期：<span  class="sy_cblack"><%= current_time_and_term @course %></span></span>
+        <span class=" mr15">单位：<span class="sy_cblack"><%= get_occupation_from_user(@course.teacher).blank? ? '无' : get_occupation_from_user(@course.teacher) %></span></span>
+      </p>
   <% end %>
   <% if is_teacher %>
       <%= link_to "班级设置", {:controller => 'courses', :action => 'settings', :id => @course}, :class => "sy_btn_grey mr10 fl" %>
diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index 572efcb07..365b899cd 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -56,85 +56,93 @@
 
   <div class="sy_content">
     <div class="sy_class_l fl" id="courseLSide">
-      <div class="sy_class_leftnav mb12">
-        <ul class="accordion">
-          <% unless show_nav?(@course.course_activities.count) %>
-              <li id="sy_01" class="sy_icons_index">
-                <a href="<%=course_path(@course) %>" >动态<span><%=@course.course_activities.count %></span></a>
-              </li>
-          <% end %>
-          <% unless show_nav?(@course.boards.first ? @course.boards.first.topics.count : 0) %>
-              <li id="sy_02" class="sy_icons_boards">
-                <% count = @course.boards.first ? (@course.boards.first.topics.count + Message.where("board_id =? and parent_id is not ?", @course.boards.first.id, nil).count) : 0 %>
-                <a href="<%=course_boards_path(@course) %>">讨论区<span><%=count %></span></a>
-                <%= link_to( "",course_boards_path(@course, :flag => true, :is_new => 1), :class => 'sy_class_add', :title =>"#{l(:label_message_new)}") %>
-              </li>
-          <% end %>
-          <% unless show_nav?(@course.homework_commons.count) %>
-              <li id="sy_03" class="sy_icons_hwork">
-                <a href="<%= homework_common_index_path(:course => @course.id) %>">作业<span><%=homework_num %></span></a>
-                <%= link_to( "",homework_common_index_path(:course => @course.id,:is_new => 1), :class => 'sy_class_add', :title =>"#{l(:label_course_homework_new)}") if is_teacher %>
-              </li>
-          <% end %>
-          <% unless show_nav?(@course.news.count) %>
-              <li id="sy_04" class="sy_icons_news">
-                <a href="<%=course_news_index_path(@course) %>">通知<span><%=@course.news.count %></span></a>
-                <%= link_to( "",new_course_news_path(@course,:is_new=>1), :class => 'sy_class_add', :title =>"#{l(:label_course_news_new)}") if is_teacher %>
-              </li>
-          <% end %>
-          <% unless show_nav?(course_file_num) %>
-              <li id="sy_05" class="sy_icons_files">
-                <a href="<%=course_files_path(@course) %>">资源库<span><%=course_file_num %></span></a>
-                <% if is_teacher || (@course.publish_resource == 1  && User.current.member_of_course?(@course)) %>
-                    <a class="sy_class_add" title="上传资源" href="javascript:void(0);" onclick="course_files_upload();"> </a>
-                <% end %>
-              </li>
-          <% end %>
-          <% unless show_nav?(course_feedback_count) %>
-              <li id="sy_06" class="sy_icons_feedback">
-                <a href="<%=course_feedback_path(@course) %>">留言<span id="course_jour_count"><%=course_feedback_count %></span></a>
-                <%= link_to "", course_feedback_path(@course), :class => 'sy_class_add', :title =>"#{l(:label_course_feedback)}"%>
-              </li>
-          <% end %>
-          <% unless show_nav?(course_poll_count) %>
-              <li id="sy_07" class="sy_icons_poll">
-                <a href="<%=poll_index_path(:polls_type => "Course", :polls_group_id => @course.id) %>">问卷调查<span><%=course_poll_count %></span></a>
-                <%= link_to( "", new_poll_path(:polls_type => "Course",:polls_group_id => @course.id), :class => 'sy_class_add', :title =>"#{l(:label_new_poll)}") if is_teacher %>
-              </li>
-          <% end %>
-          <% count = User.current.allowed_to?(:as_teacher,@course)? @course.exercises.count : @course.exercises.where("exercise_status <> 1").count %>
-          <% unless show_nav?(count) %>
-              <li id="sy_08" class="sy_icons_exercise">
-                <a href="<%=exercise_index_path(:course_id => @course.id) %>">在线测验<span><%=count %></span></a>
-                <%= link_to( "", new_exercise_path(:course_id => @course.id), :class => 'sy_class_add', :title =>"新建试卷") if is_teacher %>
-              </li>
-          <% end %>
-          <% statistics_count = 0 %>
-          <% unless show_nav?(statistics_count) %>
-              <li id="sy_09" class="sy_icons_st">
-                <a href="<%=statistics_course_course_path(@course) %>">统计<span></span></a>
-                <!--<a href="javascript:void(0);" class="sy_class_add"></a>-->
-              </li>
-          <% end %>
-          <%# 工具栏展开 %>
-          <% if @course.homework_commons.count == 0 || @course.news.count == 0 || course_file_num == 0 || course_poll_count == 0 || @course.exercises.count == 0 ||
-                  course_feedback_count == 0 || @course.exercises.count == 0 || (@course.boards.first ? @course.boards.first.topics.count : 0) == 0 || statistics_count == 0%>
-              <li id="expand_tools_expand" class="sy_icons_more"><a href="javascript:void(0)"> 更多</a>
-              </li>
-              <ul class="sub-menu undis" id="navContentCourse">
-                <%= render :partial => 'courses/tool_expand' %>
-              </ul>
-          <% end %>
-        </ul>
-      </div><!--sy_class_leftnav end-->
+      <% cache [:course_leftmenu,@course.id.to_s+"-"+@course.updated_at.to_i.to_s] do%>
+          <div class="sy_class_leftnav mb12">
+            <ul class="accordion">
+              <% unless show_nav?(@course.course_activities.count) %>
+                  <li id="sy_01" class="sy_icons_index">
+                    <a href="<%=course_path(@course) %>" >动态<span><%=@course.course_activities.count %></span></a>
+                  </li>
+              <% end %>
+              <% unless show_nav?(@course.boards.first ? @course.boards.first.topics.count : 0) %>
+                  <li id="sy_02" class="sy_icons_boards">
+                    <% count = @course.boards.first ? (@course.boards.first.topics.count + Message.where("board_id =? and parent_id is not ?", @course.boards.first.id, nil).count) : 0 %>
+                    <a href="<%=course_boards_path(@course) %>">讨论区<span><%=count %></span></a>
+                    <%= link_to( "",course_boards_path(@course, :flag => true, :is_new => 1), :class => 'sy_class_add', :title =>"#{l(:label_message_new)}") %>
+                  </li>
+              <% end %>
+              <% unless show_nav?(@course.homework_commons.count) %>
+                  <li id="sy_03" class="sy_icons_hwork">
+                    <a href="<%= homework_common_index_path(:course => @course.id) %>">作业<span><%=homework_num %></span></a>
+                    <%= link_to( "",homework_common_index_path(:course => @course.id,:is_new => 1), :class => 'sy_class_add', :title =>"#{l(:label_course_homework_new)}") if is_teacher %>
+                  </li>
+              <% end %>
+              <% unless show_nav?(@course.news.count) %>
+                  <li id="sy_04" class="sy_icons_news">
+                    <a href="<%=course_news_index_path(@course) %>">通知<span><%=@course.news.count %></span></a>
+                    <%= link_to( "",new_course_news_path(@course,:is_new=>1), :class => 'sy_class_add', :title =>"#{l(:label_course_news_new)}") if is_teacher %>
+                  </li>
+              <% end %>
+              <% unless show_nav?(course_file_num) %>
+                  <li id="sy_05" class="sy_icons_files">
+                    <a href="<%=course_files_path(@course) %>">资源库<span><%=course_file_num %></span></a>
+                    <% if is_teacher || (@course.publish_resource == 1  && User.current.member_of_course?(@course)) %>
+                        <a class="sy_class_add" title="上传资源" href="javascript:void(0);" onclick="course_files_upload();"> </a>
+                    <% end %>
+                  </li>
+              <% end %>
+              <% unless show_nav?(course_feedback_count) %>
+                  <li id="sy_06" class="sy_icons_feedback">
+                    <a href="<%=course_feedback_path(@course) %>">留言<span id="course_jour_count"><%=course_feedback_count %></span></a>
+                    <%= link_to "", course_feedback_path(@course), :class => 'sy_class_add', :title =>"#{l(:label_course_feedback)}"%>
+                  </li>
+              <% end %>
+              <% unless show_nav?(course_poll_count) %>
+                  <li id="sy_07" class="sy_icons_poll">
+                    <a href="<%=poll_index_path(:polls_type => "Course", :polls_group_id => @course.id) %>">问卷调查<span><%=course_poll_count %></span></a>
+                    <%= link_to( "", new_poll_path(:polls_type => "Course",:polls_group_id => @course.id), :class => 'sy_class_add', :title =>"#{l(:label_new_poll)}") if is_teacher %>
+                  </li>
+              <% end %>
+              <% count = User.current.allowed_to?(:as_teacher,@course)? @course.exercises.count : @course.exercises.where("exercise_status <> 1").count %>
+              <% unless show_nav?(count) %>
+                  <li id="sy_08" class="sy_icons_exercise">
+                    <a href="<%=exercise_index_path(:course_id => @course.id) %>">在线测验<span><%=count %></span></a>
+                    <%= link_to( "", new_exercise_path(:course_id => @course.id), :class => 'sy_class_add', :title =>"新建试卷") if is_teacher %>
+                  </li>
+              <% end %>
+              <% statistics_count = 0 %>
+              <% unless show_nav?(statistics_count) %>
+                  <li id="sy_09" class="sy_icons_st">
+                    <a href="<%=statistics_course_course_path(@course) %>">统计<span></span></a>
+                    <!--<a href="javascript:void(0);" class="sy_class_add"></a>-->
+                  </li>
+              <% end %>
+              <%# 工具栏展开 %>
+              <% if @course.homework_commons.count == 0 || @course.news.count == 0 || course_file_num == 0 || course_poll_count == 0 || @course.exercises.count == 0 ||
+                      course_feedback_count == 0 || @course.exercises.count == 0 || (@course.boards.first ? @course.boards.first.topics.count : 0) == 0 || statistics_count == 0%>
+                  <li id="expand_tools_expand" class="sy_icons_more"><a href="javascript:void(0)"> 更多</a>
+                  </li>
+                  <ul class="sub-menu undis" id="navContentCourse">
+                    <%= render :partial => 'courses/tool_expand' %>
+                  </ul>
+              <% end %>
+            </ul>
+          </div><!--sy_class_leftnav end-->
+      <% end %>
       <%# 课程活跃度 %>
-      <%= render :partial => 'courses/course_activity_users', :locals => {:course => @course} %>
+      <% cache [:course_activity_users,@course.id.to_s] do%>
+        <%= render :partial => 'courses/course_activity_users', :locals => {:course => @course} %>
+      <% end %>
       <%# 课程英雄榜 %>
-      <%= render :partial => 'courses/course_heroes', :locals => {:course => @course} %>
-      <div class="sy_class_leftbox" >
-        <h3 class="fontGrey7">班级推荐</h3>
-        <%= render :partial => 'courses/recommendation', :locals => {:course => @course} %>
-      </div>
+      <% cache [:course_heroes,@course.id.to_s] do%>
+        <%= render :partial => 'courses/course_heroes', :locals => {:course => @course} %>
+      <% end %>
+      <% cache [:course_recommendation] do%>
+          <div class="sy_class_leftbox" >
+            <h3 class="fontGrey7">班级推荐</h3>
+            <%= render :partial => 'courses/recommendation', :locals => {:course => @course} %>
+          </div>
+      <% end %>
       <%# 更新访问数,刷新的时候更新访问次数 %>
       <%  update_visiti_count @course %>
       <div class="fontGrey5 mt10 ml20">访问计数 <%= @course.visits.to_i %> （自2016年5月）</div>
diff --git a/app/views/users/_user_homework_detail.html.erb b/app/views/users/_user_homework_detail.html.erb
index 8c606add6..fc96e1c6b 100644
--- a/app/views/users/_user_homework_detail.html.erb
+++ b/app/views/users/_user_homework_detail.html.erb
@@ -1,5 +1,6 @@
 <% is_teacher = User.current.allowed_to?(:as_teacher,homework_common.course) %>
 <div class="HomeWork mb10" id="homework_common_<%= homework_common.id %>">
+  <% cache [:user_homework_detail,@course.id.to_s+"-"+homework_common.id.to_s+"-"+is_teacher.to_s+"-"+(User.current.member_of_course?(homework_common.course) || User.current.admin? || homework_common.is_open == 1).to_s+"-"+homework_common.updated_at.to_i.to_s] do%>
   <div class="homepagePostBrief">
     <div class="homepagePostPortrait">
       <%=link_to image_tag(url_to_avatar(homework_common.user),width:"50px", height: "50px"), user_activities_path(homework_common.user.id)%>
@@ -302,6 +303,7 @@
     </div>
     <div class="cl"></div>
   </div>
+  <% end %>
 
   <% count=homework_common.journals_for_messages.count %>
   <div class="homepagePostReply">
diff --git a/config/environments/development.rb b/config/environments/development.rb
index d69cd5a41..e1ace8bcd 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -13,7 +13,7 @@ RedmineApp::Application.configure do
   config.consider_all_requests_local = true
   config.action_controller.perform_caching             = true
   # config.cache_store = :file_store,  "#{Rails.root }/files/cache_store/"
-  config.cache_store = :redis_store, 'redis://127.0.0.1:6379/0/cache', { expires_in: 90.minutes  }
+  config.cache_store = :redis_store, 'redis://127.0.0.1:6379/0/cache', { expires_in: 1.minutes  }
   #config.cache_store = :dalli_store
   # Don't care if the mailer can't send
   config.action_mailer.raise_delivery_errors = true