summaryrefslogtreecommitdiff
path: root/app/views/layouts
diff options
context:
space:
mode:
authorAzul <azul@leap.se>2012-10-17 16:02:33 +0200
committerAzul <azul@leap.se>2012-10-17 16:02:33 +0200
commitd9a510fa2126c29f0af58c6bbeff35802777eee6 (patch)
tree9e784338d95fc5d3e0b29f8083a07de43f2a1f53 /app/views/layouts
parent0c79df9874c59fbaa5c845e07d8fa1b4bbc23b9c (diff)
parentdc0584f7d993ef7c75fbdd9d341ebb3337f3448d (diff)
Merge branch 'feature-authentication_system' into develop
Diffstat (limited to 'app/views/layouts')
-rw-r--r--app/views/layouts/_navigation.html.haml10
-rw-r--r--app/views/layouts/application.html.erb14
-rw-r--r--app/views/layouts/application.html.haml23
3 files changed, 33 insertions, 14 deletions
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