Merge branch 'design_team' into ldap

Conflicts:
	app/controllers/admin/page_parts_controller.rb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_filter.html.erb
	vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletins/_sort_headers.html.erb

app/controllers/admin/page_parts_controller.rb

@@ -27,8 +27,10 @@ class Admin::PagePartsController < ApplicationController
     @r_tag = @part.public_r_tag.blank? ? LIST[:public_r_tags][0] : @part.public_r_tag
     @tag_objects = @r_tag.classify.constantize.all rescue nil
       case @module_app.key
-        when 'bulletin'
+        when 'announcement'
           @categories =  BulletinCategory.all
+        when 'news'
+          @categories =  NewsBulletinCategory.all
         when 'web_resource'
           @categories =  WebLinkCategory.all
       end
@@ -65,12 +67,14 @@ class Admin::PagePartsController < ApplicationController
   def reload_widgets
     @categories =[]
     @module_app = ModuleApp.find(params[:id])
-
-    unless (@module_app.category.nil? rescue true)
-      @module_app.category.each do |category|
-        @categories << eval(category).all.entries
-      end
-      @categories.flatten!
+    
+    case @module_app.key
+      when 'announcement'
+        @categories =  BulletinCategory.all
+      when 'news'
+        @categories =  NewsBulletinCategory.all
+      when 'web_resource'
+        @categories =  WebLinkCategory.all
     end
 
     respond_to do |format|