From 5fc50b541d80d24b3785d8c333202d1775745a85 Mon Sep 17 00:00:00 2001 From: Martin Lensment Date: Fri, 27 Mar 2015 12:48:31 +0200 Subject: [PATCH] Mount depp differently, layout improvements --- .../registrar/sessions_controller.rb | 2 +- app/views/layouts/depp/application.haml | 18 ++++++++++++------ config/routes.rb | 4 ++-- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/app/controllers/registrar/sessions_controller.rb b/app/controllers/registrar/sessions_controller.rb index 4cd609de9..de37a75f6 100644 --- a/app/controllers/registrar/sessions_controller.rb +++ b/app/controllers/registrar/sessions_controller.rb @@ -1,5 +1,5 @@ class Registrar::SessionsController < SessionsController - layout 'registrar' + layout 'depp/application' def create @user = ApiUser.first if params[:user1] diff --git a/app/views/layouts/depp/application.haml b/app/views/layouts/depp/application.haml index 519cce7d6..474dea6a5 100644 --- a/app/views/layouts/depp/application.haml +++ b/app/views/layouts/depp/application.haml @@ -29,20 +29,26 @@ .navbar-collapse.collapse %ul.nav.navbar-nav - if can? :show, Invoice - %li= link_to t('invoices'), main_app.registrar_invoices_path + - active_class = ['registrar/invoices'].include?(params[:controller]) ? 'active' :nil + %li{class: active_class}= link_to t('invoices'), main_app.registrar_invoices_path - - active_class = %w(domains check renew tranfer keyrelays).include?(params[:controller]) ? 'active' :nil + - active_class = %w(depp/domains depp/check depp/renew depp/tranfer depp/keyrelays).include?(params[:controller]) ? 'active' :nil %li{class: active_class}= link_to t(:domains), depp.domains_path - - active_class = ['contacts'].include?(params[:controller]) ? 'active' :nil - %li{class: active_class}= link_to t(:contacts), contacts_path + - active_class = ['depp/contacts'].include?(params[:controller]) ? 'active' :nil + %li{class: active_class}= link_to t(:contacts), depp.contacts_path - - active_class = ['xml_consoles'].include?(params[:controller]) ? 'active' :nil - %li{class: active_class}= link_to t(:xml_console), xml_console_path + - active_class = ['depp/xml_consoles'].include?(params[:controller]) ? 'active' :nil + %li{class: active_class}= link_to t(:xml_console), depp.xml_console_path %ul.nav.navbar-nav.navbar-right %li= link_to t('log_out', user: current_user), '/registrar/logout' / /.nav-collapse + / = yield :tabs + / .container + / = render 'depp/shared/flash' + / = render 'depp/shared/epp_results' + / = yield .container - display = (flash.empty?) ? 'none' : 'block' #flash{style: "display: #{display};"} diff --git a/config/routes.rb b/config/routes.rb index 59dec51f5..a6b208655 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -79,8 +79,6 @@ Rails.application.routes.draw do end namespace(:registrar) do - mount Depp::Engine, at: '/depp', as: 'depp' - resources :invoices devise_scope :user do @@ -101,6 +99,8 @@ Rails.application.routes.draw do root 'invoices#index' end + mount Depp::Engine, at: '/registrar/depp', as: 'depp' + devise_for :users devise_scope :user do