Merge pull request #31 from bigbinary/remove-erb-use-haml

migrated erb to haml
vipulnsward · Dec 2, 2014 · f637680 · f637680
2 parents 08dbeae + 5748a6f
commit f637680
Show file tree

Hide file tree

Showing 53 changed files with 377 additions and 625 deletions.
diff --git a/Gemfile b/Gemfile
@@ -57,6 +57,8 @@ gem 'email_validator'
 # For variants support
 gem 'browser'
 
+gem 'haml-rails'
+
 group :development do
 
   # mutes assets pipeline log messages

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -104,6 +104,13 @@ GEM
     execjs (2.2.1)
     formtastic (2.3.0.rc3)
       actionpack (>= 3.0)
+    haml (4.0.6)
+      tilt
+    haml-rails (0.5.3)
+      actionpack (>= 4.0.1)
+      activesupport (>= 4.0.1)
+      haml (>= 3.1, < 5.0)
+      railties (>= 4.0.1)
     handy (0.0.27)
       hashr
     has_scope (0.6.0.rc)
@@ -239,6 +246,7 @@ DEPENDENCIES
   devise (= 3.2.3)
   devise-async
   email_validator
+  haml-rails
   handy
   honeybadger
   jbuilder (~> 1.2)

diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb
diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml
@@ -0,0 +1,2 @@
+%span.home-message
+  This is home page.
diff --git a/app/views/layouts/application.html+phone.erb b/app/views/layouts/application.html+phone.erb
diff --git a/app/views/layouts/application.html+phone.haml b/app/views/layouts/application.html+phone.haml
@@ -0,0 +1,35 @@
+!!!
+%html{lang: "en"}
+  %head
+    %meta{charset: "utf-8"}/
+    %meta{:content => "IE=Edge,chrome=1", "http-equiv" => "X-UA-Compatible"}/
+    %meta{content: "width=device-width, initial-scale=1.0", name: "viewport"}/
+    %title= content_for?(:title) ? yield(:title) : "Wheel"
+    = csrf_meta_tags
+    / Le HTML5 shim, for IE6-8 support of HTML elements
+    /[if lt IE 9]
+      <script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.6.1/html5shiv.js" type="text/javascript"></script>
+    = stylesheet_link_tag "application_phone", media: "all"
+    / <link rel="icon" href="/favicon.ico" type="image/x-icon">
+    / <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
+  %body
+    .navbar.navbar-default.navbar-static-top{role: "navigation"}
+      .container
+        .navbar-header
+          %button.navbar-toggle{"data-target" => ".navbar-collapse", "data-toggle" => "collapse", :type => "button"}
+            %span.sr-only Toggle navigation
+            %span.icon-bar
+            %span.icon-bar
+            %span.icon-bar
+          %a.navbar-brand{href: "/"} Wheel
+        .navbar-collapse.collapse
+          = render 'shared/nav'
+    .container
+      .row
+        .col-sm-12
+          = bootstrap_flash
+          = yield
+    %footer
+      / for footer
+    / Placed at the end of the document so the pages load faster
+    = javascript_include_tag "application_phone"
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
@@ -0,0 +1,35 @@
+!!!
+%html{lang: "en"}
+  %head
+    %meta{charset: "utf-8"}/
+    %meta{:content => "IE=Edge,chrome=1", "http-equiv" => "X-UA-Compatible"}/
+    %meta{content: "width=device-width, initial-scale=1.0", name: "viewport"}/
+    %title= content_for?(:title) ? yield(:title) : "Wheel"
+    = csrf_meta_tags
+    / Le HTML5 shim, for IE6-8 support of HTML elements
+    /[if lt IE 9]
+      <script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.6.1/html5shiv.js" type="text/javascript"></script>
+    = stylesheet_link_tag "application_desktop", media: "all"
+    / <link rel="icon" href="/favicon.ico" type="image/x-icon">
+    / <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon">
+  %body{class: controller_name + ' ' + action_name}
+    .navbar.navbar-default.navbar-static-top{role: "navigation"}
+      .container
+        .navbar-header
+          %button.navbar-toggle{"data-target" => ".navbar-collapse", "data-toggle" => "collapse", :type => "button"}
+            %span.sr-only Toggle navigation
+            %span.icon-bar
+            %span.icon-bar
+            %span.icon-bar
+          %a.navbar-brand{href: "/"} Wheel
+        .navbar-collapse.collapse
+          = render 'shared/nav'
+    .container.page
+      .row
+        .col-sm-12
+          = bootstrap_flash
+          = yield
+    %footer
+      / for footer
+    / Placed at the end of the document so the pages load faster
+    = javascript_include_tag "application_desktop"
diff --git a/app/views/layouts/mailer.erb → app/views/layouts/mailer.haml b/app/views/layouts/mailer.erb → app/views/layouts/mailer.haml
@@ -1,9 +1,9 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-  <meta name="viewport" content="width=device-width"/>
-  <style>
+!!! Strict
+%html{xmlns: "http://www.w3.org/1999/xhtml"}
+  %head
+    %meta{:content => "text/html; charset=utf-8", "http-equiv" => "Content-Type"}/
+    %meta{content: "width=device-width", name: "viewport"}/
+    :css
       body {
           font-family: sans-serif;
           font-size: 14px;
@@ -152,73 +152,31 @@
           position: relative;
           z-index: 1;
       }
-
-  </style>
-</head>
-<body style="font-size: 16px !important; line-height: 26px !important;">
-<table class="body" style="width: 100% !important;">
-  <tr>
-    <td class="center" align="center" valign="top">
-      <center>
-
-        <table class="row header" style="background: #000000 !important; width: 100% !important;">
-          <tr>
-            <td class="center" align="center">
-              <center>
-
-                <table class="container">
-                  <tr>
-                    <td class="wrapper last">
-
-                      <table class="twelve columns">
-                        <tr>
-                          <td class="six sub-columns">
-
-                          </td>
-                          <td class="six sub-columns last" >
-                            <span class="template-label">&nbsp;</span>
-                          </td>
-                        </tr>
-                      </table>
-
-                    </td>
-                  </tr>
-                </table>
-
-              </center>
-            </td>
-          </tr>
-        </table>
-
-        <table class="container">
-          <tr>
-            <td>
-
-              <table class="row">
-                <tr>
-                  <td class="wrapper last">
-
-                    <table class="twelve columns">
-                      <tr>
-                        <td>
-                          <%= yield %>
-                        </td>
-                        <td class="expander"></td>
-                      </tr>
-                    </table>
-
-                  </td>
-                </tr>
-              </table>
-
-              <!-- container end below -->
-            </td>
-          </tr>
-        </table>
-
-      </center>
-    </td>
-  </tr>
-</table>
-</body>
-</html>
+  %body{style: "font-size: 16px !important; line-height: 26px !important;"}
+    %table.body{style: "width: 100% !important;"}
+      %tr
+        %td.center{align: "center", valign: "top"}
+          %center
+            %table.row.header{style: "background: #000000 !important; width: 100% !important;"}
+              %tr
+                %td.center{align: "center"}
+                  %center
+                    %table.container
+                      %tr
+                        %td.wrapper.last
+                          %table.twelve.columns
+                            %tr
+                              %td.six.sub-columns
+                              %td.six.sub-columns.last
+                                %span.template-label &nbsp;
+            %table.container
+              %tr
+                %td
+                  %table.row
+                    %tr
+                      %td.wrapper.last
+                        %table.twelve.columns
+                          %tr
+                            %td
+                              = yield
+                            %td.expander