Merge branch 'master' of git://github.com/joshsoftware/ideahub

* 'master' of git://github.com/joshsoftware/ideahub: changed the twitter handle Livefyre integration Conflicts: app/views/ideas/_idea.html.haml
punerb · Jun 15, 2012 · 83fdeef · 83fdeef
2 parents e404e14 + 986f39b
commit 83fdeef
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/app/views/ideas/_idea.html.haml b/app/views/ideas/_idea.html.haml
@@ -18,7 +18,7 @@
       =# pluralize(idea.users.count, "participant")
       = idea.users.count
     .floatRight
-      = tweet_button :via => "joshideahub",:count=> "none", :url => idea_url(idea), :text => "This is an interesting idea! Help out "
+      = tweet_button :via => "punerb",:count=> "none", :url => idea_url(idea), :text => "This is an interesting idea! Help out "
 
   .modal{style: "display:none", id: "idea-detail-#{idea.id}"}
     .modal-header

diff --git a/app/views/ideas/show.html.haml b/app/views/ideas/show.html.haml
@@ -1,6 +1,8 @@
 - content_for :title do
   = @idea.title
 
+= javascript_include_tag 'http://zor.livefyre.com/wjs/v1.0/javascripts/livefyre_init.js'
+
 .well.grid
   .row
     %h2= @idea.title
@@ -22,4 +24,7 @@
   .row
     %h6
       Scheduled #{ @idea.schedules.last.try(:scheduled_at).try(:idea_date) or "soon" }
-
+
+  .row
+    :javascript
+      var fyre = LF({site_id: 305993});