diff --git a/app/views/bookmarks/_bookmark.html.haml b/app/views/bookmarks/_bookmark.html.haml index 88a7b82f7..ca90be1fe 100644 --- a/app/views/bookmarks/_bookmark.html.haml +++ b/app/views/bookmarks/_bookmark.html.haml @@ -4,8 +4,7 @@ %b shared a link %br = post.title - /- (foo = post.link.to_s) - /- (bar = post.link) + %a{:href => "#{post.link}"} = post.link %div.time= link_to "#{time_ago_in_words(post.updated_at)} ago", bookmark_path(post) diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index b0b07bd68..c785e5d03 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -19,7 +19,7 @@ WebSocket.__swfLocation = "/javascripts/WebSocketMain.swf"; - = javascript_include_tag 'socket' if user_signed_in? + = javascript_include_tag 'socket' if user_signed_in? = csrf_meta_tag = yield(:head) diff --git a/config/initializers/socket.rb b/config/initializers/socket.rb index a6caf0a7d..59485f970 100644 --- a/config/initializers/socket.rb +++ b/config/initializers/socket.rb @@ -15,7 +15,7 @@ module WebSocket end end - EventMachine::WebSocket.start(:host => "0.0.0.0", :port => 8080) do |ws| + EventMachine::WebSocket.start(:host => "0.0.0.0", :port => 8080, :debug => true) do |ws| ws.onopen { sid = @channel.subscribe { |msg| ws.send msg }