From c0077b7c9d57adc6f4d59bbbd4b0024a1a31d205 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 2 Mar 2016 16:54:07 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E5=85=B1=E8=B5=84=E6=BA=90/=E6=88=91?=
 =?UTF-8?q?=E7=9A=84=E8=B5=84=E6=BA=90JS=E5=AE=9E=E7=8E=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/users/_user_resource_info.html.erb |  4 ++--
 app/views/users/user_resource.html.erb       | 20 ++++++++++++--------
 app/views/users/user_resource.js.erb         |  2 +-
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/app/views/users/_user_resource_info.html.erb b/app/views/users/_user_resource_info.html.erb
index 9c682f9c8..6efaa75e0 100644
--- a/app/views/users/_user_resource_info.html.erb
+++ b/app/views/users/_user_resource_info.html.erb
@@ -1,7 +1,7 @@
 <div id="users_setting">
   <div class="resourcesUploadBox mt10"><a href="javascript:void(0);" onclick="show_upload();" class="uploadBoxIcon">上传资源</a></div>
   <div id="search_div">
-    <%= render :partial =>  'resource_search_form',:locals => {:user => @user, :type => @type} %>
+    <%= render :partial =>  'users/resource_search_form',:locals => {:user => @user, :type => @type} %>
   </div>
   <div style="float: left; margin-top: 7px; font-size: 14px; margin-left: 15px;"><span style="align:center ;font-size: 14px;color: gray;">为您找到<span id="res_all_count"><%= @atta_count %></span>个资源</span></div>
 </div>
@@ -18,7 +18,7 @@
 <div class="cl"></div>
 <form id="resources_list_form">
   <div id="resources_list">
-    <%= render :partial => 'resources_list' ,:locals=>{ :attachments => @attachments} %>
+    <%= render :partial => 'users/resources_list' , :locals => { :attachments => @attachments} %>
   </div>
   <div class="cl"></div>
   <div class="resource-list-option fl">
diff --git a/app/views/users/user_resource.html.erb b/app/views/users/user_resource.html.erb
index ec1a57852..d8d7d7dc7 100644
--- a/app/views/users/user_resource.html.erb
+++ b/app/views/users/user_resource.html.erb
@@ -11,12 +11,12 @@
     function remote_get_resources(user_id,type){
 
     }
-//    $(document).ready(function(){
-    //        $(".resource-switch").click(function(){
-    //            $(".resource-switch").children().removeClass("resource-tab-active");
-    //            $(this).children().addClass("resource-tab-active");
-    //        });
-    //    });
+    $(document).ready(function(){
+            $(".resource-switch").click(function(){
+                $(".resource-switch").children().removeClass("resource-tab-active");
+                $(this).children().addClass("resource-tab-active");
+            });
+        });
     function remote_search(){
         $("#resource_search_form").submit();
     }
@@ -72,8 +72,12 @@
 
 <div class="resource-wrapper">
   <ul class="resource-banner">
-    <li class="fl resource-switch"><a href="<%= user_resource_user_path %>;"  class="resource-tab resource-tab-active">公共资源</a></li>
-    <li class="fl resource-switch"><a href="javascript:void(0);" onclick="show_my_resource();" class="resource-tab ">我的资源</a></li>
+    <li class="fl resource-switch">
+      <a href="<%= user_resource_user_path(@user, :type => '6') %>" id="user_homeworks_choose" class="resource-tab resource-tab-active" data-remote="true">公共资源</a>
+    </li>
+    <li class="fl resource-switch">
+      <a href="<%= user_resource_user_path(@user, :type => '1') %>" id="user_homeworks_choose" class="resource-tab" data-remote="true">我的资源</a>
+    </li>
     <li class="fl w770 border-bottom h34">&nbsp;</li>
     <li class="fr resource-banner-li border-bottom h34">
       <ul class="resourcesSelect">
diff --git a/app/views/users/user_resource.js.erb b/app/views/users/user_resource.js.erb
index bb195d4bf..48f10d277 100644
--- a/app/views/users/user_resource.js.erb
+++ b/app/views/users/user_resource.js.erb
@@ -1,4 +1,4 @@
-$("#search_div").html('<%= escape_javascript( render :partial =>  'resource_search_form',:locals => {:user=>@user,:type=>@type} ) %>');
+$("#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 %>');
 $("#res_count").html(0);