Mount depp differently, layout improvements

This commit is contained in:
Martin Lensment 2015-03-27 12:48:31 +02:00
parent f841d342b5
commit 5fc50b541d
3 changed files with 15 additions and 9 deletions

View file

@ -1,5 +1,5 @@
class Registrar::SessionsController < SessionsController
layout 'registrar'
layout 'depp/application'
def create
@user = ApiUser.first if params[:user1]

View file

@ -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};"}

View file

@ -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