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
2f13d4da
Commit
2f13d4da
authored
Dec 12, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Implement sidebar navigation for project area
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
c7db2661
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
144 additions
and
18 deletions
+144
-18
app/assets/stylesheets/sections/sidebar.scss
app/assets/stylesheets/sections/sidebar.scss
+120
-0
app/views/layouts/nav/_project.html.haml
app/views/layouts/nav/_project.html.haml
+5
-2
app/views/layouts/project_settings.html.haml
app/views/layouts/project_settings.html.haml
+9
-9
app/views/layouts/projects.html.haml
app/views/layouts/projects.html.haml
+9
-6
app/views/projects/_settings_nav.html.haml
app/views/projects/_settings_nav.html.haml
+1
-1
No files found.
app/assets/stylesheets/sections/sidebar.scss
0 → 100644
View file @
2f13d4da
body
.project
{
padding
:
0
;
header
.container
{
width
:
100%
!
important
;
}
}
.page-with-sidebar
{
background
:
#F5F5F5
;
header
.navbar-inner
{
padding
:
0px
20px
;
}
}
.sidebar-wrapper
{
z-index
:
1000
;
position
:
absolute
;
left
:
250px
;
width
:
0
;
height
:
100%
;
margin-left
:
-250px
;
overflow-y
:
auto
;
background
:
#F5F5F5
;
}
.content-wrapper
{
width
:
100%
;
padding
:
15px
;
background
:
#FFF
;
}
.nav-sidebar
{
position
:
fixed
;
top
:
45px
;
width
:
250px
;
margin
:
0
;
list-style
:
none
;
margin-top
:
20px
;
}
.nav-sidebar
li
a
.count
{
float
:
right
;
background
:
#eee
;
padding
:
2px
8px
;
@include
border-radius
(
6px
);
}
.nav-sidebar
li
.active
a
{
color
:
#333
;
background
:
#EEE
;
font-weight
:
bold
;
}
.nav-sidebar
li
{
&
.separate-item
{
border-top
:
1px
solid
#ddd
;
padding-top
:
10px
;
margin-top
:
10px
;
}
a
{
color
:
#666
;
display
:
block
;
text-decoration
:
none
;
padding
:
6px
15px
;
font-size
:
13px
;
line-height
:
20px
;
text-shadow
:
0
1px
2px
#FFF
;
padding-left
:
30px
;
&
:hover
{
text-decoration
:
none
;
color
:
#333
;
background
:
#DDD
;
}
&
:active
,
&
:focus
{
text-decoration
:
none
;
}
}
}
.project-settings-nav
{
margin-left
:
0px
;
padding-left
:
0px
;
li
{
line-height
:
28px
;
font-size
:
12px
;
list-style
:
none
;
a
{
padding
:
5px
15px
;
font-size
:
12px
;
padding-left
:
30px
;
}
}
}
@media
(
min-width
:
768px
)
{
.page-with-sidebar
{
padding-left
:
250px
;
}
.sidebar-wrapper
{
width
:
250px
;
}
.content-wrapper
{
padding
:
20px
;
}
}
/** TODO: REMOVE **/
.profiler-results
{
display
:
none
;
}
app/views/layouts/nav/_project.html.haml
View file @
2f13d4da
%ul
.project-navigation
%ul
.project-navigation
.nav.nav-sidebar
=
nav_link
(
path:
'projects#show'
,
html_options:
{
class:
"home"
})
do
=
nav_link
(
path:
'projects#show'
,
html_options:
{
class:
"home"
})
do
=
link_to
project_path
(
@project
),
title:
'Project'
,
class:
'shortcuts-project'
do
=
link_to
project_path
(
@project
),
title:
'Project'
,
class:
'shortcuts-project'
do
Project
Project
...
@@ -40,6 +40,9 @@
...
@@ -40,6 +40,9 @@
=
link_to
'Snippets'
,
project_snippets_path
(
@project
),
class:
'shortcuts-snippets'
=
link_to
'Snippets'
,
project_snippets_path
(
@project
),
class:
'shortcuts-snippets'
-
if
project_nav_tab?
:settings
-
if
project_nav_tab?
:settings
=
nav_link
(
html_options:
{
class:
"
#{
project_tab_class
}
"
})
do
=
nav_link
(
html_options:
{
class:
"
#{
project_tab_class
}
separate-item
"
})
do
=
link_to
edit_project_path
(
@project
),
class:
"stat-tab tab "
do
=
link_to
edit_project_path
(
@project
),
class:
"stat-tab tab "
do
Settings
Settings
%i
.fa.fa-angle-down
-
if
defined?
(
settings
)
&&
settings
=
render
'projects/settings_nav'
app/views/layouts/project_settings.html.haml
View file @
2f13d4da
...
@@ -7,13 +7,13 @@
...
@@ -7,13 +7,13 @@
=
render
"layouts/init_auto_complete"
=
render
"layouts/init_auto_complete"
-
if
can?
(
current_user
,
:download_code
,
@project
)
-
if
can?
(
current_user
,
:download_code
,
@project
)
=
render
'shared/no_ssh'
=
render
'shared/no_ssh'
%nav
.main-nav.navbar-collapse.collapse
.container
=
render
'layouts/nav/project'
.page-with-sidebar
.container
.sidebar-wrapper
=
render
'layouts/nav/project'
,
settings:
true
.content-wrapper
.container-fluid
.content
.content
=
render
"layouts/flash"
=
render
"layouts/flash"
.row
.col-md-2
=
render
"projects/settings_nav"
.col-md-10
=
yield
=
yield
=
yield
:embedded_scripts
app/views/layouts/projects.html.haml
View file @
2f13d4da
...
@@ -7,9 +7,12 @@
...
@@ -7,9 +7,12 @@
=
render
"layouts/init_auto_complete"
=
render
"layouts/init_auto_complete"
-
if
can?
(
current_user
,
:download_code
,
@project
)
-
if
can?
(
current_user
,
:download_code
,
@project
)
=
render
'shared/no_ssh'
=
render
'shared/no_ssh'
%nav
.main-nav.navbar-collapse.collapse
.container
=
render
'layouts/nav/project'
.page-with-sidebar
.container
.sidebar-wrapper
=
render
'layouts/nav/project'
.content-wrapper
.container-fluid
.content
.content
=
render
"layouts/flash"
=
render
"layouts/flash"
=
yield
=
yield
...
...
app/views/projects/_settings_nav.html.haml
View file @
2f13d4da
%ul
.
nav.nav-pills.nav-stacked.nav-stacked-menu.append-bottom-20.
project-settings-nav
%ul
.project-settings-nav
=
nav_link
(
path:
'projects#edit'
)
do
=
nav_link
(
path:
'projects#edit'
)
do
=
link_to
edit_project_path
(
@project
),
class:
"stat-tab tab "
do
=
link_to
edit_project_path
(
@project
),
class:
"stat-tab tab "
do
%i
.fa.fa-pencil-square-o
%i
.fa.fa-pencil-square-o
...
...
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