Merge branch 'szzh' into dev_hjq

app/controllers/attachments_controller.rb

@@ -23,6 +23,7 @@ class AttachmentsController < ApplicationController
   before_filter :delete_authorize, :only => [:destroy]
   before_filter :authorize_global, :only => [:upload]
   before_filter :authorize_attachment_download1, :only => [:download]
+  before_filter :has_login
   #before_filter :login_without_softapplication, only: [:download]
   accept_api_auth :show, :download, :upload
   require 'iconv'
@@ -67,6 +68,7 @@ class AttachmentsController < ApplicationController
   end
 
   def direct_download
+    @attachment.increment_download
     send_file @attachment.diskfile, :filename => filename_for_content_disposition(@attachment.filename),
       :type => detect_content_type(@attachment),
       :disposition => 'attachment'    #inline can open in browser
@@ -77,7 +79,6 @@ class AttachmentsController < ApplicationController
     # 下载添加权限设置
     candown = attachment_candown @attachment
     if candown || User.current.admin? || User.current.id == @attachment.author_id
-      @attachment.increment_download
       if stale?(:etag => @attachment.digest)
         if params[:preview] == 'true'
           convered_file = @attachment.diskfile
@@ -511,4 +512,8 @@ private
       format.js
     end
   end
+
+  def has_login
+    render_403 unless User.current.logged?
+  end
 end

app/controllers/courses_controller.rb

@@ -343,8 +343,8 @@ class CoursesController < ApplicationController
   def export_course_member_excel
     @all_members = student_homework_score(0,0,0,"desc")
     filename="#{@course.teacher.lastname.to_s + @course.teacher.firstname.to_s }_#{@course.name}_#{@course.time.to_s + @course.term}#{l(:excel_member_list)}";
-    # 如果是ie11 需要转码
-    if(/rv\:11\.0/.match(request.env["HTTP_USER_AGENT"]) != nil)
+    # 如果是ie 需要转码
+    if(/trident/.match(request.env["HTTP_USER_AGENT"]) != nil)
       filename= URI::encode(filename)
     end
     respond_to do |format|
@@ -695,7 +695,13 @@ class CoursesController < ApplicationController
       # 显示老师和助教的活动
       # @authors = searchTeacherAndAssistant(@course)
       @authors = course_all_member(@course)
+      Dir.glob("#{Rails.root}/app/models/*.rb").sort.each { |file| require file }
       events = []
+      key = "course_events_#{@course.id}".to_sym
+      if Rails.env.production? && Setting.course_cahce_enabled?
+        events = Rails.cache.read(key) || []
+      end
+      if events.empty? 
         @authors.each do |author|
           @activity = Redmine::Activity::Fetcher.new(User.current, :course => @course,
                                                      :with_subprojects => false,
@@ -709,7 +715,8 @@ class CoursesController < ApplicationController
           else
             events += @activity.events(@days, @course.created_at, :is_public => 1)
           end
-
+        end
+        Rails.cache.write(key, events) if Rails.env.production? && Setting.course_cahce_enabled?
       end
     else
     # @author = @course.teacher

app/controllers/homework_common_controller.rb

@@ -3,6 +3,7 @@ class HomeworkCommonController < ApplicationController
   before_filter :find_course, :only => [:index,:new,:create]
   before_filter :find_homework, :only => [:edit,:update,:alert_anonymous_comment,:start_anonymous_comment,:stop_anonymous_comment,:destroy]
   before_filter :teacher_of_course, :only => [:new, :create, :edit, :update, :destroy, :start_anonymous_comment, :stop_anonymous_comment, :alert_anonymous_comment]
+  before_filter :member_of_course, :only => [:index]
 
   def index
     homeworks = @course.homework_commons.order("created_at desc")
@@ -203,6 +204,11 @@ class HomeworkCommonController < ApplicationController
     render_403 unless User.current.allowed_to?(:as_teacher,@course) || User.current.admin?
   end
 
+  #当前用户是不是课程的成员
+  def member_of_course
+    render_403 unless User.current.member_of_course?(@course) || User.current.admin?
+  end
+
   def get_assigned_homeworks(student_works, n, index)
     student_works += student_works
     student_works[index + 1 .. index + n]

app/controllers/poll_controller.rb

@@ -483,6 +483,24 @@ class PollController < ApplicationController
         count_row += 1
       end
     end
+
+    sheet1.row(count_row).default_format = blue
+    sheet1[count_row ,0] = l(:label_bidding_user_studentname)
+    poll_questions.each_with_index do |poll_question, i|
+      sheet1[count_row ,i + 1] = poll_question.question_title
+    end
+    count_row += 1
+    @poll.users.each do |user|
+      sheet1[count_row ,0] = user.show_name
+      poll_questions.each_with_index do |poll_question, i|
+        if poll_question.question_type == 1 || poll_question.question_type == 2
+          sheet1[count_row ,i + 1] = user.poll_votes.where(:poll_question_id => poll_question.id).map{|poll_vote| poll_vote.poll_answer.answer_text.gsub(/<\/?.*?>/,"").gsub(/&nbsp;/," ") if poll_vote.poll_answer}.join(";")
+        else
+          sheet1[count_row ,i + 1] = user.poll_votes.where(:poll_question_id => poll_question.id).map{|poll_vote| poll_vote.vote_text.gsub(/<\/?.*?>/,"").gsub(/&nbsp;/," ")}.join(";")
+        end
+      end
+      count_row += 1
+    end
     book.write xls_report
     xls_report.string
   end

app/controllers/student_work_controller.rb

@@ -2,7 +2,7 @@ class StudentWorkController < ApplicationController
   layout "base_courses"
   include StudentWorkHelper
   require 'bigdecimal'
-  before_filter :find_homework, :only => [:new, :index, :create]
+  before_filter :find_homework, :only => [:new, :index, :create, :student_work_absence_penalty]
   before_filter :find_work, :only => [:edit, :update, :show, :destroy, :add_score, :praise_student_work]
   before_filter :member_of_course, :only => [:index, :new, :create, :show, :add_score, :praise_student_work]
   before_filter :author_of_work, :only => [:edit, :update, :destroy]
@@ -233,6 +233,25 @@ class StudentWorkController < ApplicationController
     end
   end
 
+  #评价列表显示
+  def student_work_absence_penalty
+    render_403 unless User.current.allowed_to?(:as_teacher,@course)
+    order = params[:order] || "desc"
+    work_ids = "(" + @homework.student_works.map(&:id).join(",") + ")"
+    @stundet_works = StudentWork.find_by_sql("SELECT *,(all_count - has_count) AS absence FROM(
+      SELECT * ,
+        (SELECT COUNT(*) FROM `student_works_evaluation_distributions` WHERE user_id = student_works.user_id AND student_work_id IN #{work_ids}) AS all_count,
+        (SELECT COUNT(*) FROM `student_works_scores` WHERE user_id = student_works.user_id AND student_work_id IN #{work_ids}) AS has_count
+      FROM `student_works`
+      WHERE homework_common_id = 213
+    ) AS table_1
+    ORDER BY absence #{order}")
+    @order = order == "desc" ? "asc" : "desc"
+    respond_to do |format|
+      format.html
+    end
+  end
+
   private
   #获取作业
   def find_homework

app/controllers/welcome_controller.rb

@@ -219,7 +219,7 @@ class WelcomeController < ApplicationController
   # 判断网站的入口，是课程 course 则跳过index去渲染 course 方法
   def entry_select
     url = request.original_url.gsub('/','')
-    if url.include?(Setting.host_course.gsub('/',''))
+    if url.include?(Setting.url_course.gsub('/',''))
       if @first_page.show_course == 1
         course
         render :course
@@ -228,7 +228,7 @@ class WelcomeController < ApplicationController
       end
 
       return 0
-    elsif url.include?(Setting.host_contest.gsub('/',''))
+    elsif url.include?(Setting.url_contest.gsub('/',''))
       if @first_page.show_contest == 1
         contest
         render :contest
@@ -237,7 +237,7 @@ class WelcomeController < ApplicationController
       end
 
       return 0
-    elsif url.include?(Setting.host_user.gsub('/',''))
+    elsif url.include?(Setting.url_user.gsub('/',''))
       #redirect_to(:controller => "users", :action => "index")
     end
       

app/helpers/application_helper.rb

@@ -2330,4 +2330,11 @@ module ApplicationHelper
   def cur_user_works_for_homework homework
     homework.student_works.where("user_id = ?",User.current).first
   end
+
+  def file_preview_tag(file, html_options={})
+    if %w(pdf pptx doc docx xls xlsx).any?{|x| file.filename.downcase.end_with?(x)}
+      link_to '预览', download_named_attachment_path(file.id, file.filename, preview: true),html_options
+    end
+  end
+
 end

app/helpers/student_work_helper.rb

@@ -60,4 +60,14 @@ module StudentWorkHelper
   def is_praise_homework user_id, obj_id
     PraiseTread.where("user_id = #{user_id} AND praise_tread_object_id = #{obj_id} AND praise_tread_object_type = 'StudentWork'").empty?
   end
+
+  #获取指定学生在指定作业内应匿评的数量
+  def all_evaluation_count user,homework
+    StudentWorksEvaluationDistribution.joins(:student_work).where("student_works_evaluation_distributions.user_id = #{user.id} AND student_works.homework_common_id = #{homework.id}").count
+  end
+
+  #获取指定学生在指定作业内已匿评的数量
+  def has_evaluation_count user,homework
+    StudentWorksScore.joins(:student_work).where("student_works_scores.user_id = #{user.id} AND student_works.homework_common_id = #{homework.id}").count
+  end
 end

app/models/activity.rb

@@ -5,4 +5,6 @@ class Activity < ActiveRecord::Base
   validates :act_id, presence: true
   validates :act_type, presence: true
   validates :user_id, presence: true
+
+  include Trustie::Cache::ClearCourseEvent
 end

app/models/forge_activity.rb

@@ -19,4 +19,5 @@ class ForgeActivity < ActiveRecord::Base
   validates :project_id,presence: true
   validates :forge_act_id,presence: true
   validates :forge_act_type, presence: true
+
 end

app/models/member.rb

@@ -129,6 +129,16 @@ class Member < ActiveRecord::Base
     StudentWork.select("homework_commons.name, student_works.final_score").joins(:homework_common).where("student_works.user_id = #{self.user_id} and homework_commons.course_id = #{self.course_id}")
   end
 
+  #当前课程的作业列表
+  def homework_common_list
+    HomeworkCommon.where(:course_id => self.course_id)
+  end
+
+  #当前学生在指定作业内的得分
+  def homework_common_score homework_common
+    StudentWork.select("final_score").where(:homework_common_id => homework_common.id,:user_id => self.user_id)
+  end
+
   def student_work_score_avg
     StudentWork.joins(:homework_common).where("student_works.user_id = #{self.user_id} and homework_commons.course_id = #{self.course_id}").average(:final_score).try(:round, 2).to_f
   end

app/views/attachments/_form.html.erb

@@ -1,11 +1,13 @@
+<style type="text/css">
+  input.is_public,input.is_public_checkbox{height:12px;}
+  input.is_public_checkbox{margin-left:4px;margin-right:4px;}
+</style>
 <div class="fl">
 <span id="attachments_fields" xmlns="http://www.w3.org/1999/html">
 <% if defined?(container) && container && container.saved_attachments %>
   <% container.attachments.each_with_index do |attachment, i| %>
     <span id="attachments_p<%= i %>" class="attachment">
-      <%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'filename readonly', :readonly => 'readonly') %>
-      <%= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 254, :placeholder => l(:label_optional_description), :class => 'description', :style => "display: inline-block;") %>
-      <span class="ispublic-label"><%= l(:field_is_public) %>:</span>
+      <%= text_field_tag("attachments[p#{i}][filename]", attachment.filename, :class => 'filename readonly', :readonly => 'readonly') %><%= text_field_tag("attachments[p#{i}][description]", attachment.description, :maxlength => 254, :placeholder => l(:label_optional_description), :class => 'description', :style => "display: inline-block;") %><span class="ispublic-label"><%= l(:field_is_public) %>:</span>
       <%= check_box_tag("attachments[p#{i}][is_public_checkbox]", attachment.is_public, attachment.is_public == 1 ? true : false, :class => 'is_public') %>
       <%= if attachment.id.nil?
             #待补充代码

app/views/bids/edit.html.erb

@@ -1,4 +1,4 @@
-<%= javascript_include_tag "/assets/kindeditor/kindeditor" %>
+<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg' %>
 <%= labelled_form_for @bid,:html => { :multipart => true } do |f| %>
     <%= render :partial => 'new_homework_form', :locals => { :bid => @bid, :bid_id => "edit_bid_#{@bid.id}",:f=>f,:edit_mode => true} %>
 <% end %>

app/views/boards/_course_show.html.erb

@@ -66,7 +66,31 @@
             <div class="cl"></div>
 
             <script>
-                $(function(){if($("#contentmessage<%=topic.id %>").height()>182){$("#project_show_<%= topic.id%>").show();}});
+              //$(function(){if($("#contentmessage<%#=topic.id %>").height()>182){$("#project_show_<%#= topic.id%>").show();}});
+              //解决由于图片加载慢造成div高度不够 以至于展开按钮不显示的bug
+              $(function(){
+                function nh_show_btn(){
+                  if($("#contentmessage<%=topic.id %>").height()>182){
+                    $("#project_show_<%= topic.id%>").show();
+                  }
+                }
+                var div = $("#contentmessage<%=topic.id %>");
+                var imgs = $('img',div);
+                var lens = imgs.length;
+                function nh_load_img_end(){
+                  lens--;
+                  if(lens <= 0){
+                    nh_show_btn();
+                  }
+                }
+                if(lens <= 0){
+                  nh_show_btn();
+                }else{
+                  $('img',div).load(function(){
+                    nh_load_img_end();
+                  });
+                }
+              });
             </script>
             <div  class="project_board_content break_word" id="content_<%=topic.id%>">
               <div id="contentmessage<%=topic.id %>" class="upload_img">
@@ -92,7 +116,7 @@
 
           <div class="cl"></div>
 
-          <div class="talk_new ml15 mb10" nhname='about_talk' id="about_newtalk<%=topic.id%>"  style="display: none">
+          <div class="talk_new ml15 mb10" nhname='about_talk' id="about_newtalk<%=topic.id%>"  style="display: none;border-top: 1px dashed #d9d9d9;padding-top:5px;margin-left:0px;padding-left:15px;">
             <ul>
               <%= render :partial => 'edit',locals:  {:topic => topic} %>
             </ul>

app/views/boards/_form_course.html.erb

@@ -39,7 +39,7 @@
       <label class="fl ml3" ><span class="c_red">*</span>&nbsp;<%= l(:field_description) %>&nbsp;：</label>
   <% end %>
   <%= text_area :quote,:quote,:style => 'display:none',:nhname=>"quote_input" %>
-  <div class="content">
+  <div class="content <%= replying ? '':'ml55' %>">
     <% if replying%>
 
         <%= f.text_area :content,

app/views/boards/_form_project.html.erb

@@ -1,13 +1,13 @@
 <style>
-    .comment{
-        position: relative;
-        width: 330px;
-        padding: 10px;
-    }
-    .comment .ke-toolbar{
-        position: absolute;
-        bottom: -18px;
-    }
+    /*.comment{*/
+        /*position: relative;*/
+        /*width: 330px;*/
+        /*padding: 10px;*/
+    /*}*/
+    /*.comment .ke-toolbar{*/
+        /*position: absolute;*/
+        /*bottom: -18px;*/
+    /*}*/
 
 </style>
 <%= error_messages_for 'message' %>

app/views/boards/_project_show.html.erb

@@ -58,7 +58,31 @@
                 <a href="javascript:void(0)" class="talk_up fr c_red" style="margin-right: 10px;"><%= l(:label_board_sticky)%></a>
             <% end %>
             <script>
-                $(function(){if($("#contentmessage<%=topic.id %>").height()>182){$("#project_show_<%= topic.id%>").show();}});
+                //$(function(){if($("#contentmessage<%#=topic.id %>").height()>182){$("#project_show_<%#= topic.id%>").show();}});
+                //解决由于图片加载慢造成div高度不够 以至于展开按钮不显示的bug
+                $(function(){
+                  function nh_show_btn(){
+                    if($("#contentmessage<%=topic.id %>").height()>182){
+                      $("#project_show_<%= topic.id%>").show();
+                    }
+                  }
+                  var div = $("#contentmessage<%=topic.id %>");
+                  var imgs = $('img',div);
+                  var lens = imgs.length;
+                  function nh_load_img_end(){
+                    lens--;
+                    if(lens <= 0){
+                      nh_show_btn();
+                    }
+                  }
+                  if(lens <= 0){
+                    nh_show_btn();
+                  }else{
+                    $('img',div).load(function(){
+                      nh_load_img_end();
+                    });
+                  }
+                });
             </script>
           </div>
           <div class="cl"></div>
@@ -80,7 +104,7 @@
           <a href="javascript:void(0)" nhname="showbtn_reply" class="c_dblue fr" style="margin-right:10px;"><%= l(:button_reply) %></a>
         <% end %>
         <div class="cl"></div>
-        <div class="talk_new ml15 mb10" nhname='about_talk' id="about_newtalk<%=topic.id%>" style="display: none">
+        <div class="talk_new ml15 mb10" nhname='about_talk' id="about_newtalk<%=topic.id%>" style="display: none;border-top: 1px dashed #d9d9d9;padding-top:5px;margin-left:0px;padding-left:15px;">
           <ul>
             <%= render :partial => 'edit',locals:  {:topic => topic} %>
           </ul>

app/views/boards/show.html.erb

@@ -1,4 +1,5 @@
 <style type="text/css">
+    div.talk_new .ke-container{margin-left:2px;}
     /*div.ke-toolbar{display:none;width:400px;border:none;background:none;padding:0px 0px;}
     span.ke-toolbar-icon{line-height:26px;font-size:14px;padding-left:26px;}
     span.ke-toolbar-icon-url{background-image:url( /images/public_icon.png )}
@@ -33,7 +34,7 @@
     else if (window.attachEvent)
         window.attachEvent("onload", buildsubmenus)
 </script>
-<%= javascript_include_tag "/assets/kindeditor/kindeditor" %>
+<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
 <%#= javascript_include_tag "/assets/kindeditor/kindeditor-min" %>
 
 <% if @project %>
@@ -122,18 +123,23 @@ function nh_check_field(params){
 function nh_init_board(params){
     //发帖/编辑/回复按钮的click
     params.showbtn.click(function(){
+        params.textarea.removeAttr('placeholder');
         if(params.textarea.data('init') == undefined){
             //初始化编辑器
             var editor = params.kindutil.create(params.textarea, {
 //                allowPreviewEmoticons : false,
 //                allowImageUpload : false,
-                resizeType : 1,minWidth:"1px",width:"565px",height:"150px",
+                resizeType : 1,minWidth:"1px",width:"560px",height:"150px",
                 allowFileManager:true,uploadJson:"/kindeditor/upload",
                 fileManagerJson:"/kindeditor/filemanager",
                 afterChange:function(){//按键事件
                     nh_check_field({content:this,contentmsg:params.contentmsg,textarea:params.textarea});
                 },
                 afterCreate:function(){
+                  var userAgent = navigator.userAgent.toLowerCase();
+                  if(/trident/.test(userAgent)){
+                    $("div.talk_new .ke-container").css({'margin-left':'0px'});
+                  }
 //                    var toolbar = $("div[class='ke-toolbar']",params.about_talk);
 //                    $(".ke-outline>.ke-toolbar-icon",toolbar).append('表情');
 //                    params.toolbar_container.append(toolbar);

app/views/common/403.html

@@ -1,25 +1,33 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>没有访问权限</title>
-<style>
-body{ font-size:12px; font-family:"微软雅黑","宋体"; line-height:1.9; background:#fff; font-style:normal;}
-div,html,img,ul,li,p,body,h1,h2,h3,h4,p,a,table,tr,td,fieldset,input,span{ margin:0; padding:0;}
-div,img,tr,td{ border:0;}
-table,tr,td{border:0; cellspacing:0; cellpadding:0;}
-ul,li{ list-style-type:none}
-.cl{ clear:both; overflow:hidden; }
-a{ text-decoration:none; }
-a:hover{ }
+    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+    <title>没有访问权限</title>
+    <style>
+        body{ font-size:12px; font-family:"微软雅黑","宋体"; line-height:1.9; background:#fff; font-style:normal;}
+        div,html,img,ul,li,p,body,h1,h2,h3,h4,p,a,table,tr,td,fieldset,input,span{ margin:0; padding:0;}
+        div,img,tr,td{ border:0;}
+        table,tr,td{border:0; cellspacing:0; cellpadding:0;}
+        ul,li{ list-style-type:none}
+        .cl{ clear:both; overflow:hidden; }
+        a{ text-decoration:none !important; }
+        a:hover{ }
 
-.error_content{ width:550px; height:200px; margin:0 auto; padding:10px 0;}
-.error_left{color:#15bccf; font-size:100px; font-weight:bold; font-style:oblique; width:200px; height:120px; padding-right:30px; float:left;}
-.error_right{ width:240px; height:120px; float:left;color:#15bccf; font-size: 17px; font-weight:bold; padding-left:30px; margin-top:40px; border-left:1px dashed #CCC; }
-.error_link{ margin-top:8px;}
-.error_link a{ display:block; width:80px; height:28px; font-size:14px; font-weight:bold; color:#fff; text-align:center; background:#15bccf; float:left; margin-right:10px;}
-.error_link a:hover{ background:#ff8417;}
-</style>
+        .error_content{ width:550px; height:200px; margin:0 auto; padding:10px 0;}
+        .error_left{color:#15bccf; font-size:100px; font-weight:bold; font-style:oblique; width:200px; height:120px; padding-right:30px; float:left;}
+        .error_right{ width:240px; height:120px; float:left;color:#15bccf; font-size: 17px; font-weight:bold; padding-left:30px; margin-top:40px; border-left:1px dashed #CCC; }
+        .error_link{ margin-top:8px;}
+        .error_link a{ display:block; width:80px; height:28px; font-size:14px; font-weight:bold; color:#fff; text-align:center; background:#15bccf; float:left; margin-right:10px;}
+        .error_link a:hover{ background:#ff8417;}
+    </style>
+    <script type="text/javascript">
+        $(function(){
+            if(window.history.length == 1)
+            {
+                $("#history_back").css("background","#CCC");
+            }
+        });
+    </script>
 </head>
 
 <body>
@@ -31,7 +39,7 @@ a:hover{ }
         没有访问权限！建议您</p>
         <div class="error_link">
         	<!---<a href="http://forge.trustie.net/" target="_blank">返回首页</a>---->
-            <a href="javascript:history.back()">后退一步</a>
+            <a href="javascript:history.back()" id="history_back">后退一步</a>
             <a href="http://user.trustie.net/users/5/user_newfeedback">给我留言</a>
         </div>
     </div>

app/views/courses/_courses_jours.html.erb

@@ -8,10 +8,10 @@
   div.ke-toolbar .ke-outline{border:none;}
 
   div.respond-form .reply_btn{margin-left:565px;margin-top:5px;}
-  div.recall_con{width:600px;}
-  div.recall_con .reply_btn{margin-left:555px;margin-top:5px;}
+  div.recall_con{width:570px;}
+  div.recall_con .reply_btn{margin-left:525px;margin-top:5px;}
 </style>
-<%= javascript_include_tag "/assets/kindeditor/kindeditor" %>
+<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
 <div class="msg_box fl" id='leave-message' nhname="new_message">
   <%# reply_allow = JournalsForMessage.create_by_user? User.current %>
   <h4><%= l(:label_leave_message) %></h4>
@@ -56,6 +56,7 @@
   $(function(){
 
     function init_editor(params){
+      params.textarea.removeAttr('placeholder');
       var editor = params.kindutil.create(params.textarea, {
         resizeType : 1,minWidth:"1px",width:"100%",height:"150px",
         items:['emoticons'],

app/views/courses/_show_member_score.html.erb

@@ -17,13 +17,14 @@
     <h2><%= @member_score.user.name %> 历次作业积分</h2>
     <ul class="tscore_box">
       <li ><span class="c_blue02 w280">作业名称</span><span class="c_blue02 w70">得分</span></li>
-      <% @member_score.student_work_score.each do |homework_score| %>
+      <% @member_score.homework_common_list.each do |homework_common| %>
             <li>
               <span class="c_grey02 w280">
-                <%= homework_score.name %>
+                <%= homework_common.name %>
               </span>
               <span class="c_red w70">
-                <%= format("%0.2f",homework_score.final_score.nil? ? 0 : homework_score.final_score) %>
+                <% final_score = @member_score.homework_common_score(homework_common).first%>
+                <%= final_score.nil? || final_score.final_score.nil? ? "--" : format("%0.2f", final_score.final_score) %>
               </span>
             </li>
        <% end %>

app/views/files/_course_list.html.erb

@@ -25,7 +25,9 @@
       <% if file.is_public? || User.current.member_of_course?(course) %>
           <div class="re_con_box" id="container_files_<%= file.id %>">
             <div class="">
-              <%= link_to truncate(file.filename,length: 35, omission: '...'), download_named_attachment_path(file.id, file.filename, preview: true),:title => file.filename+"\n"+file.description.to_s, :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis;",:class => "c_dblue f_14 f_b f_l"  %>
+              <%= link_to truncate(file.filename,length: 35, omission: '...'), 
+              download_named_attachment_path(file.id, file.filename),
+              :title => file.filename+"\n"+file.description.to_s, :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis;",:class => "c_dblue f_14 f_b f_l"  %>
               <% if User.current.logged? %>
                   <% if (is_course_teacher(User.current,@course) || file.author_id == User.current.id) && course_contains_attachment?(@course,file) %>
                       <%= link_to("选入我的其他课程",quote_resource_show_course_file_path(@course,file),:class => "f_l re_select c_lorange",:remote => true) if has_course?(User.current,file) %>
@@ -40,7 +42,7 @@
                   <% else %>
                       <%= link_to("选入我的课程",quote_resource_show_course_file_path(@course,file),:class => "f_l re_select c_lorange",:remote => true) if has_course?(User.current,file) %>
                   <% end %>
-                  <%= link_to_attachment file, text: '下载', class: 'f_l re_open' %>
+                  <%= file_preview_tag(file, class: 'f_l re_open') %>
               <% else %>
               <% end %>
             </div>

app/views/files/_project_file_list.html.erb

@@ -18,7 +18,9 @@
   <% project_attachments.each do |file| %>
       <div class="re_con_box">
         <div class="">
-          <%= link_to truncate(file.filename,length: 35, omission: '...'), download_named_attachment_path(file.id, file.filename, preview: true),:title => file.filename+"\n"+file.description.to_s, :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis;",:class => "c_dblue f_14 f_b f_l"  %>
+          <%= link_to truncate(file.filename,length: 35, omission: '...'),
+            download_named_attachment_path(file.id, file.filename),
+            :title => file.filename+"\n"+file.description.to_s, :style => "overflow: hidden; white-space: nowrap;text-overflow: ellipsis;",:class => "c_dblue f_14 f_b f_l"  %>
           <% if User.current.logged? %>
               <% if (manage_allowed || file.author_id == User.current.id) && project_contains_attachment?(project,file) %>
                   <%= link_to(l(:label_slected_to_other_project),quote_resource_show_project_project_file_path(project,file),:class => "f_l re_select",:remote => true) if has_project?(User.current,file) %>
@@ -30,7 +32,7 @@
               <% else %>
                   <%= link_to(l(:label_slected_to_project),quote_resource_show_project_project_file_path(project,file),:class => "f_l re_select",:remote => true) if has_project?(User.current,file) %>
               <% end %>
-              <%= link_to_attachment file, text: '下载', class: 'f_l re_open' %>
+              <%= file_preview_tag(file, class: 'f_l re_open') %>
           <% end %>
         </div>
         <div class="cl"></div>

app/views/forums/edit.html.erb

@@ -1,4 +1,4 @@
 <!-- added by fq -->
 <h1>编辑讨论区</h1>
-<%= javascript_include_tag "/assets/kindeditor/kindeditor" %>
+<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
 <%= render 'form_edit_mode' %>

app/views/forums/new.html.erb

@@ -5,7 +5,7 @@
 <% @nav_dispaly_forum_label = 1%>
 <!-- added by fq -->
 <h1 style="margin-top: 2%; margin-left: 49%"><%= l :label_forum_new %></h1>
-<%= javascript_include_tag "/assets/kindeditor/kindeditor" %>
+<%= javascript_include_tag "/assets/kindeditor/kindeditor",'/assets/kindeditor/pasteimg'  %>
 <%= render 'form_create_mode' %>
 
 <%#= link_to l(:button_back), forums_path %>