From c303f7ff3fb07eacca19001491d52b50b579e2dd Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Thu, 21 Jan 2016 14:33:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E5=88=86=E4=BA=AB=E7=9A=84js=E6=96=B9?=
 =?UTF-8?q?=E6=B3=95=E7=BB=9F=E4=B8=80=EF=BC=8C=E5=88=86=E4=BA=AB=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E3=80=81=E9=80=9A=E7=9F=A5=E7=AD=89=E5=9D=87=E5=8F=AF?=
 =?UTF-8?q?=E5=A4=8D=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/news_controller.rb            |  10 +-
 app/views/files/_course_list.html.erb         |   4 +-
 app/views/files/_file_tools.html.erb          |   4 +-
 app/views/files/_org_subfield_list.html.erb   |   4 +-
 app/views/files/_tool_settings.html.erb       |   4 +-
 app/views/files/index.html.erb                |  98 ---------------
 app/views/news/index.html.erb                 | 113 -----------------
 app/views/news/index.js.erb                   |   2 +-
 .../org_subfields/_show_post_type.html.erb    | 115 -----------------
 app/views/org_subfields/show.html.erb         |  98 ---------------
 .../organizations/_org_subfield_news.html.erb |   2 +-
 app/views/users/_course_news.html.erb         |   2 +-
 app/views/users/_project_news.html.erb        |   2 +-
 .../users/_resource_share_for_orgs.html.erb   |   4 +-
 ..._resource_share_for_project_popup.html.erb |   4 +-
 .../users/_resource_share_popup.html.erb      |   4 +-
 .../users/_share_news_to_course.html.erb      |   4 +-
 app/views/users/_share_news_to_org.html.erb   |   4 +-
 .../users/_share_news_to_project.html.erb     |   4 +-
 app/views/users/user_resource.html.erb        |  96 +-------------
 public/javascripts/application.js             | 117 ++++++++++++++++++
 21 files changed, 153 insertions(+), 542 deletions(-)

diff --git a/app/controllers/news_controller.rb b/app/controllers/news_controller.rb
index 5c9c48904..0962deb10 100644
--- a/app/controllers/news_controller.rb
+++ b/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
diff --git a/app/views/files/_course_list.html.erb b/app/views/files/_course_list.html.erb
index f1d96d22c..47c08d2fb 100644
--- a/app/views/files/_course_list.html.erb
+++ b/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 %>
diff --git a/app/views/files/_file_tools.html.erb b/app/views/files/_file_tools.html.erb
index df4d9d738..91b475600 100644
--- a/app/views/files/_file_tools.html.erb
+++ b/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 %>
diff --git a/app/views/files/_org_subfield_list.html.erb b/app/views/files/_org_subfield_list.html.erb
index 424319889..7a5d95125 100644
--- a/app/views/files/_org_subfield_list.html.erb
+++ b/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 %>
diff --git a/app/views/files/_tool_settings.html.erb b/app/views/files/_tool_settings.html.erb
index 72ec6d89f..41d74b7df 100644
--- a/app/views/files/_tool_settings.html.erb
+++ b/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 %>
diff --git a/app/views/files/index.html.erb b/app/views/files/index.html.erb
index b702d5872..8cb547b13 100644
--- a/app/views/files/index.html.erb
+++ b/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;  //标签的值
diff --git a/app/views/news/index.html.erb b/app/views/news/index.html.erb
index bd3c99672..c4dd11ea0 100644
--- a/app/views/news/index.html.erb
+++ b/app/views/news/index.html.erb
@@ -4,118 +4,5 @@
     <%= render :partial => 'course_news', locals: {course: @course} %>
 <% end %>
 
-<script type='text/javascript'>
-    function org_id_click(){
-        var sendText = $("input[name='org_id']:checked").next().text();
-        var orgDirection = "目标地址："
-        $(".orgDirection").text(orgDirection + sendText);
-    }
-    function subfield_click(){
-        var sendText = $("input[name='org_id']:checked").next().text();
-        var orgDirection = "目标地址："
-        var sendColumn = $("input[name='subfield']:checked").next().text();
-        $(".orgDirection").text(orgDirection + sendText + " / " + sendColumn);
-    }
 
-    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 + '&send_type=news'
-            });
-        }else if(lastSendType == '1'){
-            $.ajax({
-                type: 'get',
-                url: '<%= search_user_course_user_path(User.current)%>' + '?send_id=' + id + '&send_type=news'
-            });
-        }else if( lastSendType == '3'){//组织
-            $.ajax({
-                type: 'get',
-                url: '<%= search_user_org_user_path(User.current)%>' + '?send_id=' + id + '&send_type=news'
-            });
-        }else{
-            $.ajax({
-                type: 'get',
-                url: '<%= search_user_course_user_path(User.current)%>' + '?send_id=' + id + '&send_type=news'
-            });
-        }
-    }
-
-    //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 + '&send_type=news'
-                });
-            } else if(sendType == '2') {
-                $.ajax({
-                    type: 'get',
-                    url: '<%= search_user_project_user_path(User.current)%>' + '?send_id=' + res_id + '&send_type=news'
-                });
-            }else if(sendType == '3'){
-                $.ajax({
-                    type: 'get',
-                    url: '<%= search_user_org_user_path(User.current)%>' + '?send_id=' + res_id + '&send_type=news'
-                });
-            }
-        }
-
-        lastSendType = sendType;
-    }
-<% end %>
-
-</script>
 
diff --git a/app/views/news/index.js.erb b/app/views/news/index.js.erb
index 302c0cf9d..d2cac877c 100644
--- a/app/views/news/index.js.erb
+++ b/app/views/news/index.js.erb
@@ -1,5 +1,5 @@
 <% if @project %>
-    $("#news_list").html("<%= escape_javascript(render :partial => 'course_news_list', :locals=>{ :newss=>@newss,:obj_pages=>@obj_pages, :obj_count=>@obj_count})%>");
+    $("#show_more_project_news").replaceWith("<%= escape_javascript(render :partial => 'project_news_detail', :locals=>{ :all_news=>@newss,:page => @page})%>");
 <% else %>
     $("#show_more_course_news").replaceWith("<%= escape_javascript( render :partial =>  'course_news_detail', :locals =>{:newss => @newss, :page => @page} )%>");
 <% end %>
\ No newline at end of file
diff --git a/app/views/org_subfields/_show_post_type.html.erb b/app/views/org_subfields/_show_post_type.html.erb
index 6faabd3e9..bc95c0774 100644
--- a/app/views/org_subfields/_show_post_type.html.erb
+++ b/app/views/org_subfields/_show_post_type.html.erb
@@ -29,121 +29,6 @@
                            :org_act_count=> @org_activities.count} %>
 <% end %>
 
-<script type='text/javascript'>
-    function org_id_click(){
-        var sendText = $("input[name='org_id']:checked").next().text();
-        var orgDirection = "目标地址："
-        $(".orgDirection").text(orgDirection + sendText);
-    }
-    function subfield_click(){
-        var sendText = $("input[name='org_id']:checked").next().text();
-        var orgDirection = "目标地址："
-        var sendColumn = $("input[name='subfield']:checked").next().text();
-        $(".orgDirection").text(orgDirection + sendText + " / " + sendColumn);
-    }
-
-    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 + '&send_type=news'
-            });
-        }else if(lastSendType == '1'){
-            $.ajax({
-                type: 'get',
-                url: '<%= search_user_course_user_path(User.current)%>' + '?send_id=' + id + '&send_type=news'
-            });
-        }else if( lastSendType == '3'){//组织
-            $.ajax({
-                type: 'get',
-                url: '<%= search_user_org_user_path(User.current)%>' + '?send_id=' + id + '&send_type=news'
-            });
-        }else{
-            $.ajax({
-                type: 'get',
-                url: '<%= search_user_course_user_path(User.current)%>' + '?send_id=' + id + '&send_type=news'
-            });
-        }
-    }
-
-    //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 + '&send_type=news'
-                });
-            } else if(sendType == '2') {
-                $.ajax({
-                    type: 'get',
-                    url: '<%= search_user_project_user_path(User.current)%>' + '?send_id=' + res_id + '&send_type=news'
-                });
-            }else if(sendType == '3'){
-                $.ajax({
-                    type: 'get',
-                    url: '<%= search_user_org_user_path(User.current)%>' + '?send_id=' + res_id + '&send_type=news'
-                });
-            }
-        }
-
-        lastSendType = sendType;
-    }
-    <% end %>
-
-</script>
-
 
 
 
diff --git a/app/views/org_subfields/show.html.erb b/app/views/org_subfields/show.html.erb
index 374088acf..82203b4de 100644
--- a/app/views/org_subfields/show.html.erb
+++ b/app/views/org_subfields/show.html.erb
@@ -238,105 +238,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;  //标签的值
diff --git a/app/views/organizations/_org_subfield_news.html.erb b/app/views/organizations/_org_subfield_news.html.erb
index 3cb530860..074d15a42 100644
--- a/app/views/organizations/_org_subfield_news.html.erb
+++ b/app/views/organizations/_org_subfield_news.html.erb
@@ -35,7 +35,7 @@
           <li class="homepagePostSettingIcon">
             <% if User.current.logged? %>
                 <ul class="homepagePostSettiongText">
-                  <li><%= link_to("发&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;送".html_safe, 'javascript:void(0)',:class => "postOptionLink",:onclick=>"show_send('#{activity.id}')")  %></li>
+                  <li><%= link_to("发&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;送".html_safe, 'javascript:void(0)',:class => "postOptionLink",:onclick=>"show_send('#{activity.id}','#{User.current.id}','news')")  %></li>
                 </ul>
             <% end %>
           </li>
diff --git a/app/views/users/_course_news.html.erb b/app/views/users/_course_news.html.erb
index fdb8f2476..ea61e2895 100644
--- a/app/views/users/_course_news.html.erb
+++ b/app/views/users/_course_news.html.erb
@@ -40,7 +40,7 @@
           <li class="homepagePostSettingIcon">
             <% if User.current.logged? %>
                 <ul class="homepagePostSettiongText">
-                  <li><%= link_to("发&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;送".html_safe, 'javascript:void(0)',:class => "postOptionLink",:onclick=>"show_send('#{activity.id}')")  %></li>
+                  <li><%= link_to("发&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;送".html_safe, 'javascript:void(0)',:class => "postOptionLink",:onclick=>"show_send('#{activity.id}',#{User.current.id},'news')")  %></li>
                 </ul>
             <% end %>
           </li>
diff --git a/app/views/users/_project_news.html.erb b/app/views/users/_project_news.html.erb
index 57597d6e4..eb4941668 100644
--- a/app/views/users/_project_news.html.erb
+++ b/app/views/users/_project_news.html.erb
@@ -37,7 +37,7 @@
           <li class="homepagePostSettingIcon">
             <% if User.current.logged? %>
                 <ul class="homepagePostSettiongText">
-                  <li><%= link_to("发&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;送".html_safe, 'javascript:void(0)',:class => "postOptionLink",:onclick=>"show_send('#{activity.id}')")  %></li>
+                  <li><%= link_to("发&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;送".html_safe, 'javascript:void(0)',:class => "postOptionLink",:onclick=>"show_send('#{activity.id}','#{User.current.id}','news')")  %></li>
                 </ul>
             <% end %>
           </li>
diff --git a/app/views/users/_resource_share_for_orgs.html.erb b/app/views/users/_resource_share_for_orgs.html.erb
index 5a712b857..792db7546 100644
--- a/app/views/users/_resource_share_for_orgs.html.erb
+++ b/app/views/users/_resource_share_for_orgs.html.erb
@@ -1,7 +1,7 @@
 <div >
     <div class="relateText fl mb10 mr5">发送到</div>
     <div class="resourcesSendTo mr15">
-      <select class="resourcesSendType" onclick="chooseSendType('<%= send_id%>','<%= send_ids%>');">
+      <select class="resourcesSendType" onclick="chooseSendType('<%= send_id%>','<%= send_ids%>','<%= User.current.id %>','file');">
         <option value="1">课程</option>
         <option value="2">项目</option>
         <option value="3" selected>组织</option>
@@ -13,7 +13,7 @@
       <%= hidden_field_tag(:send_ids, send_ids) %>
     <input type="text" name="serach" id="search_org_input" value="<%=@search %>" placeholder="输入名称搜索" class="orgSendSearch mt15" />
       <script>
-          observeSearchfieldOnInput('search_org_input','<%= search_user_org_user_path(user)%>','<%= send_id %>','<%= send_ids%>')
+          observeSearchfieldOnInput('search_org_input','<%= search_user_org_user_path(user)%>','<%= send_id %>','<%= send_ids%>','file')
       </script>
   <% end %>
     <div class="cl"></div>
diff --git a/app/views/users/_resource_share_for_project_popup.html.erb b/app/views/users/_resource_share_for_project_popup.html.erb
index f15c29e90..33fa03061 100644
--- a/app/views/users/_resource_share_for_project_popup.html.erb
+++ b/app/views/users/_resource_share_for_project_popup.html.erb
@@ -2,7 +2,7 @@
   <div>
     <div class="sendText fl mr10" style="width: auto">发送到</div>
     <div class="resourcesSendTo">
-      <select class="resourcesSendType" onclick="chooseSendType('<%= send_id %>','<%= send_ids %>');">
+      <select class="resourcesSendType" onclick="chooseSendType('<%= send_id %>','<%= send_ids %>','<%= User.current.id %>','file');">
         <option value="1">课程</option>
         <option value="2" selected>项目</option>
         <option value="3">组织</option>
@@ -18,7 +18,7 @@
         <%= hidden_field_tag(:send_ids, send_ids) %>
       <input type="text" id="search_project_input" value="<%= @search %>" name="search" placeholder="输入项目ID或者名称搜索" class="searchResourcePopup" />
         <script>
-            observeSearchfieldOnInput('search_project_input','<%= search_user_project_user_path(user)%>','<%= send_id %>','<%= send_ids %>')
+            observeSearchfieldOnInput('search_project_input','<%= search_user_project_user_path(user)%>','<%= send_id %>','<%= send_ids %>','file')
         </script>
       <!--<a href="javascript:void(0);"  class="searchIconPopup"></a>-->
         <%= submit_tag '',:class=>'searchIcon2',:onfocus=>"this.blur();",:style=>'border-style:none' %>
diff --git a/app/views/users/_resource_share_popup.html.erb b/app/views/users/_resource_share_popup.html.erb
index af7bd5bd3..74265cabb 100644
--- a/app/views/users/_resource_share_popup.html.erb
+++ b/app/views/users/_resource_share_popup.html.erb
@@ -4,7 +4,7 @@
   <div>
     <div class="sendText fl mr10" style="width: auto">发送到</div>
     <div class="resourcesSendTo">
-      <select class="resourcesSendType" onclick="chooseSendType('<%= send_id%>','<%= send_ids%>');">
+      <select class="resourcesSendType" onclick="chooseSendType('<%= send_id%>','<%= send_ids%>','<%= User.current.id %>','file');">
         <option value="1">课程</option>
         <option value="2">项目</option>
         <option value="3">组织</option>
@@ -20,7 +20,7 @@
         <%= hidden_field_tag(:send_ids, send_ids) %>
       <input type="text" id="search_course_input" value="<%= @search %>" name="search" placeholder="输入课程ID或者名称搜索" class="searchResourcePopup" />
         <script>
-            observeSearchfieldOnInput('search_course_input','<%= search_user_course_user_path(user)%>','<%= send_id %>','<%= send_ids%>')
+            observeSearchfieldOnInput('search_course_input','<%= search_user_course_user_path(user)%>','<%= send_id %>','<%= send_ids%>','file')
         </script>
       <!--<a href="javascript:void(0);"  class="searchIconPopup"></a>-->
         <%= submit_tag '',:class=>'searchIcon2',:onfocus=>"this.blur();",:style=>'border-style:none' %>
diff --git a/app/views/users/_share_news_to_course.html.erb b/app/views/users/_share_news_to_course.html.erb
index 9865f6af2..144792201 100644
--- a/app/views/users/_share_news_to_course.html.erb
+++ b/app/views/users/_share_news_to_course.html.erb
@@ -4,7 +4,7 @@
   <div>
     <div class="sendText fl mr10" style="width: auto">发送到</div>
     <div class="resourcesSendTo">
-      <select class="resourcesSendType" onclick="chooseSendType('<%= send_id%>','<%= send_ids%>');">
+      <select class="resourcesSendType" onclick="chooseSendType('<%= send_id%>','<%= send_ids%>','<%= User.current.id %>','news');">
         <option value="1">课程</option>
         <option value="2">项目</option>
         <option value="3">组织</option>
@@ -20,7 +20,7 @@
         <%= hidden_field_tag(:send_ids, send_ids) %>
         <input type="text" id="search_course_input" value="<%= @search %>" name="search" placeholder="输入课程ID或者名称搜索" class="searchResourcePopup" />
         <script>
-            observeSearchfieldOnInput('search_course_input','<%= search_user_course_user_path(user)%>','<%= send_id %>','<%= send_ids%>')
+            observeSearchfieldOnInput('search_course_input','<%= search_user_course_user_path(user)%>','<%= send_id %>','<%= send_ids%>','news')
         </script>
         <!--<a href="javascript:void(0);"  class="searchIconPopup"></a>-->
         <%= submit_tag '',:class=>'searchIcon2',:onfocus=>"this.blur();",:style=>'border-style:none' %>
diff --git a/app/views/users/_share_news_to_org.html.erb b/app/views/users/_share_news_to_org.html.erb
index f57a91ae6..794c6db89 100644
--- a/app/views/users/_share_news_to_org.html.erb
+++ b/app/views/users/_share_news_to_org.html.erb
@@ -1,7 +1,7 @@
 <div >
   <div class="relateText fl mb10 mr5">发送到</div>
   <div class="resourcesSendTo mr15">
-    <select class="resourcesSendType" onclick="chooseSendType('<%= send_id%>','<%= send_ids%>');">
+    <select class="resourcesSendType" onclick="chooseSendType('<%= send_id%>','<%= send_ids%>','<%= User.current.id %>','news');">
       <option value="1">课程</option>
       <option value="2">项目</option>
       <option value="3" selected>组织</option>
@@ -13,7 +13,7 @@
       <%= hidden_field_tag(:send_ids, send_ids) %>
       <input type="text" name="serach" id="search_org_input" value="<%=@search %>" placeholder="输入名称搜索" class="orgSendSearch mt15" />
       <script>
-          observeSearchfieldOnInput('search_org_input','<%= search_user_org_user_path(user)%>','<%= send_id %>','<%= send_ids%>')
+          observeSearchfieldOnInput('search_org_input','<%= search_user_org_user_path(user)%>','<%= send_id %>','<%= send_ids%>','news')
       </script>
   <% end %>
   <div class="cl"></div>
diff --git a/app/views/users/_share_news_to_project.html.erb b/app/views/users/_share_news_to_project.html.erb
index 0ae011caf..37bac105a 100644
--- a/app/views/users/_share_news_to_project.html.erb
+++ b/app/views/users/_share_news_to_project.html.erb
@@ -2,7 +2,7 @@
   <div>
     <div class="sendText fl mr10" style="width: auto">发送到</div>
     <div class="resourcesSendTo">
-      <select class="resourcesSendType" onclick="chooseSendType('<%= send_id %>','<%= send_ids %>');">
+      <select class="resourcesSendType" onclick="chooseSendType('<%= send_id %>','<%= send_ids %>','<%= User.current.id %>','news');">
         <option value="1">课程</option>
         <option value="2" selected>项目</option>
         <option value="3">组织</option>
@@ -18,7 +18,7 @@
         <%= hidden_field_tag(:send_ids, send_ids) %>
         <input type="text" id="search_project_input" value="<%= @search %>" name="search" placeholder="输入项目ID或者名称搜索" class="searchResourcePopup" />
         <script>
-            observeSearchfieldOnInput('search_project_input','<%= search_user_project_user_path(user)%>','<%= send_id %>','<%= send_ids %>')
+            observeSearchfieldOnInput('search_project_input','<%= search_user_project_user_path(user)%>','<%= send_id %>','<%= send_ids %>','news')
         </script>
         <!--<a href="javascript:void(0);"  class="searchIconPopup"></a>-->
         <%= submit_tag '',:class=>'searchIcon2',:onfocus=>"this.blur();",:style=>'border-style:none' %>
diff --git a/app/views/users/user_resource.html.erb b/app/views/users/user_resource.html.erb
index 2f94e4401..e395604f4 100644
--- a/app/views/users/user_resource.html.erb
+++ b/app/views/users/user_resource.html.erb
@@ -141,7 +141,7 @@
   <li><a tabindex="-1" href="#" onclick="if(<%= User.current.logged?%>)preview();" onfocus="this.blur()">预览</a></li>
   <li><a tabindex="-1" href="#" onclick="if(<%= User.current.logged?%>)rename();" onfocus="this.blur()">重命名</a></li>
   <!--  data-remote="true" 这个属性会让ajax请求状态标志就在当前按钮的上方显示，就不会滚动浏览器，因而弹出框也会在当前窗口中央展示-->
-  <li><a tabindex="-1" href="#" onclick="if(<%= User.current.logged?%>)show_send();" data-remote="true" onfocus="this.blur()" >发送</a></li>
+  <li><a tabindex="-1" href="#" onclick="if(<%= User.current.logged?%>)show_send_();" data-remote="true" onfocus="this.blur()" >发送</a></li>
   <li><a tabindex="-1" href="#" onclick="if(<%= User.current.logged?%>)delete_file();" onfocus="this.blur()">删除</a></li>
 </ul>
 
@@ -330,7 +330,7 @@
 
 
 
-    function show_send(){
+    function show_send_(){
         $("#contextMenu").hide();
         document.oncontextmenu = function() {return true;}
         line.children().css("background-color",'white');
@@ -338,12 +338,14 @@
         if (lastSendType === '2'){  //如果已经发送过一次了，那么就应该沿用上次发送的类型。
             $.ajax({
                 type: 'get',
-                url: '<%= search_user_project_user_path(@user)%>' + '?send_id=' + id
+                url: '<%= search_user_project_user_path(@user)%>' + '?send_id=' + id,
+                data:{send_type:'file'}
             });
         }else{
             $.ajax({
                 type: 'get',
-                url: '<%= search_user_course_user_path(@user)%>' + '?send_id=' + id
+                url: '<%= search_user_course_user_path(@user)%>' + '?send_id=' + id,
+                data:{send_type:'file'}
             });
         }
     }
@@ -476,91 +478,5 @@
         }
     }
 
-    //id 发送的id
-    //发送的id数组
-    function chooseSendType(res_id,res_ids){
-
-        sendType = $(".resourcesSendType").val();
-        if (sendType === lastSendType) {
-            return;
-        } else if (lastSendType != null) { //不是第一次点击的时候
-            if(res_ids == "") {//如果是单个发送
-                if (sendType === '1') {
-                    $.ajax({
-                        type: 'get',
-                        url: '<%= search_user_course_user_path(@user)%>' + '?send_id=' + id
-                    });
-                } else if(sendType === '2') {
-                    $.ajax({
-                        type: 'get',
-                        url: '<%= search_user_project_user_path(@user)%>' + '?send_id=' + id
-                    });
-                }else if(sendType ==='3')
-                {
-                    $.ajax({
-                        type: 'get',
-                        url: '<%= search_user_org_user_path(@user)%>' + '?send_id=' + res_id
-                    });
-                }
-            }else{//如果是多个发送
-                if (sendType === '1'){
-                    $.ajax({
-                        type: 'get',
-                        url: '<%= search_user_course_user_path(@user)%>' + '?'+ $("#resources_list_form").serialize()
-                    });
-                }else if(sendType === '2'){
-                    $.ajax({
-                        type: 'get',
-                        url: '<%= search_user_project_user_path(@user)%>' + '?' +  $("#resources_list_form").serialize()
-                    });
-                }else if(sendType === '3'){
-                    $.ajax({
-                        type: 'get',
-                        url: '<%= search_user_org_user_path(User.current)%>' + '?'+$("#resources_list_form").serialize()
-                    });
-                }
-            }
-        }
-
-        lastSendType = sendType;
-    }
-
-    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 subfield_click(){
-        var sendText = $("input[name='org_id']:checked").next().text();
-        var orgDirection = "目标地址："
-        var sendColumn = $("input[name='subfield']:checked").next().text();
-        $(".orgDirection").text(orgDirection + sendText + " / " + sendColumn);
-    }
-
 </script>
 
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 193b358dc..2487a3ff0 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -1035,3 +1035,120 @@ function showNormalImage(id) {
     }
 
 }
+
+//文件、帖子、通知分享
+function org_id_click(){
+  var sendText = $("input[name='org_id']:checked").next().text();
+  var orgDirection = "目标地址：";
+  $(".orgDirection").text(orgDirection + sendText);
+}
+function subfield_click(){
+  var sendText = $("input[name='org_id']:checked").next().text();
+  var orgDirection = "目标地址：";
+  var sendColumn = $("input[name='subfield']:checked").next().text();
+  $(".orgDirection").text(orgDirection + sendText + " / " + sendColumn);
+}
+
+function observeSearchfieldOnInput(fieldId, url,send_id,send_ids, send_type) {
+  $('#'+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, send_type:send_type},
+          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;
+  }
+}
+
+var sendType = '1';
+var lastSendType ;//初始为发送到我的课程
+function show_send(id, user_id, send_type){
+  if (lastSendType === '2'){  //如果已经发送过一次了，那么就应该沿用上次发送的类型。
+    $.ajax({
+      type: 'get',
+      url: '/users/' + user_id + '/search_user_project',
+      data:{send_id:id, send_type:send_type}
+    });
+  }else if(lastSendType == '1'){
+    $.ajax({
+      type: 'get',
+      url: '/users/' + user_id + '/search_user_course',
+      data:{send_id:id, send_type:send_type}
+    });
+  }else if( lastSendType == '3'){//组织
+    $.ajax({
+      type: 'get',
+      url: '/users/' + user_id + '/search_user_org',
+      data:{send_id:id, send_type:send_type}
+    });
+  }else{
+    $.ajax({
+      type: 'get',
+      url: '/users/' + user_id + '/search_user_course',
+      data:{send_id:id, send_type:send_type}
+    });
+  }
+}
+
+//id 发送的id
+//发送的id数组
+function chooseSendType(res_id,res_ids, user_id, send_type){
+
+  sendType = $(".resourcesSendType").val();
+  if (sendType === lastSendType) {
+    return;
+  } else if(lastSendType != null) { //不是第一次点击的时候
+    if (sendType == '1') {
+      $.ajax({
+        type: 'get',
+        url: '/users/' + user_id + '/search_user_course',
+        data:{send_id:res_id, send_type:send_type}
+      });
+    } else if(sendType == '2') {
+      $.ajax({
+        type: 'get',
+        url: '/users/' + user_id + '/search_user_project',
+        data:{send_id:res_id, send_type:send_type}
+      });
+    }else if(sendType == '3'){
+      $.ajax({
+        type: 'get',
+        url: '/users/' + user_id + '/search_user_org',
+        data:{send_id:res_id, send_type:send_type}
+      });
+    }
+  }
+  lastSendType = sendType;
+}