From 99bc3604b2306d6a8b7cf15067fdcc488d8a1aaf Mon Sep 17 00:00:00 2001 From: Peter W Date: Fri, 9 Jan 2015 16:01:14 -0800 Subject: [PATCH 1/2] move footer and topbar inside --- app/views/layouts/application.html.erb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 49af958..2ce3bb8 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -26,6 +26,7 @@ <%= csrf_meta_tags %> <%= yield :head %> +
@@ -54,8 +55,9 @@
- <%= yield %> + + <%= render "layouts/footer"%> + -<%= render "layouts/footer"%> From fe98981dec2113efe43cb63f72362d516dec4ec1 Mon Sep 17 00:00:00 2001 From: Peter W Date: Fri, 9 Jan 2015 16:02:33 -0800 Subject: [PATCH 2/2] move topbar into its own file --- app/views/layouts/_topbar.html.erb | 26 +++++++++++++++++++++ app/views/layouts/application.html.erb | 31 +------------------------- 2 files changed, 27 insertions(+), 30 deletions(-) create mode 100644 app/views/layouts/_topbar.html.erb diff --git a/app/views/layouts/_topbar.html.erb b/app/views/layouts/_topbar.html.erb new file mode 100644 index 0000000..ab082cb --- /dev/null +++ b/app/views/layouts/_topbar.html.erb @@ -0,0 +1,26 @@ + \ No newline at end of file diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 2ce3bb8..721b676 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -27,37 +27,8 @@ <%= yield :head %> - - - + <%= render "layouts/topbar"%> <%= yield %> - <%= render "layouts/footer"%> -