Add haml, markup, and textile support

- add haml, RedCloth, and maruku gems to Gemfile - add hpricot and ruby_parser in dev environment - rename application layout (erb -> haml) - refactor application layout
14 years ago · 586ebf5214
4 changed files with 115 additions and 17 deletions
--- a/11
+++ b/11
@ -6,6 +6,9 @@ gem 'rails', '3.0.4'
 # gem 'rails', :git => 'git://github.com/rails/rails.git'

 gem 'sqlite3'
+gem 'haml'
+gem 'RedCloth'
+gem 'maruku'

 # Use unicorn as the web server
 # gem 'unicorn'
@ -26,6 +29,8 @@ gem 'sqlite3'
 # Bundle gems for the local environment. Make sure to
 # put test-only gems in this group so their generators
 # and rake tasks are available in development mode:
-# group :development, :test do
-#   gem 'webrat'
-# end
+
+group :development, :test do
+  gem 'hpricot'
+  gem 'ruby_parser'
+end
--- a/Gemfile.lock
+++ b/Gemfile.lock
@ -0,0 +1,87 @@
+GEM
+  remote: http://rubygems.org/
+  specs:
+    RedCloth (4.2.7)
+    abstract (1.0.0)
+    actionmailer (3.0.4)
+      actionpack (= 3.0.4)
+      mail (~> 2.2.15)
+    actionpack (3.0.4)
+      activemodel (= 3.0.4)
+      activesupport (= 3.0.4)
+      builder (~> 2.1.2)
+      erubis (~> 2.6.6)
+      i18n (~> 0.4)
+      rack (~> 1.2.1)
+      rack-mount (~> 0.6.13)
+      rack-test (~> 0.5.7)
+      tzinfo (~> 0.3.23)
+    activemodel (3.0.4)
+      activesupport (= 3.0.4)
+      builder (~> 2.1.2)
+      i18n (~> 0.4)
+    activerecord (3.0.4)
+      activemodel (= 3.0.4)
+      activesupport (= 3.0.4)
+      arel (~> 2.0.2)
+      tzinfo (~> 0.3.23)
+    activeresource (3.0.4)
+      activemodel (= 3.0.4)
+      activesupport (= 3.0.4)
+    activesupport (3.0.4)
+    arel (2.0.8)
+    builder (2.1.2)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
+    haml (3.0.25)
+    hpricot (0.8.3)
+    i18n (0.5.0)
+    mail (2.2.15)
+      activesupport (>= 2.3.6)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    maruku (0.6.0)
+      syntax (>= 1.0.0)
+    mime-types (1.16)
+    polyglot (0.3.1)
+    rack (1.2.1)
+    rack-mount (0.6.13)
+      rack (>= 1.0.0)
+    rack-test (0.5.7)
+      rack (>= 1.0)
+    rails (3.0.4)
+      actionmailer (= 3.0.4)
+      actionpack (= 3.0.4)
+      activerecord (= 3.0.4)
+      activeresource (= 3.0.4)
+      activesupport (= 3.0.4)
+      bundler (~> 1.0)
+      railties (= 3.0.4)
+    railties (3.0.4)
+      actionpack (= 3.0.4)
+      activesupport (= 3.0.4)
+      rake (>= 0.8.7)
+      thor (~> 0.14.4)
+    rake (0.8.7)
+    ruby_parser (2.0.5)
+      sexp_processor (~> 3.0)
+    sexp_processor (3.0.5)
+    sqlite3 (1.3.3)
+    syntax (1.0.0)
+    thor (0.14.6)
+    treetop (1.4.9)
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.24)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  RedCloth
+  haml
+  hpricot
+  maruku
+  rails (= 3.0.4)
+  ruby_parser
+  sqlite3
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title>Aironeac</title>
-  <%= stylesheet_link_tag :all %>
-  <%= javascript_include_tag :defaults %>
-  <%= csrf_meta_tag %>
-</head>
-<body>
-
-<%= yield %>
-
-</body>
-</html>
--- a/app/views/layouts/application.html.haml
+++ b/app/views/layouts/application.html.haml
@ -0,0 +1,20 @@
+!!!
+%html
+  %head
+    %title= @title or 'Air-one Services'
+    %meta(charset='utf-8')
+    %meta(content='J.Infield' name='author')
+    %meta(name='description' content='Quality commercial, residential, and industrial HVAC, electrical and plumbing services')
+    %meta(name='copyright' content='Copyright 2011 J.Infield, all rights reserved')
+    %link(rel='stylesheet' media='screen' href='stylesheets/reset.css')
+    %link(rel='stylesheet' media='screen' href='stylesheets/grids.css')
+    %link(rel='stylesheet' media='screen' href='stylesheets/layout.css')
+    %script(src='javascripts/jquery.min.js')
+    = yield :header
+  %body
+    #container
+      = yield
+      #footer
+        :textile
+          (c)2011 J.Infield -- All rights Reserved
+/ © Copyright 2011 J.Infield. All Rights Reserved.