Merge branch 'design_team' into ldap

vendor/built_in_modules/web_resource/app/controllers/panel/web_resource/back_end/web_links_controller.rb

@@ -7,7 +7,8 @@ class Panel::WebResource::BackEnd::WebLinksController < OrbitBackendController
   
 	get_categorys(params[:web_link_category_id])
 	
-	@web_links = WebLink.search(params[:category_id])
+	# @web_links = WebLink.search(params[:category_id])
+	@web_links = WebLink.all.page(params[:page]).per(10)
 	
 	get_tags
 

vendor/built_in_modules/web_resource/app/views/panel/web_resource/back_end/web_links/index.html.erb

@@ -19,3 +19,5 @@
 	</tbody>
 </table>
 
+<%= paginate @web_links %>
+