From 5bab384195e7f0208f05908b40c624041080b348 Mon Sep 17 00:00:00 2001
From: spen <spen@rulingcom.com>
Date: Thu, 13 Mar 2014 15:20:44 +0800
Subject: [PATCH] Updated Facebook set

---
 .../front_end/bulletins_controller.rb          |  1 -
 .../front_end/bulletins/show.html.erb          | 18 +-----------------
 lib/announcement.rb                            |  1 -
 3 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/app/controllers/panel/announcement/front_end/bulletins_controller.rb b/app/controllers/panel/announcement/front_end/bulletins_controller.rb
index dfa0e86..d2fee70 100644
--- a/app/controllers/panel/announcement/front_end/bulletins_controller.rb
+++ b/app/controllers/panel/announcement/front_end/bulletins_controller.rb
@@ -55,7 +55,6 @@ class Panel::Announcement::FrontEnd::BulletinsController < OrbitWidgetController
   
   def show
     @item = Page.find(params[:page_id]) rescue nil
-    @fb_share = eval(params[:facebook_share]) rescue false
     if params[:preview] == "true"
       preview_content
     else
diff --git a/app/views/panel/announcement/front_end/bulletins/show.html.erb b/app/views/panel/announcement/front_end/bulletins/show.html.erb
index d75ef7b..e2e1219 100644
--- a/app/views/panel/announcement/front_end/bulletins/show.html.erb
+++ b/app/views/panel/announcement/front_end/bulletins/show.html.erb
@@ -38,20 +38,4 @@
 	<% end %>
 </div>
 
-<%#= share_links(@bulletin, 'announcement') %>
-<% if @fb_share %>
-	<a href="" target="_blank" class="fb-share-button">
- 		<%= image_tag("announcement/fbn.png",:width=>30, :height=>30) %>
-	</a>
-	<script type="text/javascript">
-		(function(){
-			$(".fb-share-button").click(function(){
-				var img = window.location.protocol + "//" + window.location.host + "<%= @bulletin.image.url rescue '' %>",
-					url = "https://www.facebook.com/sharer/sharer.php?s=100&p[title]=<%= @bulletin.title %>&p[images][0]=" + img + "&p[url]="+window.location.href;
-				newwindow = window.open(url,'name','height=500,width=1024');
-				if (window.focus) {newwindow.focus()}
-				return false;
-			})
-		})();
-	</script>
-<% end %>
\ No newline at end of file
+<%= share_links(@bulletin, 'announcement') %>
\ No newline at end of file
diff --git a/lib/announcement.rb b/lib/announcement.rb
index abf0ffb..cabf028 100644
--- a/lib/announcement.rb
+++ b/lib/announcement.rb
@@ -38,7 +38,6 @@ module Announcement
 			    enable ["typeA", "typeB_style3", "typeC"]
 			    image :image
 			    field :postdate
-			    facebook_enabled false
 			    link_field :title,{:method => 'panel_announcement_front_end_bulletin_path',:args=>:self}
 			    link_field :bulletin_category_with_title,{:method => 'panel_announcement_front_end_bulletins_path',:args=>{:category_id => [:category,:id]}}
 			    field :subtitle