merge

app/controllers/admin_controller.rb

@@ -469,6 +469,23 @@ class AdminController < ApplicationController
     end
   end
 
+  #最近登录老师列表
+  def latest_login_teachers
+    scope = User.find_by_sql("SELECT * FROM users,user_extensions WHERE users.id = user_extensions.user_id AND user_extensions.identity=0 ORDER BY last_login_on DESC")
+    if params[:startdate].present?
+      scope = User.find_by_sql("SELECT * FROM users,user_extensions WHERE users.id = user_extensions.user_id AND user_extensions.identity=0 and last_login_on>= '#{params[:startdate]} 00:00:00' ORDER BY last_login_on DESC")
+    end
+    if params[:enddate].present?
+      scope = User.find_by_sql("SELECT * FROM users,user_extensions WHERE users.id = user_extensions.user_id AND user_extensions.identity=0 and last_login_on <= '#{params[:enddate]} 23:59:59' ORDER BY last_login_on DESC")
+    end
+    @teachers = scope
+    @teachers = paginateHelper @teachers,30
+    @page = (params['page'] || 1).to_i - 1
+    respond_to do |format|
+      format.html
+    end
+  end
+
   #作业
   def homework
     @homework = HomeworkCommon.order('end_time desc')

app/controllers/courses_controller.rb

@@ -450,6 +450,93 @@ class CoursesController < ApplicationController
       #copy avatar
       copy_avatar(@course, copy_course)
 
+      if params[:course_content_type]
+        params[:course_content_type].each do |type|
+          case type
+            when "0"
+              homeworks = copy_course.homework_commons
+              homeworks.each do |homework|
+                new_homework = HomeworkCommon.new
+                new_homework.name = homework.name
+                new_homework.user_id = User.current.id
+                new_homework.description = homework.description
+                new_homework.publish_time = Date.today + 30
+                new_homework.end_time = Date.today + 60
+                new_homework.homework_type = homework.homework_type
+                new_homework.late_penalty = homework.late_penalty
+                new_homework.course_id = @course.id
+                new_homework.teacher_priority = homework.teacher_priority
+                new_homework.anonymous_comment = homework.anonymous_comment
+                new_homework.quotes = 0
+                new_homework.is_open = homework.is_open
+                homework.attachments.each do |attachment|
+                  att = attachment.copy
+                  att.container_id = nil
+                  att.container_type = nil
+                  att.copy_from = attachment.id
+                  att.save
+                  new_homework.attachments << att
+                end
+                homework_detail_manual = homework.homework_detail_manual
+                homework_detail_programing = homework.homework_detail_programing
+                homework_detail_group = homework.homework_detail_group
+                if homework_detail_manual
+                  new_homework.homework_detail_manual = HomeworkDetailManual.new
+                  new_homework_detail_manual =  new_homework.homework_detail_manual
+                  new_homework_detail_manual.ta_proportion = homework_detail_manual.ta_proportion
+                  new_homework_detail_manual.comment_status = 0
+                  new_homework_detail_manual.evaluation_start = Date.today + 67
+                  new_homework_detail_manual.evaluation_end = Date.today + 74
+                  new_homework_detail_manual.evaluation_num = homework_detail_manual.evaluation_num
+                  new_homework_detail_manual.absence_penalty = homework_detail_manual.absence_penalty
+                end
+                if homework_detail_programing
+                  new_homework.homework_detail_programing = HomeworkDetailPrograming.new
+                  new_homework.homework_detail_programing.ta_proportion = homework_detail_programing.ta_proportion
+                  new_homework.homework_detail_programing.language = homework_detail_programing.language
+                  homework.homework_tests.each_with_index do |homework_test|
+                    new_homework.homework_tests << HomeworkTest.new(
+                        input: homework_test.input,
+                        output: homework_test.output
+                    )
+                  end
+                end
+
+                if homework_detail_group
+                  new_homework.homework_detail_group = HomeworkDetailGroup.new
+                  new_homework.homework_detail_group.min_num = homework_detail_group.min_num
+                  new_homework.homework_detail_group.max_num = homework_detail_group.max_num
+                  new_homework.homework_detail_group.base_on_project = homework_detail_group.base_on_project
+                end
+                if new_homework.save
+                  new_homework_detail_manual.save if new_homework_detail_manual
+                  new_homework.homework_detail_programing.save if new_homework.homework_detail_programing
+                  new_homework.homework_detail_group.save if new_homework.homework_detail_group
+                end
+                homework.update_attribute(:quotes, homework.quotes+1)
+              end
+            when "1"
+              attachments = copy_course.attachments
+              attachments.each do |attachment|
+                attach_copied_obj = attachment.copy
+                attach_copied_obj.tag_list.add(attachment.tag_list) # tag关联
+                attach_copied_obj.container = @course
+                attach_copied_obj.created_on = Time.now
+                attach_copied_obj.author_id = User.current.id
+                attach_copied_obj.copy_from = attachment.copy_from.nil? ? attachment.id : attachment.copy_from
+                attach_copied_obj.is_publish = 0
+                attach_copied_obj.publish_time = Date.today + 30
+                if attach_copied_obj.attachtype == nil
+                  attach_copied_obj.attachtype = 4
+                end
+                attach_copied_obj.save
+                update_quotes attach_copied_obj
+              end
+          end
+        end
+      end
+
+=begin
       if params[:checkAll]
         attachments = copy_course.attachments
         attachments.each do |attachment|
@@ -513,6 +600,7 @@ class CoursesController < ApplicationController
           end
         end
       end
+=end
     end
     if @course
       respond_to do |format|

app/controllers/homework_common_controller.rb

@@ -6,8 +6,8 @@ class HomeworkCommonController < ApplicationController
 
   include StudentWorkHelper
   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,:start_evaluation_set,:set_evaluation_attr,:score_rule_set,:alert_forbidden_anonymous_comment]
+  before_filter :find_homework, :only => [:edit,:update,:alert_anonymous_comment,:start_anonymous_comment,:stop_anonymous_comment,:destroy,:start_evaluation_set,:set_evaluation_attr,:score_rule_set,:alert_forbidden_anonymous_comment,:alert_open_student_works,:open_student_works]
-  before_filter :teacher_of_course, :only => [:new, :create, :edit, :update, :destroy, :start_anonymous_comment, :stop_anonymous_comment, :alert_anonymous_comment,:start_evaluation_set,:set_evaluation_attr,:score_rule_set,:alert_forbidden_anonymous_comment]
+  before_filter :teacher_of_course, :only => [:new, :create, :edit, :update, :destroy, :start_anonymous_comment, :stop_anonymous_comment, :alert_anonymous_comment,:start_evaluation_set,:set_evaluation_attr,:score_rule_set,:alert_forbidden_anonymous_comment,:alert_open_student_works,:open_student_works]
   before_filter :member_of_course, :only => [:index]
 
   def index
@@ -261,6 +261,30 @@ class HomeworkCommonController < ApplicationController
     end
   end
 
+  def open_student_works
+    if @homework.is_open == 0
+      @homework.update_attribute(:is_open, 1)
+    else
+      @homework.update_attribute(:is_open, 0)
+    end
+    @user_activity_id = params[:user_activity_id]
+    @is_in_course = params[:is_in_course] if params[:is_in_course]
+    @course_activity = params[:course_activity] if params[:course_Activity]
+  end
+
+  def alert_open_student_works
+    if params[:user_activity_id]
+      @user_activity_id = params[:user_activity_id]
+    else
+      @user_activity_id = -1
+    end
+    @is_in_course = params[:is_in_course] if params[:is_in_course]
+    @course_activity = params[:course_activity] if params[:course_Activity]
+    respond_to do |format|
+      format.js
+    end
+  end
+
   def programing_test
     test = {language:params[:language],src:Base64.encode64(params[:src]),input:[params[:input]],output:[params[:output]]}
     @index = params[:index]

app/controllers/repositories_controller.rb

@@ -34,7 +34,7 @@ class RepositoriesController < ApplicationController
   before_filter :find_repository, :only => [:edit, :update, :destroy, :committers]
   before_filter :find_project_repository, :except => [:new, :create, :newcreate, :edit, :update, :destroy, :committers, :newrepo, :to_gitlab, :forked]
   before_filter :find_changeset, :only => [:revision, :add_related_issue, :remove_related_issue]
-  before_filter :authorize , :except => [:newrepo,:newcreate,:fork, :to_gitlab, :forked]
+  before_filter :authorize , :except => [:newrepo,:newcreate,:fork, :to_gitlab, :forked, :commit_diff]
   accept_rss_auth :revisions
   # hidden repositories filter // 隐藏代码过滤器
   before_filter :check_hidden_repo, :only => [:show, :stats, :revisions, :revision, :diff ]
@@ -521,6 +521,13 @@ update
     end
   end
 
+  # 每次提交对应的文件差异
+  def commit_diff
+    @commit_diff = $g.commit_diff(@project.gpid, params[:changeset])
+    @commit_details = $g.commit(@project.gpid, params[:changeset])
+    render :layout => 'base_projects'
+  end
+
   def diff
     if params[:format] == 'diff'
       @diff = @repository.diff(@path, @rev, @rev_to)

app/controllers/student_work_controller.rb

@@ -6,9 +6,10 @@ class StudentWorkController < ApplicationController
   require "base64"
   before_filter :find_homework, :only => [:new, :index, :create, :student_work_absence_penalty, :absence_penalty_list, :evaluation_list, :program_test,:set_score_rule,:forbidden_anonymous_comment,:delete_work,:new_student_work_project,:student_work_project,:cancel_relate_project,:search_course_students]
   before_filter :find_work, :only => [:edit, :update, :show, :destroy, :add_score, :praise_student_work,:retry_work,:revise_attachment]
-  before_filter :member_of_course, :only => [:index, :new, :create, :show, :add_score, :praise_student_work]
+  before_filter :member_of_course, :only => [:new, :create, :show, :add_score, :praise_student_work]
   before_filter :author_of_work, :only => [:edit, :update, :destroy]
   before_filter :teacher_of_course, :only => [:student_work_absence_penalty, :absence_penalty_list, :evaluation_list, :set_score_rule, :forbidden_anonymous_comment]
+  before_filter :is_logged, :only => [:index]
 
   ### 
   def program_test
@@ -91,6 +92,10 @@ class StudentWorkController < ApplicationController
         student_in_group = '(' + group_students.map{|user| user.id}.join(',')  + ')'
       end
       #老师 || 超级管理员 || 禁用匿评&&作业截止&&已提交作品 显示所有列表
+      if @homework.is_open == 1
+        @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").joins(:user).where("users.id in #{student_in_group}").order("#{@order} #{@b_sort}"),@name
+        @show_all = true
+      elsif @homework.is_open == 0 && User.current.member_of_course?(@course) || User.current.admin?
         if @is_teacher || @homework.homework_detail_manual.nil? ||
             (@homework.anonymous_comment == 1 && Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.now.strftime("%Y-%m-%d") && !@homework.student_works.where(:user_id => User.current.id).empty?)
           @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").joins(:user).where("users.id in #{student_in_group}").order("#{@order} #{@b_sort}"),@name
@@ -138,8 +143,17 @@ class StudentWorkController < ApplicationController
         else
           @stundet_works = []
         end
+      else
+        render_403
+        return
+      end
+
       @student_work_count = (search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").joins(:user).where("users.id in #{student_in_group}").order("#{@order} #{@b_sort}"),@name).count
     else
+      if @homework.is_open == 1
+        @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").order("#{@order} #{@b_sort}"),@name
+        @show_all = true
+      elsif @homework.is_open == 0 && User.current.member_of_course?(@course) || User.current.admin?
         if @is_teacher || @homework.homework_detail_manual.nil? || (@homework.anonymous_comment == 1 && Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.now.strftime("%Y-%m-%d") && !@homework.student_works.where(:user_id => User.current.id).empty?)   #老师 || 超级管理员 显示所有列表
           @stundet_works = search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").order("#{@order} #{@b_sort}"),@name
           @show_all = true
@@ -186,6 +200,11 @@ class StudentWorkController < ApplicationController
         else
           @stundet_works = []
         end
+      else
+        render_403
+        return
+      end
+
       @student_work_count = (search_homework_member @homework.student_works.select("student_works.*,IF(final_score is null,null,final_score - absence_penalty - late_penalty) as score").order("#{@order} #{@b_sort}"),@name).count
     end
 
@@ -802,6 +821,10 @@ class StudentWorkController < ApplicationController
     render_403 unless User.current.allowed_to?(:as_teacher,@course) || User.current.admin?
   end
 
+  def is_logged
+    redirect_to signin_path unless User.current.logged?
+  end
+
   #根据条件过滤作业结果
   def search_homework_member homeworks,name
     if name == ""

app/controllers/users_controller.rb

@@ -532,9 +532,10 @@ class UsersController < ApplicationController
       if @student_work.nil?
         @student_work = StudentWork.new
       end
+      @course = @homework.course
       respond_to do |format|
         format.js
-        format.html {render :layout => 'new_base_user'}
+        format.html {render :layout => 'base_courses'}
       end
     else
       render_403

app/controllers/words_controller.rb

@@ -74,9 +74,10 @@ class WordsController < ApplicationController
       #   render 'test/index'
       # }
       format.js {
+        #@reply_type = params[:reply_type]
         @user_activity_id = params[:user_activity_id]
         @activity = JournalsForMessage.find(parent_id)
-        @is_activity = params[:is_activity]
+        @is_activity = params[:is_activity] if params[:is_activity]
       }
     end
 
@@ -98,6 +99,10 @@ class WordsController < ApplicationController
         @user_activity_id = params[:user_activity_id] if params[:user_activity_id]
         @is_activity = params[:is_activity].to_i if params[:is_activity]
         @activity = @journal_destroyed.parent if @journal_destroyed.parent
+        unless @activity
+          redirect_to feedback_path(@user)
+          return
+        end
       elsif @journal_destroyed.jour_type == 'HomeworkCommon'
         @homework = HomeworkCommon.find @journal_destroyed.jour_id
         if params[:user_activity_id]

app/helpers/issues_helper.rb

@@ -80,7 +80,7 @@ module IssuesHelper
       issuetype << "support fl"
       issuetype << "支持"
     elsif value == "功能" || value == 2
-      issuetype << "function fl"
+      issuetype << "issues-function fl"
       issuetype << "功能"
     else
       issuetype << "weekly fl"

app/helpers/repositories_helper.rb

@@ -41,6 +41,16 @@ module RepositoriesHelper
     identifiers.include?(iden) ? false :true
   end
 
+  # 获取diff内容行号
+  def diff_line_num content
+    content.scan(/@@ -(\d+),\d+ \+\d+,\d+ @@/).first.join("").to_i
+  end
+
+  # 处理内容
+  def diff_content content
+    content.gsub!(/.*@@ -\d+,\d+ \+\d+,\d+ @@\n/m,'')
+  end
+
   def format_revision(revision)
     if revision.respond_to? :format_identifier
       revision.format_identifier

app/helpers/users_helper.rb

@@ -85,6 +85,11 @@ module UsersHelper
     end
   end
 
+  def link_to_user_version(version, options = {})
+    return '' unless version && version.is_a?(Version)
+    link_to_if version.visible?, format_version_name(version), { :controller => 'versions', :action => 'show', :id => version }, :class => "linkBlue"
+  end
+
   # 统计未读消息数
   def unviewed_message(user)
     course_count = CourseMessage.where("user_id =? and viewed =?", user, 0).count

app/models/attachment.rb

@@ -28,6 +28,7 @@ class Attachment < ActiveRecord::Base
   belongs_to :attachmentstype,  :foreign_key => "attachtype",:primary_key => "id"
   # 被ForgeActivity虚拟关联
   has_many :forge_acts, :class_name => 'ForgeActivity',:as =>:forge_act ,:dependent => :destroy
+  has_many :forwards, :as => :from
   # 课程动态
   has_many :course_acts, :class_name => 'CourseActivity',:as =>:course_act ,:dependent => :destroy
   # end
@@ -87,7 +88,8 @@ class Attachment < ActiveRecord::Base
   cattr_accessor :thumbnails_storage_path
   @@thumbnails_storage_path = File.join(Rails.root, "tmp", "thumbnails")
 
-  before_save :files_to_final_location,:act_as_course_activity
+  before_save :files_to_final_location
+  after_save :act_as_course_activity
   after_create :office_conver, :be_user_score,:act_as_forge_activity,:create_attachment_ealasticsearch_index
   after_update :office_conver, :be_user_score,:update_attachment_ealasticsearch_index
   after_destroy :delete_from_disk,:down_user_score,:delete_attachment_ealasticsearch_index, :decrease_attchments_count
@@ -605,10 +607,16 @@ class Attachment < ActiveRecord::Base
 
   #课程动态公共表记录
   def act_as_course_activity
-    if self.container_type == "Course" && self.course_acts.empty?
+    if self.container_type == "Course"
+      if self.is_publish == 0
+        self.course_acts.destroy_all
+      else
+        if self.is_publish == 1 && self.course_acts.empty?
           self.course_acts << CourseActivity.new(:user_id => self.author_id,:course_id => self.container_id)
         end
       end
+    end
+  end
 
   def create_attachment_ealasticsearch_index
     if self.is_public == 1 && ( (self.container_type == 'Project' &&  Project.find(self.container_id).is_public == 1) ||
@@ -643,8 +651,8 @@ class Attachment < ActiveRecord::Base
 
   def decrease_attchments_count
     if self.container_type == "Project" && !self.project.project_score.nil?
-      aatach_count = self.container.project_score.attach_num - 1
+      attach_count = self.container.project_score.attach_num - 1
-      self.container.project_score.update_attribute(:attach_num, aatach_count)
+      self.container.project_score.update_attribute(:attach_num, attach_count < 0 ? 0 : attach_count)
     end
   end
 end

app/models/forward.rb

@@ -0,0 +1,4 @@
+class Forward < ActiveRecord::Base
+  validates_presence_of :from_id, :from_type, :to_id, :to_type
+  belongs_to :from, :polymorphic => true
+end

app/models/issue.rb

@@ -184,7 +184,7 @@ class Issue < ActiveRecord::Base
   def decrease_issues_count
     unless self.project.project_score.nil?
       issue_count = self.project.project_score.issue_num - 1
-      self.project.project_score.update_attribute(:issue_num, issue_count)
+      self.project.project_score.update_attribute(:issue_num, issue_count < 0 ? 0 : issue_count)
     end
   end
 

app/models/journal.rb

@@ -219,8 +219,9 @@ class Journal < ActiveRecord::Base
   # 减少留言数量统计
   def decrease_issues_journal_count
     unless self.issue.project.nil?
-      project = self.issue.project
+      journal_count = self.issue.project.project_score.issue_journal_num - 1
-      project.project_score.update_attribute(:issue_journal_num, project.project_score.issue_journal_num - 1)
+      # project = self.issue.project
+       self.issue.project.project_score.update_attribute(:issue_journal_num, journal_count < 0 ? 0 : journal_count)
     end
   end
 

app/models/message.rb

@@ -146,10 +146,10 @@ class Message < ActiveRecord::Base
       # 讨论区
       if self.parent_id.nil?
         count = self.project.project_score.board_num - 1
-        self.project.project_score.update_attribute(:board_num, count)
+        self.project.project_score.update_attribute(:board_num, count < 0 ? 0 : count)
       else # 回复
         count = self.project.project_score.board_message_num - 1
-        self.project.project_score.update_attribute(:board_message_num, count)
+        self.project.project_score.update_attribute(:board_message_num, count < 0 ? 0 : count)
       end
     end
   end

app/models/news.rb

@@ -126,7 +126,7 @@ class News < ActiveRecord::Base
   def decrease_news_count
     if self.project && !self.project.project_score.nil?
       count = self.project.project_score.news_num - 1
-      self.project.project_score.update_attribute(:news_num, count)
+      self.project.project_score.update_attribute(:news_num, count < 0 ? 0 : count)
     end
   end
 

app/services/courses_service.rb

@@ -252,6 +252,7 @@ class CoursesService
   def edit_course(params,course,current_user)
     course.send(:safe_attributes=, params[:course], current_user)
     #course.safe_attributes = params[:course]
+    course.password = params[:course][:password]
     course.time = params[:time]
     course.term = params[:term]
     course.end_time = params[:end_time]

app/views/admin/_tab_users.erb

@@ -0,0 +1,7 @@
+<div class="tabs">
+  <ul>
+    <li><%= link_to '用户', {:action => 'latest_login_users'},   class: "#{current_page?(latest_login_users_path)? 'selected' : nil }" %></li>
+    <li><%= link_to '老师',  {:action => 'latest_login_teachers'},  class: "#{current_page?(latest_login_teachers_path)? 'selected' : nil }" %></li>
+
+  </ul>
+</div>

app/views/admin/latest_login_teachers.html.erb

@@ -0,0 +1,84 @@
+<%= stylesheet_link_tag 'jquery/jquery-ui-1.9.2', :media => 'all' %>
+<h3>
+  <%=l(:label_latest_login_user_list)%>
+</h3>
+<%= render 'tab_users' %>
+
+<h3>
+  最近登录老师列表
+</h3>
+<%= form_tag({}, :method => :get) do %>
+    <fieldset>
+      <legend>
+        <%= l(:label_filter_plural) %>
+      </legend>
+      <label style="float:left">开始日期：</label>
+      <%= text_field_tag 'startdate', params[:startdate], :size => 15, :onchange=>"$('#ui-datepicker-div').hide()", :style=>"float:left"%>
+      <%= calendar_for('startdate')%><span style="float: left ">&nbsp;&nbsp;&nbsp;</span>
+      <label style="float:left">结束日期：</label>
+      <%= text_field_tag 'enddate', params[:enddate], :size => 15, :onchange =>"$('#ui-datepicker-div').hide()", :style=>"float:left"%>
+      <%= calendar_for('enddate')%> &nbsp;
+      <%= submit_tag l(:button_apply), :class => "small", :name => nil %>
+      <%= link_to l(:button_clear), {:controller => 'admin', :action => 'latest_login_teachers'}, :class => 'icon icon-reload' %>
+    </fieldset>
+<% end %>
+&nbsp;
+<div class="autoscroll">
+  <table class="list" style="width: 100%;table-layout: fixed">
+    <thead>
+    <tr>
+      <th style="width: 30px;">
+        序号
+      </th>
+      <th style="width: 70px;">
+        登录时间
+      </th>
+      <th style="width: 30px;">
+        用户id
+      </th>
+      <th style="width: 50px;">
+        用户姓名
+      </th>
+      <th style="width: 50px;">
+        用户登录名
+      </th>
+      <th style="width: 50px;">
+        用户身份
+      </th>
+    </tr>
+    </thead>
+    <tbody>
+    <% @count=@page * 30 %>
+    <% for teacher in @teachers do %>
+        <tr>
+          <% @count +=1 %>
+          <td align="center">
+            <%=@count %>
+          </td>
+          <td align="center">
+            <%=format_time(teacher.last_login_on) %>
+          </td>
+          <td align="center">
+            <%=teacher.id %>
+          </td>
+          <td align="center" style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;" class="name" title='<% if teacher.try(:realname) == ' '%><%= teacher.login%><% else %><%=teacher.try(:realname) %><% end %>'>
+            <% if teacher.try(:realname) == ' '%>
+                <%= link_to(teacher.login, user_path(teacher)) %>
+            <% else %>
+                <%= link_to(teacher.try(:realname), user_path(teacher)) %>
+            <% end %>
+          </td>
+          <td align="center">
+            <%=link_to(teacher.login, user_path(teacher)) %>
+          </td>
+          <td align="center">
+            老师
+          </td>
+        </tr>
+    <% end %>
+    </tbody>
+  </table>
+</div>
+<div class="pagination">
+  <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false %>
+</div>

app/views/admin/latest_login_users.html.erb

@@ -2,7 +2,10 @@
 <h3>
   <%=l(:label_latest_login_user_list)%>
 </h3>
-
+<%= render 'tab_users' %>
+<h3>
+  <%=l(:label_latest_login_user_list)%>
+</h3>
 <%= form_tag({}, :method => :get) do %>
     <fieldset>
       <legend>

app/views/common/_file.html.erb

@@ -8,7 +8,7 @@
       <a href="#L<%= line_num %>" style="padding-top: 0px;"><%= line_num %></a>
     </th>
     <td class="line-code">
-      <pre style="width:auto;white-space: nowrap; "><%= line.html_safe %></pre>
+      <pre style="width:auto;white-space: nowrap;overflow: auto; "><%= line.html_safe %></pre>
     </td>
   </tr>
   <% line_num += 1 %>

app/views/courses/_copy_course.html.erb

@@ -92,16 +92,23 @@
       <span class="c_grey">（选中后课外用户可见该课程，否则仅对课内成员可见）</span>
       <div class="cl"></div>
     </li>
-    <li class="ml58">
+    <li class="ml85">
-      <label class="fl">复制资源&nbsp;&nbsp;：</label>
+      <label class="fl">复制&nbsp;&nbsp;：</label>
-      <ul class="fl" id="copyResource">
+      <ul class="fl" id="copyResource" style="width:544px;">
-        <li class="sendCourseName fl mr15 ml5">
+        <li class="sendCourseName fl ml5">
-          <label>
+          <label class="fl">
-            <input name="checkAll" type="checkbox" id="allResource" value="0" class="resourceCopy"/>
+            <input name="course_content_type[]" type="checkbox" value="0" class="resourceCopy"/>
-            全部</label>
+            作业</label>
+            <span class="c_red ml5 fl mb10 w490">复制到新课中的作业将在1个月后发布、2个月后提交截止，请您调整作业的发布时间、截止时间等时间节点。</span>
+        </li>
+        <li class="sendCourseName fl ml5">
+          <label class="fl">
+            <input name="course_content_type[]" type="checkbox" value="1" class="resourceCopy"/>
+            资源</label>
+            <span class="c_red ml5 fl mb10">复制到新课的资源将在1个月后发布，请您调整资源的发布时间，否则学生可能看不到资源。</span>
         </li>
       </ul>
-      <ul class="fl" id="copyResource2">
+      <!--<ul class="fl" id="copyResource2">
         <li class="sendCourseName fl mr15">
           <label>
             <input name="course_attachment_type[]" type="checkbox" value="1" class="resourceCopy"/>
@@ -134,7 +141,7 @@
         </li>
         <div class="cl"></div>
       </ul>
-      <span class="c_red ml5 fl mb10">您可以通过选择资源类型，将对应资源复制到新课程中。</span>
+      <span class="c_red ml5 fl mb10">您可以通过选择类型，将对应类型复制到新课程中。</span>-->
       <div class="cl"></div>
     </li>
   <% end %>

app/views/courses/copy_course.js.erb

@@ -3,7 +3,7 @@ if(document.getElementById("popbox02")) {
 }
 $('#ajax-modal').html('<%= escape_javascript(render :partial => 'copy_course') %>');
 showModal('ajax-modal', '730px');
-$('#ajax-modal').css('height','530px').css('width','730px');
+$('#ajax-modal').css('height','auto').css('width','730px');
 $('#ajax-modal').siblings().remove();
 $('#ajax-modal').before("<div class='resourcePopupClose mt5 mr-5'>" +
 "<a href='javascript:void(0)' class='resourceClose' onclick='hideResource();'></a></div>");

app/views/courses/settings/_join_org.html.erb

@@ -15,8 +15,8 @@
         <input type="text" name="orgs" class="searchOrg mb5 ml20" placeholder="请输入组织名称" />
         <div id="search_orgs_result_list" class="ml20"></div>
         <ul id="paginator" class="wlist ml20" style="float:none;"></ul>
-        <a href="javascript:void(0);" class="saveBtn db fl ml20 mr15 mb5" onclick="course_join_org(<%= @course.id %>);">关联</a>
+        <a href="javascript:void(0);" class="saveBtn db fl ml20 mr15 mt5" onclick="course_join_org(<%= @course.id %>);">关联</a>
-        <a href="javascript:void(0);" class="cancelBtn db fl" onclick="cancel_join_orgs();">取消</a>
+        <a href="javascript:void(0);" class="org-cancel-btn db fl mt5" onclick="cancel_join_orgs();">取消</a>
     <% end %>
   </div>
   <div class="relatedList fr">

app/views/files/search_org_subfield_tag_attachment.js.erb

@@ -1,2 +1,3 @@
 $("#org_subfield_list").html("<%= escape_javascript(render :partial => 'org_subfield_list',
     :locals => {org_subfield: @org_subfield,all_attachments: @result,sort:@sort,order:@order,org_subfield_attachments:@searched_attach})%>");
+$("#attachment_count").html("<%= @result.count %>");

app/views/homework_common/_alert_open_student_works.html.erb

@@ -0,0 +1,23 @@
+<div id="popbox02">
+  <div class="ni_con">
+    <% if @homework.is_open == 0 %>
+        <h2>公开作品</h2>
+        <p>
+          本次作业的所有作品将对Trustie平台所有注册用户开放，请问是否确定公开作品？
+        </p>
+    <% else %>
+        <h2>取消公开作品</h2>
+        <p>
+          您将取消“公开作品”的功能，本次作业的作品将不对Trustie平台其他未加入本课程的用户开放，请问是否确定？
+        </p>
+    <% end %>
+    <div class="ni_btn">
+      <a href="javascript:" class="tijiao" onclick="clickOK('<%= open_student_works_homework_common_path(@homework, :user_activity_id => @user_activity_id,:is_in_course=>@is_in_course, :course_activity => @course_activity)%>');" style="margin-bottom: 20px;" >
+        确&nbsp;&nbsp;定
+      </a>
+      <a href="javascript:" class="tijiao" onclick="clickCanel();" style="margin-bottom: 20px;">
+        取&nbsp;&nbsp;消
+      </a>
+    </div>
+  </div>
+</div>

app/views/homework_common/alert_open_student_works.js.erb

@@ -0,0 +1,6 @@
+$("#ajax-modal").html("<%=escape_javascript(render :partial => 'alert_open_student_works') %>");
+showModal('ajax-modal', '500px');
+$('#ajax-modal').siblings().remove();
+$('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
+        "<a href='javascript:' onclick='clickCanel();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
+$('#ajax-modal').parent().css("top","30%").css("left","30%").css("position","fixed").css("border","3px solid #269ac9");

app/views/homework_common/open_student_works.js.erb

@@ -0,0 +1,7 @@
+<% if @user_activity_id.to_i == -1 %>
+$("#homework_common_<%= @homework.id %>").replaceWith("<%= escape_javascript(render :partial => "users/user_homework_detail",:locals => {:homework_common => @homework, :is_in_course => @is_in_course})%>");
+sd_create_editor_from_data(<%= @homework.id%>,"","100%", "<%=@homework.class.to_s%>");
+<% else %>
+$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_homework', :locals => {:activity => @homework,:user_activity_id =>@user_activity_id,:course_activity=>@course_activity}) %>");
+sd_create_editor_from_data(<%= @user_activity_id%>,"","100%", "UserActivity");
+<% end %>

app/views/issues/_detail.html.erb

@@ -8,7 +8,7 @@
       <% when 1%>
           <span class="issues fl" title="缺陷"></span>
       <% when 2%>
-          <span class="function fl" title="功能"></span>
+          <span class="issues-function fl" title="功能"></span>
       <% when 3%>
           <span class="support fl" title="支持"></span>
       <% when 4%>

app/views/layouts/base_courses.html.erb

@@ -1,6 +1,11 @@
 <%# course_model %>
 <% course_file_num = visable_attachemnts_incourse(@course).count%>
 <% is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course)) %>
+<% if User.current.admin? || User.current.allowed_to?(:as_teacher,@course) %>
+    <% homework_num = @course.homework_commons.count %>
+<% else %>
+    <% homework_num = @course.homework_commons.where("publish_time <= '#{Date.today}'").count %>
+<% end %>
 <!DOCTYPE html>
 <html lang="en">
 <head>
@@ -74,7 +79,7 @@
         <% unless show_nav?(@course.homework_commons.count) %>
         <div class="subNav">
           <%= link_to l(:label_homework), homework_common_index_path(:course => @course.id), :class => "f14 c_blue02"%>
-          <%= link_to "(#{@course.homework_commons.count})", homework_common_index_path(:course => @course.id), :class => "subnav_num c_orange"%>
+          <%= link_to "(#{homework_num})", homework_common_index_path(:course => @course.id), :class => "subnav_num c_orange"%>
           <%= link_to( "", homework_common_index_path(:course => @course.id,:is_new => 1), :class => 'courseMenuSetting', :title =>"#{l(:label_course_homework_new)}") if is_teacher %>
         </div>
         <% end %>
@@ -176,7 +181,7 @@
               <% if student_score.score.to_i != 0 %>
                   <li> <a href="javascript:void:(0);"><%=link_to image_tag(url_to_avatar(student_score.user), :width => "35", :height => "35", :class=> "rankPortrait"),user_path(student_score.user) %></a>
                     <p><a href="javascript:void:(0);"><%=link_to student_score.user.show_name, user_path(student_score.user), :title => student_score.user.show_name %></a></p>
-                    <p><span class="c_red" style="cursor:pointer" title="作业总分：<%= student_score.score  %>"><%= student_score.score.to_i %></span></p>
+                    <p><span class="c_red" style="cursor:pointer" title="作业总分：<%= format("%.1f",student_score.score<0 ? 0 : student_score.score) %>"><%= student_score.score<0 ? 0 : student_score.score.to_i %></span></p>
                   </li>
               <% end %>
           <% end %>

app/views/layouts/base_org.html.erb

@@ -46,12 +46,12 @@
           <li class="navOrgMenu fr" id="orgUser" style="cursor:pointer;">
             <%= link_to image_tag(url_to_avatar(User.current),:width => '23',:height => '23'), request.local? ? user_path(User.current):("https://www.trustie.net/users/" + User.current.id.to_s),:alt => '用户头像', :target => '_blank',:style=>'border-radius:3px; vertical-align:top; margin-top:3px; display:inline-block; margin-right:3px;' %>
             <%= link_to User.current, (request.local? || request.subdomain.blank?) ? user_path(User.current):("https://www.trustie.net/users/" + User.current.id.to_s),:id => "orgUserName",:class => 'fontGrey2 f14 mr5',:target => '_blank' %>
-            <%= link_to "退出",(request.local? || request.subdomain.nil?) ? signout_path():"https://www.trustie.net/logout", :class =>"menuGrey", :method => 'post', :rel => "nofollow" %>
+            <%= link_to "退出",(request.local? || request.subdomain.blank?) ? signout_path():"https://www.trustie.net/logout", :class =>"menuGrey", :method => 'post', :rel => "nofollow" %>
           </li>
           <!--<li class="navOrgMenu fr"><%#=link_to User.current, user_path(User.current), :class => "linkGrey8 f14" %></li>-->
       <% else %>
-          <li class="navOrgMenu fr"><a href="<%= (request.local? || request.subdomain.nil?) ? signin_path(:login=>true):'https://www.trustie.net/login?login=true' %>" class="linkGrey8 f14">登录</a></li>
+          <li class="navOrgMenu fr"><a href="<%= (request.local? || request.subdomain.blank?) ? signin_path(:login=>true):'https://www.trustie.net/login?login=true' %>" class="linkGrey8 f14">登录</a></li>
-          <li class="navOrgMenu fr"><a href="<%= (request.local? || request.subdomain.nil?) ? signin_path(:login=>false):'https://www.trustie.net/login?login=false' %>" class="linkGrey8 f14 mr15">注册</a></li>
+          <li class="navOrgMenu fr"><a href="<%= (request.local? || request.subdomain.blank?) ? signin_path(:login=>false):'https://www.trustie.net/login?login=false' %>" class="linkGrey8 f14 mr15">注册</a></li>
       <% end %>
     </ul>
     <!--<div class="navHomepageProfile">

app/views/layouts/base_projects.html.erb

@@ -12,7 +12,7 @@
   <%= favicon %>
   <%= javascript_heads %>
   <%= heads_for_theme %>
-  <%= stylesheet_link_tag 'header','public', 'pleft', 'project','prettify','jquery/jquery-ui-1.9.2','repository','share' %>
+  <%= stylesheet_link_tag 'header','scm','public', 'pleft', 'project','prettify','jquery/jquery-ui-1.9.2','repository','share' %>
   <%= javascript_include_tag 'cookie','project', 'header','prettify','select_list_move','attachments' %>
 
   <%= call_hook :view_layouts_base_html_head %>

app/views/layouts/new_base_user.html.erb

@@ -272,6 +272,7 @@
       <div class="showpicBox">
         <p>预览</p>
         <%= image_tag(url_to_avatar(@user), :style=>"width:96px;height:96px;",:class=>"mb5 mt10",:nhname=>'avatar_image') %>
+        <br/>
         <span >96px*96px</span> <br />
         <div class="mb20"></div>
         <%= image_tag(url_to_avatar(@user), :style=>"width:48px;height:48px;",:class=>"mb5",:nhname=>'avatar_image') %>

app/views/org_document_comments/_new.html.erb

@@ -1,8 +1,12 @@
 <%= content_for(:header_tags) do %>
     <%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
+    <%= javascript_include_tag "des_KindEditor"  %>
 <% end %>
 
 <script>
+    $(function(){
+        init_des_data(150);
+    });
     function check_org_title()
     {
         if($("#document_title").val().trim() == "")
@@ -26,14 +30,14 @@
     }
     function cancel_create_org_document(){
         $("#document_title").val("");
-        org_document_description_editor.html("");
+        //org_document_description_editor.html("");
-        org_document_description_editor.sync();
+        //org_document_description_editor.sync();
         $('#org_document_editor').hide();
         $('#doc_title_hint').hide();
     }
 </script>
+    <div class="resources" nhname="new_topic_form">
       <%= form_tag organization_org_document_comments_path(:organization_id => @organization.id), :id => 'new_org_document_form' do |f| %>
-    <div class="resources">
       <div>
         <input class="postDetailInput fl" maxlength="250" name="org_document_comment[title]" id="document_title" style="resize:none;" onfocus = "$('#org_document_editor').show();" placeholder="请输入文章标题" />
       </div>
@@ -41,10 +45,10 @@
       <div class="cl"></div>
       <div id="org_document_editor" class="mt10" style="display: none">
         <div>
-          <%= kindeditor_tag 'org_document_comment[content]','', :editor_id => 'org_document_description_editor', :height => "150px" %>
+          <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='description_textarea' name="org_document_comment[content]"></textarea>
+          <%#= kindeditor_tag 'org_document_comment[content]','', :editor_id => 'org_document_description_editor', :height => "150px" %>
         </div>
         <div class="cl"></div>
-
         <p id="homework_course_id_span" class="c_red mt5"></p>
         <div class="cl"></div>
         <div class="mt10">
@@ -54,12 +58,11 @@
         </div>
         <div class="cl"></div>
         <div class="mt5">
-          <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick="create_org_document();">确定</a>
+          <a href="javascript:void(0);" class="BlueCirBtnMini fr" id="new_topic_submit_btn">确定</a>
           <span class="fr mr10 mt3">或</span>
-          <a href="javascript:void(0);" onclick="cancel_create_org_document();" class="fr mr10 mt3">取消</a>
+          <a href="javascript:void(0);" id="new_topic_cancel_btn" class="fr mr10 mt3">取消</a>
           <div class="cl"></div>
         </div>
-
-      </div>
       </div>
       <% end %>
+    </div>

app/views/org_document_comments/edit.html.erb

@@ -31,7 +31,7 @@
       </div>
       <div id="doc_title_hint"></div>
       <div class="cl"></div>
-      <div id="org_document_editor" >
+      <div>
         <div class="mt10">
           <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='description_textarea' name="org_document_comment[content]"><%=@org_document.content.html_safe %></textarea>
           <%#= kindeditor_tag 'org_document_comment[content]','', :editor_id => 'org_document_description_editor', :height => "150px" %>

app/views/org_document_comments/new.html.erb

@@ -39,7 +39,7 @@
     </div>
     <div id="doc_title_hint">
     </div>
-    <div id="org_document_editor" class="mt15" >
+    <div class="mt15" >
       <div class="mt10">
         <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='description_textarea' name="org_document_comment[content]"></textarea>
         <%#= kindeditor_tag 'org_document_comment[content]','', :editor_id => 'org_document_description_editor', :height => "150px" %>

app/views/organizations/_org_course_homework.html.erb

@@ -114,9 +114,11 @@
       </div>
       <div class="cl"></div>
       <div>
+        <% if activity.anonymous_comment == 0%>
             <div class="homepagePostDeadline">
               缺评扣分：<%= activity.homework_detail_manual.absence_penalty%>分/作品
             </div>
+        <% end %>
         <% if activity.anonymous_comment == 0%>
             <div class="homepagePostDeadline" style="float: right; margin-right: 220px;" id="evaluation_end_time_<%=user_activity_id %>">
               匿评关闭时间：<%= activity.homework_detail_manual.evaluation_end%>&nbsp;23:59
@@ -240,6 +242,15 @@
                         <%= link_to("禁用匿评", alert_forbidden_anonymous_comment_homework_common_path(activity,:user_activity_id => user_activity_id,:course_activity=>course_activity),:class => "postOptionLink", :remote => true)%>
                       </li>
                   <% end %>
+                  <% if (activity.anonymous_comment == 1 && activity.is_open == 0) || (activity.anonymous_comment == 0 && comment_status == 3 && activity.is_open == 0) %>
+                      <li>
+                        <%= link_to("公开作品", alert_open_student_works_homework_common_path(activity,:user_activity_id => user_activity_id, :is_in_course => -1,:course_activity=>course_activity),:class => "postOptionLink", :remote => true)%>
+                      </li>
+                  <% elsif activity.is_open == 1 %>
+                      <li>
+                        <%= link_to("取消公开", alert_open_student_works_homework_common_path(activity,:user_activity_id => user_activity_id, :is_in_course => -1,:course_activity=>course_activity),:class => "postOptionLink", :remote => true)%>
+                      </li>
+                  <% end %>
                 </ul>
               </li>
             </ul>

app/views/organizations/_org_left_subfield_list.html.erb

@@ -71,7 +71,7 @@
     <div class="homepageLeftMenuBlock" style="display:<%= field.hide == 0?'block':'none' %>;" id="org_subfield_<%= field.id %>">
       <% if field.field_type == "Post" %>
           <% if !field.subfield_subdomain_dir.nil? %>
-              <% if !request.local? and !organization.domain.nil? and Organization.where("domain is not null").map(&:domain).include?(request.subdomain) %>
+              <% if !request.local? and Secdomain.where("sub_type=2 and pid=?", organization.id).count > 0 and Secdomain.where("sub_type=2 and pid=?", organization.id).map(&:subname).include?(request.subdomain) %>
                   <%= link_to "#{field.name}", show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :class => "homepageMenuText" %>
               <% else %>
                   <%= link_to "#{field.name}", show_org_subfield_organization_path(:id => organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "homepageMenuText" %>
@@ -84,7 +84,7 @@
        <% end %>
       <% else %>
         <% if !field.subfield_subdomain_dir.nil? %>
-          <% if !request.local? and !organization.domain.nil? and Organization.where("domain is not null").map(&:domain).include?(request.subdomain) %>
+          <% if !request.local? and Secdomain.where("sub_type=2 and pid=?", organization.id).count > 0 and Secdomain.where("sub_type=2 and pid=?", organization.id).map(&:subname).include?(request.subdomain) %>
             <%= link_to "#{field.name}", show_subfield_without_id_path(:sub_dir_name => field.subfield_subdomain_dir.name), :class => "homepageMenuText" %>
           <% else %>
             <%= link_to "#{field.name}", show_org_subfield_organization_path(:id => organization.id, :sub_dir_name => field.subfield_subdomain_dir.name), :class => "homepageMenuText" %>

app/views/organizations/setting.html.erb

@@ -59,9 +59,10 @@
           <div class="w607 fr">http：//
             <input type="text" name="organization[domain]" id="domain" value="<%= domain.nil? ? '' : domain.subname %>" class="orgUrlInput" />
             .trustie.net<a href="javascript:void(0);" class="linkBlue ml15" style="text-decoration:underline;" onclick="apply_subdomain(<%= @organization.id %>,$('#domain').val());">申请</a>
-            <% if domain.present? and OrgMessage.where("organization_id=? and message_type='ApplySubdomain'", @organization.id).order("updated_at desc").first.content == domain.subname %>
+            <% record = OrgMessage.where("organization_id=? and message_type='ApplySubdomain'", @organization.id).order("updated_at desc").first %>
+            <% if domain.present? and record.present? and record.content == domain.subname %>
                 <span>(已批准)</span>
-            <% elsif OrgMessage.where("organization_id=? and message_type='ApplySubdomain'", @organization.id).count > 0 %>
+            <% elsif record %>
                 <span>(您申请了子域名<%= OrgMessage.where("organization_id=? and message_type='ApplySubdomain'", @organization.id).order("updated_at desc").first.content %>，还未批准)</span>
             <% end %>
             <p class="c_green f12" id="apply_hint" ></p></div>

app/views/repositories/_commit_details.html.erb

@@ -0,0 +1,15 @@
+<div class="commit-row-info">
+  <% if !user_commit_rep(changeset.author_email).nil? %>
+      <a class="commit-author-link has_tooltip"> <span class="commit-author-name">
+                        <%= image_tag(url_to_avatar(user_commit_rep(changeset.author_email)), :width => "20", :height => "20", :class => "fl portraitRadius mt2 ml4 mr5") %>
+        <%= link_to user_commit_rep(changeset.author_email), user_path(user_commit_rep(changeset.author_email)), :length => 30 %></span></a>提交于
+      <div class="committed_ago">
+        <time class="time_ago js-timeago" title="<%= changeset.created_at %>"><%= time_tag(changeset.created_at) %>前 </time>&nbsp;
+      </div>
+  <% else %>
+      <span class="commit-author-name"><%= changeset.author_email %></span>提交于
+      <div class="committed_ago">
+        <time class="time_ago js-timeago" title="<%= changeset.created_at %>"><%= time_tag(changeset.created_at) %> 前</time>&nbsp;
+      </div>
+  <% end %>
+</div>

app/views/repositories/_revisions.html.erb

@@ -20,27 +20,13 @@
           <div class="col-md-10 col-sm-12">
             <ul class="bordered-list">
               <li class="commit js-toggle-container">
-                <div class="commit-row-info">
+                <%= render :partial => 'commit_details', :locals => {:changeset => changeset} %>
-                  <% if !user_commit_rep(changeset.author_email).nil? %>
-                      <a class="commit-author-link has_tooltip"> <span class="commit-author-name">
-                        <%= image_tag(url_to_avatar(user_commit_rep(changeset.author_email)), :width => "20", :height => "20", :class => "fl portraitRadius mt2 ml4 mr5") %>
-                        <%= link_to user_commit_rep(changeset.author_email), user_path(user_commit_rep(changeset.author_email)), :length => 30 %></span></a>提交于
-                      <div class="committed_ago">
-                        <time class="time_ago js-timeago" title="<%= changeset.created_at %>"><%= time_tag(changeset.created_at) %>前 </time>&nbsp;
-                      </div>
-                  <% else %>
-                      <span class="commit-author-name"><%= changeset.author_email %></span>提交于
-                      <div class="committed_ago">
-                        <time class="time_ago js-timeago" title="<%= changeset.created_at %>"><%= time_tag(changeset.created_at) %> 前</time>&nbsp;
-                      </div>
-                  <% end %>
-                </div>
                 <div style="padding-left:30px;" class="commit-row-title">
                 <strong class="str-truncated">
                   <a class="commit-row-message"><%= textilizable(truncate_at_line_break(changeset.message)) %></a>
                 </strong>
                 <div class="pull-right" title="修订号">
-                  <%= h truncate(changeset.short_id.to_s, :length => 20) %>
+                  <%= link_to truncate(changeset.short_id.to_s, :length => 20), {:controller => 'repositories', :action => 'commit_diff', :id => project.id, :changeset => changeset.id} %>
                 </div>
                 <div class="notes_count">
                 </div>

app/views/repositories/commit_diff.html.erb

@@ -0,0 +1,55 @@
+<div class="project_r_h">
+  <div class="fl"><h2 class="project_h2_repository"><%= render :partial => 'breadcrumbs', :locals => {:path => @path, :kind => 'dir', :revision => @rev} %></h2></div>
+</div>
+<!--<script>-->
+<!--//    $(document).ready(function(){-->
+<!--//        $("#changed-files").click(function(){-->
+<!--//            $("#changed-files-detail").toggle();-->
+<!--//        });-->
+<!--//    });-->
+<!--</script>-->
+<div class="showing-changes-info fontGrey2"> Commit <a href="javascript:void()" class="linkGrey3">
+  <%= @commit_details.id %></a><br />
+  <li class="commit js-toggle-container">
+    <%= render :partial => 'commit_details', :locals => {:changeset => @commit_details} %>
+  </li>
+</div>
+<div class="showing-changes-project f14"><%= @commit_details.message %></div>
+<!--<div class="showing-changes-row fontGrey2">Showing <a href="javascript:void()" class="linkGrey3" id="changed-files">3 changed files</a> with <span class="c_green">3 additions</span> and <span class="c_red">3 deletions</span>-->
+  <!--<ol class="mt10" id="changed-files-detail">-->
+    <!--<li><a href="javascript:void()" class="linkGrey3" id="changed-files">app/views/organizations/_org_course_homework.html.erb</a> </li>-->
+    <!--<li><a href="javascript:void()" class="linkGrey3" id="changed-files">app/views/users/_course_homework.html.erb</a> </li>-->
+    <!--<li><a href="javascript:void()" class="linkGrey3" id="changed-files">app/views/users/_user_homework_detail.html.erb</a> </li>-->
+  <!--</ol>-->
+<!--</div>-->
+
+<% @commit_diff.each do |cd| %>
+    <div class="showing-changes-row fontGrey2">
+      <a href="javascript:void()" class="linkGrey3" id="changed-files">
+        <img src="/images/vlicon/file.png" width="18" height="20" style="vertical-align:middle;" class="mr5" /><%= cd.new_path %>
+      </a>
+    </div>
+    <div class="autoscroll">
+      <table class="filecontent syntaxhl" style="width:100%;" >
+        <tbody>
+        <% line_num = diff_line_num(cd.diff) %>
+        <% diff_content = diff_content(cd.diff) %>
+        <% syntax_highlight_lines(cd.new_path, Redmine::CodesetUtil.to_utf8_by_setting(diff_content)).each do |line| %>
+            <tr>
+              <th class="line-num" id="L<%= line_num %>" style="vertical-align: top;">
+                <a href="#L<%= line_num %>" style="padding-top: 0px;"><%= line_num %></a>
+              </th>
+              <% if line[0,1] == "-" %>
+                  <td class="line-code diff_out"><pre style="width:auto;white-space: nowrap; "><%= line.html_safe %></pre></td>
+              <% elsif line[0,1] == "+" %>
+                  <td class="line-code diff_in"><pre style="width:auto;white-space: nowrap; "><%= line.html_safe %></pre></td>
+              <% else%>
+                  <td class="line-code"><pre style="width:auto;white-space: nowrap; "><%= line.html_safe %></pre></td>
+              <% end %>
+            </tr>
+            <% line_num += 1 %>
+        <% end %>
+        </tbody>
+      </table>
+    </div>
+<% end %>

app/views/student_work/_student_work_list.html.erb

@@ -4,15 +4,16 @@
       <font class="f12 c_red">
         (<%= @student_work_count%>人已交)
       </font>
-    <% if !@is_teacher && @stundet_works.empty?%>
+    <% my_work = @homework.student_works.where("user_id = #{User.current.id}").first %>
+    <% if !@is_teacher && my_work.nil? && User.current.member_of_course?(@course) %>
        <span class="f12 c_red">您尚未提交作品</span>
-    <% elsif !@is_teacher &&Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(Time.now.to_s).strftime("%Y-%m-%d") && !@stundet_works.empty?%>
+    <% elsif !@is_teacher && my_work &&Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") < Time.parse(Time.now.to_s).strftime("%Y-%m-%d") && !@stundet_works.empty?%>
        <span class="f12 c_red">您已提交且不可再修改，因为截止日期已过</span>
-    <% elsif !@is_teacher &&Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.parse(Time.now.to_s).strftime("%Y-%m-%d") && !@stundet_works.empty?%>
+    <% elsif !@is_teacher && my_work &&Time.parse(@homework.end_time.to_s).strftime("%Y-%m-%d") >= Time.parse(Time.now.to_s).strftime("%Y-%m-%d") && !@stundet_works.empty?%>
        <span class="f12 c_red">您已提交，您还可以修改</span>
     <% end %>
   </span>
-  <%if @is_teacher || @homework.homework_detail_manual.comment_status == 3%>
+  <%if @is_teacher || @homework.homework_detail_manual.comment_status == 3 || @homework.is_open == 1%>
       <div class="hworkSearchBox">
         <input type="text" id="course_student_name" value="<%= @name%>" placeholder="姓名、学号、邮箱" class="hworkSearchInput" onkeypress="SearchByName('<%= student_work_index_path(:homework => @homework.id)%>',event);"/>
         <a class="hworkSearchIcon" id="search_in_student_work" onclick="SearchByName_1('<%= student_work_index_path(:homework => @homework.id)%>');" href="javascript:void(0)"></a>

app/views/users/_course_homework.html.erb

@@ -114,9 +114,11 @@
       </div>
       <div class="cl"></div>
       <div>
+        <% if activity.anonymous_comment == 0%>
             <div class="homepagePostDeadline">
               缺评扣分：<%= activity.homework_detail_manual.absence_penalty%>分/作品
             </div>
+        <% end %>
         <% if activity.anonymous_comment == 0%>
             <div class="homepagePostDeadline" style="float: right; margin-right: 220px;" id="evaluation_end_time_<%=user_activity_id %>">
               匿评关闭时间：<%= activity.homework_detail_manual.evaluation_end%>&nbsp;23:59
@@ -239,6 +241,15 @@
                         <%= link_to("禁用匿评", alert_forbidden_anonymous_comment_homework_common_path(activity,:user_activity_id => user_activity_id,:course_activity=>course_activity),:class => "postOptionLink", :remote => true)%>
                       </li>
                   <% end %>
+                  <% if (activity.anonymous_comment == 1 && activity.is_open == 0) || (activity.anonymous_comment == 0 && comment_status == 3 && activity.is_open == 0) %>
+                      <li>
+                        <%= link_to("公开作品", alert_open_student_works_homework_common_path(activity,:user_activity_id => user_activity_id, :is_in_course => -1,:course_activity=>course_activity),:class => "postOptionLink", :remote => true)%>
+                      </li>
+                  <% elsif activity.is_open == 1 %>
+                      <li>
+                        <%= link_to("取消公开", alert_open_student_works_homework_common_path(activity,:user_activity_id => user_activity_id, :is_in_course => -1,:course_activity=>course_activity),:class => "postOptionLink", :remote => true)%>
+                      </li>
+                  <% end %>
                 </ul>
               </li>
             </ul>

app/views/users/_project_issue.html.erb

@@ -18,7 +18,7 @@
           <% when 1%>
             <span class="issues fl" title="缺陷"></span>
         <% when 2%>
-            <span class="function fl" title="功能"></span>
+            <span class="issues-function fl" title="功能"></span>
         <% when 3%>
             <span class="support fl" title="支持"></span>
         <% when 4%>

app/views/users/_user_homework_detail.html.erb

@@ -115,9 +115,11 @@
       </div>
       <div class="cl"></div>
       <div>
+        <% if homework_common.anonymous_comment == 0 %>
             <div class="homepagePostDeadline">
               缺评扣分：<%= homework_common.homework_detail_manual.absence_penalty%>分/作品
             </div>
+        <% end %>
         <% if homework_common.anonymous_comment == 0%>
             <div class="homepagePostDeadline" style="float: right; margin-right: 220px;" id="evaluation_end_time_<%=homework_common.id %>">
               匿评关闭时间：<%= homework_common.homework_detail_manual.evaluation_end%>&nbsp;23:59
@@ -243,6 +245,15 @@
                       <%= link_to("禁用匿评", alert_forbidden_anonymous_comment_homework_common_path(homework_common,:is_in_course => is_in_course),:class => "postOptionLink", :remote => true)%>
                     </li>
                 <% end %>
+                <% if (homework_common.anonymous_comment == 1 && homework_common.is_open == 0) || (homework_common.anonymous_comment == 0 && comment_status == 3 && homework_common.is_open == 0) %>
+                    <li>
+                      <%= link_to("公开作品", alert_open_student_works_homework_common_path(homework_common, :is_in_course => is_in_course,:course_activity=> -1),:class => "postOptionLink", :remote => true)%>
+                    </li>
+                <% elsif homework_common.is_open == 1 %>
+                    <li>
+                      <%= link_to("取消公开", alert_open_student_works_homework_common_path(homework_common, :is_in_course => is_in_course,:course_activity=> -1),:class => "postOptionLink", :remote => true)%>
+                    </li>
+                <% end %>
               </ul>
             </li>
           </ul>

app/views/users/_user_journalsformessage.html.erb

@@ -47,7 +47,7 @@
                   <li>
                     <%= link_to(l(:label_bid_respond_delete),
                                 {:controller => 'words', :action => 'destroy', :object_id => activity, :user_id => activity.user,:user_activity_id => user_activity_id,:is_activity=>is_activity},
-                                :remote => true, :confirm => l(:text_are_you_sure), :method => 'delete',
+                                :confirm => l(:text_are_you_sure), :method => 'delete',
                                 :class => "postOptionLink", :title => l(:button_delete))  %>
                   </li>
                 </ul>

app/views/users/new_user_commit_homework.html.erb

@@ -4,7 +4,12 @@
   <%= stylesheet_link_tag "/assets/codemirror/codemirror" %>
 
 <% end %>
-
+<script type="text/javascript">
+    $(function(){
+        $("#RSide").removeAttr("id");
+        $("#Container").css("width","1000px");
+    });
+</script>
 <!-- 模板1开始，可以使用script（type设置为text/html）来存放模板片段，并且用id标示 -->
 <script id="t:result-list" type="text/html">
     <div class="ProResultTop">
@@ -40,7 +45,7 @@
 </script>
 <!-- 模板1结束 -->
 
- <div class="ProgramHomework">
+ <div class="ProgramHomework ml10">
       
 
       <div class="homepageRightBanner mb10">
@@ -91,7 +96,9 @@
             </div>
             <div class="mt10">
               <a href="javascript:void(0);" class="BlueCirBtn fl" data-homework-id="<%=@homework.id%>" data-student-work-id="<%=@student_work.id%>" id="test-program-btn">测试代码</a>
-              <% unless @is_test %>
+              <% if @is_test %>
+                <%=link_to '返  回',course_path(@course),:class=>'fr mt6' %>
+              <% else @is_test %>
                 <a href="javascript:void(0);" class="BlueCirBtn fr" id="commit-program-work-btn">提交代码</a>
               <% end %>
                 <div class="cl"></div>

app/views/words/create_reply.js.erb

@@ -1,11 +1,11 @@
 <% if @save_succ %>
     <% if @user_activity_id %>
-        <% if @reply_type == 'user' %>
+        <% if @is_activity %>
             $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/user_journalsformessage', :locals => {:activity => @activity,:user_activity_id =>@user_activity_id,:is_activity=>@is_activity}) %>");
         <% else %>
             $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_journalsformessage', :locals => {:activity => @activity,:user_activity_id =>@user_activity_id}) %>");
         <% end %>
-        #init_activity_KindEditor_data('<%= @user_activity_id%>', "", "87%", "UserActivity");
+        //init_activity_KindEditor_data('<%#= @user_activity_id%>', "", "87%", "UserActivity");
         sd_create_editor_from_data('<%= @user_activity_id%>', "", "100%", "UserActivity");
     <% else %>
         <% if !@jfm.nil? && @jfm.jour_type == 'Principal' %>

app/views/words/destroy.js.erb

@@ -4,7 +4,8 @@
   <% if @is_user%>
     <% if @activity %>
         $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/user_journalsformessage', :locals => {:activity => @activity,:user_activity_id =>@user_activity_id,:is_activity=>@is_activity}) %>");
-        init_activity_KindEditor_data('<%= @user_activity_id%>', "", "87%", "UserActivity");
+        //init_activity_KindEditor_data('<%#= @user_activity_id%>', "", "87%", "UserActivity");
+        sd_create_editor_from_data('<%= @user_activity_id%>', "", "100%", "UserActivity");
     <% else %>
         $("#user_activity_<%= @user_activity_id%>").hide();
     <% end %>

config/routes.rb

@@ -238,6 +238,8 @@ RedmineApp::Application.routes.draw do
       get 'stop_anonymous_comment'
       get 'alert_anonymous_comment'
       get 'alert_forbidden_anonymous_comment'
+      get 'alert_open_student_works'
+      get 'open_student_works'
       get 'start_evaluation_set'
       get 'score_rule_set'
       post 'set_evaluation_attr'
@@ -832,7 +834,7 @@ RedmineApp::Application.routes.draw do
       :controller => 'repositories',
       :format => false,
       :constraints => {
-          :action => /(browse|show|entry|raw|annotate|diff)/,
+          :action => /(browse|show|entry|raw|annotate|diff|commit_diff)/,
           :rev    => /[a-z0-9\.\-_]+/
       }
 
@@ -851,15 +853,15 @@ RedmineApp::Application.routes.draw do
       :controller => 'repositories',
       :format => false,
       :constraints => {
-          :action => /(browse|show|entry|raw|annotate|diff)/,
+          :action => /(browse|show|entry|raw|annotate|diff|commit_diff)/,
           :rev    => /[a-z0-9\.\-_]+/
       }
   get 'projects/:id/repository/:repository_id/:action(/*path(.:ext))',
       :controller => 'repositories',
-      :action => /(browse|show|entry|raw|changes|annotate|diff)/
+      :action => /(browse|show|entry|raw|changes|annotate|diff|commit_diff)/
   get 'projects/:id/repository/:action(/*path(.:ext))',
       :controller => 'repositories',
-      :action => /(browse|show|entry|raw|changes|annotate|diff)/
+      :action => /(browse|show|entry|raw|changes|annotate|diff|commit_diff)/
 
   get 'projects/:id/repository/:repository_id', :to => 'repositories#show', :path => nil
   get 'projects/:id/repository', :to => 'repositories#show', :path => nil
@@ -952,7 +954,8 @@ RedmineApp::Application.routes.draw do
   match 'admin/project_messages', as: :project_messages
   match'admin/course_messages', as: :course_messages
   get 'admin/notices'
-  get 'admin/latest_login_users'
+  match 'admin/latest_login_users', as: :latest_login_users
+  match 'admin/latest_login_teachers', as: :latest_login_teachers
   get 'admin/homework'
 
   resources :auth_sources do

db/migrate/20160223021012_add_index_to_secdomain.rb

@@ -1,5 +0,0 @@
-class AddIndexToSecdomain < ActiveRecord::Migration
-  def change
-    add_index(:secdomains, :subname, unique: true)
-  end
-end

db/migrate/20160224032046_create_forwards.rb

@@ -0,0 +1,15 @@
+class CreateForwards < ActiveRecord::Migration
+  def up
+    create_table :forwards do|t|
+      t.integer :from_id
+      t.string :from_type
+      t.integer :to_id
+      t.string :to_type
+      t.timestamp :created_at
+    end
+  end
+
+  def down
+    drop_table :forwards
+  end
+end

db/migrate/20160224074034_update_one_student_score.rb

@@ -0,0 +1,38 @@
+class UpdateOneStudentScore < ActiveRecord::Migration
+  def up
+    student_work_score = StudentWorksScore.where("user_id = 11688 AND student_work_id = 34414").first
+    student_work_score.score = 100
+    student_work_score.save
+    student_works = StudentWork.where("user_id = 6456")
+    student_works.each do |work|
+      unless work.student_works_scores.empty?
+        if work.student_works_scores.where(:reviewer_role => 2).empty?
+          work.teaching_asistant_score = nil
+        else
+          work.teaching_asistant_score = work.student_works_scores.where(:reviewer_role => 2).average(:score).try(:round, 2).to_f
+        end
+        if work.student_works_scores.where(:reviewer_role => 3).empty?
+          work.student_score = nil
+        else
+          work.student_score = work.student_works_scores.where(:reviewer_role => 3).average(:score).try(:round, 2).to_f
+        end
+      end
+      if work.teaching_asistant_score.nil?
+        work.final_score = work.student_score
+      elsif work.student_score.nil?
+        work.final_score = work.teaching_asistant_score
+      else
+        homework = HomeworkCommon.find work.homework_common_id
+        ta_proportion = homework.homework_detail_manual.ta_proportion
+        final_ta_score = BigDecimal.new("#{work.teaching_asistant_score}") * BigDecimal.new("#{ta_proportion}")
+        final_s_score = BigDecimal.new("#{work.student_score}") * (BigDecimal.new('1.0')  - BigDecimal.new("#{ta_proportion}"))
+        final_score = final_ta_score + final_s_score
+        work.final_score = format("%.2f",final_score.to_f)
+      end
+      work.save
+    end
+  end
+
+  def down
+  end
+end

db/migrate/20160225024759_add_is_open_to_homewrok_common.rb

@@ -0,0 +1,5 @@
+class AddIsOpenToHomewrokCommon < ActiveRecord::Migration
+  def change
+    add_column :homework_commons, :is_open, :integer, :default => 0
+  end
+end

public/javascripts/des_kindEditor.js

@@ -90,7 +90,9 @@ function init_form(params){
 }
 function nh_reset_form(params){
     params.form[0].reset();
-    params.texttitle.empty();
+    $("#document_title").val("");
+    $('#org_document_editor').hide();
+    $('#doc_title_hint').hide();
     params.textarea.empty();
     if(params.editor != undefined){
         params.editor.html(params.textarea.html());
@@ -134,4 +136,8 @@ function init_des_data(){
             }
         });
     });
+
+    div_form = $("div[nhname='new_topic_form']");
+    $(".ke-edit", div_form).css("height","150px");
+    $(".ke-edit-iframe",div_form).css("height","150px");
 }

public/stylesheets/courses.css

@@ -1186,7 +1186,7 @@ a:hover.testEdit{ background:url(images/icons.png) -21px -272px  no-repeat;}
 .courseMenuSetting:hover {background:url(../images/homepage_icon2.png) -190px -407px no-repeat;}
 .rankList {width:220px; padding:10px; background-color:#ffffff; margin-top:10px;}
 .rankList li {width:73px; padding:8px 0px 0px 0px; text-align:center; float:left; position:relative;}
-.rankList li p {width:100%; overflow:hidden; white-space:normal; text-overflow:ellipsis; color:#585858;word-wrap: normal; word-break: normal;}
+.rankList li p {width:100%; overflow:hidden; white-space:nowrap; text-overflow:ellipsis; color:#585858;word-wrap: normal; word-break: normal;}
 .rankPortrait {border-radius:50%; width:35px; height:35px;}
 .numIntro {position:absolute; text-align:left; z-index:999; box-shadow:0px 2px 8px rgba(146, 153, 169, 0.5); border:1px solid #eaeaea; background-color:#ffffff; padding:3px 5px; left:15px; color:#585858; white-space: nowrap;}
 .font_cus {font-family: "微软雅黑","宋体"; font-size: 12px; line-height: 1.5;}

public/stylesheets/new_user.css

@@ -1405,7 +1405,7 @@ span.at a{color:#269ac9;text-decoration: none;}
 .issues{ background:url(../images/public_icon.png) -66px 5px no-repeat; width:18px; height:21px;}
 .duty{ background:url(../images/public_icon.png) -66px -18px no-repeat; width:18px; height:21px;}
 .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;}
+.issues-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;}
 
 /*资源发送到org*/

public/stylesheets/org.css

@@ -40,6 +40,8 @@ a.org_member_btn{ padding:1px 5px; background:#15bccf; color:#fff;}
 .searchOrg {height:24px; width:200px; color:#9b9b9b; border:1px solid #15bccf;}
 a.cancelBtn {padding:3px 5px; background-color:#D9D9D9; color:#656565;}
 a.cancelBtn:hover {background-color:#717171; color:#ffffff;}
+a.org-cancel-btn {padding:3px 5px; background-color:#D9D9D9; color:#656565;}
+a.org-cancel-btn:hover {background-color:#717171; color:#ffffff;}
 .relatedList ul li {border-bottom:1px solid #e4e4e4; width:320px; height:22px; vertical-align:middle; line-height:22px;}
 .relatedListName {width:240px; text-align:left; max-width:240px; overflow:hidden; white-space:nowrap; text-overflow:ellipsis;}
 .relatedListOption {width:80px; text-align:center;}

public/stylesheets/project.css

@@ -200,12 +200,6 @@ a.pro_mes_w_news{ height:20px; float:right;display:block; color:#999999;}
 .pro_info_box ul li{ height:24px;}
 .pro_info_p{color:#0781b4 !important; float:left;  width:80px; overflow:hidden; white-space: nowrap; text-overflow:ellipsis; }
 .edit_pro_box{overflow:hidden;display:none; margin-bottom:30px; border-bottom:1px dashed #CCC; padding-bottom:10px;}
-/*问题状态图片*/
-.issues{ background:url(../images/public_icon.png) -66px 5px no-repeat; width:16px; height:21px;}
-.duty{ background:url(../images/public_icon.png) -66px -18px no-repeat; width:16px; height:21px;}
-.support{ background:url(../images/public_icon.png) -66px -45px no-repeat; width:16px; height:21px;}
-.function{ background:url(../images/public_icon.png) -66px -70px no-repeat; width:16px; height:21px;}
-.weekly{ background:url(../images/public_icon.png) -66px -95px no-repeat; width:16px; height:21px;}
 /****翻页***/
 ul.wlist{ float:right; border-bottom:none; height:30px; margin-top:20px; }
 ul.wlist li{float: left;}
@@ -694,7 +688,7 @@ p.other-formats { text-align: right; font-size:0.9em; color: #666; }
 
 /*pre标签换行*/
 .break_word{word-break: break-all;word-wrap: break-word;}
-.break_word_firefox{white-space: pre-wrap;word-break: break-all;}
+.break_word_firefox{white-space: pre-wrap !important;word-break: break-all;}
 
 /*问题跟踪attachment显示*/
 div.attachments { margin-top: 12px; }
@@ -896,9 +890,9 @@ a:hover.Reply_pic{border:1px solid #64bdd9;}
 /*end*/
 /***** Diff *****/
 .diff_out { background: #fcc; }
-.diff_out span { background: #faa; }
+/*.diff_out span { background: #faa; }*/
 .diff_in { background: #cfc; }
-.diff_in span { background: #afa; }
+/*.diff_in span { background: #afa; }*/
 
 .text-diff {
     padding: 1em;
@@ -1084,7 +1078,7 @@ a:hover.link_file_a{ background:url(../images/pic_file.png) 0 -25px no-repeat; c
 .issues{ background:url(../images/public_icon.png) -66px 5px no-repeat; width:18px; height:21px;}
 .duty{ background:url(../images/public_icon.png) -66px -18px no-repeat; width:18px; height:21px;}
 .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;}
+.issues-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;}
 
 .upload_img img{max-width: 100%;}
@@ -1169,3 +1163,18 @@ div.disable_link {background-color: #c1c1c1 !important;}
 .proInfoBox2{ border:1px solid #dddddd; height:45px; padding:10px 0; background-color:#f1f1f1;}
 .proInfoBox2 ul li{ height:24px; position:relative;}
 .maxwidth150{max-width: 150px;}
+
+/*版本库diff*/
+.showing-changes-info {width:650px; padding:10px; padding-top: 0px; background-color:#ffffff; line-height:2;}
+.showing-changes-project {width:650px; padding:10px; border-top:1px solid #dce0e6; border-bottom:1px solid #dce0e6; background-color:#f1f1f1;}
+.showing-changes-row {width:650px; padding:10px; border-bottom:1px solid #dce0e6; background-color:#f1f1f1;}
+#changed-files-detail {display:none;}
+#changed-files-detail li {list-style-type:disc; margin-left:15px;}
+.showing-changes-detail {width:670px; border-bottom:1px solid #dce0e6; background-color:#f1f1f1;}
+.changes-detail-chart {width:100%; overflow:auto; border-collapse:collapse; margin:0px; padding:0px; background-color:#f1f1f1;}
+.diff-line-number {width:35px; min-width:35px; max-width:50px; border-right:1px solid #c1c1c1; padding:0px 5px; text-align:right; background-color:#f1f1f1;}
+.code-line-old {background-color:#ffecec;}
+.number-line-old {background-color:#ffdddd; border-color:#f1c0c0;}
+.code-line-new {background-color:#eaffea;}
+.number-line-new {background-color:#dbffdb; border-color:#c1e9c1;}
+.branch-label {padding-right: 5px; border-radius:2px; color:#888888; display:inline-block; background-color:#f8fafc;}

public/stylesheets/public.css

@@ -113,6 +113,7 @@ h4{ font-size:14px; color:#3b3b3b;}
 .mt0 {margin-top:0px !important;}
 .mt3{ margin-top:3px;}
 .mt5{ margin-top:5px;}
+.mt6{ margin-top:6px;}
 .mt8{ margin-top:8px;}
 .mt10{ margin-top:10px !important;}
 .mt20{margin-top: 20px;}
@@ -156,6 +157,7 @@ h4{ font-size:14px; color:#3b3b3b;}
 .w430{ width:470px;}
 .w455{width:455px !important;}
 .w465{width:465px !important;}
+.w490{width:490px;}
 .w520{ width:520px;}
 .w543{ width:543px;}
 .w557{ width:557px;}