Fixed login, new_password and invitation views.

app/views/layouts/_header.html.haml

@@ -0,0 +1,29 @@
+!!! 5
+%html(lang="en")
+  %head
+    %meta(charset="utf-8")
+    %meta(http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1")
+    %meta(name="viewport" content="width=device-width, initial-scale=1.0")
+    %title= content_for?(:title) ? yield(:title) : "Foodsoft"
+    = csrf_meta_tags
+    / Le HTML5 shim, for IE6-8 support of HTML elements
+    /[if lt IE 9]
+      = javascript_include_tag "http://html5shim.googlecode.com/svn/trunk/html5.js"
+    = stylesheet_link_tag "application", :media => "all"
+    %link(href="images/apple-touch-icon-144x144.png" rel="apple-touch-icon-precomposed" sizes="144x144")
+    %link(href="images/apple-touch-icon-114x114.png" rel="apple-touch-icon-precomposed" sizes="114x114")
+    %link(href="images/apple-touch-icon-72x72.png" rel="apple-touch-icon-precomposed" sizes="72x72")
+    %link(href="images/apple-touch-icon.png" rel="apple-touch-icon-precomposed")
+    //%link(href="images/favicon.ico" rel="shortcut icon")
+
+    = yield(:head)
+
+  %body
+    = yield
+
+    /
+      Javascripts
+      \==================================================
+    / Placed at the end of the document so the pages load faster
+    = javascript_include_tag "application"
+    = yield(:javascript)

app/views/layouts/application.html.haml

@@ -1,58 +1,35 @@
-!!! 5
-%html(lang="en")
-  %head
-    %meta(charset="utf-8")
-    %meta(http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1")
-    %meta(name="viewport" content="width=device-width, initial-scale=1.0")
-    %title= content_for?(:title) ? yield(:title) : "Foodsoft"
-    = csrf_meta_tags
-    / Le HTML5 shim, for IE6-8 support of HTML elements
-    /[if lt IE 9]
-      = javascript_include_tag "http://html5shim.googlecode.com/svn/trunk/html5.js"
-    = stylesheet_link_tag "application", :media => "all"
-    %link(href="images/apple-touch-icon-144x144.png" rel="apple-touch-icon-precomposed" sizes="144x144")
-    %link(href="images/apple-touch-icon-114x114.png" rel="apple-touch-icon-precomposed" sizes="114x114")
-    %link(href="images/apple-touch-icon-72x72.png" rel="apple-touch-icon-precomposed" sizes="72x72")
-    %link(href="images/apple-touch-icon.png" rel="apple-touch-icon-precomposed")
-    %link(href="images/favicon.ico" rel="shortcut icon")
+= render layout: 'layouts/header' do
+  .row-fluid
 
+  .navbar.navbar-fixed-top
+    .navbar-inner
+      .container-fluid
+        %a.btn.btn-navbar(data-target=".nav-collapse" data-toggle="collapse")
+          %span.icon-bar
+          %span.icon-bar
+          %span.icon-bar
+          = link_to 'Foodsoft', root_path(anchor: ''), class: 'brand'
+        .container.nav-collapse
+          = render_navigation expand_all: true, renderer: :bootstrap
 
-  %body
+  .container-fluid
     .row-fluid
-
-    .navbar.navbar-fixed-top
-      .navbar-inner
-        .container-fluid
-          %a.btn.btn-navbar(data-target=".nav-collapse" data-toggle="collapse")
-            %span.icon-bar
-            %span.icon-bar
-            %span.icon-bar
-            = link_to 'Foodsoft', root_path(anchor: ''), class: 'brand'
-          .container.nav-collapse
-            = render_navigation expand_all: true, renderer: :bootstrap
-
-    .container-fluid
-      .row-fluid
-        - if content_for?(:sidebar)
-          .span2
-            = yield(:sidebar)
-          .span10
-            - if show_title?
-              .page-header
-                %h1= yield(:title)
-            = yield
-        - else
+      - if content_for?(:sidebar)
+        .span2
+          = yield(:sidebar)
+        .span10
+          = bootstrap_flash
           - if show_title?
             .page-header
               %h1= yield(:title)
           = yield
-    
-      %footer
-        %p
-          Foodsoft, open source software to manage a non-profit food coop.
+      - else
+        = bootstrap_flash
+        - if show_title?
+          .page-header
+            %h1= yield(:title)
+        = yield
 
-    /
-      Javascripts
-      \==================================================
-    / Placed at the end of the document so the pages load faster
-    = javascript_include_tag "application"
+    %footer
+      %p
+        Foodsoft, open source software to manage a non-profit food coop.

app/views/layouts/login.html.haml

@@ -1,19 +1,13 @@
-!!!
-%html
-  %head
-    %meta{"http-equiv" => "content-type", :content => "text/html;charset=UTF-8"}
-    %title= "FoodSoft - " + (yield(:title) or controller.controller_name)
-    = stylesheet_link_tag 'application'
-    = javascript_include_tag 'application'
-    = csrf_meta_tags
-    = yield(:head)
-  %body
-    #login
-      - if yield(:title)
-        %h1= yield(:title)
-      - flash.each do |name, msg|
-        = content_tag :div, msg, :class => "flash #{name}"
-      = yield
-      #meta
-        Foodcoop 
-        = link_to_if FoodsoftConfig[:homepage], FoodsoftConfig[:name], FoodsoftConfig[:homepage]
+= render layout: 'layouts/header' do
+  .container
+    .row
+      .span6.offset3
+        = bootstrap_flash
+        - if show_title?
+          .page-header
+            %h1= yield(:title)
+        = yield
+
+        %footer
+          %p
+            Foodsoft, open source software to manage a non-profit food coop.