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 @@ 总得分为以上得分之和 <% 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 @@ <% end %> - <% end %> + <%# end %> <% end %>
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 @@
-
-
资源库
-
+
+ <% end %>
<% unless User.current.logged? %>
@@ -95,34 +97,36 @@
<% end %>
-
- <%= 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) ) %> - - <%= 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%> +
+ <%= 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) ) %> + + <%= link_to("导入资源", import_resources_user_path(User.current, :type => 6, :course_id => @course.id), :class => "blue-btn fr mr5", :remote => true) %> + <% end %> <% end %> - <% end %> - - -
-
-
- <%= render :partial => "files/tag_yun", :locals => {:tag_list => @tag_list,:course => @course,:tag_name => @tag_name}%> -
-
-
-

- <%= render :partial => "files/tip_attachment_count" %> -

-

- <%= render :partial => 'course_file_filter_order', :locals => {:remote => @is_remote, :sort => @sort, :order => @order} %> -

-
-
+ + +
+
+
+ <%= render :partial => "files/tag_yun", :locals => {:tag_list => @tag_list,:course => @course,:tag_name => @tag_name}%> +
+
+
+

+ <%= render :partial => "files/tip_attachment_count" %> +

+

+ <%= render :partial => 'course_file_filter_order', :locals => {:remote => @is_remote, :sort => @sort, :order => @order} %> +

+
+
+ <% end %>
<% if !User.current.member_of_course?(@course) && show_attachment_tip(@course.id, "Course") %>
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 @@ <%=file.publish_time %>  0点发布 <% end %>
-
- 上传时间：<%= format_time(file.created_on)%> - <% if file.tag_list.length > 0%> - 上传类型：<%= file.tag_list[0] %> - <% end %> -

文件大小：<%= number_to_human_size(file.filesize) %>

-

下载<%= file.downloads%>  |  引用<%= file.quotes.nil? ? 0:file.quotes %>

-
+ <% cache [:resource_detail,file.id.to_s] do%> +
+ 上传时间：<%= format_time(file.created_on)%> + <% if file.tag_list.length > 0%> + 上传类型：<%= file.tag_list[0] %> + <% end %> +

文件大小：<%= number_to_human_size(file.filesize) %>

+

下载<%= file.downloads%>  |  引用<%= file.quotes.nil? ? 0:file.quotes %>

+
+ <% end %> <%# unless file.description.blank? %>
- <% 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"))) %>
<%= 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 %>

<%= link_to(@course.teacher.show_name, user_path(@course.teacher), :class => 'sy_cgrey') %>  >  @@ -29,6 +29,8 @@ <% end %>

+ +<% cache [:course_logo,@course.id.to_s+"-"+is_teacher.to_s] do%> +<% end %> + +<% cache [:course_invite,@course.id.to_s+"-"+(User.current.admin? || User.current.member_of_course?(@course)).to_s] do%>

邀 请 码
@@ -52,24 +57,26 @@

+<% end %>
-
-

<%=@course.name %>

- -

- 教师：<%= course_teacher_link teacher_num %> - 学生：<%= course_student_link student_num %> - 资源：<%= link_to course_file_num, course_files_path(@course), :class => 'sy_cblue',:id=>'courses_files_count_info' %> -

-
-
- <% cache [:course_title,@course.id,@course.updated_at.to_i] do%> -

- 主讲老师：<%= link_to(@course.teacher.show_name, user_path(@course.teacher), :class => 'sy_cblue') %> - 学时：<%= @course.class_period %>学时 - 学期：<%= current_time_and_term @course %> - 单位：<%= get_occupation_from_user(@course.teacher).blank? ? '无' : get_occupation_from_user(@course.teacher) %> -

+ + <% cache [:course_righthead,@course.id.to_s] do%> +
+

<%=@course.name %>

+ +

+ 教师：<%= course_teacher_link TeacherAndAssistantCount(@course) %> + 学生：<%= course_student_link studentCount(@course) %> + 资源：<%= link_to visable_attachemnts_incourse(@course).count, course_files_path(@course), :class => 'sy_cblue',:id=>'courses_files_count_info' %> +

+
+
+

+ 主讲老师：<%= link_to(@course.teacher.show_name, user_path(@course.teacher), :class => 'sy_cblue') %> + 学时：<%= @course.class_period %>学时 + 学期：<%= current_time_and_term @course %> + 单位：<%= get_occupation_from_user(@course.teacher).blank? ? '无' : get_occupation_from_user(@course.teacher) %> +

<% 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 @@
-
-
    - <% unless show_nav?(@course.course_activities.count) %> -
  • - 动态<%=@course.course_activities.count %> -
    • - <% end %> - <% unless show_nav?(@course.boards.first ? @course.boards.first.topics.count : 0) %> -
  • - <% 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 %> - 讨论区<%=count %> - <%= link_to( "",course_boards_path(@course, :flag => true, :is_new => 1), :class => 'sy_class_add', :title =>"#{l(:label_message_new)}") %> -
    • - <% end %> - <% unless show_nav?(@course.homework_commons.count) %> -
  • - 作业<%=homework_num %> - <%= 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 %> -
    • - <% end %> - <% unless show_nav?(@course.news.count) %> -
  • - 通知<%=@course.news.count %> - <%= link_to( "",new_course_news_path(@course,:is_new=>1), :class => 'sy_class_add', :title =>"#{l(:label_course_news_new)}") if is_teacher %> -
    • - <% end %> - <% unless show_nav?(course_file_num) %> -
  • - 资源库<%=course_file_num %> - <% if is_teacher || (@course.publish_resource == 1 && User.current.member_of_course?(@course)) %> - - <% end %> -
    • - <% end %> - <% unless show_nav?(course_feedback_count) %> -
  • - 留言<%=course_feedback_count %> - <%= link_to "", course_feedback_path(@course), :class => 'sy_class_add', :title =>"#{l(:label_course_feedback)}"%> -
    • - <% end %> - <% unless show_nav?(course_poll_count) %> -
  • - @course.id) %>">问卷调查<%=course_poll_count %> - <%= 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 %> -
    • - <% end %> - <% count = User.current.allowed_to?(:as_teacher,@course)? @course.exercises.count : @course.exercises.where("exercise_status <> 1").count %> - <% unless show_nav?(count) %> -
  • - 在线测验<%=count %> - <%= link_to( "", new_exercise_path(:course_id => @course.id), :class => 'sy_class_add', :title =>"新建试卷") if is_teacher %> -
    • - <% end %> - <% statistics_count = 0 %> - <% unless show_nav?(statistics_count) %> -
  • - 统计 - -
    • - <% 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%> -
  • 更多 -
    • - - <% end %> -
-
+ <% cache [:course_leftmenu,@course.id.to_s+"-"+@course.updated_at.to_i.to_s] do%> +
+
    + <% unless show_nav?(@course.course_activities.count) %> +
  • + 动态<%=@course.course_activities.count %> +
    • + <% end %> + <% unless show_nav?(@course.boards.first ? @course.boards.first.topics.count : 0) %> +
  • + <% 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 %> + 讨论区<%=count %> + <%= link_to( "",course_boards_path(@course, :flag => true, :is_new => 1), :class => 'sy_class_add', :title =>"#{l(:label_message_new)}") %> +
    • + <% end %> + <% unless show_nav?(@course.homework_commons.count) %> +
  • + 作业<%=homework_num %> + <%= 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 %> +
    • + <% end %> + <% unless show_nav?(@course.news.count) %> +
  • + 通知<%=@course.news.count %> + <%= link_to( "",new_course_news_path(@course,:is_new=>1), :class => 'sy_class_add', :title =>"#{l(:label_course_news_new)}") if is_teacher %> +
    • + <% end %> + <% unless show_nav?(course_file_num) %> +
  • + 资源库<%=course_file_num %> + <% if is_teacher || (@course.publish_resource == 1 && User.current.member_of_course?(@course)) %> + + <% end %> +
    • + <% end %> + <% unless show_nav?(course_feedback_count) %> +
  • + 留言<%=course_feedback_count %> + <%= link_to "", course_feedback_path(@course), :class => 'sy_class_add', :title =>"#{l(:label_course_feedback)}"%> +
    • + <% end %> + <% unless show_nav?(course_poll_count) %> +
  • + @course.id) %>">问卷调查<%=course_poll_count %> + <%= 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 %> +
    • + <% end %> + <% count = User.current.allowed_to?(:as_teacher,@course)? @course.exercises.count : @course.exercises.where("exercise_status <> 1").count %> + <% unless show_nav?(count) %> +
  • + 在线测验<%=count %> + <%= link_to( "", new_exercise_path(:course_id => @course.id), :class => 'sy_class_add', :title =>"新建试卷") if is_teacher %> +
    • + <% end %> + <% statistics_count = 0 %> + <% unless show_nav?(statistics_count) %> +
  • + 统计 + +
    • + <% 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%> +
  • 更多 +
    • + + <% 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} %> -
-

班级推荐

- <%= render :partial => 'courses/recommendation', :locals => {:course => @course} %> -
+ <% cache [:course_heroes,@course.id.to_s] do%> + <%= render :partial => 'courses/course_heroes', :locals => {:course => @course} %> + <% end %> + <% cache [:course_recommendation] do%> +
+

班级推荐

+ <%= render :partial => 'courses/recommendation', :locals => {:course => @course} %> +
+ <% end %> <%# 更新访问数,刷新的时候更新访问次数 %> <% update_visiti_count @course %>
访问计数 <%= @course.visits.to_i %> （自2016年5月）
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) %>
+ <% 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%>
<%=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 @@
+ <% end %> <% count=homework_common.journals_for_messages.count %>
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