Permalink
Browse files

Haml Conversion

* Rename app and index erb to haml
* Change target el to something shorter ('livefyre')
* Move haml-rails out of asset require
* bundle
  • Loading branch information...
1 parent 6852a2a commit 2d1bd6c128218293cd8f725862955422e30dfb32 Andy Zhang committed Mar 23, 2013
View
@@ -25,6 +25,7 @@ group :assets do
end
gem 'jquery-rails'
+gem 'haml-rails'
# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
gem 'turbolinks'
View
@@ -38,6 +38,13 @@ GEM
erubis (2.7.0)
execjs (1.4.0)
multi_json (~> 1.0)
+ haml (4.0.1)
+ tilt
+ haml-rails (0.4)
+ actionpack (>= 3.1, < 4.1)
+ activesupport (>= 3.1, < 4.1)
+ haml (>= 3.1, < 4.1)
+ railties (>= 3.1, < 4.1)
hike (1.2.1)
i18n (0.6.4)
jbuilder (1.0.2)
@@ -115,6 +122,7 @@ PLATFORMS
DEPENDENCIES
coffee-rails (~> 4.0.0.beta1)
+ haml-rails
jbuilder (~> 1.0.1)
jquery-rails
pg
@@ -5,7 +5,7 @@ $ ->
[
siteId: '308094'
articleId: '/content/dailybeast/cheats/2013/03/20/weed-found-on-rihanna-s-tour-bus'
- el: 'livefyre-app-/content/dailybeast/cheats/2013/03/20/weed-found-on-rihanna-s-tour-bus'
+ el: 'livefyre'
]
(widget) ->
widget.on "initialRenderComplete", (widget) ->
@@ -0,0 +1 @@
+.livefyre
@@ -1 +0,0 @@
-<div id="livefyre-app-/content/dailybeast/cheats/2013/03/20/weed-found-on-rihanna-s-tour-bus"></div>
@@ -0,0 +1,10 @@
+%html
+ %head
+ %title CommentsRails
+ = stylesheet_link_tag "application", media: "all", "data-turbolinks-track" => true
+ = javascript_include_tag "http://zor.thedailybeast.fyre.co/wjs/v3.0/javascripts/livefyre.js"
+ = javascript_include_tag "application", "data-turbolinks-track" => true
+ = csrf_meta_tags
+
+ %body
+ = yield
@@ -1,15 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
- <title>CommentsRails</title>
- <%= stylesheet_link_tag "application", media: "all", "data-turbolinks-track" => true %>
- <%= javascript_include_tag "http://zor.thedailybeast.fyre.co/wjs/v3.0/javascripts/livefyre.js" %>
- <%= javascript_include_tag "application", "data-turbolinks-track" => true %>
- <%= csrf_meta_tags %>
-</head>
-<body>
-
-<%= yield %>
-
-</body>
-</html>

0 comments on commit 2d1bd6c

Please sign in to comment.