Permalink
Browse files

Convert layout to haml

  • Loading branch information...
1 parent 616519f commit 62fecef83ee1bd2dc28aa05dcf9cea53bf0b5502 @briancollins briancollins committed Dec 14, 2011
Showing with 51 additions and 29 deletions.
  1. +51 −0 app/views/layouts/application.html.erb
  2. +0 −28 app/views/layouts/application.html.haml
  3. +0 −1 db/schema.rb
View
51 app/views/layouts/application.html.erb
@@ -0,0 +1,51 @@
+<!doctype html>
+<html>
+ <head>
+ <title>Monospace</title>
+ <%= stylesheet_link_tag :all %>
+ <%= javascript_include_tag "https://js.stripe.com/v1/" %>
+ <%= javascript_tag "Stripe.publishableKey = '#{STRIPE_PUBLISHABLE_KEY}';" %>
+ <%= javascript_include_tag :defaults %>
+ <%= csrf_meta_tag %>
+
+ </head>
+
+ <body>
+ <div class="topbar">
+ <div class="fill">
+ <div class="container">
+ <h3><%= link_to "Monospace", root_path %></h3>
+ <ul class="nav">
+ <% if current_user %>
+ <li>
+ <%= link_to "Edit Profile", edit_profile_path %>
+ </li>
+ <li>
+ <%= link_to "Sign Out", sign_out_path %>
+ </li>
+ <% else %>
+ <li>
+ <%= link_to "Sign In", sign_in_path %>
+ </li>
+ <li>
+ <%= link_to "Register", register_path %>
+ </li>
+ <% end %>
+ </ul>
+ </div>
+ </div>
+ </div>
+ <div class="main container">
+ <div class="row">
+ <div class="span6 columns">
+ <% if flash.notice %>
+ <div class="alert-message block-message success" id="notice">
+ <%= flash.notice %>
+ </div>
+ <% end %>
+ </div>
+ </div>
+ <%= yield %>
+ </div>
+ </body>
+</html>
View
28 app/views/layouts/application.html.haml
@@ -1,28 +0,0 @@
-!!!
-%html
- %head
- %title= Monospace
- = stylesheet_link_tag :all
- = javascript_include_tag "https://js.stripe.com/v1/"
- = javascript_tag "Stripe.publishableKey = '#{STRIPE_PUBLISHABLE_KEY}';";
- = javascript_include_tag :defaults
- = csrf_meta_tag
-
- %body
- .topbar
- .fill
- .container
- %h3= link_to "Monospace", root_path
- %ul.nav
- - if current_user
- %li= link_to "Edit Profile", edit_profile_path
- %li= link_to "Sign Out", sign_out_path
- - else
- %li= link_to "Sign In", sign_in_path
- %li= link_to "Register", register_path
- .main.container
- .row
- .span6.columns
- - if flash.notice
- #notice.alert-message.block-message.success= flash.notice
- = yield
View
1 db/schema.rb
@@ -1,4 +1,3 @@
-# encoding: UTF-8
# This file is auto-generated from the current state of the database. Instead
# of editing this file, please use the migrations feature of Active Record to
# incrementally modify your database, and then regenerate this schema definition.

0 comments on commit 62fecef

Please sign in to comment.