Commit 28639a19 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

For navless pages render dashboard nav

Signed-off-by: default avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent 47d26b05
%header.navbar.navbar-fixed-top.navbar-gitlab
.navbar-inner
.container
%h4.center
= image_tag 'logo-white.png', width: 32, height: 32
- if defined?(sidebar) .page-with-sidebar{ class: nav_sidebar_class }
.page-with-sidebar{ class: nav_sidebar_class }
= render "layouts/broadcast" = render "layouts/broadcast"
.sidebar-wrapper .sidebar-wrapper
- if defined?(sidebar)
= render(sidebar) = render(sidebar)
- else
= render 'layouts/nav/dashboard'
.collapse-nav .collapse-nav
= render partial: 'layouts/collapse_button' = render partial: 'layouts/collapse_button'
.content-wrapper .content-wrapper
...@@ -11,10 +13,6 @@ ...@@ -11,10 +13,6 @@
= render "layouts/flash" = render "layouts/flash"
.clearfix .clearfix
= yield = yield
- else
.container.navless-container
.content
= yield
= yield :embedded_scripts = yield :embedded_scripts
......
...@@ -2,11 +2,7 @@ ...@@ -2,11 +2,7 @@
%html{ lang: "en"} %html{ lang: "en"}
= render "layouts/head" = render "layouts/head"
%body.ui_mars.login-page.application %body.ui_mars.login-page.application
%header.navbar.navbar-fixed-top.navbar-gitlab = render "layouts/empty_head_panel"
.navbar-inner
.container
%h4.center
= image_tag 'logo-white.png', width: 32, height: 32
= render "layouts/broadcast" = render "layouts/broadcast"
.container.navless-container .container.navless-container
.content .content
......
...@@ -4,7 +4,4 @@ ...@@ -4,7 +4,4 @@
%body{class: "#{app_theme} application", :'data-page' => body_data_page} %body{class: "#{app_theme} application", :'data-page' => body_data_page}
= render "layouts/broadcast" = render "layouts/broadcast"
= render "layouts/head_panel", title: defined?(@title_url) ? link_to(@title, @title_url) : @title = render "layouts/head_panel", title: defined?(@title_url) ? link_to(@title, @title_url) : @title
.container.navless-container = render 'layouts/page'
.content
= render "layouts/flash"
= yield
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment