Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
gitlab-ce
Commits
28639a19
Commit
28639a19
authored
Apr 22, 2015
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
For navless pages render dashboard nav
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
47d26b05
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
21 additions
and
25 deletions
+21
-25
app/views/layouts/_empty_head_panel.html.haml
app/views/layouts/_empty_head_panel.html.haml
+5
-0
app/views/layouts/_page.html.haml
app/views/layouts/_page.html.haml
+14
-16
app/views/layouts/devise.html.haml
app/views/layouts/devise.html.haml
+1
-5
app/views/layouts/navless.html.haml
app/views/layouts/navless.html.haml
+1
-4
No files found.
app/views/layouts/_empty_head_panel.html.haml
0 → 100644
View file @
28639a19
%header
.navbar.navbar-fixed-top.navbar-gitlab
.navbar-inner
.container
%h4
.center
=
image_tag
'logo-white.png'
,
width:
32
,
height:
32
app/views/layouts/_page.html.haml
View file @
28639a19
-
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
)
.collapse-nav
-
else
=
render
partial:
'layouts/collapse_button'
=
render
'layouts/nav/dashboard'
.content-wrapper
.collapse-nav
.container-fluid
=
render
partial:
'layouts/collapse_button'
.content
.content-wrapper
=
render
"layouts/flash"
.container-fluid
.clearfix
.content
=
yield
=
render
"layouts/flash"
-
else
.clearfix
.container.navless-container
=
yield
.content
=
yield
=
yield
:embedded_scripts
=
yield
:embedded_scripts
...
...
app/views/layouts/devise.html.haml
View file @
28639a19
...
@@ -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
...
...
app/views/layouts/navless.html.haml
View file @
28639a19
...
@@ -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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment