From 9fc227d6197e371cca60ebe3e774323f9d4477e4 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Mon, 28 Mar 2016 14:50:26 +0800
Subject: [PATCH 01/14] =?UTF-8?q?=E8=B5=84=E6=BA=90=E5=BA=93=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_resources_list.html.erb     | 353 +++++++++++++++++-
 app/views/users/_user_resource_info.html.erb | 356 +------------------
 2 files changed, 353 insertions(+), 356 deletions(-)

diff --git a/app/views/users/_resources_list.html.erb b/app/views/users/_resources_list.html.erb
index c2b37f0e6..a545038f1 100644
--- a/app/views/users/_resources_list.html.erb
+++ b/app/views/users/_resources_list.html.erb
@@ -26,14 +26,349 @@
     <% end %>
 <% end %>
 
-<ul class="resource-list">
-  <ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu" id="contextMenu">
-    <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?%>)delete_file();" onfocus="this.blur()">删除</a></li>
-  </ul>
-</ul>
+<script>
+    var pageX = 0;
+    var pageY = 0;
+    //当前选中的行
+    var line;
+    //已经选中的行，和当前选中的行的区别是：右键选中为line，换一行右键后，line变为last_line,line变为换行后的line
+    var last_line;
+    //资源名称
+    var res_name;
+    //资源名称的链接
+    var res_link;
+    var id; //资源id
+    var sendType = '1';  //发送到课程 1  发送到项目 2
+    var lastSendType;  //保存上次发送的发送类型
+    $("#resources_list").mousedown(function(e) {
+        //如果是右键的话
+        if (3 == e.which) {
+            if(  $("#res_name").length != 0 || $("#ajax-indicator").is(":hidden") == false){ //其他ajax在执行的时候阻止操作
+                e.preventDefault();
+                return ;
+            }
+            document.oncontextmenu = function() {return false;}
+            pageX = e.clientX;
+            pageY = e.clientY;
+            $("#contextMenu").hide();
+            $("#contextMenu").attr("style","display: block; position: fixed; top:"
+                    + pageY
+                    + "px; left:"
+                    + pageX
+                    + "px; width: 80px;");
+            $("#contextMenu").show();
+            //当前光标所在的对象
 
+            var ele = document.elementFromPoint(pageX,pageY);
+            //转换为jquery对象
+            line = $(ele).parent();
+            //如果上一条存在被选中，那么将上一条的背景色改为白色
+            if(last_line != null){
+                last_line.children().css("background-color", 'white');
+                restore();
+                last_line == null;
+            }
+            //如果当前的tag是li，那么还要li的父级元素
+            if(line.get(0).tagName === 'LI'){
+                line = line.parent();
+            }
+            //将当前的元素的所有子元素的背景色改为蓝色
+            line.children().css("background-color", '#e1e1e1');
+            //将当前元素赋给 上一个对象 保存起来。
+            last_line = line;
+        }
+    });
+    //元素包含关系计算
+    var contains  = function(root, el) {
+        if (root.compareDocumentPosition)
+            return root === el || !!(root.compareDocumentPosition(el) & 16);
+        if (root.contains && el.nodeType === 1){
+            return root.contains(el) && root !== el;
+        }
+        while ((el = el.parentNode))
+            if (el === root) return true;
+        return false;
+    }
+    $(document.body).click(function(e) {
+        //在列表上的任何单击事件都要恢复原来的样子
+        //隐藏右键菜单
+        //e.preventDefault();
+        $("#contextMenu").hide();
+        if( $("#ajax-indicator").is(":hidden") == false && $("#res_name").length != 0 ){ //其他ajax在执行的时候或者res_name仍然存在阻止操作
+            return ;
+        }
+        document.oncontextmenu = function() {return true;}
+        //如果当前行为空，那么要将当前行的拿到
+        var ele;
+        if(line == null){
+            ele = document.elementFromPoint(e.clientX, e.clientY);
+            line = $(ele).parent();
+            //如果是在li上点击事件，那么要获得父组件
+            if(line.get(0).tagName === 'LI'){
+                line = line.parent();
+            }
 
+        }
+        //如果当前对象在表格里，将当前行改变为白色,这里主要是防止点击页面的其他链接的时候，那个链接背景色变白了
+        if( contains($("#resources_list").get(0),line.get(0))){
+            line.children().css("background-color", 'white');
+        }
+
+        //当前行恢复编辑状态到链接状态
+        if(ele && ele.nodeName != 'INPUT') {
+            restore();
+        }
+        line = null;
+    });
+    //只要有一个选中了就是true
+    function checkboxSelected(){
+        selected = false;
+        $("#resources_list").find("input[name='checkbox1[]']").each(function(){
+            if($(this).attr('checked') == true){
+                selected = true;
+            }
+        });
+        return selected;
+    }
+    //只有全选才是true
+    function checkboxAllSelected(){
+        allSelected = true;
+        $("#resources_list").find("input[name='checkbox1[]']").each(function(){
+            if($(this).attr('checked') == undefined){
+                allSelected = false;
+            }
+        });
+        return allSelected;
+    }
+    //只有全部不选才是true
+    function checkboxAllDeselected(){
+        allDeselected = true;
+        $("#resources_list").find("input[name='checkbox1[]']").each(function(){
+            if($(this).attr('checked') == 'checked'){
+                allDeselected = false;
+            }
+        });
+        return allDeselected;
+    }
+    //查看所有的checkbox状态，并且按情况更改$("#checkboxAll")的状态
+    function checkAllBox(checkbox){
+        //只有选中当前checkbox且这个时候所有的checkbox都被选中了，$("#checkboxAll")才是被选中状态，其余都是非选中状态
+        if(checkbox.attr('checked') == 'checked' && checkboxAllSelected()){
+            $("#checkboxAll").attr('checked',true);
+        }else{
+            $("#checkboxAll").attr('checked',false);
+        }
+        $("#res_count").html(getCheckBoxSeletedCount());
+
+    }
+    //获取当前checkbox选中的数目
+    function getCheckBoxSeletedCount(){
+        var i = 0;
+        $("#resources_list").find("input[name='checkbox1[]']").each(function(){
+            if($(this).attr('checked') == 'checked'){
+                i ++;
+            }
+        });
+        return i;
+    }
+    //全选反选
+    function all_select(){
+
+        if($("#checkboxAll").attr('checked')){
+            $("#resources_list").find("input[name='checkbox1[]']").each(function(){
+                $(this).attr('checked',true);
+            });
+            $("#res_count").html(getCheckBoxSeletedCount());
+        }else{
+            $("#resources_list").find("input[name='checkbox1[]']").each(function(){
+                $(this).attr('checked',false);
+            });
+            $("#res_count").html(0);
+        }
+    }
+
+    function show_upload(){
+        $("#ajax-modal").html('<%= escape_javascript( render :partial => 'upload_resource' ,:locals => {:user=>User.current.id,:type=>@type,:status=>@status})%>');
+        showModal('ajax-modal', '452px');
+        $('#ajax-modal').siblings().remove();
+        $('#ajax-modal').before("<a href='javascript:void(0)' onclick='closeModal();' style='margin-left: 435px;' class='resourceClose'></a>");
+        $('#ajax-modal').parent().css("top","50%").css("left","50%").css("position","absolute");
+        $('#ajax-modal').parent().addClass("resourceUploadPopup");
+        $('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
+    }
+    //批量删除
+    function batch_delete(){
+        var data = $("#resources_list_form").serialize();
+        if($("input[type=checkbox][data-has-history=Y]:checked").length != 0){
+            alert("您只能删除没有历史记录的资源，请重新选择后再删除。");
+            return;
+        }
+        if($("input[type=checkbox][data-deleteble=N]:checked").length != 0){
+            alert("您只能删除自己上传的资源，请重新选择后再删除。");
+            return;
+        }
+
+        if(data != "" && confirm('确认要删除这些资源吗？')) {
+            $.post(
+                    '<%= user_resource_delete_user_path(User.current.id,:type=>@type,:status=>@status)%>',
+                    $("#resources_list_form").serialize(),//只会对选中的控件进行序列化提交
+                    function (data) {
+
+                    }
+            );
+        }
+    }
+
+
+
+    function show_send_(){
+        $("#contextMenu").hide();
+        document.oncontextmenu = function() {return true;}
+        line.children().css("background-color",'white');
+        id = line.children().last().html();
+        if (lastSendType === '2'){  //如果已经发送过一次了，那么就应该沿用上次发送的类型。
+            $.ajax({
+                type: 'get',
+                url: '<%= search_user_project_user_path(User.current.id)%>' + '?send_id=' + id,
+                data:{send_type:'file'}
+            });
+        }else{
+            $.ajax({
+                type: 'get',
+                url: '<%= search_user_course_user_path(User.current.id)%>' + '?send_id=' + id,
+                data:{send_type:'file'}
+            });
+        }
+    }
+
+    function batch_send(){
+        if($("#resources_list_form").serialize() == ""){
+            alert('暂时不支持多页选择，您当前页没有选择任何资源');
+            return ;
+        }
+        if (lastSendType === '2'){  //如果已经发送过一次了，那么就应该沿用上次发送的类型。
+            $.ajax({
+                type: 'get',
+                url: '<%= search_user_project_user_path(User.current.id)%>' + '?' +  $("#resources_list_form").serialize(),
+                data:{send_type:'file'}
+            });
+        }else{
+            $.ajax({
+                type: 'get',
+                url: '<%= search_user_course_user_path(User.current.id)%>' + '?'+ $("#resources_list_form").serialize(),
+                data:{send_type:'file'}
+            });
+
+        }
+    }
+
+    function preview(){
+        $("#contextMenu").hide();
+        document.oncontextmenu = function() {return true;}
+        line.children().css("background-color",'white');
+        id = line.children().last().html();
+        $.ajax({
+            type:'get',
+            url:'<%= resource_preview_user_path(User.current.id)%>'+"?resource_id="+id
+        });
+    }
+
+    function rename(){
+        $("#contextMenu").hide();
+        document.oncontextmenu = function() {return true;}
+        line.children().css("background-color",'white');
+        id = line.children().last().html();
+        user_id = line.children().eq(5).html();
+        if(user_id === '<%= User.current.id %>') {
+            res_name = line.children().eq(1).children().attr('title');
+            res_link = line.children().eq(1).html();
+            line.children().eq(1).html(
+                            '<input name="res_name" id="res_name" ' +
+                            'style="height: 2em;line-height: 2em;overflow: hidden;" onblur="restore();" ' +
+                            ' onkeypress="if(event.keyCode==13){event.preventDefault();this.blur();}" ' +
+                            'value="'+res_name+
+                            '"/>  <input type="hidden" id ="res_id" name="res_id" value="'+id+'"/>');
+            $("#res_name").focus();
+            $("html,body").animate({scrollTop:$("#res_name").offset().top},1000)
+        }else{
+            alert('您无法修改此资源！')
+        }
+    }
+    String.prototype.trim = function() {
+        var str = this,
+                str = str.replace(/^\s\s*/, ''),
+                ws = /\s/,
+                i = str.length;
+        while (ws.test(str.charAt(--i)));
+        return str.slice(0, i + 1);
+    }
+
+
+
+    //恢复编辑状态到链接状态
+    //如果当前是编辑状态，任何的不在输入框里的单击右键事件都需要将编辑状态变回链接状态
+    //如果是编辑状态，且做了修改，那么久要进行修改，并且将修改值经过处理替换到页面显示
+    function restore(){
+        //上一行不为空 且链接不为空
+        if( last_line != null && res_link != null && res_link != '') {
+            name = $("#res_name").lenght != 0 && $("#res_name").val() != undefined  ?  $("#res_name").val().trim() : undefined ;
+            if (name == undefined || name === 'undefined' ){ //只要res_name没有值，那么就不是编辑状态
+                return;
+            }
+            if( name && name != res_name.trim()){
+
+                if(confirm('确定修改为 '+name)){
+                    $.ajax({
+                        url:  '<%=rename_resource_user_path(User.current.id) %>'+  "?res_name="+$('#res_name').val() + "&res_id=" + $("#res_id").val(),
+                        type:'get',
+                        success:function (data)
+                        {
+                            if (data != 'fail' && name != undefined && name != 'undefined') {//修改成功，那么将链接恢复，并且将链接的显示内容改变。链接可以不变
+                                last_line.children().eq(1).html(res_link);
+                                last_line.children().eq(1).children().attr('title', name);
+                                last_line.children().eq(1).children().attr('href', data);
+                                last_line.children().eq(1).children().html(name.length > 17 ? name.substring(0, 17) + '...' : name);
+                            } else {
+                                last_line.children().eq(1).html(res_link);
+                                res_link = null; //如果修改失败，恢复之后将res_link置空
+                            }
+                        }
+                    } );
+                }else{
+                    last_line.children().eq(1).html(res_link);
+                    res_link = null; //如果没有做修改，恢复之后将res_link置空
+                }
+            }else {
+                last_line.children().eq(1).html(res_link);
+                res_link = null;//如果没有做修改，恢复之后将res_link置空
+            }
+
+
+        }
+    }
+
+    function delete_file() {
+        $("#contextMenu").hide();
+        document.oncontextmenu = function () {
+            return true;
+        }
+        line.children().css("background-color", 'white');
+        id = line.children().last().html();
+        user_id = line.children().eq(5).html();
+        if(line.children().first().children().data('hasHistory') == 'Y'){
+            alert('该资源存在历史版本，不能删除');
+            return;
+        }
+        if(user_id === '<%= User.current.id%>') {
+            if (confirm('确定要删除资源"' + line.children().eq(1).children().attr('title').trim() + '"么?')) {
+                $.ajax({
+                    type: 'post',
+                    url: '<%= user_resource_delete_user_path(User.current.id)%>' + '?resource_id=' + id + '&type=<%=@type %>&status=<%=@status %>'
+                });
+            }
+        }else{
+            alert('您无法删除此资源！')
+        }
+    }
+
+</script>
diff --git a/app/views/users/_user_resource_info.html.erb b/app/views/users/_user_resource_info.html.erb
index bf36e4b38..bea78130a 100644
--- a/app/views/users/_user_resource_info.html.erb
+++ b/app/views/users/_user_resource_info.html.erb
@@ -37,350 +37,12 @@
 <!--<div id="upload_box" style="display: none">-->
 <!--<%#= render :partial => 'upload_resource' ,:locals => {:user=>@user}%>-->
 <!--</div>-->
-<script>
-    var pageX = 0;
-    var pageY = 0;
-    //当前选中的行
-    var line;
-    //已经选中的行，和当前选中的行的区别是：右键选中为line，换一行右键后，line变为last_line,line变为换行后的line
-    var last_line;
-    //资源名称
-    var res_name;
-    //资源名称的链接
-    var res_link;
-    var id; //资源id
-    var sendType = '1';  //发送到课程 1  发送到项目 2
-    var lastSendType;  //保存上次发送的发送类型
-    $("#resources_list").mousedown(function(e) {
-        //如果是右键的话
-        if (3 == e.which) {
-            if(  $("#res_name").length != 0 || $("#ajax-indicator").is(":hidden") == false){ //其他ajax在执行的时候阻止操作
-                e.preventDefault();
-                return ;
-            }
-            document.oncontextmenu = function() {return false;}
-            pageX = e.clientX;
-            pageY = e.clientY;
-            $("#contextMenu").hide();
-            $("#contextMenu").attr("style","display: block; position: fixed; top:"
-                    + pageY
-                    + "px; left:"
-                    + pageX
-                    + "px; width: 80px;");
-            $("#contextMenu").show();
-            //当前光标所在的对象
-
-            var ele = document.elementFromPoint(pageX,pageY);
-            //转换为jquery对象
-            line = $(ele).parent();
-            //如果上一条存在被选中，那么将上一条的背景色改为白色
-            if(last_line != null){
-                last_line.children().css("background-color", 'white');
-                restore();
-                last_line == null;
-            }
-            //如果当前的tag是li，那么还要li的父级元素
-            if(line.get(0).tagName === 'LI'){
-                line = line.parent();
-            }
-            //将当前的元素的所有子元素的背景色改为蓝色
-            line.children().css("background-color", '#e1e1e1');
-            //将当前元素赋给 上一个对象 保存起来。
-            last_line = line;
-        }
-    });
-    //元素包含关系计算
-    var contains  = function(root, el) {
-        if (root.compareDocumentPosition)
-            return root === el || !!(root.compareDocumentPosition(el) & 16);
-        if (root.contains && el.nodeType === 1){
-            return root.contains(el) && root !== el;
-        }
-        while ((el = el.parentNode))
-            if (el === root) return true;
-        return false;
-    }
-    $(document.body).click(function(e) {
-        //在列表上的任何单击事件都要恢复原来的样子
-        //隐藏右键菜单
-        //e.preventDefault();
-        $("#contextMenu").hide();
-        if( $("#ajax-indicator").is(":hidden") == false && $("#res_name").length != 0 ){ //其他ajax在执行的时候或者res_name仍然存在阻止操作
-            return ;
-        }
-        document.oncontextmenu = function() {return true;}
-        //如果当前行为空，那么要将当前行的拿到
-        var ele;
-        if(line == null){
-            ele = document.elementFromPoint(e.clientX, e.clientY);
-            line = $(ele).parent();
-            //如果是在li上点击事件，那么要获得父组件
-            if(line.get(0).tagName === 'LI'){
-                line = line.parent();
-            }
-
-        }
-        //如果当前对象在表格里，将当前行改变为白色,这里主要是防止点击页面的其他链接的时候，那个链接背景色变白了
-        if( contains($("#resources_list").get(0),line.get(0))){
-            line.children().css("background-color", 'white');
-        }
-
-        //当前行恢复编辑状态到链接状态
-        if(ele && ele.nodeName != 'INPUT') {
-            restore();
-        }
-        line = null;
-    });
-    //只要有一个选中了就是true
-    function checkboxSelected(){
-        selected = false;
-        $("#resources_list").find("input[name='checkbox1[]']").each(function(){
-            if($(this).attr('checked') == true){
-                selected = true;
-            }
-        });
-        return selected;
-    }
-    //只有全选才是true
-    function checkboxAllSelected(){
-        allSelected = true;
-        $("#resources_list").find("input[name='checkbox1[]']").each(function(){
-            if($(this).attr('checked') == undefined){
-                allSelected = false;
-            }
-        });
-        return allSelected;
-    }
-    //只有全部不选才是true
-    function checkboxAllDeselected(){
-        allDeselected = true;
-        $("#resources_list").find("input[name='checkbox1[]']").each(function(){
-            if($(this).attr('checked') == 'checked'){
-                allDeselected = false;
-            }
-        });
-        return allDeselected;
-    }
-    //查看所有的checkbox状态，并且按情况更改$("#checkboxAll")的状态
-    function checkAllBox(checkbox){
-        //只有选中当前checkbox且这个时候所有的checkbox都被选中了，$("#checkboxAll")才是被选中状态，其余都是非选中状态
-        if(checkbox.attr('checked') == 'checked' && checkboxAllSelected()){
-            $("#checkboxAll").attr('checked',true);
-        }else{
-            $("#checkboxAll").attr('checked',false);
-        }
-        $("#res_count").html(getCheckBoxSeletedCount());
-
-    }
-    //获取当前checkbox选中的数目
-    function getCheckBoxSeletedCount(){
-        var i = 0;
-        $("#resources_list").find("input[name='checkbox1[]']").each(function(){
-            if($(this).attr('checked') == 'checked'){
-                i ++;
-            }
-        });
-        return i;
-    }
-    //全选反选
-    function all_select(){
-
-        if($("#checkboxAll").attr('checked')){
-            $("#resources_list").find("input[name='checkbox1[]']").each(function(){
-                $(this).attr('checked',true);
-            });
-            $("#res_count").html(getCheckBoxSeletedCount());
-        }else{
-            $("#resources_list").find("input[name='checkbox1[]']").each(function(){
-                $(this).attr('checked',false);
-            });
-            $("#res_count").html(0);
-        }
-    }
-
-    function show_upload(){
-        $("#ajax-modal").html('<%= escape_javascript( render :partial => 'upload_resource' ,:locals => {:user=>User.current.id,:type=>@type,:status=>@status})%>');
-        showModal('ajax-modal', '452px');
-        $('#ajax-modal').siblings().remove();
-        $('#ajax-modal').before("<a href='javascript:void(0)' onclick='closeModal();' style='margin-left: 435px;' class='resourceClose'></a>");
-        $('#ajax-modal').parent().css("top","50%").css("left","50%").css("position","absolute");
-        $('#ajax-modal').parent().addClass("resourceUploadPopup");
-        $('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
-    }
-    //批量删除
-    function batch_delete(){
-        var data = $("#resources_list_form").serialize();
-        if($("input[type=checkbox][data-has-history=Y]:checked").length != 0){
-            alert("您只能删除没有历史记录的资源，请重新选择后再删除。");
-            return;
-        }
-        if($("input[type=checkbox][data-deleteble=N]:checked").length != 0){
-            alert("您只能删除自己上传的资源，请重新选择后再删除。");
-            return;
-        }
-
-        if(data != "" && confirm('确认要删除这些资源吗？')) {
-            $.post(
-                    '<%= user_resource_delete_user_path(User.current.id,:type=>@type,:status=>@status)%>',
-                    $("#resources_list_form").serialize(),//只会对选中的控件进行序列化提交
-                    function (data) {
-
-                    }
-            );
-        }
-    }
-
-
-
-    function show_send_(){
-        $("#contextMenu").hide();
-        document.oncontextmenu = function() {return true;}
-        line.children().css("background-color",'white');
-        id = line.children().last().html();
-        if (lastSendType === '2'){  //如果已经发送过一次了，那么就应该沿用上次发送的类型。
-            $.ajax({
-                type: 'get',
-                url: '<%= search_user_project_user_path(User.current.id)%>' + '?send_id=' + id,
-                data:{send_type:'file'}
-            });
-        }else{
-            $.ajax({
-                type: 'get',
-                url: '<%= search_user_course_user_path(User.current.id)%>' + '?send_id=' + id,
-                data:{send_type:'file'}
-            });
-        }
-    }
-
-    function batch_send(){
-        if($("#resources_list_form").serialize() == ""){
-            alert('暂时不支持多页选择，您当前页没有选择任何资源');
-            return ;
-        }
-        if (lastSendType === '2'){  //如果已经发送过一次了，那么就应该沿用上次发送的类型。
-            $.ajax({
-                type: 'get',
-                url: '<%= search_user_project_user_path(User.current.id)%>' + '?' +  $("#resources_list_form").serialize(),
-                data:{send_type:'file'}
-            });
-        }else{
-            $.ajax({
-                type: 'get',
-                url: '<%= search_user_course_user_path(User.current.id)%>' + '?'+ $("#resources_list_form").serialize(),
-                data:{send_type:'file'}
-            });
-
-        }
-    }
-
-    function preview(){
-        $("#contextMenu").hide();
-        document.oncontextmenu = function() {return true;}
-        line.children().css("background-color",'white');
-        id = line.children().last().html();
-        $.ajax({
-            type:'get',
-            url:'<%= resource_preview_user_path(User.current.id)%>'+"?resource_id="+id
-        });
-    }
-
-    function rename(){
-        $("#contextMenu").hide();
-        document.oncontextmenu = function() {return true;}
-        line.children().css("background-color",'white');
-        id = line.children().last().html();
-        user_id = line.children().eq(5).html();
-        if(user_id === '<%= User.current.id %>') {
-            res_name = line.children().eq(1).children().attr('title');
-            res_link = line.children().eq(1).html();
-            line.children().eq(1).html(
-                            '<input name="res_name" id="res_name" ' +
-                            'style="height: 2em;line-height: 2em;overflow: hidden;" onblur="restore();" ' +
-                            ' onkeypress="if(event.keyCode==13){event.preventDefault();this.blur();}" ' +
-                            'value="'+res_name+
-                            '"/>  <input type="hidden" id ="res_id" name="res_id" value="'+id+'"/>');
-            alert("test");
-            $("#res_name").focus();
-            $("html,body").animate({scrollTop:$("#res_name").offset().top},1000)
-        }else{
-            alert('您无法修改此资源！')
-        }
-    }
-    String.prototype.trim = function() {
-        var str = this,
-                str = str.replace(/^\s\s*/, ''),
-                ws = /\s/,
-                i = str.length;
-        while (ws.test(str.charAt(--i)));
-        return str.slice(0, i + 1);
-    }
-
-
-
-    //恢复编辑状态到链接状态
-    //如果当前是编辑状态，任何的不在输入框里的单击右键事件都需要将编辑状态变回链接状态
-    //如果是编辑状态，且做了修改，那么久要进行修改，并且将修改值经过处理替换到页面显示
-    function restore(){
-        //上一行不为空 且链接不为空
-        if( last_line != null && res_link != null && res_link != '') {
-            name = $("#res_name").lenght != 0 && $("#res_name").val() != undefined  ?  $("#res_name").val().trim() : undefined ;
-            if (name == undefined || name === 'undefined' ){ //只要res_name没有值，那么就不是编辑状态
-                return;
-            }
-            if( name && name != res_name.trim()){
-
-                if(confirm('确定修改为 '+name)){
-                    $.ajax({
-                        url:  '<%=rename_resource_user_path(User.current.id) %>'+  "?res_name="+$('#res_name').val() + "&res_id=" + $("#res_id").val(),
-                        type:'get',
-                        success:function (data)
-                        {
-                            if (data != 'fail' && name != undefined && name != 'undefined') {//修改成功，那么将链接恢复，并且将链接的显示内容改变。链接可以不变
-                                last_line.children().eq(1).html(res_link);
-                                last_line.children().eq(1).children().attr('title', name);
-                                last_line.children().eq(1).children().attr('href', data);
-                                last_line.children().eq(1).children().html(name.length > 17 ? name.substring(0, 17) + '...' : name);
-                            } else {
-                                last_line.children().eq(1).html(res_link);
-                                res_link = null; //如果修改失败，恢复之后将res_link置空
-                            }
-                        }
-                    } );
-                }else{
-                    last_line.children().eq(1).html(res_link);
-                    res_link = null; //如果没有做修改，恢复之后将res_link置空
-                }
-            }else {
-                last_line.children().eq(1).html(res_link);
-                res_link = null;//如果没有做修改，恢复之后将res_link置空
-            }
-
-
-        }
-    }
-
-    function delete_file() {
-        $("#contextMenu").hide();
-        document.oncontextmenu = function () {
-            return true;
-        }
-        line.children().css("background-color", 'white');
-        id = line.children().last().html();
-        user_id = line.children().eq(5).html();
-        if(line.children().first().children().data('hasHistory') == 'Y'){
-            alert('该资源存在历史版本，不能删除');
-            return;
-        }
-        if(user_id === '<%= User.current.id%>') {
-            if (confirm('确定要删除资源"' + line.children().eq(1).children().attr('title').trim() + '"么?')) {
-                $.ajax({
-                    type: 'post',
-                    url: '<%= user_resource_delete_user_path(User.current.id)%>' + '?resource_id=' + id + '&type=<%=@type %>&status=<%=@status %>'
-                });
-            }
-        }else{
-            alert('您无法删除此资源！')
-        }
-    }
-
-</script>
\ No newline at end of file
+<ul class="resource-list">
+  <ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu" id="contextMenu">
+    <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?%>)delete_file();" onfocus="this.blur()">删除</a></li>
+  </ul>
+</ul>
\ No newline at end of file

From 33c9331c7b0a5c5ae2d6d5e13596c37112480b72 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Mon, 28 Mar 2016 15:35:24 +0800
Subject: [PATCH 02/14] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?=E4=B8=BA=E7=A7=81=E6=9C=89/=E5=85=AC=E5=BC=80=20=E8=AF=BE?=
 =?UTF-8?q?=E7=A8=8B=E5=A4=B4=E9=83=A8=E6=9C=AA=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/layouts/_project_info.html.erb | 1 +
 app/views/layouts/base_courses.html.erb  | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/layouts/_project_info.html.erb b/app/views/layouts/_project_info.html.erb
index d94cbdcc7..30f527595 100644
--- a/app/views/layouts/_project_info.html.erb
+++ b/app/views/layouts/_project_info.html.erb
@@ -1,6 +1,7 @@
 <% is_teacher = User.current.logged? && (User.current.admin? || User.current.allowed_to?(:as_teacher,@course)) %>
 <% teacher_num = TeacherAndAssistantCount(@course) %>
 <% student_num = studentCount(@course) %>
+<% course_file_num = visable_attachemnts_incourse(@course).count %>
 <div class="pr_info_logo fl mr10 mb5">
   <% if is_excellent_course(@course) %>
     <img src="/images/course/boutique.png" width="50" height="auto" alt="精品" class="boutiqueP" />
diff --git a/app/views/layouts/base_courses.html.erb b/app/views/layouts/base_courses.html.erb
index bdbed2931..ff7f20300 100644
--- a/app/views/layouts/base_courses.html.erb
+++ b/app/views/layouts/base_courses.html.erb
@@ -55,8 +55,7 @@
   <div id="content">
     <div id="LSide" class="fl">
       <div class="project_info" style="position: relative" id="project_info_<%=@course.id %>">
-        <% course_file_num = visable_attachemnts_incourse(@course).count %>
-        <%=render :partial=>'layouts/project_info', :locals => {:course_file_num => course_file_num} %>
+        <%=render :partial=>'layouts/project_info' %>
       </div><!--课程信息 end-->
       <div class="info_box">
         <ul>

From 64f13a04ccc7989bd3120f362d67d27c2a93074c Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Mon, 28 Mar 2016 17:09:42 +0800
Subject: [PATCH 03/14] =?UTF-8?q?=E5=8A=A8=E6=80=81500=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/projects/_project_activities.html.erb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/views/projects/_project_activities.html.erb b/app/views/projects/_project_activities.html.erb
index f0a0a3f4b..bb6cdad0c 100644
--- a/app/views/projects/_project_activities.html.erb
+++ b/app/views/projects/_project_activities.html.erb
@@ -48,7 +48,7 @@
 </script>
 
 <% unless forge_acts.empty? %>
-    <% forge_acts.includes(:forge_act).each do |activity| -%>
+    <% forge_acts.each do |activity| -%>
         <script>
             function expand_reply(container, btnid) {
                 var target = $(container);

From f46985c8bcdd3e86b07b387af478286ef1f9ef2b Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Mon, 28 Mar 2016 17:20:46 +0800
Subject: [PATCH 04/14] =?UTF-8?q?=E4=BD=9C=E5=93=81=E7=82=B9=E8=B5=9E?=
 =?UTF-8?q?=E6=8A=A5500?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/student_work/_programing_work_show.html.erb | 2 +-
 app/views/student_work/_show.html.erb                 | 2 +-
 app/views/student_work/_student_work_praise.html.erb  | 6 +++---
 app/views/student_work/praise_student_work.js.erb     | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/views/student_work/_programing_work_show.html.erb b/app/views/student_work/_programing_work_show.html.erb
index 6009dfbb5..cf5866bc6 100644
--- a/app/views/student_work/_programing_work_show.html.erb
+++ b/app/views/student_work/_programing_work_show.html.erb
@@ -18,7 +18,7 @@
     <% if @homework.homework_detail_manual.comment_status == 3 && work.user != User.current%>
         <!-- 匿评结束阶段，显示点赞按钮 -->
         <li class="fr" id="student_work_praise_<%= work.id%>">
-          <%= render :partial => 'student_work_praise' %>
+          <%= render :partial => 'student_work_praise',:locals => {:work => work} %>
         </li>
     <% end%>
     <div class="cl"></div>
diff --git a/app/views/student_work/_show.html.erb b/app/views/student_work/_show.html.erb
index 67c04d71f..dc2fdafb6 100644
--- a/app/views/student_work/_show.html.erb
+++ b/app/views/student_work/_show.html.erb
@@ -25,7 +25,7 @@
     <% if @homework.homework_detail_manual.comment_status == 3 && !is_my_work %>
         <!-- 匿评结束阶段，显示点赞按钮 -->
         <li class="fr" id="student_work_praise_<%= work.id%>">
-          <%= render :partial => 'student_work_praise' %>
+          <%= render :partial => 'student_work_praise',:locals => {:work => work} %>
         </li>
     <% end%>
     <div class="cl"></div>
diff --git a/app/views/student_work/_student_work_praise.html.erb b/app/views/student_work/_student_work_praise.html.erb
index f03bbdcc1..8796244ea 100644
--- a/app/views/student_work/_student_work_praise.html.erb
+++ b/app/views/student_work/_student_work_praise.html.erb
@@ -1,5 +1,5 @@
-<% if is_praise_homework User.current.id,@work.id  %>
-    <%= link_to "赞(#{praise_homework_count @work.id})",praise_student_work_student_work_path(@work), :remote => true,:class => 'orange_btn', :style => 'font-size:12px;'%>
+<% if is_praise_homework User.current.id,work.id  %>
+    <%= link_to "赞(#{praise_homework_count work.id})",praise_student_work_student_work_path(work), :remote => true,:class => 'orange_btn', :style => 'font-size:12px;'%>
 <% else %>
-    <%= link_to "赞(#{praise_homework_count @work.id})","javascript:void(0)",:class => 'grey_btn', :style => 'font-size:12px;'%>
+    <%= link_to "赞(#{praise_homework_count work.id})","javascript:void(0)",:class => 'grey_btn', :style => 'font-size:12px;'%>
 <% end %>
\ No newline at end of file
diff --git a/app/views/student_work/praise_student_work.js.erb b/app/views/student_work/praise_student_work.js.erb
index c58eb5a2f..d0916cdc2 100644
--- a/app/views/student_work/praise_student_work.js.erb
+++ b/app/views/student_work/praise_student_work.js.erb
@@ -1 +1 @@
-$('#student_work_praise_<%= @work.id%>').html('<%= escape_javascript(render :partial => 'student_work/student_work_praise')%>');
\ No newline at end of file
+$('#student_work_praise_<%= @work.id%>').html('<%= escape_javascript(render :partial => 'student_work/student_work_praise', :locals => {:work => @work})%>');
\ No newline at end of file

From 1a1d5b4c49bc25b19499cc2a72f965c25c1d3b10 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Mon, 28 Mar 2016 19:20:09 +0800
Subject: [PATCH 05/14] =?UTF-8?q?=E8=A7=A3=E5=86=B3=EF=BC=9A=E5=8F=91?=
 =?UTF-8?q?=E9=80=81=E5=8A=9F=E8=83=BD=E5=9C=A8=E4=B8=AD=E6=96=87=E8=BE=93?=
 =?UTF-8?q?=E5=85=A5=E7=9A=84=E6=83=85=E5=86=B5=E4=B8=8B=EF=BC=8C=E4=BC=9A?=
 =?UTF-8?q?=E5=87=BA=E7=8E=B0=E8=BE=93=E5=85=A5=E6=A1=86=E5=86=85=E5=AE=B9?=
 =?UTF-8?q?=E5=A2=9E=E5=A4=9A=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_course_file_form.html.erb    | 26 ++++++++++++
 app/views/users/_course_message_form.html.erb | 26 ++++++++++++
 app/views/users/_course_news_form.html.erb    | 26 ++++++++++++
 app/views/users/_org_file_form.html.erb       | 32 ++++++++++++++
 app/views/users/_org_message_form.html.erb    | 31 ++++++++++++++
 app/views/users/_org_news_form.html.erb       | 32 ++++++++++++++
 app/views/users/_project_file_form.html.erb   | 25 +++++++++++
 .../users/_project_message_form.html.erb      | 25 +++++++++++
 app/views/users/_project_news_form.html.erb   | 25 +++++++++++
 .../users/_resource_share_for_orgs.html.erb   | 42 ++-----------------
 ..._resource_share_for_project_popup.html.erb | 27 +-----------
 .../users/_resource_share_popup.html.erb      | 29 ++-----------
 .../users/_share_message_to_course.html.erb   | 31 ++------------
 .../users/_share_message_to_org.html.erb      | 42 ++-----------------
 .../users/_share_message_to_project.html.erb  | 30 ++-----------
 .../users/_share_news_to_course.html.erb      | 31 ++------------
 app/views/users/_share_news_to_org.html.erb   | 42 ++-----------------
 .../users/_share_news_to_project.html.erb     | 31 ++------------
 app/views/users/search_user_course.js.erb     | 38 ++++++++++-------
 app/views/users/search_user_org.js.erb        | 12 +++++-
 app/views/users/search_user_project.js.erb    | 10 +++++
 public/javascripts/application.js             |  6 +--
 22 files changed, 326 insertions(+), 293 deletions(-)
 create mode 100644 app/views/users/_course_file_form.html.erb
 create mode 100644 app/views/users/_course_message_form.html.erb
 create mode 100644 app/views/users/_course_news_form.html.erb
 create mode 100644 app/views/users/_org_file_form.html.erb
 create mode 100644 app/views/users/_org_message_form.html.erb
 create mode 100644 app/views/users/_org_news_form.html.erb
 create mode 100644 app/views/users/_project_file_form.html.erb
 create mode 100644 app/views/users/_project_message_form.html.erb
 create mode 100644 app/views/users/_project_news_form.html.erb

diff --git a/app/views/users/_course_file_form.html.erb b/app/views/users/_course_file_form.html.erb
new file mode 100644
index 000000000..2743ed159
--- /dev/null
+++ b/app/views/users/_course_file_form.html.erb
@@ -0,0 +1,26 @@
+<%= form_tag add_exist_file_to_course_user_path(user),:remote=>true,:id=>'course_list_form' do %>
+    <div>
+      <%= hidden_field_tag(:send_id, send_id) %>
+      <%= hidden_field_tag(:send_ids, send_ids) %>
+      <div class="courseReferContainer">
+        <% if !courses.empty?  %>
+            <% courses.each do |course| %>
+                <ul class="courseSend">
+                  <li class="" style="display:inline-block">
+                    <input name="course_ids[]" type="checkbox" value="<%= course.id %>" class="courseSendCheckbox"/>
+                  </li>
+                  <li class="sendCourseName"><%= truncate(course.name,:lendght=>25) + '['+course.time.to_s+course.term + ']'%></li>
+                </ul>
+            <% end %>
+        <% end %>
+      </div>
+    </div>
+    <div>
+      <div class="courseSendSubmit">
+        <!--<a href="javascript:void(0);" class="sendSourceText">确定</a>-->
+        <%= submit_tag '确定',:class=>'sendSourceText',:onfocus=>'this.blur();' %>
+      </div>
+      <div class="courseSendCancel"><a href="javascript:void(0);" class="sendSourceText mt10" onclick="hideModal();">取消</a></div>
+    </div>
+    <div class="cl"></div>
+<% end %>
\ No newline at end of file
diff --git a/app/views/users/_course_message_form.html.erb b/app/views/users/_course_message_form.html.erb
new file mode 100644
index 000000000..94e0f65ec
--- /dev/null
+++ b/app/views/users/_course_message_form.html.erb
@@ -0,0 +1,26 @@
+<%= form_tag share_message_to_course_user_path(user), :remote => true, :id => 'course_list_form' %>
+<div>
+  <%= hidden_field_tag(:send_id, send_id) %>
+  <%= hidden_field_tag(:send_ids, send_ids) %>
+  <div class="courseReferContainer">
+    <% if !courses.empty? %>
+        <% courses.each do |course| %>
+            <ul class="courseSend">
+              <li class="" style="display:inline-block">
+                <input name="course_ids[]" type="checkbox" value="<%= course.id %>" class="courseSendCheckbox"/>
+              </li>
+              <li class="sendCourseName"><%= truncate(course.name, :lendght => 25) + '['+course.time.to_s+course.term + ']' %></li>
+            </ul>
+        <% end %>
+    <% end %>
+  </div>
+</div>
+<div>
+  <div class="courseSendSubmit">
+    <!--<a href="javascript:void(0);" class="sendSourceText">确定</a>-->
+    <%= submit_tag '确定', :class => 'sendSourceText', :onfocus => 'this.blur();' %>
+  </div>
+  <div class="courseSendCancel">
+    <a href="javascript:void(0);" class="sendSourceText mt10" onclick="hideModal();">取消</a></div>
+</div>
+<div class="cl"></div>
\ No newline at end of file
diff --git a/app/views/users/_course_news_form.html.erb b/app/views/users/_course_news_form.html.erb
new file mode 100644
index 000000000..a244b8678
--- /dev/null
+++ b/app/views/users/_course_news_form.html.erb
@@ -0,0 +1,26 @@
+<%= form_tag share_news_to_course_user_path(user), :remote => true, :id => 'course_list_form' %>
+<div>
+  <%= hidden_field_tag(:send_id, send_id) %>
+  <%= hidden_field_tag(:send_ids, send_ids) %>
+  <div class="courseReferContainer">
+    <% if !courses.empty? %>
+        <% courses.each do |course| %>
+            <ul class="courseSend">
+              <li class="" style="display:inline-block">
+                <input name="course_ids[]" type="checkbox" value="<%= course.id %>" class="courseSendCheckbox"/>
+              </li>
+              <li class="sendCourseName"><%= truncate(course.name, :lendght => 25) + '['+course.time.to_s+course.term + ']' %></li>
+            </ul>
+        <% end %>
+    <% end %>
+  </div>
+</div>
+<div>
+  <div class="courseSendSubmit">
+    <!--<a href="javascript:void(0);" class="sendSourceText">确定</a>-->
+    <%= submit_tag '确定', :class => 'sendSourceText', :onfocus => 'this.blur();' %>
+  </div>
+  <div class="courseSendCancel"><a href="javascript:void(0);" class="sendSourceText mt10" onclick="hideModal();">取消</a>
+  </div>
+</div>
+<div class="cl"></div>
\ No newline at end of file
diff --git a/app/views/users/_org_file_form.html.erb b/app/views/users/_org_file_form.html.erb
new file mode 100644
index 000000000..8d8332297
--- /dev/null
+++ b/app/views/users/_org_file_form.html.erb
@@ -0,0 +1,32 @@
+<%= form_tag add_exist_file_to_org_user_path(user),:remote=>true,:id=>'orgs_list_form' do %>
+    <%= hidden_field_tag(:send_id, send_id) %>
+    <%= hidden_field_tag(:send_ids, send_ids) %>
+    <div class="sectionWrap fl mr15">
+
+      <ul class="fontGrey3 sectionContent">
+        <% unless orgs.empty? %>
+            <% orgs.each do |org|%>
+                <li>
+                  <label>
+                    <input type="radio" name="org_id" value="<%= org.id%>" onchange="change_org_subfield('<%= org_resources_subfield_organization_path(:id=>org.id)%>')" class="mt3 fl mr5" />
+                    <span><%= org.name%></span></label>
+                </li>
+            <%end%>
+        <%end%>
+      </ul>
+    </div>
+    <div class="columnWrap">
+      <ul class="columnContent">
+        <%= render :partial => 'users/org_resources_subfield',:locals => {:subfield=>nil}%>
+      </ul>
+    </div>
+    <div class="cl"></div>
+    <div class="orgDirection mb10 break_word" style="white-space: nowrap;-o-text-overflow:ellipsis;text-overflow: ellipsis;overflow: hidden">目标地址：</div>
+    <div class="courseSendSubmit mr15">
+      <%= submit_tag '确定',:class=>'sendSourceText',:onfocus=>'this.blur();',:onclick=>"check_des(event);" %>
+    </div>
+    <div class="courseSendCancel">
+      <a href="javascript:void(0);" onclick="hideModal();" class="sendSourceText">取消</a>
+    </div>
+    <div class="cl"></div>
+<%end %>
\ No newline at end of file
diff --git a/app/views/users/_org_message_form.html.erb b/app/views/users/_org_message_form.html.erb
new file mode 100644
index 000000000..82fbed8e4
--- /dev/null
+++ b/app/views/users/_org_message_form.html.erb
@@ -0,0 +1,31 @@
+<%= form_tag share_message_to_org_user_path(user), :remote => true, :id => 'orgs_list_form' do %>
+    <%= hidden_field_tag(:send_id, send_id) %>
+    <%= hidden_field_tag(:send_ids, send_ids) %>
+    <div class="sectionWrap fl mr15">
+      <ul class="fontGrey3 sectionContent">
+        <% unless orgs.empty? %>
+            <% orgs.each do |org| %>
+                <li>
+                  <label>
+                    <input type="radio" name="org_id" value="<%= org.id %>" onchange="change_org_subfield('<%= org_resources_subfield_organization_path(:id=>org.id,:send_type => params[:send_type])%>')" class="mt3 fl mr5"/>
+                    <span><%= org.name %></span></label>
+                </li>
+            <% end %>
+        <% end %>
+      </ul>
+    </div>
+    <div class="columnWrap">
+      <ul class="columnContent">
+        <%= render :partial => 'users/org_resources_subfield', :locals => {:subfield => nil} %>
+      </ul>
+    </div>
+    <div class="cl"></div>
+    <div class="orgDirection mb10 break_word" style="white-space: nowrap;-o-text-overflow:ellipsis;text-overflow: ellipsis;overflow: hidden">目标地址：</div>
+    <div class="courseSendSubmit mr15">
+      <%= submit_tag '确定', :class => 'sendSourceText', :onfocus => 'this.blur();', :onclick => "check_des(event);" %>
+    </div>
+    <div class="courseSendCancel">
+      <a href="javascript:void(0);" onclick="hideModal();" class="sendSourceText">取消</a>
+    </div>
+    <div class="cl"></div>
+<% end %>
\ No newline at end of file
diff --git a/app/views/users/_org_news_form.html.erb b/app/views/users/_org_news_form.html.erb
new file mode 100644
index 000000000..2c2fbf230
--- /dev/null
+++ b/app/views/users/_org_news_form.html.erb
@@ -0,0 +1,32 @@
+<%= form_tag share_news_to_org_user_path(user), :remote => true, :id => 'orgs_list_form' do %>
+    <%= hidden_field_tag(:send_id, send_id) %>
+    <%= hidden_field_tag(:send_ids, send_ids) %>
+    <div class="sectionWrap fl mr15">
+
+      <ul class="fontGrey3 sectionContent">
+        <% unless orgs.empty? %>
+            <% orgs.each do |org| %>
+                <li>
+                  <label>
+                    <input type="radio" name="org_id" value="<%= org.id %>" onchange="change_org_subfield('<%= org_resources_subfield_organization_path(:id=>org.id,:send_type => params[:send_type])%>')" class="mt3 fl mr5"/>
+                    <span><%= org.name %></span></label>
+                </li>
+            <% end %>
+        <% end %>
+      </ul>
+    </div>
+    <div class="columnWrap">
+      <ul class="columnContent">
+        <%= render :partial => 'users/org_resources_subfield', :locals => {:subfield => nil} %>
+      </ul>
+    </div>
+    <div class="cl"></div>
+    <div class="orgDirection mb10 break_word" style="white-space: nowrap;-o-text-overflow:ellipsis;text-overflow: ellipsis;overflow: hidden">目标地址：</div>
+    <div class="courseSendSubmit mr15">
+      <%= submit_tag '确定', :class => 'sendSourceText', :onfocus => 'this.blur();', :onclick => "check_des(event);" %>
+    </div>
+    <div class="courseSendCancel">
+      <a href="javascript:void(0);" onclick="hideModal();" class="sendSourceText">取消</a>
+    </div>
+    <div class="cl"></div>
+<% end %>
\ No newline at end of file
diff --git a/app/views/users/_project_file_form.html.erb b/app/views/users/_project_file_form.html.erb
new file mode 100644
index 000000000..d56402407
--- /dev/null
+++ b/app/views/users/_project_file_form.html.erb
@@ -0,0 +1,25 @@
+<%= form_tag add_exist_file_to_project_user_path(user), :remote => true, :id => 'projects_list_form' %>
+<div>
+  <%= hidden_field_tag(:send_id, send_id) %>
+  <%= hidden_field_tag(:send_ids, send_ids) %>
+  <div class="courseReferContainer">
+    <% if !projects.empty? %>
+        <% projects.each do |project| %>
+            <ul class="courseSend">
+              <li class="" style="display:inline-block">
+                <input name="projects_ids[]" type="checkbox" value="<%= project.id %>" class="courseSendCheckbox"/>
+              </li>
+              <li class="sendCourseName"><%= project.name %></li>
+            </ul>
+        <% end %>
+    <% end %>
+  </div>
+</div>
+<div>
+  <div class="courseSendSubmit">
+    <!--<a href="javascript:void(0);" class="sendSourceText">确定</a>-->
+    <%= submit_tag '确定', :class => 'sendSourceText', :onfocus => 'this.blur();' %>
+  </div>
+  <div class="courseSendCancel"><a href="javascript:void(0);" class="sendSourceText" onclick="hideModal();">取消</a></div>
+</div>
+<div class="cl"></div>
diff --git a/app/views/users/_project_message_form.html.erb b/app/views/users/_project_message_form.html.erb
new file mode 100644
index 000000000..1084142f9
--- /dev/null
+++ b/app/views/users/_project_message_form.html.erb
@@ -0,0 +1,25 @@
+<%= form_tag share_message_to_project_user_path(user), :remote => true, :id=>'projects_list_form' %>
+<div>
+  <%= hidden_field_tag(:send_id, send_id) %>
+  <%= hidden_field_tag(:send_ids, send_ids) %>
+  <div class="courseReferContainer">
+    <% if !projects.empty?  %>
+        <% projects.each do |project| %>
+            <ul class="courseSend">
+              <li class="" style="display:inline-block">
+                <input name="project_ids[]" type="checkbox" value="<%= project.id %>" class="courseSendCheckbox"/>
+              </li>
+              <li class="sendCourseName"><%= project.name%></li>
+            </ul>
+        <% end %>
+        </div>
+        </div>
+        <div>
+          <div class="courseSendSubmit">
+            <!--<a href="javascript:void(0);" class="sendSourceText">确定</a>-->
+            <%= submit_tag '确定',:class=>'sendSourceText',:onfocus=>'this.blur();' %>
+          </div>
+          <div class="courseSendCancel"><a href="javascript:void(0);" class="sendSourceText" onclick="hideModal();">取消</a></div>
+        </div>
+        <div class="cl"></div>
+    <% end %>
\ No newline at end of file
diff --git a/app/views/users/_project_news_form.html.erb b/app/views/users/_project_news_form.html.erb
new file mode 100644
index 000000000..2293f942a
--- /dev/null
+++ b/app/views/users/_project_news_form.html.erb
@@ -0,0 +1,25 @@
+<%= form_tag share_news_to_project_user_path(user), :remote => true, :id => 'projects_list_form' %>
+<div>
+  <%= hidden_field_tag(:send_id, send_id) %>
+  <%= hidden_field_tag(:send_ids, send_ids) %>
+  <div class="courseReferContainer">
+    <% if !projects.empty? %>
+        <% projects.each do |project| %>
+            <ul class="courseSend">
+              <li class="" style="display:inline-block">
+                <input name="project_ids[]" type="checkbox" value="<%= project.id %>" class="courseSendCheckbox"/>
+              </li>
+              <li class="sendCourseName"><%= project.name %></li>
+            </ul>
+        <% end %>
+    <% end %>
+  </div>
+</div>
+<div>
+  <div class="courseSendSubmit">
+    <!--<a href="javascript:void(0);" class="sendSourceText">确定</a>-->
+    <%= submit_tag '确定', :class => 'sendSourceText', :onfocus => 'this.blur();' %>
+  </div>
+  <div class="courseSendCancel"><a href="javascript:void(0);" class="sendSourceText" onclick="hideModal();">取消</a></div>
+</div>
+<div class="cl"></div>
\ No newline at end of file
diff --git a/app/views/users/_resource_share_for_orgs.html.erb b/app/views/users/_resource_share_for_orgs.html.erb
index 792db7546..2438727a3 100644
--- a/app/views/users/_resource_share_for_orgs.html.erb
+++ b/app/views/users/_resource_share_for_orgs.html.erb
@@ -18,42 +18,6 @@
   <% end %>
     <div class="cl"></div>
 </div>
-<%= form_tag add_exist_file_to_org_user_path(user),:remote=>true,:id=>'orgs_list_form' do %>
-    <%= hidden_field_tag(:send_id, send_id) %>
-    <%= hidden_field_tag(:send_ids, send_ids) %>
-  <div class="sectionWrap fl mr15">
-
-    <ul class="fontGrey3 sectionContent">
-      <% unless @orgs.empty? %>
-          <% @orgs.each do |org|%>
-              <li>
-                <label>
-                  <input type="radio" name="org_id" value="<%= org.id%>" onchange="change_org_subfield('<%= org_resources_subfield_organization_path(:id=>org.id)%>')" class="mt3 fl mr5" />
-                  <span><%= org.name%></span></label>
-              </li>
-          <%end%>
-      <%end%>
-    </ul>
-  </div>
-  <div class="columnWrap">
-    <ul class="columnContent">
-      <!--<span class="fontBlue pl10">请在左侧选择要转发的位置</span>-->
-      <!--<li style="background-color:#f1f1f1; color:#555555; padding-top:2px; padding-bottom:2px;">请选择栏目：</li>-->
-     <%= render :partial => 'users/org_resources_subfield',:locals => {:subfield=>nil}%>
-      <!--<li>-->
-        <!--<label>-->
-          <!--<input type="radio" name="sendColumn" class="mt3 fl mr5" />-->
-          <!--<span>动态</span></label>-->
-      <!--</li>-->
-    </ul>
-  </div>
-  <div class="cl"></div>
-  <div class="orgDirection mb10 break_word" style="white-space: nowrap;-o-text-overflow:ellipsis;text-overflow: ellipsis;overflow: hidden">目标地址：</div>
-  <div class="courseSendSubmit mr15">
-    <%= submit_tag '确定',:class=>'sendSourceText',:onfocus=>'this.blur();',:onclick=>"check_des(event);" %>
-  </div>
-  <div class="courseSendCancel">
-    <a href="javascript:void(0);" onclick="hideModal();" class="sendSourceText">取消</a>
-  </div>
-  <div class="cl"></div>
- <%end %>
\ No newline at end of file
+<div id="org_file_form">
+  <%= render :partial => 'users/org_file_form', :locals => {:user => user, :orgs => @orgs, :send_id => send_id, :send_ids => send_ids} %>
+</div>
\ No newline at end of file
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 33fa03061..219db4ffc 100644
--- a/app/views/users/_resource_share_for_project_popup.html.erb
+++ b/app/views/users/_resource_share_for_project_popup.html.erb
@@ -24,31 +24,8 @@
         <%= submit_tag '',:class=>'searchIcon2',:onfocus=>"this.blur();",:style=>'border-style:none' %>
     <% end %>
   </div>
-  <%= form_tag add_exist_file_to_project_user_path(user), :remote => true, :id=>'projects_list_form' %>
-  <div>
-
-    <%= hidden_field_tag(:send_id, send_id) %>
-    <%= hidden_field_tag(:send_ids, send_ids) %>
-    <div class="courseReferContainer">
-    <% if !projects.empty?  %>
-        <% projects.each do |project| %>
-        <ul class="courseSend">
-          <li class="" style="display:inline-block">
-            <input name="projects_ids[]" type="checkbox" value="<%= project.id %>" class="courseSendCheckbox"/>
-          </li>
-          <li class="sendCourseName"><%= project.name%></li>
-        </ul>
-        <% end %>
-    </div>
+  <div id="project_file_form">
+    <%= render :partial => 'users/project_file_form', :locals => {:user => user, :projects => projects, :send_id => send_id, :send_ids => send_ids} %>
   </div>
-  <div>
-    <div class="courseSendSubmit">
-      <!--<a href="javascript:void(0);" class="sendSourceText">确定</a>-->
-      <%= submit_tag '确定',:class=>'sendSourceText',:onfocus=>'this.blur();' %>
-    </div>
-    <div class="courseSendCancel"><a href="javascript:void(0);" class="sendSourceText" onclick="hideModal();">取消</a></div>
-  </div>
-  <div class="cl"></div>
-    <% end %>
 </div>
 
diff --git a/app/views/users/_resource_share_popup.html.erb b/app/views/users/_resource_share_popup.html.erb
index 74265cabb..13494758c 100644
--- a/app/views/users/_resource_share_popup.html.erb
+++ b/app/views/users/_resource_share_popup.html.erb
@@ -26,31 +26,8 @@
         <%= submit_tag '',:class=>'searchIcon2',:onfocus=>"this.blur();",:style=>'border-style:none' %>
     <% end %>
   </div>
-  <%= form_tag add_exist_file_to_course_user_path(user),:remote=>true,:id=>'course_list_form' %>
-      <div>
-
-        <%= hidden_field_tag(:send_id, send_id) %>
-        <%= hidden_field_tag(:send_ids, send_ids) %>
-        <div class="courseReferContainer">
-        <% if !courses.empty?  %>
-            <% courses.each do |course| %>
-            <ul class="courseSend">
-              <li class="" style="display:inline-block">
-                <input name="course_ids[]" type="checkbox" value="<%= course.id %>" class="courseSendCheckbox"/>
-              </li>
-              <li class="sendCourseName"><%= truncate(course.name,:lendght=>25) + '['+course.time.to_s+course.term + ']'%></li>
-            </ul>
-            <% end %>
-          </div>
-      </div>
-      <div>
-        <div class="courseSendSubmit">
-          <!--<a href="javascript:void(0);" class="sendSourceText">确定</a>-->
-          <%= submit_tag '确定',:class=>'sendSourceText',:onfocus=>'this.blur();' %>
-        </div>
-        <div class="courseSendCancel"><a href="javascript:void(0);" class="sendSourceText mt10" onclick="hideModal();">取消</a></div>
-      </div>
-      <div class="cl"></div>
-  <% end %>
+  <div id="course_file_form">
+    <%= render :partial => "users/course_file_form", :locals => {:user => user, :send_id => send_id, :send_ids => send_ids, :courses => courses} %>
+  </div>
 </div>
 
diff --git a/app/views/users/_share_message_to_course.html.erb b/app/views/users/_share_message_to_course.html.erb
index eda4a9b97..66d44739c 100644
--- a/app/views/users/_share_message_to_course.html.erb
+++ b/app/views/users/_share_message_to_course.html.erb
@@ -26,31 +26,8 @@
         <%= submit_tag '',:class=>'searchIcon2',:onfocus=>"this.blur();",:style=>'border-style:none' %>
     <% end %>
   </div>
-  <%= form_tag share_message_to_course_user_path(user),:remote=>true,:id=>'course_list_form' %>
-  <div>
-
-    <%= hidden_field_tag(:send_id, send_id) %>
-    <%= hidden_field_tag(:send_ids, send_ids) %>
-    <div class="courseReferContainer">
-      <% if !courses.empty?  %>
-          <% courses.each do |course| %>
-              <ul class="courseSend">
-                <li class="" style="display:inline-block">
-                  <input name="course_ids[]" type="checkbox" value="<%= course.id %>" class="courseSendCheckbox"/>
-                </li>
-                <li class="sendCourseName"><%= truncate(course.name,:lendght=>25) + '['+course.time.to_s+course.term + ']'%></li>
-              </ul>
-          <% end %>
-          </div>
-          </div>
-          <div>
-            <div class="courseSendSubmit">
-              <!--<a href="javascript:void(0);" class="sendSourceText">确定</a>-->
-              <%= submit_tag '确定',:class=>'sendSourceText',:onfocus=>'this.blur();' %>
-            </div>
-            <div class="courseSendCancel"><a href="javascript:void(0);" class="sendSourceText mt10" onclick="hideModal();">取消</a></div>
-          </div>
-          <div class="cl"></div>
-      <% end %>
-      </div>
+  <div id="course_message_form">
+    <%= render :partial => 'users/course_message_form', :locals => {:user => user, :courses => courses, :send_id => send_id, :send_ids => send_ids} %>
+  </div>
+</div>
 
diff --git a/app/views/users/_share_message_to_org.html.erb b/app/views/users/_share_message_to_org.html.erb
index da3c7a072..8cb2fae57 100644
--- a/app/views/users/_share_message_to_org.html.erb
+++ b/app/views/users/_share_message_to_org.html.erb
@@ -18,42 +18,6 @@
   <% end %>
   <div class="cl"></div>
 </div>
-<%= form_tag share_message_to_org_user_path(user),:remote=>true,:id=>'orgs_list_form' do %>
-    <%= hidden_field_tag(:send_id, send_id) %>
-    <%= hidden_field_tag(:send_ids, send_ids) %>
-    <div class="sectionWrap fl mr15">
-
-      <ul class="fontGrey3 sectionContent">
-        <% unless @orgs.empty? %>
-            <% @orgs.each do |org|%>
-                <li>
-                  <label>
-                    <input type="radio" name="org_id" value="<%= org.id%>" onchange="change_org_subfield('<%= org_resources_subfield_organization_path(:id=>org.id,:send_type => params[:send_type])%>')" class="mt3 fl mr5" />
-                    <span><%= org.name%></span></label>
-                </li>
-            <%end%>
-        <%end%>
-      </ul>
-    </div>
-    <div class="columnWrap">
-      <ul class="columnContent">
-        <!--<span class="fontBlue pl10">请在左侧选择要转发的位置</span>-->
-        <!--<li style="background-color:#f1f1f1; color:#555555; padding-top:2px; padding-bottom:2px;">请选择栏目：</li>-->
-        <%= render :partial => 'users/org_resources_subfield',:locals => {:subfield=>nil}%>
-        <!--<li>-->
-        <!--<label>-->
-        <!--<input type="radio" name="sendColumn" class="mt3 fl mr5" />-->
-        <!--<span>动态</span></label>-->
-        <!--</li>-->
-      </ul>
-    </div>
-    <div class="cl"></div>
-    <div class="orgDirection mb10 break_word" style="white-space: nowrap;-o-text-overflow:ellipsis;text-overflow: ellipsis;overflow: hidden">目标地址：</div>
-    <div class="courseSendSubmit mr15">
-      <%= submit_tag '确定',:class=>'sendSourceText',:onfocus=>'this.blur();',:onclick=>"check_des(event);" %>
-    </div>
-    <div class="courseSendCancel">
-      <a href="javascript:void(0);" onclick="hideModal();" class="sendSourceText">取消</a>
-    </div>
-    <div class="cl"></div>
-<%end %>
\ No newline at end of file
+<div id="org_message_form">
+  <%= render :partial => 'users/org_message_form',:locals => {:user => user, :orgs => @orgs, :send_id => send_id, :send_ids => send_ids} %>
+</div>
\ No newline at end of file
diff --git a/app/views/users/_share_message_to_project.html.erb b/app/views/users/_share_message_to_project.html.erb
index 4b79a779c..3a89c0b9f 100644
--- a/app/views/users/_share_message_to_project.html.erb
+++ b/app/views/users/_share_message_to_project.html.erb
@@ -24,30 +24,8 @@
         <%= submit_tag '',:class=>'searchIcon2',:onfocus=>"this.blur();",:style=>'border-style:none' %>
     <% end %>
   </div>
-  <%= form_tag share_message_to_project_user_path(user), :remote => true, :id=>'projects_list_form' %>
-  <div>
-    <%= hidden_field_tag(:send_id, send_id) %>
-    <%= hidden_field_tag(:send_ids, send_ids) %>
-    <div class="courseReferContainer">
-      <% if !projects.empty?  %>
-          <% projects.each do |project| %>
-              <ul class="courseSend">
-                <li class="" style="display:inline-block">
-                  <input name="project_ids[]" type="checkbox" value="<%= project.id %>" class="courseSendCheckbox"/>
-                </li>
-                <li class="sendCourseName"><%= project.name%></li>
-              </ul>
-          <% end %>
-          </div>
-          </div>
-          <div>
-            <div class="courseSendSubmit">
-              <!--<a href="javascript:void(0);" class="sendSourceText">确定</a>-->
-              <%= submit_tag '确定',:class=>'sendSourceText',:onfocus=>'this.blur();' %>
-            </div>
-            <div class="courseSendCancel"><a href="javascript:void(0);" class="sendSourceText" onclick="hideModal();">取消</a></div>
-          </div>
-          <div class="cl"></div>
-      <% end %>
-      </div>
+  <div id="project_message_form">
+    <%= render :partial => 'users/project_message_form', :locals => {:projects => projects, :user => user, :send_id => send_id, :send_ids => send_ids} %>
+  </div>
+</div>
 
diff --git a/app/views/users/_share_news_to_course.html.erb b/app/views/users/_share_news_to_course.html.erb
index 144792201..a1a0d6e39 100644
--- a/app/views/users/_share_news_to_course.html.erb
+++ b/app/views/users/_share_news_to_course.html.erb
@@ -26,31 +26,8 @@
         <%= submit_tag '',:class=>'searchIcon2',:onfocus=>"this.blur();",:style=>'border-style:none' %>
     <% end %>
   </div>
-  <%= form_tag share_news_to_course_user_path(user),:remote=>true,:id=>'course_list_form' %>
-  <div>
-
-    <%= hidden_field_tag(:send_id, send_id) %>
-    <%= hidden_field_tag(:send_ids, send_ids) %>
-    <div class="courseReferContainer">
-      <% if !courses.empty?  %>
-          <% courses.each do |course| %>
-              <ul class="courseSend">
-                <li class="" style="display:inline-block">
-                  <input name="course_ids[]" type="checkbox" value="<%= course.id %>" class="courseSendCheckbox"/>
-                </li>
-                <li class="sendCourseName"><%= truncate(course.name,:lendght=>25) + '['+course.time.to_s+course.term + ']'%></li>
-              </ul>
-          <% end %>
-          </div>
-          </div>
-          <div>
-            <div class="courseSendSubmit">
-              <!--<a href="javascript:void(0);" class="sendSourceText">确定</a>-->
-              <%= submit_tag '确定',:class=>'sendSourceText',:onfocus=>'this.blur();' %>
-            </div>
-            <div class="courseSendCancel"><a href="javascript:void(0);" class="sendSourceText mt10" onclick="hideModal();">取消</a></div>
-          </div>
-          <div class="cl"></div>
-      <% end %>
-      </div>
+  <div id="course_news_form">
+    <%= render :partial => 'users/course_news_form',:locals => {:user => user, :courses => courses, :send_id => send_id, :send_ids => send_ids} %>
+  </div>
+</div>
 
diff --git a/app/views/users/_share_news_to_org.html.erb b/app/views/users/_share_news_to_org.html.erb
index 794c6db89..095e09027 100644
--- a/app/views/users/_share_news_to_org.html.erb
+++ b/app/views/users/_share_news_to_org.html.erb
@@ -18,42 +18,6 @@
   <% end %>
   <div class="cl"></div>
 </div>
-<%= form_tag share_news_to_org_user_path(user),:remote=>true,:id=>'orgs_list_form' do %>
-    <%= hidden_field_tag(:send_id, send_id) %>
-    <%= hidden_field_tag(:send_ids, send_ids) %>
-    <div class="sectionWrap fl mr15">
-
-      <ul class="fontGrey3 sectionContent">
-        <% unless @orgs.empty? %>
-            <% @orgs.each do |org|%>
-                <li>
-                  <label>
-                    <input type="radio" name="org_id" value="<%= org.id%>" onchange="change_org_subfield('<%= org_resources_subfield_organization_path(:id=>org.id,:send_type => params[:send_type])%>')" class="mt3 fl mr5" />
-                    <span><%= org.name%></span></label>
-                </li>
-            <%end%>
-        <%end%>
-      </ul>
-    </div>
-    <div class="columnWrap">
-      <ul class="columnContent">
-        <!--<span class="fontBlue pl10">请在左侧选择要转发的位置</span>-->
-        <!--<li style="background-color:#f1f1f1; color:#555555; padding-top:2px; padding-bottom:2px;">请选择栏目：</li>-->
-        <%= render :partial => 'users/org_resources_subfield',:locals => {:subfield=>nil}%>
-        <!--<li>-->
-        <!--<label>-->
-        <!--<input type="radio" name="sendColumn" class="mt3 fl mr5" />-->
-        <!--<span>动态</span></label>-->
-        <!--</li>-->
-      </ul>
-    </div>
-    <div class="cl"></div>
-    <div class="orgDirection mb10 break_word" style="white-space: nowrap;-o-text-overflow:ellipsis;text-overflow: ellipsis;overflow: hidden">目标地址：</div>
-    <div class="courseSendSubmit mr15">
-      <%= submit_tag '确定',:class=>'sendSourceText',:onfocus=>'this.blur();',:onclick=>"check_des(event);" %>
-    </div>
-    <div class="courseSendCancel">
-      <a href="javascript:void(0);" onclick="hideModal();" class="sendSourceText">取消</a>
-    </div>
-    <div class="cl"></div>
-<%end %>
\ No newline at end of file
+<div id="org_news_form">
+  <%= render :partial => 'users/org_news_form', :locals => {:orgs => @orgs, :user => user,:send_id => send_id, :send_ids => send_ids} %>
+</div>
\ No newline at end of file
diff --git a/app/views/users/_share_news_to_project.html.erb b/app/views/users/_share_news_to_project.html.erb
index 37bac105a..0fb38f8df 100644
--- a/app/views/users/_share_news_to_project.html.erb
+++ b/app/views/users/_share_news_to_project.html.erb
@@ -24,31 +24,8 @@
         <%= submit_tag '',:class=>'searchIcon2',:onfocus=>"this.blur();",:style=>'border-style:none' %>
     <% end %>
   </div>
-  <%= form_tag share_news_to_project_user_path(user), :remote => true, :id=>'projects_list_form' %>
-  <div>
-
-    <%= hidden_field_tag(:send_id, send_id) %>
-    <%= hidden_field_tag(:send_ids, send_ids) %>
-    <div class="courseReferContainer">
-      <% if !projects.empty?  %>
-          <% projects.each do |project| %>
-              <ul class="courseSend">
-                <li class="" style="display:inline-block">
-                  <input name="project_ids[]" type="checkbox" value="<%= project.id %>" class="courseSendCheckbox"/>
-                </li>
-                <li class="sendCourseName"><%= project.name%></li>
-              </ul>
-          <% end %>
-          </div>
-          </div>
-          <div>
-            <div class="courseSendSubmit">
-              <!--<a href="javascript:void(0);" class="sendSourceText">确定</a>-->
-              <%= submit_tag '确定',:class=>'sendSourceText',:onfocus=>'this.blur();' %>
-            </div>
-            <div class="courseSendCancel"><a href="javascript:void(0);" class="sendSourceText" onclick="hideModal();">取消</a></div>
-          </div>
-          <div class="cl"></div>
-      <% end %>
-      </div>
+  <div id="project_news_form">
+    <%= render :partial => 'users/project_news_form', :locals => {:user => user, :projects => projects, :send_id => send_id, :send_ids => send_ids} %>
+  </div>
+</div>
 
diff --git a/app/views/users/search_user_course.js.erb b/app/views/users/search_user_course.js.erb
index f4509987f..c191d8c4c 100644
--- a/app/views/users/search_user_course.js.erb
+++ b/app/views/users/search_user_course.js.erb
@@ -9,18 +9,28 @@
 //$("#upload_box").css('left','').css('top','');
 //$("#upload_box").html('<%#= escape_javascript( render :partial => "resource_share_popup" ,:locals => {:courses=>@course,:user=>@user,:send_id=>@send_id,:send_ids=>@send_ids})%>');
 //$("#upload_box").css('display','block');
-<% if params[:send_type].present? && params[:send_type] == 'news' %>
-$("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/share_news_to_course' , :locals => {:courses => @course, :user => @user, :send_id => @send_id, :send_ids => @send_ids}) %>');
-<% elsif params[:send_type] == 'file' %>
-$("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/resource_share_popup' , :locals => {:courses => @course, :user => @user, :send_id => @send_id, :send_ids => @send_ids}) %>');
-<% elsif params[:send_type] == 'message' %>
-$("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/share_message_to_course' ,:locals => {:courses => @course, :user => @user, :send_id => @send_id, :send_ids => @send_ids}) %>');
+<% if params[:is_observe].nil? %>
+    <% if params[:send_type].present? && params[:send_type] == 'news' %>
+    $("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/share_news_to_course' , :locals => {:courses => @course, :user => @user, :send_id => @send_id, :send_ids => @send_ids}) %>');
+    <% elsif params[:send_type] == 'file' %>
+    $("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/resource_share_popup' , :locals => {:courses => @course, :user => @user, :send_id => @send_id, :send_ids => @send_ids}) %>');
+    <% elsif params[:send_type] == 'message' %>
+    $("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/share_message_to_course' ,:locals => {:courses => @course, :user => @user, :send_id => @send_id, :send_ids => @send_ids}) %>');
+    <% end %>
+    showModal('ajax-modal', '452px');
+    $('#ajax-modal').siblings().remove();
+    $('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal();' style='margin-left: 435px;' class='resourceClose'></a>");
+    $('#ajax-modal').parent().css("top","50%").css("left","50%");
+    $('#ajax-modal').parent().addClass("popbox").addClass("resourceUploadPopup");
+    $('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
+    var val =  $("#search_course_input").val();
+    $("#search_course_input").val("").focus().val(val);
+<% else %>
+    <% if params[:send_type] == 'news' %>
+        $("#course_news_form").html("<%= escape_javascript(render :partial => 'users/course_news_form', :locals => {:courses => @course, :user => @user, :send_id => @send_id, :send_ids => @send_ids}) %>")
+    <% elsif params[:send_type] == 'file' %>
+        $("#course_file_form").html("<%= escape_javascript(render :partial => 'users/course_file_form', :locals => {:courses => @course, :user => @user, :send_id => @send_id, :send_ids => @send_ids}) %>");
+    <% elsif params[:send_type] == 'message' %>
+        $("#course_message_form").html("<%= escape_javascript(render :partial => 'users/course_message_form', :locals => {:courses => @course, :user => @user, :send_id => @send_id, :send_ids => @send_ids}) %>");
+    <% end %>
 <% end %>
-showModal('ajax-modal', '452px');
-$('#ajax-modal').siblings().remove();
-$('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal();' style='margin-left: 435px;' class='resourceClose'></a>");
-$('#ajax-modal').parent().css("top","50%").css("left","50%");
-$('#ajax-modal').parent().addClass("popbox").addClass("resourceUploadPopup");
-$('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
-var val =  $("#search_course_input").val();
-$("#search_course_input").val("").focus().val(val);
diff --git a/app/views/users/search_user_org.js.erb b/app/views/users/search_user_org.js.erb
index ee12e9439..044f93be5 100644
--- a/app/views/users/search_user_org.js.erb
+++ b/app/views/users/search_user_org.js.erb
@@ -1,3 +1,4 @@
+<% if params[:is_observe].nil? %>
 <% if params[:send_type].present? && params[:send_type] == 'news' %>
 $("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/share_news_to_org' ,:locals => {:orgs=>@orgs,:user=>@user,:send_id=>@send_id,:send_ids=>@send_ids})%>');
 <% elsif params[:send_type] == 'file' %>
@@ -12,4 +13,13 @@ $('#ajax-modal').parent().css("top","50%").css("left","50%");
 $('#ajax-modal').parent().addClass("popbox").addClass("shareDP");
 $('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
 var val =  $("#search_org_input").val();
-$("#search_org_input").val("").focus().val(val);
\ No newline at end of file
+$("#search_org_input").val("").focus().val(val);
+<% else %>
+    <% if params[:send_type] == 'news' %>
+    $("#org_news_form").html("<%= escape_javascript(render :partial => 'users/org_news_form', :locals => {:orgs => @orgs,:user=> @user,:send_id => @send_id, :send_ids => @send_ids}) %>");
+    <% elsif params[:send_type] == 'file' %>
+    $("#org_file_form").html("<%= escape_javascript(render :partial => 'users/org_file_form', :locals => {:orgs => @orgs,:user=> @user,:send_id => @send_id, :send_ids => @send_ids}) %>");
+    <% elsif params[:send_type] == 'message' %>
+    $("#org_message_form").html("<%= escape_javascript(render :partial => 'users/org_message_form', :locals => {:orgs => @orgs,:user=> @user,:send_id => @send_id, :send_ids => @send_ids}) %>");
+    <% end %>
+<% end %>
\ No newline at end of file
diff --git a/app/views/users/search_user_project.js.erb b/app/views/users/search_user_project.js.erb
index d58c56ca9..b431af716 100644
--- a/app/views/users/search_user_project.js.erb
+++ b/app/views/users/search_user_project.js.erb
@@ -1,3 +1,4 @@
+<% if params[:is_observe].nil? %>
 <% if params[:send_type].present? && params[:send_type] == 'news' %>
 $("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/share_news_to_project', :locals => {:projects => @projects, :user => @user, :send_id => @send_id, :send_ids => @send_ids}) %>');
 <% elsif params[:send_type] == 'file' %>
@@ -14,3 +15,12 @@ $('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
 //$("#search_project_input").focus();
 var val =  $("#search_project_input").val();
 $("#search_project_input").val("").focus().val(val);
+<% else %>
+<% if params[:send_type] == 'news' %>
+$("#project_news_form").html("<%= escape_javascript(render :partial => 'users/project_news_form', :locals => {:projects => @projects, :user => @user, :send_id => @send_id, :send_ids => @send_ids}) %>");
+<% elsif params[:send_type] == 'file' %>
+$("#project_file_form").html("<%= escape_javascript(render :partial => 'users/project_file_form', :locals => {:projects => @projects, :user => @user, :send_id => @send_id, :send_ids => @send_ids}) %>");
+<% elsif params[:send_type] == 'message' %>
+$("#project_message_form").html("<%= escape_javascript(render :partial => 'users/project_message_form', :locals => {:projects => @projects, :user => @user, :send_id => @send_id, :send_ids => @send_ids}) %>");
+<% end %>
+<% end %>
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 3378a515c..0045b0ce3 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -1055,7 +1055,7 @@ function observeSearchfieldOnInput(fieldId, url,send_id,send_ids, send_type) {
         $.ajax({
           url: url,
           type: 'get',
-          data: {search: $this.val(),send_id:send_id,send_ids:send_ids, send_type:send_type},
+          data: {search: $this.val(),send_id:send_id,send_ids:send_ids, send_type:send_type, is_observe:true},
           success: function(data){  },
           beforeSend: function(){ $this.addClass('ajax-loading'); },
           complete: function(){ $this.removeClass('ajax-loading'); }
@@ -1065,10 +1065,10 @@ function observeSearchfieldOnInput(fieldId, url,send_id,send_ids, send_type) {
     var reset = function() {
       if (timer) {
         clearInterval(timer);
-        timer = setInterval(check, 300);
+        timer = setInterval(check, 500);
       }
     };
-    var timer = setInterval(check, 300);
+    var timer = setInterval(check, 500);
     $this.bind('keyup click mousemove', reset);
   });
 }

From 395fb8fae6227ad12f50c15bf994a35a1e427c67 Mon Sep 17 00:00:00 2001
From: alan <547533434@qq.com>
Date: Mon, 28 Mar 2016 22:37:01 +0800
Subject: [PATCH 06/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9pagination,=E8=B5=84?=
 =?UTF-8?q?=E6=BA=90=E5=8C=BAbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb          |   2 +
 app/views/users/_resources_list.html.erb     | 343 ------------------
 app/views/users/_user_resource_info.html.erb | 350 ++++++++++++++++++-
 app/views/users/user_resource_create.js.erb  |  29 +-
 lib/redmine/pagination.rb                    |   8 +-
 5 files changed, 372 insertions(+), 360 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index f885c5c1c..1cf4534bb 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1618,8 +1618,10 @@ class UsersController < ApplicationController
         @attachments = get_public_resources(user_course_ids, user_project_ids, params[:order], @score)
       end
     end
+
     @status = params[:status]
     @type = params[:type]
+    @path = user_resource_user_path(User.current, :type => @type)
     @limit = 25
     @is_remote = true
     @atta_count = @attachments.count
diff --git a/app/views/users/_resources_list.html.erb b/app/views/users/_resources_list.html.erb
index a545038f1..69b512653 100644
--- a/app/views/users/_resources_list.html.erb
+++ b/app/views/users/_resources_list.html.erb
@@ -27,348 +27,5 @@
 <% end %>
 
 <script>
-    var pageX = 0;
-    var pageY = 0;
-    //当前选中的行
-    var line;
-    //已经选中的行，和当前选中的行的区别是：右键选中为line，换一行右键后，line变为last_line,line变为换行后的line
-    var last_line;
-    //资源名称
-    var res_name;
-    //资源名称的链接
-    var res_link;
-    var id; //资源id
-    var sendType = '1';  //发送到课程 1  发送到项目 2
-    var lastSendType;  //保存上次发送的发送类型
-    $("#resources_list").mousedown(function(e) {
-        //如果是右键的话
-        if (3 == e.which) {
-            if(  $("#res_name").length != 0 || $("#ajax-indicator").is(":hidden") == false){ //其他ajax在执行的时候阻止操作
-                e.preventDefault();
-                return ;
-            }
-            document.oncontextmenu = function() {return false;}
-            pageX = e.clientX;
-            pageY = e.clientY;
-            $("#contextMenu").hide();
-            $("#contextMenu").attr("style","display: block; position: fixed; top:"
-                    + pageY
-                    + "px; left:"
-                    + pageX
-                    + "px; width: 80px;");
-            $("#contextMenu").show();
-            //当前光标所在的对象
-
-            var ele = document.elementFromPoint(pageX,pageY);
-            //转换为jquery对象
-            line = $(ele).parent();
-            //如果上一条存在被选中，那么将上一条的背景色改为白色
-            if(last_line != null){
-                last_line.children().css("background-color", 'white');
-                restore();
-                last_line == null;
-            }
-            //如果当前的tag是li，那么还要li的父级元素
-            if(line.get(0).tagName === 'LI'){
-                line = line.parent();
-            }
-            //将当前的元素的所有子元素的背景色改为蓝色
-            line.children().css("background-color", '#e1e1e1');
-            //将当前元素赋给 上一个对象 保存起来。
-            last_line = line;
-        }
-    });
-    //元素包含关系计算
-    var contains  = function(root, el) {
-        if (root.compareDocumentPosition)
-            return root === el || !!(root.compareDocumentPosition(el) & 16);
-        if (root.contains && el.nodeType === 1){
-            return root.contains(el) && root !== el;
-        }
-        while ((el = el.parentNode))
-            if (el === root) return true;
-        return false;
-    }
-    $(document.body).click(function(e) {
-        //在列表上的任何单击事件都要恢复原来的样子
-        //隐藏右键菜单
-        //e.preventDefault();
-        $("#contextMenu").hide();
-        if( $("#ajax-indicator").is(":hidden") == false && $("#res_name").length != 0 ){ //其他ajax在执行的时候或者res_name仍然存在阻止操作
-            return ;
-        }
-        document.oncontextmenu = function() {return true;}
-        //如果当前行为空，那么要将当前行的拿到
-        var ele;
-        if(line == null){
-            ele = document.elementFromPoint(e.clientX, e.clientY);
-            line = $(ele).parent();
-            //如果是在li上点击事件，那么要获得父组件
-            if(line.get(0).tagName === 'LI'){
-                line = line.parent();
-            }
-
-        }
-        //如果当前对象在表格里，将当前行改变为白色,这里主要是防止点击页面的其他链接的时候，那个链接背景色变白了
-        if( contains($("#resources_list").get(0),line.get(0))){
-            line.children().css("background-color", 'white');
-        }
-
-        //当前行恢复编辑状态到链接状态
-        if(ele && ele.nodeName != 'INPUT') {
-            restore();
-        }
-        line = null;
-    });
-    //只要有一个选中了就是true
-    function checkboxSelected(){
-        selected = false;
-        $("#resources_list").find("input[name='checkbox1[]']").each(function(){
-            if($(this).attr('checked') == true){
-                selected = true;
-            }
-        });
-        return selected;
-    }
-    //只有全选才是true
-    function checkboxAllSelected(){
-        allSelected = true;
-        $("#resources_list").find("input[name='checkbox1[]']").each(function(){
-            if($(this).attr('checked') == undefined){
-                allSelected = false;
-            }
-        });
-        return allSelected;
-    }
-    //只有全部不选才是true
-    function checkboxAllDeselected(){
-        allDeselected = true;
-        $("#resources_list").find("input[name='checkbox1[]']").each(function(){
-            if($(this).attr('checked') == 'checked'){
-                allDeselected = false;
-            }
-        });
-        return allDeselected;
-    }
-    //查看所有的checkbox状态，并且按情况更改$("#checkboxAll")的状态
-    function checkAllBox(checkbox){
-        //只有选中当前checkbox且这个时候所有的checkbox都被选中了，$("#checkboxAll")才是被选中状态，其余都是非选中状态
-        if(checkbox.attr('checked') == 'checked' && checkboxAllSelected()){
-            $("#checkboxAll").attr('checked',true);
-        }else{
-            $("#checkboxAll").attr('checked',false);
-        }
-        $("#res_count").html(getCheckBoxSeletedCount());
-
-    }
-    //获取当前checkbox选中的数目
-    function getCheckBoxSeletedCount(){
-        var i = 0;
-        $("#resources_list").find("input[name='checkbox1[]']").each(function(){
-            if($(this).attr('checked') == 'checked'){
-                i ++;
-            }
-        });
-        return i;
-    }
-    //全选反选
-    function all_select(){
-
-        if($("#checkboxAll").attr('checked')){
-            $("#resources_list").find("input[name='checkbox1[]']").each(function(){
-                $(this).attr('checked',true);
-            });
-            $("#res_count").html(getCheckBoxSeletedCount());
-        }else{
-            $("#resources_list").find("input[name='checkbox1[]']").each(function(){
-                $(this).attr('checked',false);
-            });
-            $("#res_count").html(0);
-        }
-    }
-
-    function show_upload(){
-        $("#ajax-modal").html('<%= escape_javascript( render :partial => 'upload_resource' ,:locals => {:user=>User.current.id,:type=>@type,:status=>@status})%>');
-        showModal('ajax-modal', '452px');
-        $('#ajax-modal').siblings().remove();
-        $('#ajax-modal').before("<a href='javascript:void(0)' onclick='closeModal();' style='margin-left: 435px;' class='resourceClose'></a>");
-        $('#ajax-modal').parent().css("top","50%").css("left","50%").css("position","absolute");
-        $('#ajax-modal').parent().addClass("resourceUploadPopup");
-        $('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
-    }
-    //批量删除
-    function batch_delete(){
-        var data = $("#resources_list_form").serialize();
-        if($("input[type=checkbox][data-has-history=Y]:checked").length != 0){
-            alert("您只能删除没有历史记录的资源，请重新选择后再删除。");
-            return;
-        }
-        if($("input[type=checkbox][data-deleteble=N]:checked").length != 0){
-            alert("您只能删除自己上传的资源，请重新选择后再删除。");
-            return;
-        }
-
-        if(data != "" && confirm('确认要删除这些资源吗？')) {
-            $.post(
-                    '<%= user_resource_delete_user_path(User.current.id,:type=>@type,:status=>@status)%>',
-                    $("#resources_list_form").serialize(),//只会对选中的控件进行序列化提交
-                    function (data) {
-
-                    }
-            );
-        }
-    }
-
-
-
-    function show_send_(){
-        $("#contextMenu").hide();
-        document.oncontextmenu = function() {return true;}
-        line.children().css("background-color",'white');
-        id = line.children().last().html();
-        if (lastSendType === '2'){  //如果已经发送过一次了，那么就应该沿用上次发送的类型。
-            $.ajax({
-                type: 'get',
-                url: '<%= search_user_project_user_path(User.current.id)%>' + '?send_id=' + id,
-                data:{send_type:'file'}
-            });
-        }else{
-            $.ajax({
-                type: 'get',
-                url: '<%= search_user_course_user_path(User.current.id)%>' + '?send_id=' + id,
-                data:{send_type:'file'}
-            });
-        }
-    }
-
-    function batch_send(){
-        if($("#resources_list_form").serialize() == ""){
-            alert('暂时不支持多页选择，您当前页没有选择任何资源');
-            return ;
-        }
-        if (lastSendType === '2'){  //如果已经发送过一次了，那么就应该沿用上次发送的类型。
-            $.ajax({
-                type: 'get',
-                url: '<%= search_user_project_user_path(User.current.id)%>' + '?' +  $("#resources_list_form").serialize(),
-                data:{send_type:'file'}
-            });
-        }else{
-            $.ajax({
-                type: 'get',
-                url: '<%= search_user_course_user_path(User.current.id)%>' + '?'+ $("#resources_list_form").serialize(),
-                data:{send_type:'file'}
-            });
-
-        }
-    }
-
-    function preview(){
-        $("#contextMenu").hide();
-        document.oncontextmenu = function() {return true;}
-        line.children().css("background-color",'white');
-        id = line.children().last().html();
-        $.ajax({
-            type:'get',
-            url:'<%= resource_preview_user_path(User.current.id)%>'+"?resource_id="+id
-        });
-    }
-
-    function rename(){
-        $("#contextMenu").hide();
-        document.oncontextmenu = function() {return true;}
-        line.children().css("background-color",'white');
-        id = line.children().last().html();
-        user_id = line.children().eq(5).html();
-        if(user_id === '<%= User.current.id %>') {
-            res_name = line.children().eq(1).children().attr('title');
-            res_link = line.children().eq(1).html();
-            line.children().eq(1).html(
-                            '<input name="res_name" id="res_name" ' +
-                            'style="height: 2em;line-height: 2em;overflow: hidden;" onblur="restore();" ' +
-                            ' onkeypress="if(event.keyCode==13){event.preventDefault();this.blur();}" ' +
-                            'value="'+res_name+
-                            '"/>  <input type="hidden" id ="res_id" name="res_id" value="'+id+'"/>');
-            $("#res_name").focus();
-            $("html,body").animate({scrollTop:$("#res_name").offset().top},1000)
-        }else{
-            alert('您无法修改此资源！')
-        }
-    }
-    String.prototype.trim = function() {
-        var str = this,
-                str = str.replace(/^\s\s*/, ''),
-                ws = /\s/,
-                i = str.length;
-        while (ws.test(str.charAt(--i)));
-        return str.slice(0, i + 1);
-    }
-
-
-
-    //恢复编辑状态到链接状态
-    //如果当前是编辑状态，任何的不在输入框里的单击右键事件都需要将编辑状态变回链接状态
-    //如果是编辑状态，且做了修改，那么久要进行修改，并且将修改值经过处理替换到页面显示
-    function restore(){
-        //上一行不为空 且链接不为空
-        if( last_line != null && res_link != null && res_link != '') {
-            name = $("#res_name").lenght != 0 && $("#res_name").val() != undefined  ?  $("#res_name").val().trim() : undefined ;
-            if (name == undefined || name === 'undefined' ){ //只要res_name没有值，那么就不是编辑状态
-                return;
-            }
-            if( name && name != res_name.trim()){
-
-                if(confirm('确定修改为 '+name)){
-                    $.ajax({
-                        url:  '<%=rename_resource_user_path(User.current.id) %>'+  "?res_name="+$('#res_name').val() + "&res_id=" + $("#res_id").val(),
-                        type:'get',
-                        success:function (data)
-                        {
-                            if (data != 'fail' && name != undefined && name != 'undefined') {//修改成功，那么将链接恢复，并且将链接的显示内容改变。链接可以不变
-                                last_line.children().eq(1).html(res_link);
-                                last_line.children().eq(1).children().attr('title', name);
-                                last_line.children().eq(1).children().attr('href', data);
-                                last_line.children().eq(1).children().html(name.length > 17 ? name.substring(0, 17) + '...' : name);
-                            } else {
-                                last_line.children().eq(1).html(res_link);
-                                res_link = null; //如果修改失败，恢复之后将res_link置空
-                            }
-                        }
-                    } );
-                }else{
-                    last_line.children().eq(1).html(res_link);
-                    res_link = null; //如果没有做修改，恢复之后将res_link置空
-                }
-            }else {
-                last_line.children().eq(1).html(res_link);
-                res_link = null;//如果没有做修改，恢复之后将res_link置空
-            }
-
-
-        }
-    }
-
-    function delete_file() {
-        $("#contextMenu").hide();
-        document.oncontextmenu = function () {
-            return true;
-        }
-        line.children().css("background-color", 'white');
-        id = line.children().last().html();
-        user_id = line.children().eq(5).html();
-        if(line.children().first().children().data('hasHistory') == 'Y'){
-            alert('该资源存在历史版本，不能删除');
-            return;
-        }
-        if(user_id === '<%= User.current.id%>') {
-            if (confirm('确定要删除资源"' + line.children().eq(1).children().attr('title').trim() + '"么?')) {
-                $.ajax({
-                    type: 'post',
-                    url: '<%= user_resource_delete_user_path(User.current.id)%>' + '?resource_id=' + id + '&type=<%=@type %>&status=<%=@status %>'
-                });
-            }
-        }else{
-            alert('您无法删除此资源！')
-        }
-    }
 
 </script>
diff --git a/app/views/users/_user_resource_info.html.erb b/app/views/users/_user_resource_info.html.erb
index bea78130a..0a3f94bb3 100644
--- a/app/views/users/_user_resource_info.html.erb
+++ b/app/views/users/_user_resource_info.html.erb
@@ -42,7 +42,353 @@
     <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();" onfocus="this.blur()" >发送</a></li>
     <li><a tabindex="-1" href="#" onclick="if(<%= User.current.logged?%>)delete_file();" onfocus="this.blur()">删除</a></li>
   </ul>
-</ul>
\ No newline at end of file
+</ul>
+
+<script>
+    var pageX = 0;
+    var pageY = 0;
+    //当前选中的行
+    var line;
+    //已经选中的行，和当前选中的行的区别是：右键选中为line，换一行右键后，line变为last_line,line变为换行后的line
+    var last_line;
+    //资源名称
+    var res_name;
+    //资源名称的链接
+    var res_link;
+    var id; //资源id
+    var sendType = '1';  //发送到课程 1  发送到项目 2
+    var lastSendType;  //保存上次发送的发送类型
+    $("#resources_list").mousedown(function(e) {
+        //如果是右键的话
+        if (3 == e.which) {
+            if(  $("#res_name").length != 0 || $("#ajax-indicator").is(":hidden") == false){ //其他ajax在执行的时候阻止操作
+                e.preventDefault();
+                return ;
+            }
+            document.oncontextmenu = function() {return false;}
+            pageX = e.clientX;
+            pageY = e.clientY;
+            $("#contextMenu").hide();
+            $("#contextMenu").attr("style","display: block; position: fixed; top:"
+                    + pageY
+                    + "px; left:"
+                    + pageX
+                    + "px; width: 80px;");
+            $("#contextMenu").show();
+            //当前光标所在的对象
+
+            var ele = document.elementFromPoint(pageX,pageY);
+            //转换为jquery对象
+            line = $(ele).parent();
+            //如果上一条存在被选中，那么将上一条的背景色改为白色
+            if(last_line != null){
+                last_line.children().css("background-color", 'white');
+                restore();
+                last_line == null;
+            }
+            //如果当前的tag是li，那么还要li的父级元素
+            if(line.get(0).tagName === 'LI'){
+                line = line.parent();
+            }
+            //将当前的元素的所有子元素的背景色改为蓝色
+            line.children().css("background-color", '#e1e1e1');
+            //将当前元素赋给 上一个对象 保存起来。
+            last_line = line;
+        }
+    });
+    //元素包含关系计算
+    var contains  = function(root, el) {
+        if (root.compareDocumentPosition)
+            return root === el || !!(root.compareDocumentPosition(el) & 16);
+        if (root.contains && el.nodeType === 1){
+            return root.contains(el) && root !== el;
+        }
+        while ((el = el.parentNode))
+            if (el === root) return true;
+        return false;
+    }
+    $(document.body).click(function(e) {
+        //在列表上的任何单击事件都要恢复原来的样子
+        //隐藏右键菜单
+        //e.preventDefault();
+        $("#contextMenu").hide();
+        if( $("#ajax-indicator").is(":hidden") == false && $("#res_name").length != 0 ){ //其他ajax在执行的时候或者res_name仍然存在阻止操作
+            return ;
+        }
+        document.oncontextmenu = function() {return true;}
+        //如果当前行为空，那么要将当前行的拿到
+        var ele;
+        if(line == null){
+            ele = document.elementFromPoint(e.clientX, e.clientY);
+            line = $(ele).parent();
+            //如果是在li上点击事件，那么要获得父组件
+            if(line.get(0).tagName === 'LI'){
+                line = line.parent();
+            }
+
+        }
+        //如果当前对象在表格里，将当前行改变为白色,这里主要是防止点击页面的其他链接的时候，那个链接背景色变白了
+        if( contains($("#resources_list").get(0),line.get(0))){
+            line.children().css("background-color", 'white');
+        }
+
+        //当前行恢复编辑状态到链接状态
+        if(ele && ele.nodeName != 'INPUT') {
+            restore();
+        }
+        line = null;
+    });
+    //只要有一个选中了就是true
+    function checkboxSelected(){
+        selected = false;
+        $("#resources_list").find("input[name='checkbox1[]']").each(function(){
+            if($(this).attr('checked') == true){
+                selected = true;
+            }
+        });
+        return selected;
+    }
+    //只有全选才是true
+    function checkboxAllSelected(){
+        allSelected = true;
+        $("#resources_list").find("input[name='checkbox1[]']").each(function(){
+            if($(this).attr('checked') == undefined){
+                allSelected = false;
+            }
+        });
+        return allSelected;
+    }
+    //只有全部不选才是true
+    function checkboxAllDeselected(){
+        allDeselected = true;
+        $("#resources_list").find("input[name='checkbox1[]']").each(function(){
+            if($(this).attr('checked') == 'checked'){
+                allDeselected = false;
+            }
+        });
+        return allDeselected;
+    }
+    //查看所有的checkbox状态，并且按情况更改$("#checkboxAll")的状态
+    function checkAllBox(checkbox){
+        //只有选中当前checkbox且这个时候所有的checkbox都被选中了，$("#checkboxAll")才是被选中状态，其余都是非选中状态
+        if(checkbox.attr('checked') == 'checked' && checkboxAllSelected()){
+            $("#checkboxAll").attr('checked',true);
+        }else{
+            $("#checkboxAll").attr('checked',false);
+        }
+        $("#res_count").html(getCheckBoxSeletedCount());
+
+    }
+    //获取当前checkbox选中的数目
+    function getCheckBoxSeletedCount(){
+        var i = 0;
+        $("#resources_list").find("input[name='checkbox1[]']").each(function(){
+            if($(this).attr('checked') == 'checked'){
+                i ++;
+            }
+        });
+        return i;
+    }
+    //全选反选
+    function all_select(){
+
+        if($("#checkboxAll").attr('checked')){
+            $("#resources_list").find("input[name='checkbox1[]']").each(function(){
+                $(this).attr('checked',true);
+            });
+            $("#res_count").html(getCheckBoxSeletedCount());
+        }else{
+            $("#resources_list").find("input[name='checkbox1[]']").each(function(){
+                $(this).attr('checked',false);
+            });
+            $("#res_count").html(0);
+        }
+    }
+
+    function show_upload(){
+        $("#ajax-modal").html('<%= escape_javascript( render :partial => 'upload_resource' ,:locals => {:user=>User.current.id,:type=>@type,:status=>@status})%>');
+        showModal('ajax-modal', '452px');
+        $('#ajax-modal').siblings().remove();
+        $('#ajax-modal').before("<a href='javascript:void(0)' onclick='closeModal();' style='margin-left: 435px;' class='resourceClose'></a>");
+        $('#ajax-modal').parent().css("top","50%").css("left","50%").css("position","absolute");
+        $('#ajax-modal').parent().addClass("resourceUploadPopup");
+        $('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
+    }
+    //批量删除
+    function batch_delete(){
+        var data = $("#resources_list_form").serialize();
+        if($("input[type=checkbox][data-has-history=Y]:checked").length != 0){
+            alert("您只能删除没有历史记录的资源，请重新选择后再删除。");
+            return;
+        }
+        if($("input[type=checkbox][data-deleteble=N]:checked").length != 0){
+            alert("您只能删除自己上传的资源，请重新选择后再删除。");
+            return;
+        }
+
+        if(data != "" && confirm('确认要删除这些资源吗？')) {
+            $.post(
+                    '<%= user_resource_delete_user_path(User.current.id,:type=>@type,:status=>@status)%>',
+                    $("#resources_list_form").serialize(),//只会对选中的控件进行序列化提交
+                    function (data) {
+
+                    }
+            );
+        }
+    }
+
+
+
+    function show_send(){
+        $("#contextMenu").hide();
+        document.oncontextmenu = function() {return true;}
+        line.children().css("background-color",'white');
+        id = line.children().last().html();
+        if (lastSendType === '2'){  //如果已经发送过一次了，那么就应该沿用上次发送的类型。
+            $.ajax({
+                type: 'get',
+                url: '<%= search_user_project_user_path(User.current.id)%>' + '?send_id=' + id,
+                data:{send_type:'file'}
+            });
+        }else{
+            $.ajax({
+                type: 'get',
+                url: '<%= search_user_course_user_path(User.current.id)%>' + '?send_id=' + id,
+                data:{send_type:'file'}
+            });
+        }
+    }
+
+    function batch_send(){
+        if($("#resources_list_form").serialize() == ""){
+            alert('暂时不支持多页选择，您当前页没有选择任何资源');
+            return ;
+        }
+        if (lastSendType === '2'){  //如果已经发送过一次了，那么就应该沿用上次发送的类型。
+            $.ajax({
+                type: 'get',
+                url: '<%= search_user_project_user_path(User.current.id)%>' + '?' +  $("#resources_list_form").serialize(),
+                data:{send_type:'file'}
+            });
+        }else{
+            $.ajax({
+                type: 'get',
+                url: '<%= search_user_course_user_path(User.current.id)%>' + '?'+ $("#resources_list_form").serialize(),
+                data:{send_type:'file'}
+            });
+
+        }
+    }
+
+    function preview(){
+        $("#contextMenu").hide();
+        document.oncontextmenu = function() {return true;}
+        line.children().css("background-color",'white');
+        id = line.children().last().html();
+        $.ajax({
+            type:'get',
+            url:'<%= resource_preview_user_path(User.current.id)%>'+"?resource_id="+id
+        });
+    }
+
+    function rename(){
+        $("#contextMenu").hide();
+        document.oncontextmenu = function() {return true;}
+        line.children().css("background-color",'white');
+        id = line.children().last().html();
+        user_id = line.children().eq(5).html();
+        if(user_id === '<%= User.current.id %>') {
+            res_name = line.children().eq(1).children().attr('title');
+            res_link = line.children().eq(1).html();
+            line.children().eq(1).html(
+                            '<input name="res_name" id="res_name" ' +
+                            'style="height: 2em;line-height: 2em;overflow: hidden;" onblur="restore();" ' +
+                            ' onkeypress="if(event.keyCode==13){event.preventDefault();this.blur();}" ' +
+                            'value="'+res_name+
+                            '"/>  <input type="hidden" id ="res_id" name="res_id" value="'+id+'"/>');
+            $("#res_name").focus();
+            $("html,body").animate({scrollTop:$("#res_name").offset().top},1000)
+        }else{
+            alert('您无法修改此资源！')
+        }
+    }
+    String.prototype.trim = function() {
+        var str = this,
+                str = str.replace(/^\s\s*/, ''),
+                ws = /\s/,
+                i = str.length;
+        while (ws.test(str.charAt(--i)));
+        return str.slice(0, i + 1);
+    }
+
+
+
+    //恢复编辑状态到链接状态
+    //如果当前是编辑状态，任何的不在输入框里的单击右键事件都需要将编辑状态变回链接状态
+    //如果是编辑状态，且做了修改，那么久要进行修改，并且将修改值经过处理替换到页面显示
+    function restore(){
+        //上一行不为空 且链接不为空
+        if( last_line != null && res_link != null && res_link != '') {
+            name = $("#res_name").lenght != 0 && $("#res_name").val() != undefined  ?  $("#res_name").val().trim() : undefined ;
+            if (name == undefined || name === 'undefined' ){ //只要res_name没有值，那么就不是编辑状态
+                return;
+            }
+            if( name && name != res_name.trim()){
+
+                if(confirm('确定修改为 '+name)){
+                    $.ajax({
+                        url:  '<%=rename_resource_user_path(User.current.id) %>'+  "?res_name="+$('#res_name').val() + "&res_id=" + $("#res_id").val(),
+                        type:'get',
+                        success:function (data)
+                        {
+                            if (data != 'fail' && name != undefined && name != 'undefined') {//修改成功，那么将链接恢复，并且将链接的显示内容改变。链接可以不变
+                                last_line.children().eq(1).html(res_link);
+                                last_line.children().eq(1).children().attr('title', name);
+                                last_line.children().eq(1).children().attr('href', data);
+                                last_line.children().eq(1).children().html(name.length > 17 ? name.substring(0, 17) + '...' : name);
+                            } else {
+                                last_line.children().eq(1).html(res_link);
+                                res_link = null; //如果修改失败，恢复之后将res_link置空
+                            }
+                        }
+                    } );
+                }else{
+                    last_line.children().eq(1).html(res_link);
+                    res_link = null; //如果没有做修改，恢复之后将res_link置空
+                }
+            }else {
+                last_line.children().eq(1).html(res_link);
+                res_link = null;//如果没有做修改，恢复之后将res_link置空
+            }
+
+
+        }
+    }
+
+    function delete_file() {
+        $("#contextMenu").hide();
+        document.oncontextmenu = function () {
+            return true;
+        }
+        line.children().css("background-color", 'white');
+        id = line.children().last().html();
+        user_id = line.children().eq(5).html();
+        if(line.children().first().children().data('hasHistory') == 'Y'){
+            alert('该资源存在历史版本，不能删除');
+            return;
+        }
+        if(user_id === '<%= User.current.id%>') {
+            if (confirm('确定要删除资源"' + line.children().eq(1).children().attr('title').trim() + '"么?')) {
+                $.ajax({
+                    type: 'post',
+                    url: '<%= user_resource_delete_user_path(User.current.id)%>' + '?resource_id=' + id + '&type=<%=@type %>&status=<%=@status %>'
+                });
+            }
+        }else{
+            alert('您无法删除此资源！')
+        }
+    }
+</script>
\ No newline at end of file
diff --git a/app/views/users/user_resource_create.js.erb b/app/views/users/user_resource_create.js.erb
index e818f2870..cc7e543c8 100644
--- a/app/views/users/user_resource_create.js.erb
+++ b/app/views/users/user_resource_create.js.erb
@@ -1,15 +1,16 @@
-closeModal();
-$("#resources_list").html('<%= escape_javascript( render :partial => 'resources_list' ,:locals=>{ :attachments => @attachments})%>');
-$("#resource_tip_list").html('<%= escape_javascript( render :partial => 'users/user_resource_tip_list', :locals => {:user => @user, :type => @type, :status => @status}) %>');
-$("#pages").html('<%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>');
-$("#res_all_count").html(<%= @atta_count%>);
-$("#res_count").html(0);
-$("#checkboxAll").attr('checked',false);
-//更新状态
-$("#public_resource_list").attr('href','<%= user_resource_user_path(@user, :type => '6') %>');
-$("#my_resource_list").attr('href','<%= user_resource_user_path(@user, :type => '1') %>');
-$("#resource_type_all").attr('href','<%= resource_search_user_path(@user,:type => @type, :status => 1, :search => @switch_search) %>');
-$("#resource_type_course").attr('href','<%= resource_search_user_path(@user,:type => @type, :status => 2, :search => @switch_search) %>');
-$("#resource_type_project").attr('href','<%= resource_search_user_path(@user,:type => @type, :status => 3, :search => @switch_search) %>');
-$("#resource_type_user").attr('href','<%= resource_search_user_path(@user,:type => @type, :status => 5, :search => @switch_search) %>');
+closeModal();
+$("#resources_list").html('<%= escape_javascript( render :partial => 'resources_list' ,:locals=>{ :attachments => @attachments})%>');
+$("#resource_tip_list").html('<%= escape_javascript( render :partial => 'users/user_resource_tip_list', :locals => {:user => @user, :type => @type, :status => @status}) %>');
+debugger
+$("#pages").html('<%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true, :path => @path %>');
+$("#res_all_count").html(<%= @atta_count%>);
+$("#res_count").html(0);
+$("#checkboxAll").attr('checked',false);
+//更新状态
+$("#public_resource_list").attr('href','<%= user_resource_user_path(@user, :type => '6') %>');
+$("#my_resource_list").attr('href','<%= user_resource_user_path(@user, :type => '1') %>');
+$("#resource_type_all").attr('href','<%= resource_search_user_path(@user,:type => @type, :status => 1, :search => @switch_search) %>');
+$("#resource_type_course").attr('href','<%= resource_search_user_path(@user,:type => @type, :status => 2, :search => @switch_search) %>');
+$("#resource_type_project").attr('href','<%= resource_search_user_path(@user,:type => @type, :status => 3, :search => @switch_search) %>');
+$("#resource_type_user").attr('href','<%= resource_search_user_path(@user,:type => @type, :status => 5, :search => @switch_search) %>');
 $("#resource_type_file").attr('href','<%= resource_search_user_path(@user,:type => @type, :status => 4, :search => @switch_search) %>');
\ No newline at end of file
diff --git a/lib/redmine/pagination.rb b/lib/redmine/pagination.rb
index 41702e2ce..4f1e8ac46 100644
--- a/lib/redmine/pagination.rb
+++ b/lib/redmine/pagination.rb
@@ -163,11 +163,17 @@ module Redmine
       #   :per_page_links    if set to false, the "Per page" links are not rendered
       #
       def pagination_links_full(*args)
+        page = ""
         pagination_links_each(*args) do |text, parameters, options|
           if block_given?
           yield text, parameters, options
           else
-            link_to text, params.merge(parameters), options
+            if args[2][:path].nil?
+              link_to text, params.merge(parameters), options
+            else
+              page = "&page" + parameters[:page].to_s unless parameters[:page].nil?
+              link_to text, args[2][:path].to_s + page, options
+            end
           end
         end
       end

From 213cf48c090268699321573cab4577285901f47e Mon Sep 17 00:00:00 2001
From: yuanke <249218296@qq.com>
Date: Tue, 29 Mar 2016 09:02:54 +0800
Subject: [PATCH 07/14] =?UTF-8?q?=E7=BC=96=E7=A8=8B=E7=9A=84=E8=BE=93?=
 =?UTF-8?q?=E5=87=BA=E5=92=8C=E7=BB=93=E6=9E=9C=E6=AF=8F=E8=A1=8C=E5=B0=BE?=
 =?UTF-8?q?=E9=83=A8=E7=9A=84=E7=A9=BA=E6=A0=BC=E6=89=8D=E7=94=A8=E5=88=AB?=
 =?UTF-8?q?=E7=9A=84=E7=AC=A6=E5=8F=B7=E4=BB=A3=E6=9B=BF,=E4=B8=AD?=
 =?UTF-8?q?=E9=97=B4=E7=9A=84=E7=A9=BA=E6=A0=BC=E4=B8=8D=E7=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/student_work_controller.rb | 34 +++++++++++++++++++---
 public/javascripts/homework.js             |  6 ++--
 2 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index 903030ecb..ae33ccb07 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -55,8 +55,31 @@ class StudentWorkController < ApplicationController
     render :json => resultObj
   end
 
+  #行尾空格替换成□
+  def space_replace_1(str)
+    for i in 0 .. str.size
+      tChar = str[i]
+      if tChar != ' ' &&  tChar != "\n"
+        sFlag = false
+        eFlag = false
+      elsif tChar == ' ' && sFlag == false
+        tStart = i
+        sFlag = true
+      elsif tChar == "\n"
+        tEnd = i - 1
+        if sFlag == true
+          for j in  tStart .. tEnd
+            str[j] = "□"
+          end
+          sFlag = false
+        end
+      end
+    end
+  end
+
 #由于负载问题 不要使用全局变量
 #根据传入的tIndex确定是第几次测试
+#之后如果觉得很卡 可以改成将结果传回JS再以参数形式传回来
   def program_test_ex
     is_test = params[:is_test] == 'true'
     resultObj = {status: 0, results: [], error_msg: '', time: Time.now.strftime('%Y-%m-%d %T'),tseq:1,tcount:1,testid:1} #保存每测试一次返回的结果
@@ -78,11 +101,14 @@ class StudentWorkController < ApplicationController
           result = test_realtime_ex(test, params[:src])
 
           if result["status"].to_i != -2
-            result["results"].first['output'] = result["results"].first['output'].gsub(" ","□")
-            result["results"].first['result'] = result["results"].first['result'].gsub(" ","□")
+            #result["results"].first['output'] = result["results"].first['output'].gsub(" ","□")
+            #result["results"].first['result'] = result["results"].first['result'].gsub(" ","□")
           end
 
-          logger.debug result
+          space_replace_1(result["results"].first['output'])
+          space_replace_1(result["results"].first['result'])
+
+          logger.debug  result
 
           #-1 默认值 0全部正确并结束 2 超时 -2 编译错误
           resultObj[:status] = -1
@@ -108,7 +134,7 @@ class StudentWorkController < ApplicationController
                   student_work.late_penalty = 0
               end
 
-              #每次都要把数据存到数据库中
+              #每次从数据库取出上次的结果加上本次的结果再存入数据库
               status = result["status"]
               if index == 1
                 student_work_test = student_work.student_work_tests.build(status: status,
diff --git a/public/javascripts/homework.js b/public/javascripts/homework.js
index 46dfed122..70f00db98 100644
--- a/public/javascripts/homework.js
+++ b/public/javascripts/homework.js
@@ -426,7 +426,7 @@ $(function(){
 //注意\n\
     //1:该程序每次运行的时间必须小于200毫秒，否则会超时,程序超时将不会测试剩余的测试集\n\
     //2:该程序每次运行使用的内存不能超过1M，否则会返回错误\n\
-    //3:该程序每次运行输出的结果最多显示100个字符(多余的不显示),空格用□表示\n\
+    //3:该程序每次运行输出的结果最多显示100个字符(多余的不显示),每行末尾的所有空格用□表示\n\
 import java.io.*;\n\
 import java.util.*;\n\
 \n\
@@ -450,7 +450,7 @@ class Main\n\
 //注意\n\
     //1:该程序每次运行的时间必须小于200毫秒，否则会超时,程序超时将不会测试剩余的测试集\n\
     //2:该程序每次运行使用的内存不能超过1M，否则会返回错误\n\
-    //3:该程序每次运行输出的结果最多显示100个字符(多余的不显示),空格用□表示\n\
+    //3:该程序每次运行输出的结果最多显示100个字符(多余的不显示),每行末尾的所有空格用□表示\n\
 #include <stdio.h>\n\
 int main()\n\
 {\n\
@@ -470,7 +470,7 @@ src = '\
 //注意\n\
     //1:该程序每次运行的时间必须小于200毫秒，否则会超时,程序超时将不会测试剩余的测试集\n\
     //2:该程序每次运行使用的内存不能超过1M，否则会返回错误\n\
-    //3:该程序每次运行输出的结果最多显示100个字符(多余的不显示),空格用□表示\n\
+    //3:该程序每次运行输出的结果最多显示100个字符(多余的不显示),每行末尾的所有空格用□表示\n\
 #include <iostream>\n\
 using namespace std;\n\
 \n\

From ed0eb4aff31848f1e661bcbacb90e87ee9468e5e Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Tue, 29 Mar 2016 09:24:11 +0800
Subject: [PATCH 08/14] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E4=BD=9C=E5=93=81?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=97=A0=E6=B3=95=E6=89=93=E5=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers/student_work_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/helpers/student_work_helper.rb b/app/helpers/student_work_helper.rb
index df5c872f8..4e11e153e 100644
--- a/app/helpers/student_work_helper.rb
+++ b/app/helpers/student_work_helper.rb
@@ -130,7 +130,7 @@ module StudentWorkHelper
   def revise_attachment_status homework, attach
     date = Time.parse(format_time(attach.created_on.to_s)).strftime("%Y-%m-%d")
     status = ""
-    if homework.homework_detail_manual && ((homework.anonymous_comment == 0 &&homework.homework_detail_manual.evaluation_start.to_s <= date) || (homework.anonymous_comment == 1 && homework.end_time < date))
+    if homework.homework_detail_manual && ((homework.anonymous_comment == 0 &&homework.homework_detail_manual.evaluation_start.to_s <= date) || (homework.anonymous_comment == 1 && homework.end_time.to_s < date))
       status = "此时其他同学作品已公开"
     else
       status = "此时其他同学作品尚未公开"

From 598f69abb0fc0d36cb41c42c7fba6c5a7b14d494 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Tue, 29 Mar 2016 09:35:07 +0800
Subject: [PATCH 09/14] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E6=9A=82=E6=97=B6=E9=9A=90=E8=97=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/organizations/new.html.erb     | 14 +++++++-------
 app/views/organizations/setting.html.erb | 14 +++++++-------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/app/views/organizations/new.html.erb b/app/views/organizations/new.html.erb
index efe481b77..ae0900973 100644
--- a/app/views/organizations/new.html.erb
+++ b/app/views/organizations/new.html.erb
@@ -28,13 +28,13 @@
                              value:"#{User.current.id.to_s + '_' +Time.now.to_s.gsub(' ','_').gsub(':','').gsub('+','')}" %>
           </p>
         </li>
-        <li class=" mb5 ml45">
-          <span style="margin-left:10px;" >显示模式&nbsp;&nbsp;&nbsp;&nbsp;: </span>
-          <input type="radio" id="show_mode_ordinary" value="0" name="show_mode"  style="margin-left:2px;" checked />
-          <label for="show_mode_ordinary">社区模式一</label>
-          <input type="radio" id="show_mode_special" value="1" name="show_mode"  style="margin-left:10px;" />
-          <label for="show_mode_special">社区模式二</label>
-        </li>
+        <!--<li class=" mb5 ml45">-->
+          <!--<span style="margin-left:10px;" >显示模式&nbsp;&nbsp;&nbsp;&nbsp;: </span>-->
+          <!--<input type="radio" id="show_mode_ordinary" value="0" name="show_mode"  style="margin-left:2px;" checked />-->
+          <!--<label for="show_mode_ordinary">社区模式一</label>-->
+          <!--<input type="radio" id="show_mode_special" value="1" name="show_mode"  style="margin-left:10px;" />-->
+          <!--<label for="show_mode_special">社区模式二</label>-->
+        <!--</li>-->
         <li class=" mb5 ml80">
           <label >公开&nbsp;&nbsp;：</label>
           <input id="organization_is_public" name="organization[is_public]" onclick="disable_down($(this), $('#organization_alow_download'), $('#allow_down_hint'));" type="checkbox" value="1" checked="checked">
diff --git a/app/views/organizations/setting.html.erb b/app/views/organizations/setting.html.erb
index 39848d192..2676105d3 100644
--- a/app/views/organizations/setting.html.erb
+++ b/app/views/organizations/setting.html.erb
@@ -72,13 +72,13 @@
           <!--class="c_green f12" 您的申请已提交，系统会以消息的形式通知您结果 -->
         </div>
         <div class="cl"></div>
-        <div class="orgRow mb10 mt5">
-          <span style="margin-left:10px;" >显示模式&nbsp;: </span>
-          <input type="radio" id="show_mode_ordinary" value="0" name="show_mode"  style="margin-left:5px;" <%= @organization.show_mode == 0 ? "checked" : "" %> />
-          <label for="show_mode_ordinary">社区模式一</label>
-          <input type="radio" id="show_mode_special" value="1" name="show_mode"  style="margin-left:10px;" <%= @organization.show_mode == 1 ? "checked" : "" %> />
-          <label for="show_mode_special">社区模式二</label>
-        </div>
+        <!--<div class="orgRow mb10 mt5">-->
+          <!--<span style="margin-left:10px;" >显示模式&nbsp;: </span>-->
+          <!--<input type="radio" id="show_mode_ordinary" value="0" name="show_mode"  style="margin-left:5px;" <%= @organization.show_mode == 0 ? "checked" : "" %> />-->
+          <!--<label for="show_mode_ordinary">社区模式一</label>-->
+          <!--<input type="radio" id="show_mode_special" value="1" name="show_mode"  style="margin-left:10px;" <%= @organization.show_mode == 1 ? "checked" : "" %> />-->
+          <!--<label for="show_mode_special">社区模式二</label>-->
+        <!--</div>-->
         <div class="orgRow mb10 mt5"><span style="margin-left:38px;" >公开&nbsp;: </span>
           <input type="checkbox" id="is_public" onclick="disable_down($(this), $('#allow_download'),$('#allow_down_hint'));"  name="organization[is_public]" <%= @organization.is_public ? 'checked': ''%> class="ml3" />
         </div>

From 0b0f484a5b1f623cf4443a345eb9fd7d777760e2 Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Tue, 29 Mar 2016 09:50:37 +0800
Subject: [PATCH 10/14] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=90=B4=E6=96=87?=
 =?UTF-8?q?=E6=A4=8D=E7=9A=84=E5=88=86=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...29014316_update_one_student_teacher_score.rb | 17 +++++++++++++++++
 db/schema.rb                                    |  2 +-
 2 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 db/migrate/20160329014316_update_one_student_teacher_score.rb

diff --git a/db/migrate/20160329014316_update_one_student_teacher_score.rb b/db/migrate/20160329014316_update_one_student_teacher_score.rb
new file mode 100644
index 000000000..cf56db220
--- /dev/null
+++ b/db/migrate/20160329014316_update_one_student_teacher_score.rb
@@ -0,0 +1,17 @@
+class UpdateOneStudentTeacherScore < ActiveRecord::Migration
+  def up
+    work = StudentWork.find 49774
+    score = StudentWorksScore.new
+    score.score = 100
+    score.user_id = 7318
+    score.student_work_id = work.id
+    score.reviewer_role = 1
+    if score.save
+      work.teacher_score = score.score
+    end
+    work.save
+  end
+
+  def down
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index aeabe0ae0..28931468b 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20160325030423) do
+ActiveRecord::Schema.define(:version => 20160329014316) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false

From 90fd52970bff03449fcf179cfde7d77afeff85c3 Mon Sep 17 00:00:00 2001
From: alan <547533434@qq.com>
Date: Tue, 29 Mar 2016 10:15:18 +0800
Subject: [PATCH 11/14] =?UTF-8?q?fix=20bugger=20on=20=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E5=8C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/users_controller.rb           |   7 +
 .../users/_resource_share_for_orgs.html.erb   |   2 +-
 ..._resource_share_for_project_popup.html.erb | 108 ++++++------
 .../users/_resource_share_popup.html.erb      | 112 ++++++------
 app/views/users/_resources_list.html.erb      | 164 ++++++++++++++++++
 app/views/users/_user_resource_info.html.erb  | 163 -----------------
 .../users/add_exist_file_to_course.js.erb     |   1 +
 app/views/users/add_exist_file_to_org.js.erb  |   1 +
 .../users/add_exist_file_to_project.js.erb    |   1 +
 app/views/users/search_user_course.js.erb     |   2 +-
 app/views/users/search_user_org.js.erb        |  28 +--
 app/views/users/search_user_project.js.erb    |  32 ++--
 app/views/users/user_resource_create.js.erb   |   1 -
 app/views/users/user_resource_delete.js.erb   |  26 +--
 14 files changed, 329 insertions(+), 319 deletions(-)

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 1cf4534bb..efe968d3b 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -1679,6 +1679,7 @@ class UsersController < ApplicationController
     end
     @status = params[:status]
     @type = params[:type]
+    @path = user_resource_user_path(User.current, :type => @type)
     @limit = 25
     @is_remote = true
     @atta_count = @attachments.count
@@ -1703,6 +1704,7 @@ class UsersController < ApplicationController
       .select { |course|  @user.allowed_to?(:as_teacher,course)  and course.is_delete == 0 }
     end
     @search = params[:search]
+    @type = params[:type]
     #这里仅仅是传递需要发送的资源id
     @send_id = params[:send_id]
     @send_ids = params[:checkbox1] || params[:send_ids]
@@ -1721,6 +1723,7 @@ class UsersController < ApplicationController
       @projects = @user.projects.visible
     end
     @search = params[:search]
+    @type = params[:type]
     #这里仅仅是传递需要发送的资源id
     @send_id = params[:send_id]
     @send_ids = params[:checkbox1] || params[:send_ids] #搜索的时候  和 直接 用表格提交的时候的send_ids
@@ -1822,6 +1825,7 @@ class UsersController < ApplicationController
                                         "or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}))").order("created_on desc")
     @type = params[:type]
     @limit = 25
+    @path = user_resource_user_path(User.current, :type => @type)
     @user = User.current
     @is_remote = true
     @atta_count = @attachments.count
@@ -1933,6 +1937,7 @@ class UsersController < ApplicationController
                                         "or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}))").order("created_on desc")
     @type = params[:type]
     @limit = 25
+    @path = user_resource_user_path(User.current, :type => @type)
     @user = User.current
     @is_remote = true
     @atta_count = @attachments.count
@@ -2031,6 +2036,7 @@ class UsersController < ApplicationController
                                         "or (container_type = 'Course'  and container_id in (#{user_course_ids.empty? ? '0': user_course_ids.join(',')}))").order("created_on desc")
     @type = params[:type]
     @limit = 25
+    @path = user_resource_user_path(User.current, :type => @type)
     @user = User.current
     @is_remote = true
     @atta_count = @attachments.count
@@ -2723,6 +2729,7 @@ class UsersController < ApplicationController
     name = "%"+name+"%"
     @orgs = User.current.organizations.where("name like ?", name)
     @user = User.current
+    @type = params[:type]
     respond_to do |format|
       format.html {render :layout => 'static_base'}
       format.js
diff --git a/app/views/users/_resource_share_for_orgs.html.erb b/app/views/users/_resource_share_for_orgs.html.erb
index 792db7546..166d0f82b 100644
--- a/app/views/users/_resource_share_for_orgs.html.erb
+++ b/app/views/users/_resource_share_for_orgs.html.erb
@@ -18,7 +18,7 @@
   <% end %>
     <div class="cl"></div>
 </div>
-<%= form_tag add_exist_file_to_org_user_path(user),:remote=>true,:id=>'orgs_list_form' do %>
+<%= form_tag add_exist_file_to_org_user_path(user, :type => type),:remote=>true,:id=>'orgs_list_form' do %>
     <%= hidden_field_tag(:send_id, send_id) %>
     <%= hidden_field_tag(:send_ids, send_ids) %>
   <div class="sectionWrap fl mr15">
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 33fa03061..aa42b22cc 100644
--- a/app/views/users/_resource_share_for_project_popup.html.erb
+++ b/app/views/users/_resource_share_for_project_popup.html.erb
@@ -1,54 +1,54 @@
-<div class="boxContainer">
-  <div>
-    <div class="sendText fl mr10" style="width: auto">发送到</div>
-    <div class="resourcesSendTo">
-      <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>
-      </select>
-    </div>
-    <div class="cl"></div>
-  </div>
-  <!--<div class="resourcePopupClose"> <a href="javascript:void(0);" class="resourceClose" onclick="closeModal();"></a></div>-->
-  <div class="fl">
-    <%= form_tag  search_user_project_user_path(user),:method => 'get',
-                  :remote=>true,:id=>'search_user_project_form',:class=>'resourcesSearchBox' do %>
-        <%= hidden_field_tag(:send_id, send_id) %>
-        <%= 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 %>','file')
-        </script>
-      <!--<a href="javascript:void(0);"  class="searchIconPopup"></a>-->
-        <%= submit_tag '',:class=>'searchIcon2',:onfocus=>"this.blur();",:style=>'border-style:none' %>
-    <% end %>
-  </div>
-  <%= form_tag add_exist_file_to_project_user_path(user), :remote => true, :id=>'projects_list_form' %>
-  <div>
-
-    <%= hidden_field_tag(:send_id, send_id) %>
-    <%= hidden_field_tag(:send_ids, send_ids) %>
-    <div class="courseReferContainer">
-    <% if !projects.empty?  %>
-        <% projects.each do |project| %>
-        <ul class="courseSend">
-          <li class="" style="display:inline-block">
-            <input name="projects_ids[]" type="checkbox" value="<%= project.id %>" class="courseSendCheckbox"/>
-          </li>
-          <li class="sendCourseName"><%= project.name%></li>
-        </ul>
-        <% end %>
-    </div>
-  </div>
-  <div>
-    <div class="courseSendSubmit">
-      <!--<a href="javascript:void(0);" class="sendSourceText">确定</a>-->
-      <%= submit_tag '确定',:class=>'sendSourceText',:onfocus=>'this.blur();' %>
-    </div>
-    <div class="courseSendCancel"><a href="javascript:void(0);" class="sendSourceText" onclick="hideModal();">取消</a></div>
-  </div>
-  <div class="cl"></div>
-    <% end %>
-</div>
-
+<div class="boxContainer">
+  <div>
+    <div class="sendText fl mr10" style="width: auto">发送到</div>
+    <div class="resourcesSendTo">
+      <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>
+      </select>
+    </div>
+    <div class="cl"></div>
+  </div>
+  <!--<div class="resourcePopupClose"> <a href="javascript:void(0);" class="resourceClose" onclick="closeModal();"></a></div>-->
+  <div class="fl">
+    <%= form_tag  search_user_project_user_path(user),:method => 'get',
+                  :remote=>true,:id=>'search_user_project_form',:class=>'resourcesSearchBox' do %>
+        <%= hidden_field_tag(:send_id, send_id) %>
+        <%= 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 %>','file')
+        </script>
+      <!--<a href="javascript:void(0);"  class="searchIconPopup"></a>-->
+        <%= submit_tag '',:class=>'searchIcon2',:onfocus=>"this.blur();",:style=>'border-style:none' %>
+    <% end %>
+  </div>
+  <%= form_tag add_exist_file_to_project_user_path(user, :type => type), :remote => true, :id=>'projects_list_form' %>
+  <div>
+
+    <%= hidden_field_tag(:send_id, send_id) %>
+    <%= hidden_field_tag(:send_ids, send_ids) %>
+    <div class="courseReferContainer">
+    <% if !projects.empty?  %>
+        <% projects.each do |project| %>
+        <ul class="courseSend">
+          <li class="" style="display:inline-block">
+            <input name="projects_ids[]" type="checkbox" value="<%= project.id %>" class="courseSendCheckbox"/>
+          </li>
+          <li class="sendCourseName"><%= project.name%></li>
+        </ul>
+        <% end %>
+    </div>
+  </div>
+  <div>
+    <div class="courseSendSubmit">
+      <!--<a href="javascript:void(0);" class="sendSourceText">确定</a>-->
+      <%= submit_tag '确定',:class=>'sendSourceText',:onfocus=>'this.blur();' %>
+    </div>
+    <div class="courseSendCancel"><a href="javascript:void(0);" class="sendSourceText" onclick="hideModal();">取消</a></div>
+  </div>
+  <div class="cl"></div>
+    <% end %>
+</div>
+
diff --git a/app/views/users/_resource_share_popup.html.erb b/app/views/users/_resource_share_popup.html.erb
index 74265cabb..ba0eeb21e 100644
--- a/app/views/users/_resource_share_popup.html.erb
+++ b/app/views/users/_resource_share_popup.html.erb
@@ -1,56 +1,56 @@
-
-
-<div class="boxContainer">
-  <div>
-    <div class="sendText fl mr10" style="width: auto">发送到</div>
-    <div class="resourcesSendTo">
-      <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>
-      </select>
-    </div>
-    <div class="cl"></div>
-  </div>
-  <!--<div class="resourcePopupClose"> <a href="javascript:void(0);" class="resourceClose" onclick="closeModal();"></a></div>-->
-  <div class="fl">
-    <%= form_tag  search_user_course_user_path(user),:method => 'get',
-                  :remote=>true,:id=>'search_user_course_form',:class=>'resourcesSearchBox' do %>
-        <%= hidden_field_tag(:send_id, send_id) %>
-        <%= 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%>','file')
-        </script>
-      <!--<a href="javascript:void(0);"  class="searchIconPopup"></a>-->
-        <%= submit_tag '',:class=>'searchIcon2',:onfocus=>"this.blur();",:style=>'border-style:none' %>
-    <% end %>
-  </div>
-  <%= form_tag add_exist_file_to_course_user_path(user),:remote=>true,:id=>'course_list_form' %>
-      <div>
-
-        <%= hidden_field_tag(:send_id, send_id) %>
-        <%= hidden_field_tag(:send_ids, send_ids) %>
-        <div class="courseReferContainer">
-        <% if !courses.empty?  %>
-            <% courses.each do |course| %>
-            <ul class="courseSend">
-              <li class="" style="display:inline-block">
-                <input name="course_ids[]" type="checkbox" value="<%= course.id %>" class="courseSendCheckbox"/>
-              </li>
-              <li class="sendCourseName"><%= truncate(course.name,:lendght=>25) + '['+course.time.to_s+course.term + ']'%></li>
-            </ul>
-            <% end %>
-          </div>
-      </div>
-      <div>
-        <div class="courseSendSubmit">
-          <!--<a href="javascript:void(0);" class="sendSourceText">确定</a>-->
-          <%= submit_tag '确定',:class=>'sendSourceText',:onfocus=>'this.blur();' %>
-        </div>
-        <div class="courseSendCancel"><a href="javascript:void(0);" class="sendSourceText mt10" onclick="hideModal();">取消</a></div>
-      </div>
-      <div class="cl"></div>
-  <% end %>
-</div>
-
+
+
+<div class="boxContainer">
+  <div>
+    <div class="sendText fl mr10" style="width: auto">发送到</div>
+    <div class="resourcesSendTo">
+      <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>
+      </select>
+    </div>
+    <div class="cl"></div>
+  </div>
+  <!--<div class="resourcePopupClose"> <a href="javascript:void(0);" class="resourceClose" onclick="closeModal();"></a></div>-->
+  <div class="fl">
+    <%= form_tag  search_user_course_user_path(user),:method => 'get',
+                  :remote=>true,:id=>'search_user_course_form',:class=>'resourcesSearchBox' do %>
+        <%= hidden_field_tag(:send_id, send_id) %>
+        <%= 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%>','file')
+        </script>
+      <!--<a href="javascript:void(0);"  class="searchIconPopup"></a>-->
+        <%= submit_tag '',:class=>'searchIcon2',:onfocus=>"this.blur();",:style=>'border-style:none' %>
+    <% end %>
+  </div>
+  <%= form_tag add_exist_file_to_course_user_path(user, :type => type),:remote=>true,:id=>'course_list_form' %>
+      <div>
+
+        <%= hidden_field_tag(:send_id, send_id) %>
+        <%= hidden_field_tag(:send_ids, send_ids) %>
+        <div class="courseReferContainer">
+        <% if !courses.empty?  %>
+            <% courses.each do |course| %>
+            <ul class="courseSend">
+              <li class="" style="display:inline-block">
+                <input name="course_ids[]" type="checkbox" value="<%= course.id %>" class="courseSendCheckbox"/>
+              </li>
+              <li class="sendCourseName"><%= truncate(course.name,:lendght=>25) + '['+course.time.to_s+course.term + ']'%></li>
+            </ul>
+            <% end %>
+          </div>
+      </div>
+      <div>
+        <div class="courseSendSubmit">
+          <!--<a href="javascript:void(0);" class="sendSourceText">确定</a>-->
+          <%= submit_tag '确定',:class=>'sendSourceText',:onfocus=>'this.blur();' %>
+        </div>
+        <div class="courseSendCancel"><a href="javascript:void(0);" class="sendSourceText mt10" onclick="hideModal();">取消</a></div>
+      </div>
+      <div class="cl"></div>
+  <% end %>
+</div>
+
diff --git a/app/views/users/_resources_list.html.erb b/app/views/users/_resources_list.html.erb
index 69b512653..b8551f7c5 100644
--- a/app/views/users/_resources_list.html.erb
+++ b/app/views/users/_resources_list.html.erb
@@ -28,4 +28,168 @@
 
 <script>
 
+
+    function show_upload(){
+        $("#ajax-modal").html('<%= escape_javascript( render :partial => 'upload_resource' ,:locals => {:user=>User.current.id,:type=>@type,:status=>@status})%>');
+        showModal('ajax-modal', '452px');
+        $('#ajax-modal').siblings().remove();
+        $('#ajax-modal').before("<a href='javascript:void(0)' onclick='closeModal();' style='margin-left: 435px;' class='resourceClose'></a>");
+        $('#ajax-modal').parent().css("top","50%").css("left","50%").css("position","absolute");
+        $('#ajax-modal').parent().addClass("resourceUploadPopup");
+        $('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
+    }
+    //批量删除
+    function batch_delete(){
+        var data = $("#resources_list_form").serialize();
+        if($("input[type=checkbox][data-has-history=Y]:checked").length != 0){
+            alert("您只能删除没有历史记录的资源，请重新选择后再删除。");
+            return;
+        }
+        if($("input[type=checkbox][data-deleteble=N]:checked").length != 0){
+            alert("您只能删除自己上传的资源，请重新选择后再删除。");
+            return;
+        }
+
+        if(data != "" && confirm('确认要删除这些资源吗？')) {
+            $.post(
+                    '<%= user_resource_delete_user_path(User.current.id,:type=>@type,:status=>@status)%>',
+                    $("#resources_list_form").serialize(),//只会对选中的控件进行序列化提交
+                    function (data) {
+
+                    }
+            );
+        }
+    }
+
+
+
+    function show_send(){
+        $("#contextMenu").hide();
+        document.oncontextmenu = function() {return true;}
+        line.children().css("background-color",'white');
+        id = line.children().last().html();
+        if (lastSendType === '2'){  //如果已经发送过一次了，那么就应该沿用上次发送的类型。
+            $.ajax({
+                type: 'get',
+                url: '<%= search_user_project_user_path(User.current.id) %>' + "?send_id=" + id + "&type=<%= @type %>",
+                data:{send_type:'file'}
+            });
+        }else{
+            $.ajax({
+                type: 'get',
+                url: '<%= search_user_course_user_path(User.current.id)%>' + "?send_id=" + id + "&type=<%= @type %>",
+                data:{send_type:'file'}
+            });
+        }
+    }
+
+    function batch_send(){
+        if($("#resources_list_form").serialize() == ""){
+            alert('暂时不支持多页选择，您当前页没有选择任何资源');
+            return ;
+        }
+        if (lastSendType === '2'){  //如果已经发送过一次了，那么就应该沿用上次发送的类型。
+            $.ajax({
+                type: 'get',
+                url: '<%= search_user_project_user_path(User.current.id)%>' + '?' +  $("#resources_list_form").serialize() + "&type=<%= @type%>",
+                data:{send_type:'file'}
+            });
+        }else{
+            $.ajax({
+                type: 'get',
+                url: '<%= search_user_course_user_path(User.current.id)%>' + '?'+ $("#resources_list_form").serialize() + "&type=<%= @type%>",
+                data:{send_type:'file'}
+            });
+
+        }
+    }
+
+    function preview(){
+        $("#contextMenu").hide();
+        document.oncontextmenu = function() {return true;}
+        line.children().css("background-color",'white');
+        id = line.children().last().html();
+        $.ajax({
+            type:'get',
+            url:'<%= resource_preview_user_path(User.current.id)%>'+"?resource_id="+id
+        });
+    }
+
+
+    String.prototype.trim = function() {
+        var str = this,
+                str = str.replace(/^\s\s*/, ''),
+                ws = /\s/,
+                i = str.length;
+        while (ws.test(str.charAt(--i)));
+        return str.slice(0, i + 1);
+    }
+
+
+
+    //恢复编辑状态到链接状态
+    //如果当前是编辑状态，任何的不在输入框里的单击右键事件都需要将编辑状态变回链接状态
+    //如果是编辑状态，且做了修改，那么久要进行修改，并且将修改值经过处理替换到页面显示
+    function restore(){
+        //上一行不为空 且链接不为空
+        if( last_line != null && res_link != null && res_link != '') {
+            name = $("#res_name").lenght != 0 && $("#res_name").val() != undefined  ?  $("#res_name").val().trim() : undefined ;
+            if (name == undefined || name === 'undefined' ){ //只要res_name没有值，那么就不是编辑状态
+                return;
+            }
+            if( name && name != res_name.trim()){
+
+                if(confirm('确定修改为 '+name)){
+                    $.ajax({
+                        url:  '<%=rename_resource_user_path(User.current.id) %>'+  "?res_name="+$('#res_name').val() + "&res_id=" + $("#res_id").val(),
+                        type:'get',
+                        success:function (data)
+                        {
+                            if (data != 'fail' && name != undefined && name != 'undefined') {//修改成功，那么将链接恢复，并且将链接的显示内容改变。链接可以不变
+                                last_line.children().eq(1).html(res_link);
+                                last_line.children().eq(1).children().attr('title', name);
+                                last_line.children().eq(1).children().attr('href', data);
+                                last_line.children().eq(1).children().html(name.length > 17 ? name.substring(0, 17) + '...' : name);
+                            } else {
+                                last_line.children().eq(1).html(res_link);
+                                res_link = null; //如果修改失败，恢复之后将res_link置空
+                            }
+                        }
+                    } );
+                }else{
+                    last_line.children().eq(1).html(res_link);
+                    res_link = null; //如果没有做修改，恢复之后将res_link置空
+                }
+            }else {
+                last_line.children().eq(1).html(res_link);
+                res_link = null;//如果没有做修改，恢复之后将res_link置空
+            }
+
+
+        }
+    }
+
+    function delete_file() {
+        $("#contextMenu").hide();
+        document.oncontextmenu = function () {
+            return true;
+        }
+        line.children().css("background-color", 'white');
+        id = line.children().last().html();
+        user_id = line.children().eq(5).html();
+        if(line.children().first().children().data('hasHistory') == 'Y'){
+            alert('该资源存在历史版本，不能删除');
+            return;
+        }
+        if(user_id === '<%= User.current.id%>') {
+            if (confirm('确定要删除资源"' + line.children().eq(1).children().attr('title').trim() + '"么?')) {
+                $.ajax({
+                    type: 'post',
+                    url: '<%= user_resource_delete_user_path(User.current.id)%>' + '?resource_id=' + id + '&type=<%=@type %>&status=<%=@status %>'
+                });
+            }
+        }else{
+            alert('您无法删除此资源！')
+        }
+    }
 </script>
diff --git a/app/views/users/_user_resource_info.html.erb b/app/views/users/_user_resource_info.html.erb
index 0a3f94bb3..a3bc45481 100644
--- a/app/views/users/_user_resource_info.html.erb
+++ b/app/views/users/_user_resource_info.html.erb
@@ -207,93 +207,6 @@
             $("#res_count").html(0);
         }
     }
-
-    function show_upload(){
-        $("#ajax-modal").html('<%= escape_javascript( render :partial => 'upload_resource' ,:locals => {:user=>User.current.id,:type=>@type,:status=>@status})%>');
-        showModal('ajax-modal', '452px');
-        $('#ajax-modal').siblings().remove();
-        $('#ajax-modal').before("<a href='javascript:void(0)' onclick='closeModal();' style='margin-left: 435px;' class='resourceClose'></a>");
-        $('#ajax-modal').parent().css("top","50%").css("left","50%").css("position","absolute");
-        $('#ajax-modal').parent().addClass("resourceUploadPopup");
-        $('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
-    }
-    //批量删除
-    function batch_delete(){
-        var data = $("#resources_list_form").serialize();
-        if($("input[type=checkbox][data-has-history=Y]:checked").length != 0){
-            alert("您只能删除没有历史记录的资源，请重新选择后再删除。");
-            return;
-        }
-        if($("input[type=checkbox][data-deleteble=N]:checked").length != 0){
-            alert("您只能删除自己上传的资源，请重新选择后再删除。");
-            return;
-        }
-
-        if(data != "" && confirm('确认要删除这些资源吗？')) {
-            $.post(
-                    '<%= user_resource_delete_user_path(User.current.id,:type=>@type,:status=>@status)%>',
-                    $("#resources_list_form").serialize(),//只会对选中的控件进行序列化提交
-                    function (data) {
-
-                    }
-            );
-        }
-    }
-
-
-
-    function show_send(){
-        $("#contextMenu").hide();
-        document.oncontextmenu = function() {return true;}
-        line.children().css("background-color",'white');
-        id = line.children().last().html();
-        if (lastSendType === '2'){  //如果已经发送过一次了，那么就应该沿用上次发送的类型。
-            $.ajax({
-                type: 'get',
-                url: '<%= search_user_project_user_path(User.current.id)%>' + '?send_id=' + id,
-                data:{send_type:'file'}
-            });
-        }else{
-            $.ajax({
-                type: 'get',
-                url: '<%= search_user_course_user_path(User.current.id)%>' + '?send_id=' + id,
-                data:{send_type:'file'}
-            });
-        }
-    }
-
-    function batch_send(){
-        if($("#resources_list_form").serialize() == ""){
-            alert('暂时不支持多页选择，您当前页没有选择任何资源');
-            return ;
-        }
-        if (lastSendType === '2'){  //如果已经发送过一次了，那么就应该沿用上次发送的类型。
-            $.ajax({
-                type: 'get',
-                url: '<%= search_user_project_user_path(User.current.id)%>' + '?' +  $("#resources_list_form").serialize(),
-                data:{send_type:'file'}
-            });
-        }else{
-            $.ajax({
-                type: 'get',
-                url: '<%= search_user_course_user_path(User.current.id)%>' + '?'+ $("#resources_list_form").serialize(),
-                data:{send_type:'file'}
-            });
-
-        }
-    }
-
-    function preview(){
-        $("#contextMenu").hide();
-        document.oncontextmenu = function() {return true;}
-        line.children().css("background-color",'white');
-        id = line.children().last().html();
-        $.ajax({
-            type:'get',
-            url:'<%= resource_preview_user_path(User.current.id)%>'+"?resource_id="+id
-        });
-    }
-
     function rename(){
         $("#contextMenu").hide();
         document.oncontextmenu = function() {return true;}
@@ -315,80 +228,4 @@
             alert('您无法修改此资源！')
         }
     }
-    String.prototype.trim = function() {
-        var str = this,
-                str = str.replace(/^\s\s*/, ''),
-                ws = /\s/,
-                i = str.length;
-        while (ws.test(str.charAt(--i)));
-        return str.slice(0, i + 1);
-    }
-
-
-
-    //恢复编辑状态到链接状态
-    //如果当前是编辑状态，任何的不在输入框里的单击右键事件都需要将编辑状态变回链接状态
-    //如果是编辑状态，且做了修改，那么久要进行修改，并且将修改值经过处理替换到页面显示
-    function restore(){
-        //上一行不为空 且链接不为空
-        if( last_line != null && res_link != null && res_link != '') {
-            name = $("#res_name").lenght != 0 && $("#res_name").val() != undefined  ?  $("#res_name").val().trim() : undefined ;
-            if (name == undefined || name === 'undefined' ){ //只要res_name没有值，那么就不是编辑状态
-                return;
-            }
-            if( name && name != res_name.trim()){
-
-                if(confirm('确定修改为 '+name)){
-                    $.ajax({
-                        url:  '<%=rename_resource_user_path(User.current.id) %>'+  "?res_name="+$('#res_name').val() + "&res_id=" + $("#res_id").val(),
-                        type:'get',
-                        success:function (data)
-                        {
-                            if (data != 'fail' && name != undefined && name != 'undefined') {//修改成功，那么将链接恢复，并且将链接的显示内容改变。链接可以不变
-                                last_line.children().eq(1).html(res_link);
-                                last_line.children().eq(1).children().attr('title', name);
-                                last_line.children().eq(1).children().attr('href', data);
-                                last_line.children().eq(1).children().html(name.length > 17 ? name.substring(0, 17) + '...' : name);
-                            } else {
-                                last_line.children().eq(1).html(res_link);
-                                res_link = null; //如果修改失败，恢复之后将res_link置空
-                            }
-                        }
-                    } );
-                }else{
-                    last_line.children().eq(1).html(res_link);
-                    res_link = null; //如果没有做修改，恢复之后将res_link置空
-                }
-            }else {
-                last_line.children().eq(1).html(res_link);
-                res_link = null;//如果没有做修改，恢复之后将res_link置空
-            }
-
-
-        }
-    }
-
-    function delete_file() {
-        $("#contextMenu").hide();
-        document.oncontextmenu = function () {
-            return true;
-        }
-        line.children().css("background-color", 'white');
-        id = line.children().last().html();
-        user_id = line.children().eq(5).html();
-        if(line.children().first().children().data('hasHistory') == 'Y'){
-            alert('该资源存在历史版本，不能删除');
-            return;
-        }
-        if(user_id === '<%= User.current.id%>') {
-            if (confirm('确定要删除资源"' + line.children().eq(1).children().attr('title').trim() + '"么?')) {
-                $.ajax({
-                    type: 'post',
-                    url: '<%= user_resource_delete_user_path(User.current.id)%>' + '?resource_id=' + id + '&type=<%=@type %>&status=<%=@status %>'
-                });
-            }
-        }else{
-            alert('您无法删除此资源！')
-        }
-    }
 </script>
\ No newline at end of file
diff --git a/app/views/users/add_exist_file_to_course.js.erb b/app/views/users/add_exist_file_to_course.js.erb
index c05a2ebd0..8db83aefc 100644
--- a/app/views/users/add_exist_file_to_course.js.erb
+++ b/app/views/users/add_exist_file_to_course.js.erb
@@ -1,6 +1,7 @@
 <% if @flag == true%>
 $("#search_div").html('<%= escape_javascript( render :partial =>  'resource_search_form',:locals => {:user=>@user,:type=>@type} ) %>');
 $("#resources_list").html('<%= escape_javascript( render :partial => 'resources_list' ,:locals=>{ :attachments => @attachments})%>');
+$("#pages").html('<%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true, :path => @path %>');
 $("#res_count").html(0);
 $("#checkboxAll").attr('checked',false);
 $("#res_all_count").html(<%= @atta_count%>);
diff --git a/app/views/users/add_exist_file_to_org.js.erb b/app/views/users/add_exist_file_to_org.js.erb
index 9bfe1230a..c6e7f4011 100644
--- a/app/views/users/add_exist_file_to_org.js.erb
+++ b/app/views/users/add_exist_file_to_org.js.erb
@@ -1,6 +1,7 @@
 <% if @flag == true%>
 $("#search_div").html('<%= escape_javascript( render :partial =>  'resource_search_form',:locals => {:user=>@user,:type=>@type} ) %>');
 $("#resources_list").html('<%= escape_javascript( render :partial => 'resources_list' ,:locals=>{ :attachments => @attachments})%>');
+$("#pages").html('<%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true, :path => @path %>');
 $("#res_count").html(0);
 $("#checkboxAll").attr('checked',false);
 $("#res_all_count").html(<%= @atta_count%>);
diff --git a/app/views/users/add_exist_file_to_project.js.erb b/app/views/users/add_exist_file_to_project.js.erb
index ed38fa066..4c24f4932 100644
--- a/app/views/users/add_exist_file_to_project.js.erb
+++ b/app/views/users/add_exist_file_to_project.js.erb
@@ -1,6 +1,7 @@
 <% if @flag == true%>
 $("#search_div").html('<%= escape_javascript( render :partial =>  'resource_search_form',:locals => {:user=>@user,:type=>@type} ) %>');
 $("#resources_list").html('<%= escape_javascript( render :partial => 'resources_list' ,:locals=>{ :attachments => @attachments})%>');
+$("#pages").html('<%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true, :path => @path %>');
 $("#res_count").html(0);
 $("#checkboxAll").attr('checked',false);
 $("#res_all_count").html(<%= @atta_count%>);
diff --git a/app/views/users/search_user_course.js.erb b/app/views/users/search_user_course.js.erb
index f4509987f..5556d3c92 100644
--- a/app/views/users/search_user_course.js.erb
+++ b/app/views/users/search_user_course.js.erb
@@ -12,7 +12,7 @@
 <% if params[:send_type].present? && params[:send_type] == 'news' %>
 $("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/share_news_to_course' , :locals => {:courses => @course, :user => @user, :send_id => @send_id, :send_ids => @send_ids}) %>');
 <% elsif params[:send_type] == 'file' %>
-$("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/resource_share_popup' , :locals => {:courses => @course, :user => @user, :send_id => @send_id, :send_ids => @send_ids}) %>');
+$("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/resource_share_popup' , :locals => {:courses => @course, :user => @user, :send_id => @send_id, :send_ids => @send_ids, :type => @type}) %>');
 <% elsif params[:send_type] == 'message' %>
 $("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/share_message_to_course' ,:locals => {:courses => @course, :user => @user, :send_id => @send_id, :send_ids => @send_ids}) %>');
 <% end %>
diff --git a/app/views/users/search_user_org.js.erb b/app/views/users/search_user_org.js.erb
index ee12e9439..7461dbfda 100644
--- a/app/views/users/search_user_org.js.erb
+++ b/app/views/users/search_user_org.js.erb
@@ -1,15 +1,15 @@
-<% if params[:send_type].present? && params[:send_type] == 'news' %>
-$("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/share_news_to_org' ,:locals => {:orgs=>@orgs,:user=>@user,:send_id=>@send_id,:send_ids=>@send_ids})%>');
-<% elsif params[:send_type] == 'file' %>
-$("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/resource_share_for_orgs' ,:locals => {:orgs=>@orgs,:user=>@user,:send_id=>@send_id,:send_ids=>@send_ids})%>');
-<% elsif params[:send_type] == 'message' %>
-$("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/share_message_to_org' ,:locals => {:orgs=>@orgs,:user=>@user,:send_id=>@send_id,:send_ids=>@send_ids})%>');
-<% end %>
-showModal('ajax-modal', '452px');
-$('#ajax-modal').siblings().remove();
-$('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal();' style='margin-left: 435px;' class='resourceClose'></a>");
-$('#ajax-modal').parent().css("top","50%").css("left","50%");
-$('#ajax-modal').parent().addClass("popbox").addClass("shareDP");
-$('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
-var val =  $("#search_org_input").val();
+<% if params[:send_type].present? && params[:send_type] == 'news' %>
+$("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/share_news_to_org' ,:locals => {:orgs=>@orgs,:user=>@user,:send_id=>@send_id,:send_ids=>@send_ids})%>');
+<% elsif params[:send_type] == 'file' %>
+$("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/resource_share_for_orgs' ,:locals => {:orgs=>@orgs,:user=>@user,:send_id=>@send_id,:send_ids=>@send_ids, :type => @type})%>');
+<% elsif params[:send_type] == 'message' %>
+$("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/share_message_to_org' ,:locals => {:orgs=>@orgs,:user=>@user,:send_id=>@send_id,:send_ids=>@send_ids})%>');
+<% end %>
+showModal('ajax-modal', '452px');
+$('#ajax-modal').siblings().remove();
+$('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal();' style='margin-left: 435px;' class='resourceClose'></a>");
+$('#ajax-modal').parent().css("top","50%").css("left","50%");
+$('#ajax-modal').parent().addClass("popbox").addClass("shareDP");
+$('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
+var val =  $("#search_org_input").val();
 $("#search_org_input").val("").focus().val(val);
\ No newline at end of file
diff --git a/app/views/users/search_user_project.js.erb b/app/views/users/search_user_project.js.erb
index d58c56ca9..50a194814 100644
--- a/app/views/users/search_user_project.js.erb
+++ b/app/views/users/search_user_project.js.erb
@@ -1,16 +1,16 @@
-<% if params[:send_type].present? && params[:send_type] == 'news' %>
-$("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/share_news_to_project', :locals => {:projects => @projects, :user => @user, :send_id => @send_id, :send_ids => @send_ids}) %>');
-<% elsif params[:send_type] == 'file' %>
-$("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/resource_share_for_project_popup', :locals => {:projects => @projects, :user => @user, :send_id => @send_id, :send_ids => @send_ids}) %>');
-<% elsif params[:send_type] == 'message' %>
-$("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/share_message_to_project', :locals => {:projects => @projects, :user => @user, :send_id => @send_id, :send_ids => @send_ids}) %>');
-<% end %>
-showModal('ajax-modal', '452px');
-$('#ajax-modal').siblings().remove();
-$('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal();' style='margin-left: 435px;' class='resourceClose'></a>");
-$('#ajax-modal').parent().css("top","50%").css("left","50%");
-$('#ajax-modal').parent().addClass("resourceUploadPopup").addClass("popbox")
-$('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
-//$("#search_project_input").focus();
-var val =  $("#search_project_input").val();
-$("#search_project_input").val("").focus().val(val);
+<% if params[:send_type].present? && params[:send_type] == 'news' %>
+$("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/share_news_to_project', :locals => {:projects => @projects, :user => @user, :send_id => @send_id, :send_ids => @send_ids}) %>');
+<% elsif params[:send_type] == 'file' %>
+$("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/resource_share_for_project_popup', :locals => {:projects => @projects, :user => @user, :send_id => @send_id, :send_ids => @send_ids, :type => @type}) %>');
+<% elsif params[:send_type] == 'message' %>
+$("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/share_message_to_project', :locals => {:projects => @projects, :user => @user, :send_id => @send_id, :send_ids => @send_ids}) %>');
+<% end %>
+showModal('ajax-modal', '452px');
+$('#ajax-modal').siblings().remove();
+$('#ajax-modal').before("<a href='javascript:void(0)' onclick='hideModal();' style='margin-left: 435px;' class='resourceClose'></a>");
+$('#ajax-modal').parent().css("top","50%").css("left","50%");
+$('#ajax-modal').parent().addClass("resourceUploadPopup").addClass("popbox")
+$('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
+//$("#search_project_input").focus();
+var val =  $("#search_project_input").val();
+$("#search_project_input").val("").focus().val(val);
diff --git a/app/views/users/user_resource_create.js.erb b/app/views/users/user_resource_create.js.erb
index cc7e543c8..d28898e0a 100644
--- a/app/views/users/user_resource_create.js.erb
+++ b/app/views/users/user_resource_create.js.erb
@@ -1,7 +1,6 @@
 closeModal();
 $("#resources_list").html('<%= escape_javascript( render :partial => 'resources_list' ,:locals=>{ :attachments => @attachments})%>');
 $("#resource_tip_list").html('<%= escape_javascript( render :partial => 'users/user_resource_tip_list', :locals => {:user => @user, :type => @type, :status => @status}) %>');
-debugger
 $("#pages").html('<%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true, :path => @path %>');
 $("#res_all_count").html(<%= @atta_count%>);
 $("#res_count").html(0);
diff --git a/app/views/users/user_resource_delete.js.erb b/app/views/users/user_resource_delete.js.erb
index 9583274c6..ffb056e28 100644
--- a/app/views/users/user_resource_delete.js.erb
+++ b/app/views/users/user_resource_delete.js.erb
@@ -1,14 +1,14 @@
-$("#resources_list").html('<%= escape_javascript( render :partial => 'resources_list' ,:locals=>{ :attachments => @attachments})%>');
-$("#resource_tip_list").html('<%= escape_javascript( render :partial => 'users/user_resource_tip_list', :locals => {:user => @user, :type => @type, :status => @status}) %>');
-$("#pages").html('<%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>');
-$("#res_all_count").html(<%= @atta_count%>);
-$("#res_count").html(0);
-$("#checkboxAll").attr('checked',false);
-//更新状态
-$("#public_resource_list").attr('href','<%= user_resource_user_path(@user, :type => '6') %>');
-$("#my_resource_list").attr('href','<%= user_resource_user_path(@user, :type => '1') %>');
-$("#resource_type_all").attr('href','<%= resource_search_user_path(@user,:type => @type, :status => 1, :search => @switch_search) %>');
-$("#resource_type_course").attr('href','<%= resource_search_user_path(@user,:type => @type, :status => 2, :search => @switch_search) %>');
-$("#resource_type_project").attr('href','<%= resource_search_user_path(@user,:type => @type, :status => 3, :search => @switch_search) %>');
-$("#resource_type_user").attr('href','<%= resource_search_user_path(@user,:type => @type, :status => 5, :search => @switch_search) %>');
+$("#resources_list").html('<%= escape_javascript( render :partial => 'resources_list' ,:locals=>{ :attachments => @attachments})%>');
+$("#resource_tip_list").html('<%= escape_javascript( render :partial => 'users/user_resource_tip_list', :locals => {:user => @user, :type => @type, :status => @status}) %>');
+$("#pages").html('<%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true, :path => @path %>');
+$("#res_all_count").html(<%= @atta_count%>);
+$("#res_count").html(0);
+$("#checkboxAll").attr('checked',false);
+//更新状态
+$("#public_resource_list").attr('href','<%= user_resource_user_path(@user, :type => '6') %>');
+$("#my_resource_list").attr('href','<%= user_resource_user_path(@user, :type => '1') %>');
+$("#resource_type_all").attr('href','<%= resource_search_user_path(@user,:type => @type, :status => 1, :search => @switch_search) %>');
+$("#resource_type_course").attr('href','<%= resource_search_user_path(@user,:type => @type, :status => 2, :search => @switch_search) %>');
+$("#resource_type_project").attr('href','<%= resource_search_user_path(@user,:type => @type, :status => 3, :search => @switch_search) %>');
+$("#resource_type_user").attr('href','<%= resource_search_user_path(@user,:type => @type, :status => 5, :search => @switch_search) %>');
 $("#resource_type_file").attr('href','<%= resource_search_user_path(@user,:type => @type, :status => 4, :search => @switch_search) %>');
\ No newline at end of file

From 1daf620ed1da9bf3d662249fd31fea121df0ff2f Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Tue, 29 Mar 2016 10:39:44 +0800
Subject: [PATCH 12/14] =?UTF-8?q?=E6=96=B0=E5=BB=BA=E4=BD=9C=E5=93=81?=
 =?UTF-8?q?=E7=82=B9=E5=8F=96=E6=B6=88=E6=97=B6=E8=B7=B3=E5=88=B0=E6=88=91?=
 =?UTF-8?q?=E7=9A=84=E4=BD=9C=E4=B8=9A=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/student_work_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/student_work_controller.rb b/app/controllers/student_work_controller.rb
index ae33ccb07..43918ed10 100644
--- a/app/controllers/student_work_controller.rb
+++ b/app/controllers/student_work_controller.rb
@@ -581,7 +581,7 @@ class StudentWorkController < ApplicationController
         end
       end
     end
-    redirect_to user_homeworks_user_path(User.current.id)
+    redirect_to student_homeworks_user_path(User.current.id)
   end
 
   def retry_work

From e9069f02251ab82fc97475b583d98bd9598eaffd Mon Sep 17 00:00:00 2001
From: alan <547533434@qq.com>
Date: Tue, 29 Mar 2016 12:29:23 +0800
Subject: [PATCH 13/14] fix merge bug

---
 app/views/users/_course_file_form.html.erb  | 50 ++++++++---------
 app/views/users/_org_file_form.html.erb     | 62 ++++++++++-----------
 app/views/users/_project_file_form.html.erb | 50 ++++++++---------
 3 files changed, 81 insertions(+), 81 deletions(-)

diff --git a/app/views/users/_course_file_form.html.erb b/app/views/users/_course_file_form.html.erb
index b3eec5288..a1317c1f8 100644
--- a/app/views/users/_course_file_form.html.erb
+++ b/app/views/users/_course_file_form.html.erb
@@ -1,26 +1,26 @@
-<%= form_tag add_exist_file_to_course_user_path(user, :type => type),:remote=>true,:id=>'course_list_form' do %>
-    <div>
-      <%= hidden_field_tag(:send_id, send_id) %>
-      <%= hidden_field_tag(:send_ids, send_ids) %>
-      <div class="courseReferContainer">
-        <% if !courses.empty?  %>
-            <% courses.each do |course| %>
-                <ul class="courseSend">
-                  <li class="" style="display:inline-block">
-                    <input name="course_ids[]" type="checkbox" value="<%= course.id %>" class="courseSendCheckbox"/>
-                  </li>
-                  <li class="sendCourseName"><%= truncate(course.name,:lendght=>25) + '['+course.time.to_s+course.term + ']'%></li>
-                </ul>
-            <% end %>
-        <% end %>
-      </div>
-    </div>
-    <div>
-      <div class="courseSendSubmit">
-        <!--<a href="javascript:void(0);" class="sendSourceText">确定</a>-->
-        <%= submit_tag '确定',:class=>'sendSourceText',:onfocus=>'this.blur();' %>
-      </div>
-      <div class="courseSendCancel"><a href="javascript:void(0);" class="sendSourceText mt10" onclick="hideModal();">取消</a></div>
-    </div>
-    <div class="cl"></div>
+<%= form_tag add_exist_file_to_course_user_path(user, :type => defined? type ? "6" : type ),:remote=>true,:id=>'course_list_form' do %>
+    <div>
+      <%= hidden_field_tag(:send_id, send_id) %>
+      <%= hidden_field_tag(:send_ids, send_ids) %>
+      <div class="courseReferContainer">
+        <% if !courses.empty?  %>
+            <% courses.each do |course| %>
+                <ul class="courseSend">
+                  <li class="" style="display:inline-block">
+                    <input name="course_ids[]" type="checkbox" value="<%= course.id %>" class="courseSendCheckbox"/>
+                  </li>
+                  <li class="sendCourseName"><%= truncate(course.name,:lendght=>25) + '['+course.time.to_s+course.term + ']'%></li>
+                </ul>
+            <% end %>
+        <% end %>
+      </div>
+    </div>
+    <div>
+      <div class="courseSendSubmit">
+        <!--<a href="javascript:void(0);" class="sendSourceText">确定</a>-->
+        <%= submit_tag '确定',:class=>'sendSourceText',:onfocus=>'this.blur();' %>
+      </div>
+      <div class="courseSendCancel"><a href="javascript:void(0);" class="sendSourceText mt10" onclick="hideModal();">取消</a></div>
+    </div>
+    <div class="cl"></div>
 <% end %>
\ No newline at end of file
diff --git a/app/views/users/_org_file_form.html.erb b/app/views/users/_org_file_form.html.erb
index 8b6c24e50..a69e71384 100644
--- a/app/views/users/_org_file_form.html.erb
+++ b/app/views/users/_org_file_form.html.erb
@@ -1,32 +1,32 @@
-<%= form_tag add_exist_file_to_org_user_path(user, :type => type),:remote=>true,:id=>'orgs_list_form' do %>
-    <%= hidden_field_tag(:send_id, send_id) %>
-    <%= hidden_field_tag(:send_ids, send_ids) %>
-    <div class="sectionWrap fl mr15">
-
-      <ul class="fontGrey3 sectionContent">
-        <% unless orgs.empty? %>
-            <% orgs.each do |org|%>
-                <li>
-                  <label>
-                    <input type="radio" name="org_id" value="<%= org.id%>" onchange="change_org_subfield('<%= org_resources_subfield_organization_path(:id=>org.id)%>')" class="mt3 fl mr5" />
-                    <span><%= org.name%></span></label>
-                </li>
-            <%end%>
-        <%end%>
-      </ul>
-    </div>
-    <div class="columnWrap">
-      <ul class="columnContent">
-        <%= render :partial => 'users/org_resources_subfield',:locals => {:subfield=>nil}%>
-      </ul>
-    </div>
-    <div class="cl"></div>
-    <div class="orgDirection mb10 break_word" style="white-space: nowrap;-o-text-overflow:ellipsis;text-overflow: ellipsis;overflow: hidden">目标地址：</div>
-    <div class="courseSendSubmit mr15">
-      <%= submit_tag '确定',:class=>'sendSourceText',:onfocus=>'this.blur();',:onclick=>"check_des(event);" %>
-    </div>
-    <div class="courseSendCancel">
-      <a href="javascript:void(0);" onclick="hideModal();" class="sendSourceText">取消</a>
-    </div>
-    <div class="cl"></div>
+<%= form_tag add_exist_file_to_org_user_path(user, :type => defined? type ? "6" : type),:remote=>true,:id=>'orgs_list_form' do %>
+    <%= hidden_field_tag(:send_id, send_id) %>
+    <%= hidden_field_tag(:send_ids, send_ids) %>
+    <div class="sectionWrap fl mr15">
+
+      <ul class="fontGrey3 sectionContent">
+        <% unless orgs.empty? %>
+            <% orgs.each do |org|%>
+                <li>
+                  <label>
+                    <input type="radio" name="org_id" value="<%= org.id%>" onchange="change_org_subfield('<%= org_resources_subfield_organization_path(:id=>org.id)%>')" class="mt3 fl mr5" />
+                    <span><%= org.name%></span></label>
+                </li>
+            <%end%>
+        <%end%>
+      </ul>
+    </div>
+    <div class="columnWrap">
+      <ul class="columnContent">
+        <%= render :partial => 'users/org_resources_subfield',:locals => {:subfield=>nil}%>
+      </ul>
+    </div>
+    <div class="cl"></div>
+    <div class="orgDirection mb10 break_word" style="white-space: nowrap;-o-text-overflow:ellipsis;text-overflow: ellipsis;overflow: hidden">目标地址：</div>
+    <div class="courseSendSubmit mr15">
+      <%= submit_tag '确定',:class=>'sendSourceText',:onfocus=>'this.blur();',:onclick=>"check_des(event);" %>
+    </div>
+    <div class="courseSendCancel">
+      <a href="javascript:void(0);" onclick="hideModal();" class="sendSourceText">取消</a>
+    </div>
+    <div class="cl"></div>
 <%end %>
\ No newline at end of file
diff --git a/app/views/users/_project_file_form.html.erb b/app/views/users/_project_file_form.html.erb
index 2b4772124..134d837a6 100644
--- a/app/views/users/_project_file_form.html.erb
+++ b/app/views/users/_project_file_form.html.erb
@@ -1,25 +1,25 @@
-<%= form_tag add_exist_file_to_project_user_path(user, :type => type), :remote => true, :id => 'projects_list_form' %>
-<div>
-  <%= hidden_field_tag(:send_id, send_id) %>
-  <%= hidden_field_tag(:send_ids, send_ids) %>
-  <div class="courseReferContainer">
-    <% if !projects.empty? %>
-        <% projects.each do |project| %>
-            <ul class="courseSend">
-              <li class="" style="display:inline-block">
-                <input name="projects_ids[]" type="checkbox" value="<%= project.id %>" class="courseSendCheckbox"/>
-              </li>
-              <li class="sendCourseName"><%= project.name %></li>
-            </ul>
-        <% end %>
-    <% end %>
-  </div>
-</div>
-<div>
-  <div class="courseSendSubmit">
-    <!--<a href="javascript:void(0);" class="sendSourceText">确定</a>-->
-    <%= submit_tag '确定', :class => 'sendSourceText', :onfocus => 'this.blur();' %>
-  </div>
-  <div class="courseSendCancel"><a href="javascript:void(0);" class="sendSourceText" onclick="hideModal();">取消</a></div>
-</div>
-<div class="cl"></div>
+<%= form_tag add_exist_file_to_project_user_path(user, :type => defined? type ? "6" : type), :remote => true, :id => 'projects_list_form' %>
+<div>
+  <%= hidden_field_tag(:send_id, send_id) %>
+  <%= hidden_field_tag(:send_ids, send_ids) %>
+  <div class="courseReferContainer">
+    <% if !projects.empty? %>
+        <% projects.each do |project| %>
+            <ul class="courseSend">
+              <li class="" style="display:inline-block">
+                <input name="projects_ids[]" type="checkbox" value="<%= project.id %>" class="courseSendCheckbox"/>
+              </li>
+              <li class="sendCourseName"><%= project.name %></li>
+            </ul>
+        <% end %>
+    <% end %>
+  </div>
+</div>
+<div>
+  <div class="courseSendSubmit">
+    <!--<a href="javascript:void(0);" class="sendSourceText">确定</a>-->
+    <%= submit_tag '确定', :class => 'sendSourceText', :onfocus => 'this.blur();' %>
+  </div>
+  <div class="courseSendCancel"><a href="javascript:void(0);" class="sendSourceText" onclick="hideModal();">取消</a></div>
+</div>
+<div class="cl"></div>

From 56f8d4854b9f8ca8b6ede2f35c9bfdf3f9621e02 Mon Sep 17 00:00:00 2001
From: ouyangxuhua <ouyangxuhua167@163.com>
Date: Tue, 29 Mar 2016 12:38:02 +0800
Subject: [PATCH 14/14] =?UTF-8?q?=E6=81=A2=E5=A4=8D=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/search_user_org.js.erb     | 12 +++++++++++-
 app/views/users/search_user_project.js.erb | 12 +++++++++++-
 2 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/app/views/users/search_user_org.js.erb b/app/views/users/search_user_org.js.erb
index 6e31c5326..f2caf8b41 100644
--- a/app/views/users/search_user_org.js.erb
+++ b/app/views/users/search_user_org.js.erb
@@ -1,7 +1,8 @@
+<% if params[:is_observe].nil? %>
 <% if params[:send_type].present? && params[:send_type] == 'news' %>
 $("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/share_news_to_org' ,:locals => {:orgs=>@orgs,:user=>@user,:send_id=>@send_id,:send_ids=>@send_ids})%>');
 <% elsif params[:send_type] == 'file' %>
-$("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/resource_share_for_orgs' ,:locals => {:orgs=>@orgs,:user=>@user,:send_id=>@send_id,:send_ids=>@send_ids, :type => @type})%>');
+$("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/resource_share_for_orgs' ,:locals => {:orgs=>@orgs,:user=>@user,:send_id=>@send_id,:send_ids=>@send_ids,:type => @type})%>');
 <% elsif params[:send_type] == 'message' %>
 $("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/share_message_to_org' ,:locals => {:orgs=>@orgs,:user=>@user,:send_id=>@send_id,:send_ids=>@send_ids})%>');
 <% end %>
@@ -13,3 +14,12 @@ $('#ajax-modal').parent().addClass("popbox").addClass("shareDP");
 $('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
 var val =  $("#search_org_input").val();
 $("#search_org_input").val("").focus().val(val);
+<% else %>
+    <% if params[:send_type] == 'news' %>
+    $("#org_news_form").html("<%= escape_javascript(render :partial => 'users/org_news_form', :locals => {:orgs => @orgs,:user=> @user,:send_id => @send_id, :send_ids => @send_ids}) %>");
+    <% elsif params[:send_type] == 'file' %>
+    $("#org_file_form").html("<%= escape_javascript(render :partial => 'users/org_file_form', :locals => {:orgs => @orgs,:user=> @user,:send_id => @send_id, :send_ids => @send_ids}) %>");
+    <% elsif params[:send_type] == 'message' %>
+    $("#org_message_form").html("<%= escape_javascript(render :partial => 'users/org_message_form', :locals => {:orgs => @orgs,:user=> @user,:send_id => @send_id, :send_ids => @send_ids}) %>");
+    <% end %>
+<% end %>
\ No newline at end of file
diff --git a/app/views/users/search_user_project.js.erb b/app/views/users/search_user_project.js.erb
index cc0f5cc09..37d078662 100644
--- a/app/views/users/search_user_project.js.erb
+++ b/app/views/users/search_user_project.js.erb
@@ -1,7 +1,8 @@
+<% if params[:is_observe].nil? %>
 <% if params[:send_type].present? && params[:send_type] == 'news' %>
 $("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/share_news_to_project', :locals => {:projects => @projects, :user => @user, :send_id => @send_id, :send_ids => @send_ids}) %>');
 <% elsif params[:send_type] == 'file' %>
-$("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/resource_share_for_project_popup', :locals => {:projects => @projects, :user => @user, :send_id => @send_id, :send_ids => @send_ids, :type => @type}) %>');
+$("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/resource_share_for_project_popup', :locals => {:projects => @projects, :user => @user, :send_id => @send_id, :send_ids => @send_ids,:type => @type}) %>');
 <% elsif params[:send_type] == 'message' %>
 $("#ajax-modal").html('<%= escape_javascript( render :partial => 'users/share_message_to_project', :locals => {:projects => @projects, :user => @user, :send_id => @send_id, :send_ids => @send_ids}) %>');
 <% end %>
@@ -14,3 +15,12 @@ $('#ajax-modal').css("padding-left","16px").css("padding-bottom","16px");
 //$("#search_project_input").focus();
 var val =  $("#search_project_input").val();
 $("#search_project_input").val("").focus().val(val);
+<% else %>
+<% if params[:send_type] == 'news' %>
+$("#project_news_form").html("<%= escape_javascript(render :partial => 'users/project_news_form', :locals => {:projects => @projects, :user => @user, :send_id => @send_id, :send_ids => @send_ids}) %>");
+<% elsif params[:send_type] == 'file' %>
+$("#project_file_form").html("<%= escape_javascript(render :partial => 'users/project_file_form', :locals => {:projects => @projects, :user => @user, :send_id => @send_id, :send_ids => @send_ids}) %>");
+<% elsif params[:send_type] == 'message' %>
+$("#project_message_form").html("<%= escape_javascript(render :partial => 'users/project_message_form', :locals => {:projects => @projects, :user => @user, :send_id => @send_id, :send_ids => @send_ids}) %>");
+<% end %>
+<% end %>