For navless pages render dashboard nav
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
This commit is contained in:
parent
47d26b05a4
commit
28639a1971
|
@ -0,0 +1,5 @@
|
|||
%header.navbar.navbar-fixed-top.navbar-gitlab
|
||||
.navbar-inner
|
||||
.container
|
||||
%h4.center
|
||||
= image_tag 'logo-white.png', width: 32, height: 32
|
|
@ -1,20 +1,18 @@
|
|||
- if defined?(sidebar)
|
||||
.page-with-sidebar{ class: nav_sidebar_class }
|
||||
= render "layouts/broadcast"
|
||||
.sidebar-wrapper
|
||||
.page-with-sidebar{ class: nav_sidebar_class }
|
||||
= render "layouts/broadcast"
|
||||
.sidebar-wrapper
|
||||
- if defined?(sidebar)
|
||||
= render(sidebar)
|
||||
.collapse-nav
|
||||
= render partial: 'layouts/collapse_button'
|
||||
.content-wrapper
|
||||
.container-fluid
|
||||
.content
|
||||
= render "layouts/flash"
|
||||
.clearfix
|
||||
= yield
|
||||
- else
|
||||
.container.navless-container
|
||||
.content
|
||||
= yield
|
||||
- else
|
||||
= render 'layouts/nav/dashboard'
|
||||
.collapse-nav
|
||||
= render partial: 'layouts/collapse_button'
|
||||
.content-wrapper
|
||||
.container-fluid
|
||||
.content
|
||||
= render "layouts/flash"
|
||||
.clearfix
|
||||
= yield
|
||||
|
||||
= yield :embedded_scripts
|
||||
|
||||
|
|
|
@ -2,11 +2,7 @@
|
|||
%html{ lang: "en"}
|
||||
= render "layouts/head"
|
||||
%body.ui_mars.login-page.application
|
||||
%header.navbar.navbar-fixed-top.navbar-gitlab
|
||||
.navbar-inner
|
||||
.container
|
||||
%h4.center
|
||||
= image_tag 'logo-white.png', width: 32, height: 32
|
||||
= render "layouts/empty_head_panel"
|
||||
= render "layouts/broadcast"
|
||||
.container.navless-container
|
||||
.content
|
||||
|
|
|
@ -4,7 +4,4 @@
|
|||
%body{class: "#{app_theme} application", :'data-page' => body_data_page}
|
||||
= render "layouts/broadcast"
|
||||
= render "layouts/head_panel", title: defined?(@title_url) ? link_to(@title, @title_url) : @title
|
||||
.container.navless-container
|
||||
.content
|
||||
= render "layouts/flash"
|
||||
= yield
|
||||
= render 'layouts/page'
|
||||
|
|
Loading…
Reference in New Issue