Merge branch 'new_announcement_dev' of https://github.com/Rulingcom/orbit into new_announcement_dev

Conflicts:
	app/views/layouts/module_widget.html.erb

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

@@ -22,18 +22,18 @@ class Panel::Announcement::Widget::BulletinsController < ObitWidgetController
   def bulletins_and_web_links
     @tags = AnnouncementTag.all
     @selected_tag = AnnouncementTag.find(params[:id]) rescue @tags[0]
-    @bulletins = @selected_tag.get_visible_bulletins.page(params[:page]).per(1) rescue nil
+    @bulletins = @selected_tag.get_visible_bulletins.page(params[:page]).per(5) rescue nil
     @web_links = WebResourceTag.first(:conditions => {:en => @selected_tag[:en]}).get_visible_links.page(params[:page]).per(1) rescue nil
   end
   
   def reload_bulletins
     @selected_tag = AnnouncementTag.find(params[:tag_id])
-    @bulletins = @selected_tag.get_visible_bulletins.page(params[:page]).per(1) rescue nil
+    @bulletins = @selected_tag.get_visible_bulletins.page(params[:page]).per(5) rescue nil
   end
   
   def reload_web_links
     @selected_tag = AnnouncementTag.find(params[:tag_id])
-    @web_links = WebResourceTag.first(:conditions => {:en => @selected_tag[:en]}).get_visible_links.page(params[:page]).per(1) rescue nil
+    @web_links = WebResourceTag.first(:conditions => {:en => @selected_tag[:en]}).get_visible_links.page(params[:page]).per(5) rescue nil
   end
   
   

vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/reload_bulletins.js.erb

@@ -1 +1 @@
-$('#bulletins_web_links_bulletins').html("<%= j render 'bulletins' %>")
+$('#bulletins_web_links_bulletins').html("<%= j render 'bulletins' if @bulletins %>")

vendor/built_in_modules/announcement/app/views/panel/announcement/widget/bulletins/reload_web_links.js.erb

@@ -1 +1 @@
-$('#bulletins_web_links_web_links').html("<%= j render 'web_links' %>")
+$('#bulletins_web_links_web_links').html("<%= j render 'web_links' id @web_links %>")