From b6ceb95e13e40aa181a07747a8afc2793ad6af74 Mon Sep 17 00:00:00 2001 From: Carl Chenet Date: Tue, 23 May 2017 14:01:05 +0200 Subject: [PATCH] layout: if layouts/_footer exists, use it instead - merged with i18n --- .gitignore | 1 + app/views/layouts/application.html.erb | 34 ++++++++++++++------------ 2 files changed, 20 insertions(+), 15 deletions(-) diff --git a/.gitignore b/.gitignore index 4db7818..b59a649 100644 --- a/.gitignore +++ b/.gitignore @@ -25,6 +25,7 @@ app/views/home/privacy.* app/views/home/about.* app/views/home/chat.* app/views/home/404.* +app/views/layouts/_footer.* app/assets/stylesheets/local/* public/favicon.ico public/apple-touch-icon* diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 1e8c220..81c733d 100644 --- a/app/views/layouts/application.html.erb +++ b/app/views/layouts/application.html.erb @@ -117,23 +117,27 @@ <%= yield %>