4 files changed, 33 insertions, 26 deletions
diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml
index 68e39bb..0be7ca2 100644
--- a/app/views/home/index.html.haml
+++ b/app/views/home/index.html.haml
@@ -1,15 +1,3 @@
-%h1 Leap Web Demo
 
 Try to fetch a 
 = link_to "cert", cert_path
-
--if current_user
-  %p 
-    logged in as
-    = current_user.login
-    = link_to "logout", logout_path
--else
-  %p
-    = link_to "login", login_path
-    or 
-    = link_to "signup", signup_path
diff --git a/app/views/layouts/_navigation.html.haml b/app/views/layouts/_navigation.html.haml
new file mode 100644
index 0000000..04d2356
--- /dev/null
+++ b/app/views/layouts/_navigation.html.haml
@@ -0,0 +1,10 @@
+= link_to "Leap Web", root_path, :class => 'brand'
+%ul.nav
+  - if current_user
+    %li
+      = link_to t(:logout), logout_path
+  - else
+    %li
+      = link_to t(:login), login_path
+    %li
+      = link_to t(:signup), signup_path
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
deleted file mode 100644
index ce68ec8..0000000
--- a/app/views/layouts/application.html.erb
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <title>LeapWeb</title>
-  <%= stylesheet_link_tag    "application", :media => "all" %>
-  <%= javascript_include_tag "application" %>
-  <%= csrf_meta_tags %>
-</head>
-<body>
-
-<%= yield %>
-
-</body>
-</html>
diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml
new file mode 100644
index 0000000..a57d65e
--- /dev/null
+++ b/app/views/layouts/application.html.haml
@@ -0,0 +1,23 @@
+!!!
+%html
+  %head
+    %meta{:content => "width=device-width, initial-scale=1.0", :name => "viewport"}
+      %title= content_for?(:title) ? yield(:title) : "Leap Web"
+      %meta{:content => content_for?(:description) ? yield(:description) : "Leap Web", :name => "description"}
+        = stylesheet_link_tag "application", :media => "all"
+        = javascript_include_tag "application"
+        = csrf_meta_tags
+        = yield(:head)
+  %body
+    %header.navbar.navbar-fixed-top
+      %nav.navbar-inner
+        .container
+          = render 'layouts/navigation'
+    #main{:role => "main"}
+      .container
+        .content
+          .row
+            .span12
+              //= render 'layouts/messages'
+              = yield
+          %footer