Merge branch 'szzh' into develop

app/controllers/attachments_controller.rb

@@ -600,7 +600,7 @@ private
 
   def has_login
     unless @attachment && @attachment.container_type == "PhoneAppVersion"
-      render_403 if  !User.current.logged? && @attachment.container_type != 'OrgSubfield' && @attachment.container_type != 'OrgDocumentComment'
+      render_403 if  !User.current.logged? && !(@attachment.container_type == 'OrgSubfield' && @attachment.container.organization.allow_guest_download) && !(@attachment.container_type == 'OrgDocumentComment' && @attachment.container.organization.allow_guest_download)
     end
   end
 end

app/controllers/comments_controller.rb

@@ -25,7 +25,9 @@ class CommentsController < ApplicationController
 
   def create
     raise Unauthorized unless @news.commentable?
-
+    if !@news.org_subfield_id.nil?
+      @org_subfield = OrgSubfield.find(@news.org_subfield_id)
+    end
     @comment = Comment.new
     #@project ? @comment.comments = params[:comment][:comments] : @comment.comments = params[:comment]
     if params[:user_activity_id]

app/controllers/news_controller.rb

@@ -46,15 +46,16 @@ class NewsController < ApplicationController
       @course = Course.find(params[:course_id])
     end
     if @project
+      @page = params[:page] ? params[:page].to_i + 1 : 0
       scope = @project ? @project.news.visible : News.visible
 
       @news_count = scope.count
-      @news_pages = Paginator.new @news_count, @limit, params['page']
-      @offset ||= @news_pages.offset
+      #@news_pages = Paginator.new @news_count, @limit, params['page']
+      #@offset ||= @news_pages.offset
       @newss = scope.all(:include => [:author, :project],
                          :order => "#{News.table_name}.created_on DESC",
-                         :offset => @offset,
-                         :limit => @limit)
+                         :offset => @page * 10,
+                         :limit => 10)
 
       respond_to do |format|
         format.html {
@@ -63,6 +64,7 @@ class NewsController < ApplicationController
 
           render :layout => false if request.xhr?
         }
+        format.js
         format.api
         format.atom { render_feed(@newss, :title => (@project ? @project.name : Setting.app_title) + ": #{l(:label_news_plural)}") }
       end
@@ -144,6 +146,10 @@ class NewsController < ApplicationController
       if @course
         render :layout => 'base_courses'
       end
+    elsif @news.org_subfield_id
+      @org_subfield = OrgSubfield.find(@news.org_subfield_id)
+      @organization = @org_subfield.organization
+      render :layout => 'base_org'
     end
   end
 
@@ -151,6 +157,21 @@ class NewsController < ApplicationController
     #modify by nwb
     if @project
       @news = News.new(:project => @project, :author => User.current)
+      @news.safe_attributes = params[:news]
+      @news.save_attachments(params[:attachments])
+      if @news.save
+        if params[:asset_id]
+          ids = params[:asset_id].split(',')
+          update_kindeditor_assets_owner ids,@news.id,OwnerTypeHelper::NEWS
+        end
+        render_attachment_warning_if_needed(@news)
+        #flash[:notice] = l(:notice_successful_create)
+        redirect_to project_news_index_url(@project)
+      else
+        redirect_to project_news_index_url(@project)
+        #layout_file =  'base_courses'
+        #render :action => 'new', :layout => layout_file
+      end
     elsif @course
       @news = News.new(:course => @course, :author => User.current)
       #render :layout => 'base_courses'
@@ -221,8 +242,14 @@ class NewsController < ApplicationController
   end
 
   def edit
+    if @news.org_subfield_id
+      @org_subfield = OrgSubfield.find(@news.org_subfield_id)
+      @organization = @org_subfield.organization
+    end
     if @course
       render :layout => "base_courses"
+    elsif @org_subfield
+      render :layout => 'base_org'
     end
   end
 
@@ -240,12 +267,17 @@ class NewsController < ApplicationController
   end
 
   def destroy
+    if @news.org_subfield_id
+      @org_subfield = OrgSubfield.find(@news.org_subfield_id)
+    end
     @news.destroy
     # modify by nwb
     if @project
       redirect_to project_news_index_url(@project)
     elsif @course
       redirect_to course_news_index_url(@course)
+    elsif @org_subfield
+      redirect_to organization_path(@org_subfield.organization, :org_subfield_id => @org_subfield.id)
     end
 
   end

app/controllers/organizations_controller.rb

@@ -116,6 +116,7 @@ class OrganizationsController < ApplicationController
     @organization.description = params[:organization][:description]
     # @organization.domain = params[:organization][:domain]
     @organization.is_public = params[:organization][:is_public] == 'on' ? 1 : 0
+    @organization.allow_guest_download = params[:organization][:allow_guest_download] == 'on' ? 1 : 0
     #@organization.name = params[:organization][:name]
     @organization.save
      respond_to do |format|
@@ -300,7 +301,11 @@ class OrganizationsController < ApplicationController
 
   def org_resources_subfield
     @org = Organization.find(params[:id])
-    @subfield = @org.org_subfields.where('field_type = "Resource" ')
+    if params[:send_type].present? and params[:send_type] == 'news'
+      @subfield = @org.org_subfields.where("field_type = 'Post'")
+    else
+      @subfield = @org.org_subfields.where('field_type = "Resource" ')
+    end
     respond_to do | format|
       format.js
     end

app/controllers/poll_controller.rb

@@ -2,6 +2,7 @@
 class PollController < ApplicationController
   before_filter :find_poll_and_course, :only => [:edit,:update,:destroy,:show,:statistics_result,:create_poll_question,:commit_poll,:commit_answer,:publish_poll,:republish_poll,:poll_result,:close_poll,:export_poll]
   before_filter :find_container, :only => [:new,:create, :index]
+  before_filter :is_logged, :only => [:index, :show, :poll_result,:new,:create,:edit,:update,:destroy,:publish_poll,:republish_poll,:close_poll,:export_poll,:commit_answer,:commit_poll,:statistics_result]
   before_filter :is_member_of_course, :only => [:index,:show,:poll_result]
   before_filter :is_course_teacher, :only => [:new,:create,:edit,:update,:destroy,:publish_poll,:republish_poll,:close_poll,:export_poll]
   include PollHelper
@@ -503,6 +504,10 @@ class PollController < ApplicationController
     end
   end
 
+  def is_logged
+    redirect_to signin_path unless User.current.logged?
+  end
+
   def is_member_of_course
     render_403 unless(@course && (User.current.member_of_course?(@course) || User.current.admin?))
   end

app/controllers/praise_tread_controller.rb

@@ -24,7 +24,7 @@ class PraiseTreadController < ApplicationController
         end
         return
       end
-      #@horizontal = params[:horizontal].downcase == "false" ? false:true
+      @horizontal = params[:horizontal].downcase == "false" ? false:true if params[:horizontal]
       if @obj.respond_to?("author_id")
         author_id = @obj.author_id
       elsif @obj.respond_to?("user_id")
@@ -103,30 +103,36 @@ class PraiseTreadController < ApplicationController
   def find_object_by_type_and_id(type,id)
     @obj = nil
     case type
-    when 'User'
-      @obj = User.find_by_id(id)
-    when 'Issue'
-      @obj = Issue.find_by_id(id)
-    when 'Project'
-      @obj = Project.find_by_id(id)
-    when 'Bid'
-      @obj = Bid.find_by_id(id)
-    when 'Contest'
-      @obj = Contest.find_by_id(id)
-    when  'Memo'
-      @obj = Memo.find_by_id(id)
-    when 'Message'
-      @obj = Message.find_by_id(id)
-    when 'HomeworkCommon'
-      @obj = HomeworkCommon.find_by_id(id)
-    when 'JournalsForMessage'
-      @obj = JournalsForMessage.find_by_id(id)
-    when 'News'
-      @obj = News.find_by_id(id)
-    when 'Comment'
-      @obj = Comment.find_by_id(id)
-    when 'Journal'
-      @obj = Journal.find_by_id(id)
+      when  'Memo'
+        @obj = Memo.find_by_id(id)
+      when 'Message'
+        @obj = Message.find_by_id(id)
+      when 'HomeworkCommon'
+        @obj = HomeworkCommon.find_by_id(id)
+      when 'JournalsForMessage'
+        @obj = JournalsForMessage.find_by_id(id)
+      when 'News'
+        @obj = News.find_by_id(id)
+      when 'Comment'
+        @obj = Comment.find_by_id(id)
+      when 'Journal'
+        @obj = Journal.find_by_id(id)
+      when 'BlogComment'
+        @obj = BlogComment.find_by_id(id)
+      when 'OrgDocumentComment'
+        @obj = OrgDocumentComment.find_by_id(id)
+      when 'User'
+        @obj = User.find_by_id(id)
+      when 'Issue'
+        @obj = Issue.find_by_id(id)
+      when 'Project'
+        @obj = Project.find_by_id(id)
+      when 'Bid'
+        @obj = Bid.find_by_id(id)
+      when 'Contest'
+        @obj = Contest.find_by_id(id)
+      else
+        @obj = nil
     end
     return @obj
   end
@@ -143,7 +149,8 @@ class PraiseTreadController < ApplicationController
       # end
 
       #再创建或更新praise_tread_cache表
-      @ptc = PraiseTreadCache.find_by_object_id_and_object_type(id,type)
+      #@ptc = PraiseTreadCache.find_by_object_id_and_object_type(id,type)
+      @ptc = PraiseTreadCache.where("object_id = ? and object_type = ?",id.to_i,type).first
       @ptc = @ptc.nil? ? PraiseTreadCache.new : @ptc
       @ptc.object_id = id.to_i
       @ptc.object_type = type

app/controllers/users_controller.rb

@@ -746,14 +746,34 @@ class UsersController < ApplicationController
       end
     end
     # end
-    jours = @user.journals_for_messages.where('m_parent_id IS NULL').order('created_on DESC')
+    @page = params[:page] ? params[:page].to_i + 1 : 0
+    if params[:type].present?
+      case params[:type]
+        when "public"
+          jours = @user.journals_for_messages.where('m_parent_id IS NULL and private = 0').order('created_on DESC')
+          @jour_count = jours.count
+          @jour = jours.limit(10).offset(@page * 10)
+        when "private"
+          jours = @user.journals_for_messages.where('m_parent_id IS NULL and private = 1').order('created_on DESC')
+          @jour_count = jours.count
+          @jour = jours.limit(10).offset(@page * 10)
+        else
+          jours = @user.journals_for_messages.where('m_parent_id IS NULL').order('created_on DESC')
+          @jour_count = jours.count
+          @jour = jours.limit(10).offset(@page * 10)
+      end
+    else
+      jours = @user.journals_for_messages.where('m_parent_id IS NULL').order('created_on DESC')
+      @jour_count = jours.count
+      @jour = jours.limit(10).offset(@page * 10)
+    end
+    @type = params[:type]
     if User.current == @user
       jours.update_all(:is_readed => true, :status => false)
       jours.each do |journal|
         fetch_user_leaveWord_reply(journal).update_all(:is_readed => true, :status => false)
       end
     end
-    @jour = paginateHelper jours,10
     @state = false
     render :layout=>'new_base_user'
   end
@@ -1753,6 +1773,48 @@ class UsersController < ApplicationController
     end
   end
 
+  def share_news_to_course
+    news = News.find(params[:send_id])
+    course_ids = params[:course_ids]
+    course_ids.each do |course_id|
+      if Course.find(course_id).news.map(&:id).exclude?(news.id)
+        course_news = News.create(:course_id => course_id.to_i, :title => news.title, :summary => news.summary, :description => news.description,:author_id => User.current.id, :created_on => Time.now,:project_id => -1)
+        news.attachments.each do |attach|
+          course_news.attachments << Attachment.new(:filename => attach.filename, :disk_filename => attach.disk_filename, :filesize => attach.filesize, :content_type => attach.content_type, :digest => attach.digest,
+                                                 :downloads => 0, :author_id => User.current.id, :created_on => Time.now, :description => attach.description, :disk_directory => attach.disk_directory, :attachtype => attach.attachtype,
+                                                 :is_public => attach.is_public,  :quotes => 0)
+        end
+      end
+    end
+  end
+
+  def share_news_to_project
+    news = News.find(params[:send_id])
+    project_ids = params[:project_ids]
+    project_ids.each do |project_id|
+      if Project.find(project_id).news.map(&:id).exclude?(news.id)
+        project_news = News.create(:project_id => project_id.to_i, :title => news.title, :summary => news.summary, :description => news.description,:author_id => User.current.id, :created_on => Time.now)
+        news.attachments.each do |attach|
+          project_news.attachments << Attachment.new(:filename => attach.filename, :disk_filename => attach.disk_filename, :filesize => attach.filesize, :content_type => attach.content_type, :digest => attach.digest,
+                                                 :downloads => 0, :author_id => User.current.id, :created_on => Time.now, :description => attach.description, :disk_directory => attach.disk_directory, :attachtype => attach.attachtype,
+                                                 :is_public => attach.is_public,  :quotes => 0)
+        end
+      end
+    end
+  end
+
+  def share_news_to_org
+    news = News.find(params[:send_id])
+    field_id = params[:subfield]
+    org_news = News.create(:org_subfield_id => field_id.to_i, :title => news.title, :summary => news.summary, :description => news.description,:author_id => User.current.id, :created_on => Time.now,:project_id => -1)
+    news.attachments.each do |attach|
+      org_news.attachments << Attachment.new(:filename => attach.filename, :disk_filename => attach.disk_filename, :filesize => attach.filesize, :content_type => attach.content_type, :digest => attach.digest,
+                                        :downloads => 0, :author_id => User.current.id, :created_on => Time.now, :description => attach.description, :disk_directory => attach.disk_directory, :attachtype => attach.attachtype,
+                                        :is_public => attach.is_public,  :quotes => 0)
+    end
+    OrgActivity.create(:container_type => 'OrgSubfield', :container_id => field_id.to_i, :org_act_type=>'News', :org_act_id => org_news.id, :user_id => User.current.id)
+  end
+
   def change_org_subfield
 
   end
@@ -2102,9 +2164,17 @@ class UsersController < ApplicationController
     @user = User.current
     if !params[:search].nil?  #发送到有栏目类型为资源的组织中
       search = "%#{params[:search].to_s.strip.downcase}%"
-      @orgs = @user.organizations.where("name like ?", search).select{|org| OrgSubfield.where("organization_id = #{org.id} and field_type='Resource'").count > 0}
+      if params[:send_type].present? and params[:send_type] == 'news'
+        @orgs = @user.organizations.where("name like ?", search).select{|org| OrgSubfield.where("organization_id = #{org.id} and field_type='Post'").count > 0}
+      else
+        @orgs = @user.organizations.where("name like ?", search).select{|org| OrgSubfield.where("organization_id = #{org.id} and field_type='Resource'").count > 0}
+      end
     else
-      @orgs = @user.organizations.select{|org| OrgSubfield.where("organization_id = #{org.id} and field_type='Resource'").count > 0}
+      if params[:send_type].present? and params[:send_type] == 'news'
+        @orgs = @user.organizations.select{|org| OrgSubfield.where("organization_id = #{org.id} and field_type='Post'").count > 0}
+      else
+        @orgs = @user.organizations.select{|org| OrgSubfield.where("organization_id = #{org.id} and field_type='Resource'").count > 0}
+      end
     end
     @search = params[:search]
     #这里仅仅是传递需要发送的资源id

app/controllers/words_controller.rb

@@ -225,11 +225,11 @@ class WordsController < ApplicationController
   def leave_user_message
     if User.current.logged?
       @user = User.find(params[:id])
-      if params[:new_form][:user_message].size>0 && User.current.logged? && @user
+      if params[:new_form][:content].size>0 && User.current.logged? && @user
         if params[:private] && params[:private] == '1'
-          @user.journals_for_messages << JournalsForMessage.new(:user_id => User.current.id, :notes => params[:new_form][:user_message], :reply_id => 0, :status => true, :is_readed => false, :private => 1)
+          @user.journals_for_messages << JournalsForMessage.new(:user_id => User.current.id, :notes => params[:new_form][:content], :reply_id => 0, :status => true, :is_readed => false, :private => 1)
         else
-          @user.add_jour(User.current, params[:new_form][:user_message])
+          @user.add_jour(User.current, params[:new_form][:content])
         end
       end
       redirect_to feedback_path(@user)

app/helpers/application_helper.rb

@@ -2789,13 +2789,6 @@ int main(int argc, char** argv){
     ss.html_safe
   end
 
-  #代码提交数量
-  def changesets_num project
-    g = Gitlab.client
-    project.gpid.nil? ? 0 : g.project(project.gpid).commit_count
-    # project.changesets.count
-end
-
   #课程动态的更新
   def update_course_activity type, id
     course_activity = CourseActivity.where("course_act_type=? and course_act_id =?", type.to_s, id).first
@@ -2836,4 +2829,13 @@ end
       principal_activity.save
     end
   end
+
+  #项目按更新时间排序
+  def project_sort_update projects
+    unless projects.empty?
+      project_ids = '('+projects.map{|pro|pro.project_id}.join(',')+')'
+      sort_projects = ForgeActivity.find_by_sql("SELECT MAX(updated_at) AS updated_at,user_id, project_id FROM forge_activities WHERE project_id IN #{project_ids} GROUP BY project_id ORDER BY MAX(updated_at) DESC")
+      return sort_projects
+    end
+  end
 end

app/helpers/courses_helper.rb

@@ -509,7 +509,7 @@ module CoursesHelper
     type = []
     month = Time.now.month
     now_year = year.nil? ? Time.now.year : (Time.now.year <= year ? Time.now.year : year)
-    year = month < 3 ? now_year - 1 : now_year
+    year = month < 3 && now_year >=Time.now.year ? now_year - 1 : now_year
     for i in (year..year + 10)
       option = []
       option << i

app/models/course.rb

@@ -1,7 +1,6 @@
 require 'elasticsearch/model'
 class Course < ActiveRecord::Base
   include Redmine::SafeAttributes
-  include ApplicationHelper
 
   STATUS_ACTIVE     = 1
   STATUS_CLOSED     = 5
@@ -71,7 +70,7 @@ class Course < ActiveRecord::Base
   validates_length_of :description, :maximum => 10000
   before_save :self_validate
   # 公开课程变成私有课程，所有资源都变成私有
-  after_update :update_files_public,:update_course_ealasticsearch_index,:update_activity
+  after_update :update_files_public,:update_course_ealasticsearch_index
   after_create :create_board_sync, :act_as_course_activity, :act_as_course_message,:create_course_ealasticsearch_index
   before_destroy :delete_all_members,:delete_course_ealasticsearch_index
 
@@ -429,12 +428,6 @@ class Course < ActiveRecord::Base
     end
   end
 end
-#动态的更新
-def update_activity
-  update_course_activity(self.class, self.id)
-  update_user_activity(self.class, self.id)
-  update_org_activity(self.class, self.id)
-end
 
 # Delete the previous articles index in Elasticsearch
 # Course.__elasticsearch__.client.indices.delete index: Course.index_name rescue nil

app/models/mailer.rb

@@ -379,6 +379,16 @@ class Mailer < ActionMailer::Base
 
   end
 
+  # issue截止时间提醒
+  def issue_due_date(issue, recipients)
+    @author = issue.author.login
+    @issue_name = issue.subject
+    @issue_url = url_for(:controller  => 'issues', :action => 'show', :id => issue.id)
+    @subject = "#{l(:mail_issue)}#{issue.subject} #{l(:mail_issue_due_date)} "
+    mail :to => recipients,
+         :subject => @subject
+  end
+
   # Builds a Mail::Message object used to email recipients of the added issue.
   #
   # Example:

app/models/news.rb

@@ -22,6 +22,7 @@ class News < ActiveRecord::Base
   has_many_kindeditor_assets :assets, :dependent => :destroy
   #added by nwb
   belongs_to :course,:touch => true
+  belongs_to :org_subfield, :touch => true
   belongs_to :author, :class_name => 'User', :foreign_key => 'author_id'
   has_many :comments, :as => :commented, :dependent => :destroy, :order => "created_on"
   # fq
@@ -57,7 +58,7 @@ class News < ActiveRecord::Base
 
   after_create :act_as_activity,:act_as_forge_activity, :act_as_course_activity,:act_as_system_message, :add_author_as_watcher, :send_mail, :add_news_count
   after_update :update_activity
-  after_destroy :delete_kindeditor_assets, :decrease_news_count
+  after_destroy :delete_kindeditor_assets, :decrease_news_count, :delete_org_activities
 
   scope :visible, lambda {|*args|
     includes(:project).where(Project.allowed_to_condition(args.shift || User.current, :view_news, *args))
@@ -187,4 +188,8 @@ class News < ActiveRecord::Base
     Mailer.run.news_added(self) if Setting.notified_events.include?('news_added')
   end
 
+  def delete_org_activities
+    OrgActivity.where("container_type='OrgSubfield' and org_act_type='News' and org_act_id=?", self.id).destroy_all
+  end
+
 end

app/models/org_subfield.rb

@@ -6,6 +6,7 @@ class OrgSubfield < ActiveRecord::Base
   has_many :org_subfield_messages, :dependent => :destroy
   has_many :messages, :through => :org_subfield_messages
   has_many :boards, :dependent => :destroy
+  has_many :news, :dependent => :destroy
   acts_as_attachable
   after_create :create_board_sync
   # 创建资源栏目讨论区

app/services/courses_service.rb

@@ -254,6 +254,8 @@ class CoursesService
     #course.safe_attributes = params[:course]
     course.time = params[:time]
     course.term = params[:term]
+    course.end_time = params[:end_time]
+    course.end_term = params[:end_term]
     course.class_period = params[:class_period].to_i
     params[:course][:is_public] ? course.is_public = 1 : course.is_public = 0
     params[:course][:open_student] ? course.open_student = 1 : course.open_student = 0

app/views/attachments/_activity_attach.html.erb

@@ -3,7 +3,7 @@
         <div class="break_word">
           <span class="fl">
           <span title="<%= attachment.filename %>" id="attachment_<%=attachment.id %>">
-            <%= link_to_short_attachment attachment,:length=> 58, :class => 'mw400 hidden link_file_a fl newsBlue', :download => true -%>
+            <%= link_to_short_attachment attachment,:length=> 58, :class => 'hidden link_file_a fl newsBlue mw400', :download => true -%>
           </span>
           </span>
           <span class="postAttSize">(

app/views/attachments/_project_file_links.html.erb

@@ -37,7 +37,7 @@
         <% if options[:length] %>
           <%= link_to_short_attachment attachment, :class => ' link_file_board', :download => true,:length => options[:length] -%>
         <% else %>
-          <%= link_to_short_attachment attachment, :class => ' link_file_board', :download => true -%>
+          <%= link_to_short_attachment attachment, :length=> 58,:class => 'hidden link_file_a fl newsBlue mw400', :download => true -%>
         <% end %>
       </span>
         <%if is_float%>

app/views/bids/_homework.html.erb

@@ -28,7 +28,7 @@
                     $('#ajax-modal').siblings().remove();
                     $('#ajax-modal').before("<span style='float: right;cursor:pointer;'>" +
                             "<a href='javascript:' onclick='hiddent_alert_model();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
-                    $('#ajax-modal').parent().css("top","").css("left","").css("width","511");
+                    $('#ajax-modal').parent().css("top","").css("left","").css("width","511").css("border","3px solid #269ac9");
                     $('#ajax-modal').parent().addClass("alert_praise");
                 <% end %>
 

app/views/bids/alert_anonymous_comment.js.erb

@@ -1,8 +1,8 @@
-$('#ajax-modal').html('<%= escape_javascript(render :partial => 'alert_anonyoms', locals: { bid: @bid, totle_size:@totle_size, cur_size:@cur_size, percent:@percent}) %>');
-showModal('ajax-modal', '500px');
-//$('#ajax-modal').css('height','180px');
-$('#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","").css("left","");
+$('#ajax-modal').html('<%= escape_javascript(render :partial => 'alert_anonyoms', locals: { bid: @bid, totle_size:@totle_size, cur_size:@cur_size, percent:@percent}) %>');
+showModal('ajax-modal', '500px');
+//$('#ajax-modal').css('height','180px');
+$('#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","").css("left","").css("border","3px solid #269ac9");
 $('#ajax-modal').parent().addClass("anonymos");

app/views/blog_comments/show.html.erb

@@ -116,9 +116,18 @@
       <% count=@article.children.count%>
   <% end %>
   <div class="homepagePostReply">
-    <% unless count == 0  %>
+    <%# unless count == 0  %>
         <div class="homepagePostReplyBanner">
-          <div class="homepagePostReplyBannerCount">回复（<%=count %>）</div>
+          <div class="homepagePostReplyBannerCount">回复
+            <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
+            <span id="praise_count_<%=@article.id %>">
+            <% if @article.author == User.current %>
+                <span class="ml15 likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(@article) > 0 ? "（#{get_praise_num(@article)}）" : "" %></span></span>
+            <% else %>
+                <%=render :partial=> "praise_tread/praise", :locals => {:activity=>@article, :user_activity_id=>@article.id,:type=>"activity"}%>
+            <% end %>
+            </span>
+          </div>
           <div class="homepagePostReplyBannerTime"></div>
           <!-- <div class="homepagePostReplyBannerMore">
         <%# if @reply_count > 2%>
@@ -150,7 +159,14 @@
                   </div>
                   <div style="margin-top: -7px; margin-bottom: 5px">
                     <%= format_time(reply.created_on) %>
-                    <div class="fr" id="reply_edit_menu_<%= reply.id%>" style="display: none">
+                    <span id="reply_praise_count_<%=reply.id %>">
+                          <% if reply.author == User.current %>
+                            <span class="fr likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(reply) > 0 ? "（#{get_praise_num(reply)}）" : "" %></span></span>
+                          <% else %>
+                            <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%>
+                          <% end %>
+                      </span>
+                    <div class="fr mr10" id="reply_edit_menu_<%= reply.id%>" style="display: none">
                       <%= link_to(
                                   l(:button_reply),
                                   {:controller => 'blog_comments',:action => 'quote',:user_id=>reply.author_id,:blog_id=>reply.blog_id, :id => reply.id},
@@ -175,7 +191,7 @@
           <% end %>
         </div>
 
-    <% end %>
+    <%# end %>
     <div class="cl"></div>
     <% if !@article.locked? && User.current.logged?%>
         <div class="talkWrapMsg" nhname="about_talk_reply">

app/views/blogs/_article.html.erb

@@ -123,11 +123,17 @@
       <% count=activity.children.count%>
   <% end %>
   <div class="homepagePostReply">
-    <div class="topBorder" style="display: <%= count<=0 && !activity.locked ? '': 'none' %>"></div>
-    <div class="homepagePostReplyBanner" style="display: <%= count>0 ? '': 'none' %>">
-      <div class="homepagePostReplyBannerCount" onclick="expand_reply_input('#reply_input_<%= user_activity_id %>');">回复(
-        <%= count %>
-        )</div>
+    <div class="homepagePostReplyBanner">
+      <div class="homepagePostReplyBannerCount">回复
+        <sapn class="mr15"><%= count>0 ? "（#{count}）" : "" %></sapn><span style="color: #cecece;">▪</span>
+        <span id="praise_count_<%=user_activity_id %>">
+          <% if activity.author == User.current %>
+            <span class="ml15 likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(activity) > 0 ? "（#{get_praise_num(activity)}）" : "" %></span></span>
+          <% else %>
+            <%=render :partial=> "praise_tread/praise", :locals => {:activity=>activity, :user_activity_id=>user_activity_id,:type=>"activity"}%>
+          <% end %>
+        </span>
+      </div>
       <div class="homepagePostReplyBannerTime"><%#=format_date(activity.updated_on)%></div>
       <%if count > 3 %>
           <div class="homepagePostReplyBannerMore">
@@ -162,6 +168,13 @@
                           <%= link_to reply.try(:author).try(:realname), user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %>
                       <% end %>
                       <%= format_time(reply.created_on) %>
+                      <span id="reply_praise_count_<%=reply.id %>">
+                          <% if reply.author == User.current %>
+                            <span class="fr likeButton" title="不能自己赞自己哦！"> <span class="likeText">赞</span><span class="likeNum"><%= get_praise_num(reply) > 0 ? "（#{get_praise_num(reply)}）" : "" %></span></span>
+                          <% else %>
+                            <%=render :partial=> "praise_tread/praise", :locals => {:activity=>reply, :user_activity_id=>reply.id,:type=>"reply"}%>
+                          <% end %>
+                      </span>
                     </div>
                     <div class="homepagePostReplyContent break_word list_style upload_img" id="reply_content_<%= reply.id %>">
                       <%= reply.content.html_safe %>
@@ -201,5 +214,13 @@
   </div>
 </div>
 <script type="text/javascript">
-    $(description_show_hide(<%=user_activity_id %>));
+    $("#moreProject_<%=user_activity_id %>").click(function(){
+        $("#relatePWrap_<%=user_activity_id %>").toggleClass('relatePWrap');
+        $("#relatePWrap_<%=user_activity_id %>").css("height","auto");
+        $(this).hide();
+    });
+    $("#hideProject_<%=user_activity_id %>").click(function(){
+        $("#relatePWrap_<%=user_activity_id %>").toggleClass('relatePWrap');
+        $("#moreProject_<%=user_activity_id %>").show();
+    });
 </script>

app/views/comments/create.js.erb

@@ -1,6 +1,8 @@
 <% if @course %>
-$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_news', :locals => {:activity => @news,:user_activity_id =>@user_activity_id}) %>");
+    $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'users/course_news', :locals => {:activity => @news,:user_activity_id =>@user_activity_id}) %>");
+<% elsif @project %>
+    $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'projects/project_news', :locals => {:activity => @news,:user_activity_id =>@user_activity_id}) %>");
 <% else %>
-$("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'projects/project_news', :locals => {:activity => @news,:user_activity_id =>@user_activity_id}) %>");
+    $("#user_activity_<%= @user_activity_id%>").replaceWith("<%= escape_javascript(render :partial => 'organizations/org_subfield_news', :locals => {:activity => @news,:user_activity_id =>@user_activity_id}) %>");
 <% end %>
 init_activity_KindEditor_data('<%= @user_activity_id%>',"","87%", "UserActivity");

app/views/courses/join_private_courses.js.erb

@@ -7,5 +7,5 @@ $('#ajax-modal').siblings().hide();
 $('#ajax-modal').before("<span style='float: right;cursor:pointer;padding-left: 513px;'>" +
         "<a href='javascript:' onclick='hidden_join_course_form();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
 $('#ajax-modal').parent().removeClass("alert_praise");
-$('#ajax-modal').parent().css("top","").css("left","");
+$('#ajax-modal').parent().css("top","").css("left","").css("border","3px solid #269ac9");
 $('#ajax-modal').parent().addClass("alert_box");

app/views/courses/new_join.js.erb

@@ -1,8 +1,8 @@
-$('#ajax-modal').html('<%= escape_javascript(render :partial => 'projects/new_join', locals: { :course => @course}) %>');
-showModal('ajax-modal', '500px');
-$('#ajax-modal').css('height','100px');
-$('#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","").css("left","");
-$('#ajax-modal').parent().addClass("anonymos");
+$('#ajax-modal').html('<%= escape_javascript(render :partial => 'projects/new_join', locals: { :course => @course}) %>');
+showModal('ajax-modal', '500px');
+$('#ajax-modal').css('height','100px');
+$('#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","").css("left","").css("border","3px solid #269ac9");
+$('#ajax-modal').parent().addClass("anonymos");

app/views/courses/settings.html.erb

@@ -46,14 +46,15 @@
           <div class="cl"></div>
           <li  class="ml45 mb10">
             <label><span class="c_red">*</span>&nbsp;<%= l(:label_course_term)%>&nbsp;&nbsp;：</label>
-            <%= select_tag :time,options_for_select(course_time_option(@course.time),@course.time), {:id=>"time_selected"}  %>
-            <%= select_tag :term,options_for_select(course_term_option,@course.term || cur_course_term),{:id=>"term_selected"}  %>
+            <%= select_tag :time,options_for_select(course_time_option(@course.time),@course.time), {:id=>"time"}  %>
+            <%= select_tag :term,options_for_select(course_term_option,@course.term || cur_course_term),{:id=>"term"}  %>
           </li>
           <div class="cl"></div>
           <li  class="ml45 mb10">
             <label><span class="c_red">*</span>&nbsp;结束学期&nbsp;&nbsp;：</label>
-            <%= select_tag :end_time,options_for_select(course_time_option(@course.end_time),@course.end_time), {:id=>"end_time_selected"}  %>
-            <%= select_tag :end_term,options_for_select(course_term_option,@course.end_term || cur_course_term),{:id=>"end_term_selected"}  %>
+            <%= select_tag :end_time,options_for_select(course_time_option(@course.end_time),@course.end_time), {:id=>"end_time"}  %>
+            <%= select_tag :end_term,options_for_select(course_term_option,@course.end_term || cur_course_term),{:id=>"end_term"}  %>
+            <span class="c_red" id="course_time_term_notice"></span>
           </li>
           <div class="cl"></div>
           <li class="ml45 mb10">
@@ -135,11 +136,9 @@
         $('#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","").css("left","");
+        $('#ajax-modal').parent().css("top","").css("left","").css("border","3px solid #269ac9");
         $('#ajax-modal').parent().addClass("anonymos");
     }
-    $("#time_selected").click(select);
-    $("#term_selected").click(select);
-    $("#end_time_selected").click(select);
-    $("#end_term_selected").click(select);
+    $("#time").click(select);
+    $("#term").click(select);
 </script>