Merge branch 'szzh' into cxt_course

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/users_controller.rb

@@ -1773,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
@@ -2122,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/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/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/files/_course_list.html.erb

@@ -43,7 +43,7 @@
                                         <% if (delete_allowed || User.current.id == file.author_id) && file.container_id == @course.id && file.container_type == "Course"  %>
                                             <ul class="homepagePostSettiongText">
 
-                                              <li><%= link_to("发&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;送".html_safe, 'javascript:void(0)',:class => "postOptionLink",:onclick=>"show_send('#{file.id}')")  %></li>
+                                              <li><%= link_to("发&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;送".html_safe, 'javascript:void(0)',:class => "postOptionLink",:onclick=>"show_send('#{file.id}','#{User.current.id}','file')")  %></li>
                                               <li><%= link_to '更新版本',attachments_versions_path(file),:class => "postOptionLink",:remote=>true %></li>
                                               <% if @course.is_public? %>
                                                   <li>
@@ -61,7 +61,7 @@
                                         <% end %>
                                     <%else%>
                                         <ul class="resourceSendO">
-                                          <li><%= link_to("发&nbsp;&nbsp;送".html_safe, 'javascript:void(0)',:class => "postOptionLink2",:onclick=>"show_send('#{file.id}')")  %></li>
+                                          <li><%= link_to("发&nbsp;&nbsp;送".html_safe, 'javascript:void(0)',:class => "postOptionLink2",:onclick=>"show_send('#{file.id}','#{User.current.id}','file')")  %></li>
                                         </ul>
                                     <% end %>
                                 <% end %>

app/views/files/_file_tools.html.erb

@@ -2,7 +2,7 @@
     <% if (is_project_manager?(User.current, @project) || file.author_id == User.current.id) && project_contains_attachment?(@project,file) %>
         <% if (delete_allowed || User.current.id == file.author_id) && file.container_id == @project.id && file.container_type == "Project"  %>
             <ul class="homepagePostSettiongText">
-              <li><%= link_to("发&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;送".html_safe, 'javascript:void(0)',:class => "postOptionLink",:onclick=>"show_send('#{file.id}')")  %></li>
+              <li><%= link_to("发&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;送".html_safe, 'javascript:void(0)',:class => "postOptionLink",:onclick=>"show_send('#{file.id}','#{User.current.id}','file')")  %></li>
               <li><%= link_to '更新版本',attachments_versions_path(file),:class => "postOptionLink",:remote=>true %></li>
               <% if @project.is_public? %>
                   <li>
@@ -25,7 +25,7 @@
         <% end %>
     <%else%>
         <ul class="resourceSendO">
-          <li><%= link_to("发&nbsp;&nbsp;送".html_safe, 'javascript:void(0)',:class => "postOptionLink2",:onclick=>"show_send('#{file.id}')")  %></li>
+          <li><%= link_to("发&nbsp;&nbsp;送".html_safe, 'javascript:void(0)',:class => "postOptionLink2",:onclick=>"show_send('#{file.id}','#{User.current.id}','file')")  %></li>
         </ul>
     <% end %>
 <% end %>

app/views/files/_org_subfield_list.html.erb

@@ -38,7 +38,7 @@
               <% if User.current.logged? %>
                  <% if (delete_allowed || User.current.id == file.author_id) && file.container_id == org_subfield.id && file.container_type == "OrgSubfield"  %>
                     <ul class="homepagePostSettiongText">
-                      <li><%= link_to("发&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;送".html_safe, 'javascript:void(0)',:class => "postOptionLink",:onclick=>"show_send('#{file.id}')")  %></li>
+                      <li><%= link_to("发&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;送".html_safe, 'javascript:void(0)',:class => "postOptionLink",:onclick=>"show_send('#{file.id}','#{User.current.id}','file')")  %></li>
                         <li><%= link_to '更新版本',attachments_versions_path(file),:class => "postOptionLink",:remote=>true %></li>
                         <li>
                           <span id="is_public_<%= file.id %>">
@@ -52,7 +52,7 @@
                     </ul>
                   <%else%>
                       <ul class="resourceSendO">
-                        <li><%= link_to("发&nbsp;&nbsp;送".html_safe, 'javascript:void(0)',:class => "postOptionLink2",:onclick=>"show_send('#{file.id}')")  %></li>
+                        <li><%= link_to("发&nbsp;&nbsp;送".html_safe, 'javascript:void(0)',:class => "postOptionLink2",:onclick=>"show_send('#{file.id}','#{User.current.id}','file')")  %></li>
                       </ul>
                   <% end %>
               <% end %>

app/views/files/_tool_settings.html.erb

@@ -4,7 +4,7 @@
         <% if (is_project_manager?(User.current, project) || file.author_id == User.current.id) && project_contains_attachment?(project, file) %>
             <% if (delete_allowed || User.current.id == file.author_id) && file.container_id == project.id && file.container_type == "Project" %>
                 <ul class="homepagePostSettiongText">
-                  <li><%= link_to("发&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;送".html_safe, 'javascript:void(0)',:class => "postOptionLink",:onclick=>"show_send('#{file.id}')") %></li>
+                  <li><%= link_to("发&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;送".html_safe, 'javascript:void(0)',:class => "postOptionLink",:onclick=>"show_send('#{file.id}','#{User.current.id}','file')") %></li>
                   <li><%= link_to '更新版本',attachments_versions_path(file),:class => "postOptionLink",:remote=>true %></li>
                   <% if project.is_public? %>
                       <li>
@@ -20,7 +20,7 @@
             <% end %>
         <% else %>
             <ul class="resourceSendO">
-              <li><%= link_to("发&nbsp;&nbsp;送".html_safe, 'javascript:void(0)',:class => "postOptionLink2",:onclick=>"show_send('#{file.id}')")  %></li>
+              <li><%= link_to("发&nbsp;&nbsp;送".html_safe, 'javascript:void(0)',:class => "postOptionLink2",:onclick=>"show_send('#{file.id}','#{User.current.id}','file')")  %></li>
             </ul>
         <% end %>
     <% end %>

app/views/files/index.html.erb

@@ -245,105 +245,7 @@
                 });
 
     }
-    function observeSearchfieldOnInput(fieldId, url,send_id,send_ids) {
-        $('#'+fieldId).each(function() {
-            var $this = $(this);
-            $this.addClass('autocomplete');
-            $this.attr('data-value-was', $this.val());
-            var check = function() {
-                var val = $this.val();
-                if ($this.attr('data-value-was') != val){
-                    $this.attr('data-value-was', val);
-                    $.ajax({
-                        url: url,
-                        type: 'get',
-                        data: {search: $this.val(),send_id:send_id,send_ids:send_ids},
-                        success: function(data){  },
-                        beforeSend: function(){ $this.addClass('ajax-loading'); },
-                        complete: function(){ $this.removeClass('ajax-loading'); }
-                    });
-                }
-            };
-            var reset = function() {
-                if (timer) {
-                    clearInterval(timer);
-                    timer = setInterval(check, 300);
-                }
-            };
-            var timer = setInterval(check, 300);
-            $this.bind('keyup click mousemove', reset);
-        });
-    }
-    function check_des(event){
-        if($(".sectionContent").find('input[type="radio"]:checked').length <= 0){
-            event.preventDefault();
-            $(".orgDirection").text('目标地址组织不能为空')
-            return false;
-        }else if($(".columnContent").find('input[type="radio"]:checked').length <= 0){
-            event.preventDefault();
-            $(".orgDirection").text('目标地址栏目不能为空')
-            return false;
-        }else{
-            return true;
-        }
-    }
 
-    <% if User.current.logged? %>
-        var sendType = '1';
-        var lastSendType ;//初始为发送到我的课程
-        function show_send(id){
-            if (lastSendType === '2'){  //如果已经发送过一次了，那么就应该沿用上次发送的类型。
-                $.ajax({
-                    type: 'get',
-                    url: '<%= search_user_project_user_path(User.current)%>' + '?send_id=' + id
-                });
-            }else if(lastSendType == '1'){
-                $.ajax({
-                    type: 'get',
-                    url: '<%= search_user_course_user_path(User.current)%>' + '?send_id=' + id
-                });
-            }else if( lastSendType == '3'){//组织
-                $.ajax({
-                    type: 'get',
-                    url: '<%= search_user_org_user_path(User.current)%>' + '?send_id=' + id
-                });
-            }else{
-                $.ajax({
-                    type: 'get',
-                    url: '<%= search_user_course_user_path(User.current)%>' + '?send_id=' + id
-                });
-            }
-        }
-
-    //id 发送的id
-    //发送的id数组
-    function chooseSendType(res_id,res_ids){
-
-        sendType = $(".resourcesSendType").val();
-        if (sendType === lastSendType) {
-            return;
-        } else if(lastSendType != null) { //不是第一次点击的时候
-                if (sendType == '1') {
-                    $.ajax({
-                        type: 'get',
-                        url: '<%= search_user_course_user_path(User.current)%>' + '?send_id=' + res_id
-                    });
-                } else if(sendType == '2') {
-                    $.ajax({
-                        type: 'get',
-                        url: '<%= search_user_project_user_path(User.current)%>' + '?send_id=' + res_id
-                    });
-                }else if(sendType == '3'){
-                    $.ajax({
-                        type: 'get',
-                        url: '<%= search_user_org_user_path(User.current)%>' + '?send_id=' + res_id
-                    });
-                }
-        }
-
-        lastSendType = sendType;
-    }
-    <% end %>
     <% if @course %>
     var tagNameHtml; //当前双击的链接的父节点的html
     var tagName;  //标签的值

app/views/layouts/base_org.html.erb

@@ -120,21 +120,19 @@
         <!--</div>-->
 
         <div class="cl"></div>
-        <% if User.current.logged? %>
-            <div class="f12 fontGrey3">
-              <%= link_to '文章', organization_org_document_comments_path(@organization) %>&nbsp;
-              <% if User.current.logged? %>
-                  (
-                  <%= link_to OrgDocumentComment.where("organization_id =? and parent_id is null", @organization.id).count, organization_org_document_comments_path(@organization), :class => "linkBlue" %>
-                  )
-              <% end %>
-              &nbsp;|&nbsp;
-              <%= link_to '成员', members_organization_path(@organization.id) %>&nbsp;
-              <% if User.current.logged? %>
-                  （<%= link_to @organization.org_members.count, members_organization_path(@organization.id), :id => 'org_members_count_id', :class => "linkBlue" %>）
-              <% end %>
-            </div>
-        <% end %>
+        <div class="f12 fontGrey3">
+          <%= link_to '文章', organization_org_document_comments_path(@organization) %>&nbsp;
+          <%# if User.current.logged? %>
+              (
+              <%= link_to OrgDocumentComment.where("organization_id =? and parent_id is null", @organization.id).count, organization_org_document_comments_path(@organization), :class => "linkBlue" %>
+              )
+          <%# end %>
+          <% if User.current.logged? %>
+            &nbsp;|&nbsp;
+            <%= link_to '成员', members_organization_path(@organization.id) %>&nbsp;
+           （<%= link_to @organization.org_members.count, members_organization_path(@organization.id), :id => 'org_members_count_id', :class => "linkBlue" %>）
+          <% end %>
+        </div>
       </div>
       <div class="homepageLeftMenuContainer" id="sub_field_left_lists">
         <%= render :partial => "organizations/org_left_subfield_list", :locals => {:organization => @organization} %>

app/views/mailer/issue_due_date.html.erb

@@ -0,0 +1,10 @@
+<div class="mail_box" style="border:1px solid #c8c8c8; width:570px; height: auto; padding:15px; margin-top:10px; margin-bottom:10px;">
+  <ul style="list-style-type:none; margin:0; padding:0;">
+    <li style="list-style-type:none; margin:0; padding:0;"><span style="float: left;"><strong><%= l(:mail_issue_content)%></strong></span>
+		<span style="float: left; width: 526px">
+          <p><%=link_to @author, user_url(@author) %> 发布的问题跟踪：<%=link_to @issue_name, @issue_url %> <span style="color: red">截止时间快到了，请您关注！</span></p>
+        </span>
+    </li>
+  </ul>
+  <div class="cl" style="margin-top: 30px; clear:both; overflow:hidden;"></div>
+</div>

app/views/news/_course_show.html.erb

@@ -41,6 +41,7 @@
             <ul>
               <li class="homepagePostSettingIcon">
                 <ul class="homepagePostSettiongText">
+                  <li><%= link_to("发送", 'javascript:void(0)',:class => "postOptionLink",:onclick=>"show_send('#{@news.id}','#{User.current.id}','news')")  %></li>
                   <li>
                     <%= link_to(
                                 l(:button_edit),
@@ -59,6 +60,16 @@
               </li>
             </ul>
           </div>
+      <% elsif User.current.logged? %>
+          <div class="homepagePostSetting" id="message_setting_<%= @news.id %>" style="display: none">
+            <ul>
+              <li class="homepagePostSettingIcon">
+                <ul class="homepagePostSettiongText">
+                  <li><%= link_to("发送", 'javascript:void(0)',:class => "postOptionLink",:onclick=>"show_send('#{@news.id}','#{User.current.id}','news')")  %></li>
+                </ul>
+              </li>
+            </ul>
+          </div>
       <%end%>
       <div class="postDetailTitle fl">
         <a href="javascript:void(0);" class="f14 linkGrey4 fb" style="overflow:hidden;">通知: <%= @news.title%></a>

app/views/news/_edit_for_org_subfield.html.erb

@@ -0,0 +1,49 @@
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: true, prettify: false) %>
+<% end %>
+
+<div class="resources mt10">
+  <div id="new_course_news">
+    <div class="homepagePostBrief c_grey">
+      <div>
+        <input  type="text" name="news[title]" id="news_title" class="InputBox  w713" maxlength="60" onfocus="$('#news_editor').show()" onkeyup="regexTitle();" placeholder="发布通知，请先输入通知标题" value="<%= news.title%>" >
+        <p id="title_notice_span"></p>
+      </div>
+      <div id="news_editor" style="display: none;">
+        <div class="mt10">
+          <div id="news_quote" class="wiki" style="width: 92%;word-break: break-all;word-wrap: break-word;margin-left: 40px;"></div>
+          <%= text_area :quote,:quote,:style => 'display:none' %>
+          <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
+
+          <%= f.kindeditor :description, :editor_id => 'project_news_description_editor',
+                           :owner_id => news.nil? ? 0: news.id,
+                           :owner_type => OwnerTypeHelper::NEWS,
+                           :width => '100%',
+                           :height => 300,
+                           :minHeight=>300,
+                           :class => 'talk_text fl',
+                           :input_html => { :id => 'news_content',
+                                            :class => 'talk_text fl',
+                                            :maxlength => 5000 },
+                           at_id: news.id, at_type: news.class.to_s
+          %>
+          <div class="cl"></div>
+          <p id="description_notice_span"></p>
+        </div>
+        <div class="cl"></div>
+        <div class="mt10">
+          <div class="fl" id="news_attachments">
+            <%= render :partial => 'attachments/form_course', :locals => {:container => news, :isReply => false} %>
+          </div>
+        </div>
+        <div class="cl"></div>
+        <div class="mt5">
+              <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick="submitNews();">确定</a>
+              <span class="fr mr10 mt3">或</span>
+              <%= link_to "取消",news_path(news), :class => "fr mr10 mt3"%>
+        </div>
+        <div class="cl"></div>
+      </div>
+    </div>
+  </div>
+</div>

app/views/news/_organization_show.html.erb

@@ -0,0 +1,174 @@
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
+<% end %>
+
+<script type="text/javascript">
+    $(function(){
+        $("#RSide").removeAttr("id");
+        $("#Container").css("width","1000px");
+    });
+</script>
+<script>
+    function expand_reply(container,btnid){
+        var target = $(container).children();
+        var btn = $(btnid);
+        if(btn.data('init')=='0'){
+            btn.data('init',1);
+            btn.html('收起回复');
+            target.show();
+        }else{
+            btn.data('init',0);
+            btn.html('展开更多');
+            target.hide();
+            target.eq(0).show();
+            target.eq(1).show();
+            target.eq(2).show();
+        }
+    }
+    $(function() {
+        showNormalImage('message_description_<%= @news.id %>');
+    });
+</script>
+
+<div class="postRightContainer ml10" onmouseover="$('#message_setting_<%= @news.id%>').show();" onmouseout="$('#message_setting_<%= @news.id%>').hide();">
+  <div class="postThemeContainer">
+    <div class="postDetailPortrait">
+      <%= link_to image_tag(url_to_avatar(@news.author),:width=>50,:height => 50,:alt=>'图像' ),user_path(@news.author) %>
+    </div>
+    <div class="postThemeWrap">
+      <% if User.current.logged? %>
+          <div class="homepagePostSetting" id="message_setting_<%= @news.id%>" style="display: none">
+            <ul>
+              <li class="homepagePostSettingIcon">
+                <ul class="homepagePostSettiongText">
+                  <li><%= link_to("发送", 'javascript:void(0)',:class => "postOptionLink",:onclick=>"show_send('#{@news.id}','#{User.current.id}','news')")  %></li>
+                  <li>
+                    <%= link_to(
+                                l(:button_edit),
+                                {:action => 'edit', :id => @news},
+                                :class => 'postOptionLink'
+                        ) if @news.author == User.current %>
+                  </li>
+                  <li>
+                    <%= delete_link(
+                                news_path(@news),
+                                :data => {:confirm => l(:text_are_you_sure)},
+                                :class => 'postOptionLink'
+                        ) if @news.author == User.current %>
+                  </li>
+                </ul>
+              </li>
+            </ul>
+          </div>
+      <%end%>
+      <div class="postDetailTitle fl">
+        <a href="javascript:void(0);" class="f14 linkGrey4 fb" style="overflow:hidden;">通知: <%= @news.title%></a>
+      </div>
+      <div class="cl"></div>
+
+      <div class="postDetailCreater">
+        <% if @news.try(:author).try(:realname) == ' ' %>
+            <%= link_to @news.try(:author), user_path(@news.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %>
+        <% else %>
+            <%= link_to @news.try(:author).try(:realname), user_path(@news.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %>
+        <% end %>
+      </div>
+      <div class="postDetailDate mb5"><%= format_time( @news.created_on)%></div>
+      <div class="cl"></div>
+      <div class="memo-content upload_img break_word" id="message_description_<%= @news.id %>" style="word-break: break-all; word-wrap:break-word;margin-bottom: 0px !important;" >
+        <%= @news.description.html_safe%>
+      </div>
+      <div class="cl"></div>
+      <div class=" fl" style="width: 600px">
+        <%= link_to_attachments_course @news, :author => false %>
+      </div>
+    </div>
+    <div class="cl"></div>
+  </div>
+  <div class="cl"></div>
+  <div class="homepagePostReply">
+    <% unless @comments.empty? %>
+        <div class="homepagePostReplyBanner">
+          <div class="homepagePostReplyBannerCount">回复（<%=@comments.count %>）</div>
+          <div class="homepagePostReplyBannerTime"></div>
+        </div>
+        <div class="" id="reply_div_<%=@news.id %>">
+          <% @comments.each_with_index  do |reply,i| %>
+              <script type="text/javascript">
+                  $(function(){
+                      showNormalImage('reply_message_description_<%= reply.id %>');
+                  });
+              </script>
+              <div class="homepagePostReplyContainer" onmouseover="$('#reply_edit_menu_<%= reply.id%>').show();" onmouseout="$('#reply_edit_menu_<%= reply.id%>').hide();">
+                <div class="homepagePostReplyPortrait">
+                  <%= link_to image_tag(url_to_avatar(reply.author), :width => 33,:height => 33), user_path(reply.author) %>
+                </div>
+                <div class="homepagePostReplyDes">
+                  <div class="homepagePostReplyPublisher">
+                    <% if reply.try(:author).try(:realname) == ' ' %>
+                        <%= link_to reply.try(:author), user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %>
+                    <% else %>
+                        <%= link_to reply.try(:author).try(:realname), user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %>
+                    <% end %>
+                  </div>
+                  <div class="homepagePostReplyContent upload_img break_word table_maxWidth" id="reply_message_description_<%= reply.id %>">
+                    <%= reply.comments.html_safe%>
+                  </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">
+                      <%= link_to_if_authorized_course(
+                                  l(:button_delete),
+                                  {:controller => 'comments',
+                                   :action => 'destroy', :id => @news,
+                                   :comment_id => reply},
+                                  :method => :delete,
+                                  :class => 'fr newsGrey',
+                                  :data => {:confirm => l(:text_are_you_sure)},
+                                  :title => l(:button_delete)
+                          ) %>
+                    </div>
+                  </div>
+                  <p id="reply_message_<%= reply.id%>"></p>
+                </div>
+                <div class="cl"></div>
+              </div>
+          <% end %>
+        </div>
+
+    <% end %>
+    <div class="cl"></div>
+    <% if @news.commentable? %>
+        <div class="talkWrapMsg" nhname="about_talk_reply">
+          <em class="talkWrapArrow"></em>
+          <div class="cl"></div>
+          <div class="talkConIpt ml5 mb10" id="reply<%= @news.id %>">
+            <%= form_for @comment, :url=>{:controller => 'comments', :action => 'create', :id => @news}, :html => {:multipart => true, :id => 'add_comment_form'} do |f| %>
+                <div class="box"  id="news_comment">
+                  <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
+                  <%= f.kindeditor :comments, :editor_id => 'comment_editor',
+                                   :owner_id => @comment.nil? ? 0: @comment.id,
+                                   :owner_type => OwnerTypeHelper::COMMENT,
+                                   :width => '99%',
+                                   :height => 100,
+                                   :minHeight=>100,
+                                   :input_html => { :id => 'comment_content',
+                                                    :class => 'talk_text fl',
+                                                    :maxlength => 5000 }%>
+                </div>
+                <p id="add_reply_news"></p>
+                <p class="mt10">
+                  <a href="javascript:void(0)" class="grey_btn fr ml10 mr5" onclick="KindEditor.instances[0].html('');">
+                    <%= l(:label_cancel_with_space) %>
+                  </a>
+                  <a href="javascript:void(0)" class="blue_btn fr" onclick="submitComment();">
+                    <%= l(:label_comment_with_space) %>
+                  </a>
+                </p>
+            <% end %>
+            <div class="cl"></div>
+          </div>
+        </div>
+    <% end %>
+  </div>
+</div>

app/views/news/_project_news.html.erb

@@ -1,77 +1,36 @@
-<style type="text/css">
-  span{
-      word-break:break-all;
-      word-wrap:break-word;
-  }
-</style>
-<%
-   btn_tips = l(:label_news_new)
-   label_tips = l(:label_news)
-%>
-<div class="project_r_h">
-  <h2 class="project_h2"><%= label_tips %></h2>
-</div>
-<div class="talk_top">
-  <p class="fl"><%= l(:label_total_news) %><span><%= @news_count %></span><%= l(:label_project_new_list) %></p>
-  <% if @project && User.current.allowed_to?(:manage_news, @project) %>
-      <%= link_to(btn_tips, new_project_news_path(@project),
-                  :class => 'problem_new_btn fl c_dorange') %>
-      <div class="cl"></div>
-
-  <% end %>
-  <div class="cl"></div>
-</div>
 
-<div>
-  <% if @newss.empty? %>
-      <p class="nodata">
-        <%= l(:label_no_data) %>
-      </p>
-  <% else %>
-      <% @newss.each do |news| %>
-          <div class="problem_main">
-            <%= link_to image_tag(url_to_avatar(news.author),:width => 42,:height => 42), user_path(news.author), :class => "problem_pic fl" %>
-            <div class="problem_txt fl mt5 list_style">
-              <%= link_to_user_header(news.author,false,{:class=> 'problem_name c_orange fl'}) if news.respond_to?(:author) %>
-              <span class="fl"> <%= l(:label_add_news) %>：</span><%= link_to h(news.title), news_path(news),:class => 'problem_tit fl fb c_dblue' %>
-              <%=link_to "<span class = 'pic_mes'>#{news.comments.all.count}</span>".html_safe, news_path(news.id), :class => "pro_mes_w_news" %><br />
-              <div class="cl mb5"></div>
-              <p  id="news_description_<%= news.id %>" class="mt5 break_word"><%=textAreailizable news.description %><br /> </p>
-              <div class="news_foot" style="display: none;" onclick="news_show_more_des(<%= news.id %>);" id="news_foot_<%= news.id %>"><%= l(:label_expend_information) %> <span class="g-arr-down"><img src="/images/jiantou.jpg" width="12" height="6" /></span></div>
-              <span class="f1"><%= l(:label_create_time) %> ：<%= format_time(news.created_on) %></span>
-            </div>
-            <div class="cl"></div>
-          </div><!--problem_main end-->
 
+<script type="text/javascript">
+    $(function(){
+        $("#RSide").removeAttr("id");
+        $("#Container").css("width","1000px");
+    });
+    function reset_news(){
+        $("#news_title").val("");
+        $("#title_notice_span").text("");
+        $("#description_notice_span").text("");
+        document.getElementById("news_sticky").checked=false;
+        $("#news_attachments").html("<%= escape_javascript(render :partial => 'attachments/new_form', :locals => {:container => News.new})%>");
+        project_news_description_editor.html("");
+        $("#news_editor").toggle();
+    }
+    <% if @is_new%>
+    $(function(){
+        $("#news_title").focus();
+    });
+    <%end%>
+</script>
+<div class="homepageRight mt0 ml10">
+  <div class="homepageRightBanner">
+    <div class="NewsBannerName">
+      项目通知
+    </div>
+  </div>
+  <% if @project && User.current.allowed_to?(:manage_news, @project) %>
+      <%= labelled_form_for @news, :url =>{:controller=>'news',:action => 'new',  :project_id => @project.id},
+                            :html => {:nhname=>'form',:multipart => true, :id => 'news-form'} do |f| %>
+          <%= render :partial => 'project_news_new', :locals => {:f => f, :news => @news, :edit_mode => false} %>
       <% end %>
   <% end %>
+  <%= render :partial=> 'project_news_detail',:locals =>{:all_news => @newss, :page => 0} %>
 </div>
-<!--end-->
-<ul class="wlist">
-  <%= pagination_links_full @news_pages, @news_count, :per_page_links => false, :remote => false, :flag => true%>
-</ul>
-
-  <% other_formats_links do |f| %>
-      <%= f.link_to 'Atom', :url => {:project_id => @project, :key => User.current.rss_key} %>
-  <% end %>
-
-  <% content_for :header_tags do %>
-      <%= auto_discovery_link_tag(:atom, params.merge({:format => 'atom', :page => nil, :key => User.current.rss_key})) %>
-      <%= stylesheet_link_tag 'scm' %>
-  <% end %>
-
-  <% html_title(l(:label_news_plural)) -%>
-
-<script type='text/javascript'>
-    $(document).ready(function ($) {
-        $('.content-text-list').each(function () {
-            $(this).find('.delete_icon').hide();
-            $(this).mouseenter(function (event) {
-                $(this).find('.delete_icon').show();
-            });
-            $(this).mouseleave(function (event) {
-                $(this).find('.delete_icon').hide();
-            });
-        });
-    });
-</script>

app/views/news/_project_news_detail.html.erb

@@ -0,0 +1,56 @@
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false) %>
+    <%= javascript_include_tag "init_activity_KindEditor" %>
+<% end %>
+
+<style type="text/css">
+    /*回复框*/
+    .homepagePostReplyInputContainer .ke-toolbar {display: none; width: 400px; border: none; background: none; padding: 0px 0px;}
+    .homepagePostReplyInputContainer .ke-toolbar-icon {line-height: 26px; font-size: 14px; padding-left: 26px;}
+    .homepagePostReplyInputContainer .ke-toolbar-icon-url {background-image: url(/images/public_icon.png)}
+    .homepagePostReplyInputContainer .ke-outline {padding: 0px 0px; line-height: 26px; font-size: 14px;}
+    .homepagePostReplyInputContainer .ke-icon-emoticons {background-position: 0px -671px; width: 50px; height: 26px;}
+    .homepagePostReplyInputContainer .ke-icon-emoticons:hover {background-position: -79px -671px; width: 50px; height: 26px;}
+    .homepagePostReplyInputContainer .ke-outline {border: none;}
+    .homepagePostReplyInputContainer .ke-inline-block {display: none;}
+    .homepagePostReplyInputContainer .ke-container {float: left;}
+</style>
+<% if all_news %>
+    <% all_news.each do |news| %>
+        <script>
+            function expand_reply(container, btnid) {
+                var target = $(container);
+                var btn = $(btnid);
+                if (btn.data('init') == '0') {
+                    btn.data('init', 1);
+                    btn.html('收起回复');
+                    target.show();
+                } else {
+                    btn.data('init', 0);
+                    btn.html('展开更多');
+                    target.hide();
+                    target.eq(0).show();
+                    target.eq(1).show();
+                    target.eq(2).show();
+                }
+            }
+
+            function expand_reply_input(id) {
+                $(id).toggle();
+            }
+
+            $(function () {
+                init_activity_KindEditor_data(<%= news.id%>, null, "87%");
+                showNormalImage('activity_description_<%= news.id %>');
+            });
+        </script>
+        <% if news %>
+            <%= render :partial => 'users/project_news', :locals => {:activity => news, :user_activity_id => news.id} %>
+        <% end %>
+    <% end %>
+
+    <% if all_news.count == 10 %>
+        <%= link_to "点击展开更多",news_index_path(:project_id => @project.id ,:page => page),:id => "show_more_project_news",:remote => "true",:class => "loadMore mt10 f_grey"%>
+    <% end %>
+<% end%>
+

app/views/news/_project_news_new.html.erb

@@ -0,0 +1,60 @@
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: true, prettify: false) %>
+<% end %>
+
+<div class="resources mt10">
+  <div id="new_course_news">
+    <div class="homepagePostBrief c_grey">
+      <div>
+        <input  type="text" name="news[title]" id="news_title" class="InputBox  w713" maxlength="60" onfocus="$('#news_editor').show()" onkeyup="regexTitle();" placeholder="发布通知，请先输入通知标题" value="<%= news.title%>" >
+        <p id="title_notice_span"></p>
+      </div>
+      <div id="news_editor" style="display: none;">
+        <div class="mt10">
+          <%= f.check_box :sticky, :value => edit_mode ? news.sticky : 0 %>
+          <%= label_tag 'news_sticky', l(:label_board_sticky) %>
+          <div class="cl"></div>
+        </div>
+        <div class="mt10">
+          <div id="news_quote" class="wiki" style="width: 92%;word-break: break-all;word-wrap: break-word;margin-left: 40px;"></div>
+          <%= text_area :quote,:quote,:style => 'display:none' %>
+          <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
+
+          <%= f.kindeditor :description, :editor_id => 'project_news_description_editor',
+                           :owner_id => news.nil? ? 0: news.id,
+                           :owner_type => OwnerTypeHelper::NEWS,
+                           :width => '100%',
+                           :height => 300,
+                           :minHeight=>300,
+                           :class => 'talk_text fl',
+                           :input_html => { :id => 'news_content',
+                                            :class => 'talk_text fl',
+                                            :maxlength => 5000 },
+                           at_id: news.id, at_type: news.class.to_s
+          %>
+          <div class="cl"></div>
+          <p id="description_notice_span"></p>
+        </div>
+        <div class="cl"></div>
+        <div class="mt10">
+          <div class="fl" id="news_attachments">
+            <%= render :partial => 'attachments/form_course', :locals => {:container => news, :isReply => false} %>
+          </div>
+        </div>
+        <div class="cl"></div>
+        <div class="mt5">
+          <%if !edit_mode %>
+              <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick="submitNews();">确定</a>
+              <span class="fr mr10 mt3">或</span>
+              <a href="javascript:void(0);" class="fr mr10 mt3" onclick="reset_news();">取消</a>
+          <% else %>
+              <a href="javascript:void(0);" class="BlueCirBtnMini fr" onclick="submitNews();">确定</a>
+              <span class="fr mr10 mt3">或</span>
+              <%= link_to "取消",news_path(news), :class => "fr mr10 mt3"%>
+          <% end %>
+        </div>
+        <div class="cl"></div>
+      </div>
+    </div>
+  </div>
+</div>

app/views/news/_project_show.html.erb

@@ -1,72 +1,184 @@
-<div class="project_r_h">
-  <h2 class="project_h2"><%= l(:label_news) %></h2>
-</div>
+<%= content_for(:header_tags) do %>
+    <%= import_ke(enable_at: false, prettify: false, init_activity: false) %>
+<% end %>
+
+<script type="text/javascript">
+    $(function(){
+        $("#RSide").removeAttr("id");
+        $("#Container").css("width","1000px");
+    });
+</script>
+<script>
+    function expand_reply(container,btnid){
+        var target = $(container).children();
+        var btn = $(btnid);
+        if(btn.data('init')=='0'){
+            btn.data('init',1);
+            btn.html('收起回复');
+            target.show();
+        }else{
+            btn.data('init',0);
+            btn.html('展开更多');
+            target.hide();
+            target.eq(0).show();
+            target.eq(1).show();
+            target.eq(2).show();
+        }
+    }
+    $(function() {
+        showNormalImage('message_description_<%= @news.id %>');
+    });
+</script>
 
-<% if authorize_for('news', 'edit') %>
-    <div id="edit-news" style="display:none;">
-      <%= labelled_form_for :news, @news, :url => news_path(@news),
-                           :html => { :id => 'news-form', :multipart => true, :method => :put } do |f| %>
-          <%= render :partial => 'project_form', :locals => { :f => f, :is_new => false } %>
-      <% end %>
-      <div id="preview" class="wiki"></div>
+<div class="postRightContainer ml10" onmouseover="$('#message_setting_<%= @news.id%>').show();" onmouseout="$('#message_setting_<%= @news.id%>').hide();">
+  <div class="postThemeContainer">
+    <div class="postDetailPortrait">
+      <%= link_to image_tag(url_to_avatar(@news.author),:width=>50,:height => 50,:alt=>'图像' ),user_path(@news.author) %>
     </div>
-<% end %>
+    <div class="postThemeWrap">
+      <% if User.current.allowed_to?(:manage_news, @project)%>
+          <div class="homepagePostSetting" id="message_setting_<%= @news.id%>" style="display: none">
+            <ul>
+              <li class="homepagePostSettingIcon">
+                <ul class="homepagePostSettiongText">
+                  <li><%= link_to("发送", 'javascript:void(0)',:class => "postOptionLink",:onclick=>"show_send('#{@news.id}','#{User.current.id}','news')")  %></li>
+                  <li>
+                    <%= link_to(
+                                l(:button_edit),
+                                {:action => 'edit', :id => @news},
+                                :class => 'postOptionLink'
+                        ) if User.current.allowed_to?(:manage_news, @project) %>
+                  </li>
+                  <li>
+                    <%= delete_link(
+                                news_path(@news),
+                                :data => {:confirm => l(:text_are_you_sure)},
+                                :class => 'postOptionLink'
+                        ) if User.current.allowed_to?(:manage_news, @project) %>
+                  </li>
+                </ul>
+              </li>
+            </ul>
+          </div>
+      <% elsif User.current.logged? %>
+          <div class="homepagePostSetting" id="message_setting_<%= @news.id%>" style="display: none">
+            <ul>
+              <li class="homepagePostSettingIcon">
+                <ul class="homepagePostSettiongText">
+                  <li><%= link_to("发送", 'javascript:void(0)',:class => "postOptionLink",:onclick=>"show_send('#{@news.id}','#{User.current.id}','news')")  %></li>
+                </ul>
+              </li>
+            </ul>
+          </div>
+      <%end%>
+      <div class="postDetailTitle fl">
+        <a href="javascript:void(0);" class="f14 linkGrey4 fb" style="overflow:hidden;">通知: <%= @news.title%></a>
+      </div>
+      <div class="cl"></div>
 
-<div class="problem_main">
-      <%= link_to image_tag(url_to_avatar(@news.author),:width => 42,:height => 42), user_path(@news.author), :class => "problem_pic fl" %>
-      <div class="problem_txt fl mt5 list_style">
-        <h4 class="r_txt_tit mb5">  <%=h @news.title %></h4>
-        <%#= watcher_link(@news, User.current) %>
-        <%= link_to(l(:button_edit),
-                    edit_news_path(@news),
-                    :class => 'talk_edit fr',
-                    :accesskey => accesskey(:edit),
-                    :onclick => '$("#edit-news").show(); return false;') if User.current.allowed_to?(:manage_news, @project) %>
-        <%= delete_link news_path(@news),:class => 'talk_edit fr' if User.current.allowed_to?(:manage_news, @project) %>
-        <div class="cl"></div>
-        <div class="mb5" style="word-break:break-all;"><%= textAreailizable(@news, :description) %> </div>
-        <%= link_to_attachments_course @news %><br />
-        <%= l(:label_create_time) %> ：  <%= format_time(@news.created_on) %>
-        <!--<a href="#" class=" link_file">附件：爱覅俄方if.zip(27.5kB)</a> -->
+      <div class="postDetailCreater">
+        <% if @news.try(:author).try(:realname) == ' ' %>
+            <%= link_to @news.try(:author), user_path(@news.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %>
+        <% else %>
+            <%= link_to @news.try(:author).try(:realname), user_path(@news.author,:host=>Setting.host_user), :class => "linkBlue2", :target=> "_blank" %>
+        <% end %>
+      </div>
+      <div class="postDetailDate mb5"><%= format_time( @news.created_on)%></div>
+      <div class="cl"></div>
+      <div class="memo-content upload_img break_word" id="message_description_<%= @news.id %>" style="word-break: break-all; word-wrap:break-word;margin-bottom: 0px !important;" >
+        <%= @news.description.html_safe%>
       </div>
       <div class="cl"></div>
+      <div class=" fl" style="width: 600px">
+        <%= link_to_attachments_course @news, :author => false %>
+      </div>
     </div>
-<!--add comment-->
-<% if @news.commentable? %>
-    <div class="msg_box">
-          <%= toggle_link l(:label_comment_add), "add_comment_form", :focus => "comment_comments" %>
-        </p>
-        <%= form_tag({:controller => 'comments', :action => 'create', :id => @news}, :id => "add_comment_form") do %>
-            <div class="box">
-              <%= text_area 'comment', 'comments',  :rows => 5, :style => "width:98%" %>
+    <div class="cl"></div>
+  </div>
+  <div class="cl"></div>
+  <div class="homepagePostReply">
+    <% unless @comments.empty? %>
+        <div class="homepagePostReplyBanner">
+          <div class="homepagePostReplyBannerCount">回复（<%=@comments.count %>）</div>
+          <div class="homepagePostReplyBannerTime"></div>
+        </div>
+        <div class="" id="reply_div_<%=@news.id %>">
+          <% @comments.each_with_index  do |reply,i| %>
+              <script type="text/javascript">
+                  $(function(){
+                      showNormalImage('reply_message_description_<%= reply.id %>');
+                  });
+              </script>
+              <div class="homepagePostReplyContainer" onmouseover="$('#reply_edit_menu_<%= reply.id%>').show();" onmouseout="$('#reply_edit_menu_<%= reply.id%>').hide();">
+                <div class="homepagePostReplyPortrait">
+                  <%= link_to image_tag(url_to_avatar(reply.author), :width => 33,:height => 33), user_path(reply.author) %>
+                </div>
+                <div class="homepagePostReplyDes">
+                  <div class="homepagePostReplyPublisher">
+                    <% if reply.try(:author).try(:realname) == ' ' %>
+                        <%= link_to reply.try(:author), user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %>
+                    <% else %>
+                        <%= link_to reply.try(:author).try(:realname), user_path(reply.author_id,:host=>Setting.host_user), :class => "newsBlue mr10 f14" %>
+                    <% end %>
+                  </div>
+                  <div class="homepagePostReplyContent upload_img break_word table_maxWidth" id="reply_message_description_<%= reply.id %>">
+                    <%= reply.comments.html_safe%>
+                  </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">
+                      <%= link_to(
+                                  l(:button_delete),
+                                  {:controller => 'comments',
+                                   :action => 'destroy', :id => @news,
+                                   :comment_id => reply},
+                                  :method => :delete,
+                                  :class => 'fr newsGrey',
+                                  :data => {:confirm => l(:text_are_you_sure)},
+                                  :title => l(:button_delete)
+                          ) if @news.author == User.current %>
+                    </div>
+                  </div>
+                  <p id="reply_message_<%= reply.id%>"></p>
+                </div>
+                <div class="cl"></div>
+              </div>
+          <% end %>
+        </div>
 
-            </div>
-            <a onclick="submitComment();"  class="blue_btn fr" href="javascript:void(0)" ><%= l(:label_comment_add) %></a>
-        <% end %>
     <% end %>
-    </div>
-<% comments = @comments.reverse %>
-<% comments.each do |comment| %>
-      <% next if comment.new_record? %>
-      <div class="ping_C mb10">
-        <div class="ping_dispic"><%= link_to image_tag(url_to_avatar(comment.author),:width => 42,:height => 42), user_path(comment.author), :class => "ping_dispic" %></div>
-        <div class="ping_discon">
-          <div class="ping_distop">
-            <%= link_to_user_header(comment.author,false,:class => 'c_blue fb fl mb10 ') if comment.respond_to?(:author) %><span class="c_grey fr"><%= format_time(comment.created_on) %></span>
+    <div class="cl"></div>
+    <% if @news.commentable? %>
+        <div class="talkWrapMsg" nhname="about_talk_reply">
+          <em class="talkWrapArrow"></em>
+          <div class="cl"></div>
+          <div class="talkConIpt ml5 mb10" id="reply<%= @news.id %>">
+            <%= form_for @comment, :url=>{:controller => 'comments', :action => 'create', :id => @news}, :html => {:multipart => true, :id => 'add_comment_form'} do |f| %>
+                <div class="box"  id="news_comment">
+                  <%= hidden_field_tag :asset_id,params[:asset_id],:required => false,:style => 'display:none' %>
+                  <%= f.kindeditor :comments, :editor_id => 'comment_editor',
+                                   :owner_id => @comment.nil? ? 0: @comment.id,
+                                   :owner_type => OwnerTypeHelper::COMMENT,
+                                   :width => '99%',
+                                   :height => 100,
+                                   :minHeight=>100,
+                                   :input_html => { :id => 'comment_content',
+                                                    :class => 'talk_text fl',
+                                                    :maxlength => 5000 }%>
+                </div>
+                <p id="add_reply_news"></p>
+                <p class="mt10">
+                  <a href="javascript:void(0)" class="grey_btn fr ml10 mr5" onclick="KindEditor.instances[0].html('');">
+                    <%= l(:label_cancel_with_space) %>
+                  </a>
+                  <a href="javascript:void(0)" class="blue_btn fr" onclick="submitComment();">
+                    <%= l(:label_comment_with_space) %>
+                  </a>
+                </p>
+            <% end %>
             <div class="cl"></div>
-            <p><%= textAreailizable(comment.comments) %></p>
-          </div>
-          <div class="ping_disfoot"><%= link_to_if_authorized image_tag('delete.png'), {:controller => 'comments', :action => 'destroy', :id => @news, :comment_id => comment},
-                                                              :data => {:confirm => l(:text_are_you_sure)},
-                                                              :method => :delete,
-                                                              :title => l(:button_delete) %>
           </div>
         </div>
-        <div class="cl"></div>
-      </div>
-  <% end if @comments.any? %>
+    <% end %>
+  </div>
 </div>
-<% content_for :header_tags do %>
-    <%= stylesheet_link_tag 'scm' %>
-<% end %>
-<% html_title @news.title -%>

app/views/news/edit.html.erb

@@ -16,8 +16,12 @@
   </div>
   <%= labelled_form_for :news, @news, :url => news_path(@news),
                         :html => { :id => 'news-form', :multipart => true, :method => :put } do |f| %>
-  <%#= labelled_form_for :news, :url =>{:controller=>'news',:action => 'new',  :course_id => @course.id},
-                        :html => {:nhname=>'form',:multipart => true, :id => 'news-form'} do |f| %>
-      <%= render :partial => 'course_news_new', :locals => {:f => f, :news => @news, :edit_mode => true, :course => @course} %>
+      <% if @org_subfield %>
+      <%= render :partial => 'edit_for_org_subfield', :locals => {:f => f, :news => @news} %>
+      <% elsif @course %>
+        <%= render :partial => 'course_news_new', :locals => {:f => f, :news => @news, :edit_mode => true, :course => @course} %>
+      <% elsif @project %>
+      <%= render :partial => 'project_news_new', :locals => {:f => f, :news => @news, :edit_mode => true} %>
+      <% end %>
   <% end %>
 </div>

app/views/news/index.html.erb

@@ -3,3 +3,6 @@
 <% elsif @course %>
     <%= render :partial => 'course_news', locals: {course: @course} %>
 <% end %>
+
+
+