diff --git a/app/views/layouts/_footer.html.haml b/app/views/layouts/_footer.html.haml index a92d8777c..5e728baaf 100644 --- a/app/views/layouts/_footer.html.haml +++ b/app/views/layouts/_footer.html.haml @@ -1,6 +1,3 @@ - -- # There are some tags here, such as these close div tags and the close body and html tags below, which were opened in the header fragment. HAML can't handle this, so they're done in HTML instead. - .row .ten.columns %ul.link-list @@ -14,6 +11,3 @@ = link_to "Mailing list", "http://lists.growstuff.org/mailman/listinfo/discuss" %li = link_to "Community Guidelines", "https://github.com/Growstuff/policy/blob/master/community-guidelines.md" - - - diff --git a/app/views/layouts/_header.html.haml b/app/views/layouts/_header.html.haml index 0ed4e4aa2..ef413ee18 100644 --- a/app/views/layouts/_header.html.haml +++ b/app/views/layouts/_header.html.haml @@ -1,18 +1,3 @@ - -- # There are some tags here, such as html, body, etc, which are opened in this file and closed in the footer fragment. HAML can't handle this, so they're left as HTML. If you were wondering. - -%head - - - - %title - = content_for?(:title) ? yield(:title) : "Growstuff" - = stylesheet_link_tag "application", :media => "all" - = javascript_include_tag "application" - = csrf_meta_tags - - - .row .ten.columns - if user_signed_in? @@ -34,4 +19,3 @@ %h1 = link_to('Growstuff', root_path) -
diff --git a/app/views/layouts/_meta.html.haml b/app/views/layouts/_meta.html.haml new file mode 100644 index 000000000..89ca1c3d8 --- /dev/null +++ b/app/views/layouts/_meta.html.haml @@ -0,0 +1,10 @@ +%head + + + + %title + = content_for?(:title) ? yield(:title) : "Growstuff" + = stylesheet_link_tag "application", :media => "all" + = javascript_include_tag "application" + = csrf_meta_tags + diff --git a/app/views/layouts/application.html.haml b/app/views/layouts/application.html.haml index 119cb0e26..01c9e37ad 100644 --- a/app/views/layouts/application.html.haml +++ b/app/views/layouts/application.html.haml @@ -1,9 +1,14 @@ -= render :partial => "layouts/header" -- if notice - %p.notice - = notice -- if alert - %p.alert - = alert -= yield -= render :partial => "layouts/footer" +%html + = render :partial => "layouts/meta" + %body + = render :partial => "layouts/header" + .row + .ten.columns + - if notice + %p.notice + = notice + - if alert + %p.alert + = alert + = yield + = render :partial => "layouts/footer"