Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh

app/views/users/resource_search.js.erb

@@ -1,2 +1,3 @@
 $("#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 %>');
+$("#pages").html('<%= pagination_links_full @atta_pages, @atta_count, :per_page_links => false, :remote => @is_remote, :flag => true %>');
+$("#res_all_count").html(<%= @atta_count%>);

app/views/users/user_resource.html.erb

@@ -72,6 +72,12 @@
     <div id="search_div">
       <%= render :partial =>  '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>
   <div class="resourcesListBanner">
     <ul class="resourcesListTab">

app/views/users/user_resource.js.erb

@@ -2,4 +2,5 @@ $("#search_div").html('<%= escape_javascript( render :partial =>  'resource_sear
 $("#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);
-$("#checkboxAll").attr('checked',false);
+$("#checkboxAll").attr('checked',false);
+$("#res_all_count").html(<%= @atta_count%>);