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
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kazuhiko Shiozaki
gitlab-ce
Commits
eb2face2
Commit
eb2face2
authored
Dec 17, 2014
by
Dmitriy Zaporozhets
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Dashboard layout uses sidenav
Signed-off-by:
Dmitriy Zaporozhets
<
dmitriy.zaporozhets@gmail.com
>
parent
06a219ba
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
31 additions
and
33 deletions
+31
-33
app/assets/stylesheets/sections/dashboard.scss
app/assets/stylesheets/sections/dashboard.scss
+0
-14
app/views/dashboard/_groups.html.haml
app/views/dashboard/_groups.html.haml
+6
-5
app/views/dashboard/_projects.html.haml
app/views/dashboard/_projects.html.haml
+6
-5
app/views/layouts/application.html.haml
app/views/layouts/application.html.haml
+11
-7
app/views/layouts/nav/_dashboard.html.haml
app/views/layouts/nav/_dashboard.html.haml
+8
-2
No files found.
app/assets/stylesheets/sections/dashboard.scss
View file @
eb2face2
...
...
@@ -23,20 +23,6 @@
}
}
.dashboard
{
.dash-filter
{
width
:
205px
;
float
:
left
;
height
:
inherit
;
}
}
@media
(
max-width
:
1200px
)
{
.dashboard
.dash-filter
{
width
:
140px
;
}
}
.dash-sidebar-tabs
{
margin-bottom
:
2px
;
border
:
none
;
...
...
app/views/dashboard/_groups.html.haml
View file @
eb2face2
.panel.panel-default
.panel-heading.clearfix
=
search_field_tag
:filter_group
,
nil
,
placeholder:
'Filter by name'
,
class:
'dash-filter form-control'
-
if
current_user
.
can_create_group?
=
link_to
new_group_path
,
class:
"btn btn-new pull-right"
do
%i
.fa.fa-plus
New group
.input-group
=
search_field_tag
:filter_group
,
nil
,
placeholder:
'Filter by name'
,
class:
'dash-filter form-control'
-
if
current_user
.
can_create_group?
.input-group-addon
=
link_to
new_group_path
,
class:
""
do
%strong
New group
%ul
.well-list.dash-list
-
groups
.
each
do
|
group
|
%li
.group-row
...
...
app/views/dashboard/_projects.html.haml
View file @
eb2face2
.panel.panel-default
.panel-heading.clearfix
=
search_field_tag
:filter_projects
,
nil
,
placeholder:
'Filter by name'
,
class:
'dash-filter form-control'
-
if
current_user
.
can_create_project?
=
link_to
new_project_path
,
class:
"btn btn-new pull-right"
do
%i
.fa.fa-plus
New project
.input-group
=
search_field_tag
:filter_projects
,
nil
,
placeholder:
'Filter by name'
,
class:
'dash-filter form-control'
-
if
current_user
.
can_create_project?
.input-group-addon
=
link_to
new_project_path
,
class:
""
do
%strong
New project
%ul
.well-list.dash-list
-
projects
.
each
do
|
project
|
...
...
app/views/layouts/application.html.haml
View file @
eb2face2
!!! 5
%html
{
lang:
"en"
}
=
render
"layouts/head"
,
title:
"Dashboard"
%body
{
class:
"#{app_theme} application"
,
:'data-page'
=>
body_data_page
}
%body
{
class:
"#{app_theme}
sidenav
application"
,
:'data-page'
=>
body_data_page
}
=
render
"layouts/broadcast"
=
render
"layouts/head_panel"
,
title:
"Dashboard"
%nav
.main-nav.navbar-collapse.collapse
.container
=
render
'layouts/nav/dashboard'
.container
.content
=
render
"layouts/flash"
=
yield
.page-with-sidebar
.sidebar-wrapper
=
render
'layouts/nav/dashboard'
.content-wrapper
.container-fluid
.content
=
render
"layouts/flash"
.clearfix
=
yield
=
yield
:embedded_scripts
app/views/layouts/nav/_dashboard.html.haml
View file @
eb2face2
%ul
%ul
.nav.nav-sidebar.navbar-collapse.collapse
=
nav_link
(
path:
'dashboard#show'
,
html_options:
{
class:
'home'
})
do
=
link_to
root_path
,
title:
'Home'
,
class:
'shortcuts-activity'
do
%i
.fa.fa-dashboard
Activity
=
nav_link
(
path:
'dashboard#projects'
)
do
=
link_to
projects_dashboard_path
,
class:
'shortcuts-projects'
do
%i
.fa.fa-cube
Projects
=
nav_link
(
path:
'dashboard#issues'
)
do
=
link_to
issues_dashboard_path
,
class:
'shortcuts-issues'
do
%i
.fa.fa-exclamation-circle
Issues
%span
.count
=
current_user
.
assigned_issues
.
opened
.
count
=
nav_link
(
path:
'dashboard#merge_requests'
)
do
=
link_to
merge_requests_dashboard_path
,
class:
'shortcuts-merge_requests'
do
%i
.fa.fa-tasks
Merge Requests
%span
.count
=
current_user
.
assigned_merge_requests
.
opened
.
count
=
nav_link
(
controller: :help
)
do
=
link_to
"Help"
,
help_path
=
link_to
help_path
do
%i
.fa.fa-question-circle
Help
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