LDAP with sync rake task

vendor/built_in_modules/announcement/announcement.json

@@ -8,5 +8,6 @@
   "create_date": "11-11-2011",
 	"app_pages":  ["bulletins"],
 	"widgets": ["bulletins", "bulletins_and_web_links"],
+	"category": ["BulletinCategory"],
 	"enable_frontend": true
 }

vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletin_categorys_controller.rb

@@ -1,5 +1,4 @@
-class Panel::Announcement::BackEnd::BulletinCategorysController < ApplicationController
-  
+class Panel::Announcement::BackEnd::BulletinCategorysController < OrbitBackendController
   layout 'new_admin'
   
   def index

vendor/built_in_modules/announcement/app/controllers/panel/announcement/back_end/bulletins_controller.rb

@@ -1,5 +1,5 @@
-class Panel::Announcement::BackEnd::BulletinsController < ApplicationController
-  
+class Panel::Announcement::BackEnd::BulletinsController < OrbitBackendController
+  include AdminHelper
   layout 'new_admin'
   
   before_filter :authenticate_user!
@@ -151,7 +151,6 @@ class Panel::Announcement::BackEnd::BulletinsController < ApplicationController
     elsif is_sub_manager?
       @bulletin_categorys = BulletinCategory.authed_for_user(current_user,'submit_new')
     end
-<<<<<<< HEAD
   end
 
   def get_sorted_bulletins
@@ -196,8 +195,7 @@ class Panel::Announcement::BackEnd::BulletinsController < ApplicationController
         a.flatten!
         a.uniq
      end
-=======
->>>>>>> 26cd6951dba43b1f6eaf5056160309c5c77a8716
+
   end
   
   

vendor/built_in_modules/announcement/app/controllers/panel/announcement/front_end/bulletins_controller.rb

@@ -1,4 +1,4 @@
-class Panel::Announcement::FrontEnd::BulletinsController < ObitWidgetController
+class Panel::Announcement::FrontEnd::BulletinsController < OrbitWidgetController
   
   def initialize
     super

vendor/built_in_modules/announcement/app/controllers/panel/announcement/widget/bulletins_controller.rb

@@ -1,4 +1,4 @@
-class Panel::Announcement::Widget::BulletinsController < ObitWidgetController
+class Panel::Announcement::Widget::BulletinsController < OrbitWidgetController
 
   def initialize
     super

vendor/built_in_modules/new_blog/app/controllers/panel/new_blog/widget/posts_controller.rb

@@ -1,4 +1,4 @@
-class Panel::NewBlog::Widget::PostsController < ObitWidgetController
+class Panel::NewBlog::Widget::PostsController < \"
   # GET /posts
   # GET /posts.xml
   def index

vendor/built_in_modules/page_content/app/controllers/panel/page_content/front_end/page_contexts_controller.rb

@@ -1,4 +1,4 @@
-class Panel::PageContent::FrontEnd::PageContextsController < ObitWidgetController
+class Panel::PageContent::FrontEnd::PageContextsController < \"
   
   def initialize
     super

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

@@ -1,4 +1,4 @@
-class Panel::WebResource::FrontEnd::WebLinksController < ObitWidgetController
+class Panel::WebResource::FrontEnd::WebLinksController < \"
   
   def initialize
     super

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

@@ -1,4 +1,4 @@
-class Panel::WebResource::Widget::WebLinksController < ObitWidgetController
+class Panel::WebResource::Widget::WebLinksController < \"
 
   def initialize
     super

vendor/built_in_modules/web_resource/web_resource.json

@@ -8,5 +8,6 @@
   "create_date": "11-11-2011",
 	"app_pages":  ["web_links"],
 	"widgets": ["web_links"],
+	"category": ["WebLinkCategory"],
 	"enable_frontend": true
 }