Merge branch 'design_team' into ldap

Conflicts:
	Gemfile.lock
	app/controllers/admin/module_apps_controller.rb
	app/controllers/application_controller.rb
	vendor/built_in_modules/web_resource/web_resource.json

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

@@ -12,7 +12,7 @@ class Panel::WebResource::FrontEnd::WebLinksController < OrbitWidgetController
   
 	date_now = Time.now
 	
-	@web_links = WebLink.where( :is_hidden => false ).desc(:is_top, :name).page( params[:page]).per(20)
+	@web_links = WebLink.where( :is_hidden => false ).desc(:is_top, :name).page(params[:page]).per(10)
 
 	get_categorys
   end

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

@@ -24,6 +24,7 @@ class Panel::WebResource::Widget::WebLinksController < OrbitWidgetController
 
 
   def home_list
+    @title = params[:part_title]
 	
 	# deadline
   

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

@@ -2,7 +2,7 @@
 
 <%= flash_messages %>
 
-<%= paginate @web_links %>
+<%= paginate @web_links, :params => {:inner => false}%>
 
 <h1><%= t('web_link.list_web_resource') %></h1>
 

vendor/built_in_modules/web_resource/app/views/panel/web_resource/front_end/web_links/index.js.erb

@@ -0,0 +1 @@
+alert('bob');

vendor/built_in_modules/web_resource/app/views/panel/web_resource/widget/web_links/home_list.html.erb

@@ -1,5 +1,7 @@
 <div class="quicklinks">
-	<h3 class="link_title"><%= t("announcement.related_links") %></h3>
+	<% if @title %>
+		<h3 class="link_title"><%= @title %></h3>
+	<% end %>
 
 	<div id='web_links_links'>
 		<%= render 'web_links' %>

vendor/built_in_modules/web_resource/config/routes.rb

@@ -13,7 +13,6 @@ Rails.application.routes.draw do
         resources :tags
       end
       namespace :front_end do
-        root :to => "web_links#index"
         resources :web_links
       end
       namespace :widget do

vendor/built_in_modules/web_resource/web_resource.json

@@ -6,8 +6,7 @@
   "intro": "A simple blog……",
   "update_info": "Some info",
   "create_date": "11-11-2011",
-	"app_pages":  ["web_links"],
-	"widgets": ["web_links", "home_list"]
+	"widgets": ["home_list"].
 	"category": ["WebLinkCategory"],
 	"enable_frontend": true
 }