From 3e6d307e488fa1479ccda8ca42fb53176f31ec19 Mon Sep 17 00:00:00 2001 From: Andrew Radev Date: Sat, 30 May 2015 19:00:44 +0300 Subject: [PATCH] Fix login --- app/controllers/application_controller.rb | 3 --- app/views/layouts/application.html.slim | 21 +++++++++++++++++++++ 2 files changed, 21 insertions(+), 3 deletions(-) create mode 100644 app/views/layouts/application.html.slim diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 587e03d..a35a580 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -19,9 +19,6 @@ class ApplicationController < ActionController::Base I18n.locale = params[:locale] || I18n.default_locale end - layout 'management' - - protected def configure_permitted_parameters diff --git a/app/views/layouts/application.html.slim b/app/views/layouts/application.html.slim new file mode 100644 index 0000000..ae1b9bc --- /dev/null +++ b/app/views/layouts/application.html.slim @@ -0,0 +1,21 @@ +doctype html + +html + head + meta charset="utf-8" + meta http-equiv="X-UA-Compatible" content="IE=edge" + meta name="viewport" content="width=device-width, initial-scale=1" + title + - if content_for? :title + => content_for :title + | | Clarion + - else + | Clarion + + = stylesheet_link_tag "management/application" + = csrf_meta_tags + body + main + = render 'layouts/management/flash' + == yield + = javascript_include_tag "management/application"