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
da6d9607
Commit
da6d9607
authored
Sep 16, 2015
by
Kamil Trzcinski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Integrate CI navigation more tightly with project
parent
591f2e1d
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
22 additions
and
34 deletions
+22
-34
app/views/layouts/ci/_nav_admin.html.haml
app/views/layouts/ci/_nav_admin.html.haml
+2
-2
app/views/layouts/ci/_nav_dashboard.html.haml
app/views/layouts/ci/_nav_dashboard.html.haml
+0
-24
app/views/layouts/ci/application.html.haml
app/views/layouts/ci/application.html.haml
+1
-1
app/views/layouts/nav/_admin.html.haml
app/views/layouts/nav/_admin.html.haml
+6
-1
app/views/layouts/nav/_dashboard.html.haml
app/views/layouts/nav/_dashboard.html.haml
+6
-6
app/views/layouts/nav/_project.html.haml
app/views/layouts/nav/_project.html.haml
+7
-0
No files found.
app/views/layouts/ci/_nav_admin.html.haml
View file @
da6d9607
%ul
.nav.nav-sidebar
%ul
.nav.nav-sidebar
=
nav_link
do
=
nav_link
do
=
link_to
ci
_root_path
,
title:
'Back to dashboard'
,
data:
{
placement:
'right'
},
class:
'back-link'
do
=
link_to
admin
_root_path
,
title:
'Back to dashboard'
,
data:
{
placement:
'right'
},
class:
'back-link'
do
=
icon
(
'caret-square-o-left fw'
)
=
icon
(
'caret-square-o-left fw'
)
%span
%span
Back to
Dashboard
Back to
Admin
%li
.separate-item
%li
.separate-item
=
nav_link
path:
'projects#index'
do
=
nav_link
path:
'projects#index'
do
...
...
app/views/layouts/ci/_nav_dashboard.html.haml
deleted
100644 → 0
View file @
591f2e1d
%ul
.nav.nav-sidebar
=
nav_link
do
=
link_to
root_path
,
title:
'Back to dashboard'
,
data:
{
placement:
'right'
},
class:
'back-link'
do
=
icon
(
'caret-square-o-left fw'
)
%span
Back to GitLab
%li
.separate-item
=
nav_link
path:
'projects#index'
do
=
link_to
ci_root_path
do
%i
.fa.fa-home
%span
Projects
-
if
current_user
&&
current_user
.
is_admin?
%li
=
link_to
ci_admin_projects_path
do
%i
.fa.fa-cogs
%span
Admin
%li
=
link_to
ci_help_path
do
%i
.fa.fa-info
%span
Help
app/views/layouts/ci/application.html.haml
View file @
da6d9607
...
@@ -8,4 +8,4 @@
...
@@ -8,4 +8,4 @@
-
else
-
else
=
render
"layouts/header/public"
,
title:
header_title
=
render
"layouts/header/public"
,
title:
header_title
=
render
'layouts/ci/page'
,
sidebar:
'nav_dashboard'
=
render
'layouts/ci/page'
app/views/layouts/nav/_admin.html.haml
View file @
da6d9607
...
@@ -4,7 +4,7 @@
...
@@ -4,7 +4,7 @@
=
icon
(
'dashboard fw'
)
=
icon
(
'dashboard fw'
)
%span
%span
Overview
Overview
=
nav_link
(
controller:
:projects
)
do
=
nav_link
(
controller:
[
:admin
,
:projects
]
)
do
=
link_to
admin_namespaces_projects_path
,
title:
'Projects'
,
data:
{
placement:
'right'
}
do
=
link_to
admin_namespaces_projects_path
,
title:
'Projects'
,
data:
{
placement:
'right'
}
do
=
icon
(
'cube fw'
)
=
icon
(
'cube fw'
)
%span
%span
...
@@ -24,6 +24,11 @@
...
@@ -24,6 +24,11 @@
=
icon
(
'key fw'
)
=
icon
(
'key fw'
)
%span
%span
Deploy Keys
Deploy Keys
=
nav_link
do
=
link_to
ci_admin_projects_path
,
title:
'Continuous Integration'
,
data:
{
placement:
'right'
}
do
=
icon
(
'building fw'
)
%span
Continuous Integration
=
nav_link
(
controller: :logs
)
do
=
nav_link
(
controller: :logs
)
do
=
link_to
admin_logs_path
,
title:
'Logs'
,
data:
{
placement:
'right'
}
do
=
link_to
admin_logs_path
,
title:
'Logs'
,
data:
{
placement:
'right'
}
do
=
icon
(
'file-text fw'
)
=
icon
(
'file-text fw'
)
...
...
app/views/layouts/nav/_dashboard.html.haml
View file @
da6d9607
%ul
.nav.nav-sidebar
%ul
.nav.nav-sidebar
=
nav_link
(
path:
[
'root#index'
,
'projects#trending'
,
'projects#starred'
,
'projects#index'
],
html_options:
{
class:
'home'
})
do
=
nav_link
(
path:
[
'root#index'
,
'projects#trending'
,
'projects#starred'
,
'
dashboard/
projects#index'
],
html_options:
{
class:
'home'
})
do
=
link_to
root_path
,
title:
'Projects'
,
data:
{
placement:
'right'
}
do
=
link_to
root_path
,
title:
'Projects'
,
data:
{
placement:
'right'
}
do
=
icon
(
'home fw'
)
=
icon
(
'home fw'
)
%span
%span
...
@@ -31,6 +31,11 @@
...
@@ -31,6 +31,11 @@
%span
%span
Merge Requests
Merge Requests
%span
.count
=
current_user
.
assigned_merge_requests
.
opened
.
count
%span
.count
=
current_user
.
assigned_merge_requests
.
opened
.
count
=
nav_link
(
controller:
[
:ci
,
:projects
])
do
=
link_to
ci_root_path
,
title:
'Continuous Integration'
,
data:
{
placement:
'right'
}
do
=
icon
(
'building fw'
)
%span
Continuous Integration
=
nav_link
(
controller: :snippets
)
do
=
nav_link
(
controller: :snippets
)
do
=
link_to
dashboard_snippets_path
,
title:
'Your snippets'
,
data:
{
placement:
'right'
}
do
=
link_to
dashboard_snippets_path
,
title:
'Your snippets'
,
data:
{
placement:
'right'
}
do
=
icon
(
'clipboard fw'
)
=
icon
(
'clipboard fw'
)
...
@@ -46,8 +51,3 @@
...
@@ -46,8 +51,3 @@
=
icon
(
'user fw'
)
=
icon
(
'user fw'
)
%span
%span
Profile Settings
Profile Settings
=
nav_link
(
controller: :ci
)
do
=
link_to
ci_root_path
,
title:
'Continuous Integration'
,
data:
{
placement:
'right'
}
do
=
icon
(
'building fw'
)
%span
CI
app/views/layouts/nav/_project.html.haml
View file @
da6d9607
...
@@ -76,6 +76,13 @@
...
@@ -76,6 +76,13 @@
Merge Requests
Merge Requests
%span
.count.merge_counter
=
@project
.
merge_requests
.
opened
.
count
%span
.count.merge_counter
=
@project
.
merge_requests
.
opened
.
count
-
if
@project
.
gitlab_ci?
=
nav_link
(
controller:
[
:ci
,
:project
])
do
=
link_to
ci_project_path
(
@project
.
gitlab_ci_project
),
title:
'Continuous Integration'
,
data:
{
placement:
'right'
}
do
=
icon
(
'building fw'
)
%span
Continuous Integration
-
if
project_nav_tab?
:settings
-
if
project_nav_tab?
:settings
=
nav_link
(
controller:
[
:project_members
,
:teams
])
do
=
nav_link
(
controller:
[
:project_members
,
:teams
])
do
=
link_to
namespace_project_project_members_path
(
@project
.
namespace
,
@project
),
title:
'Members'
,
class:
'team-tab tab'
,
data:
{
placement:
'right'
}
do
=
link_to
namespace_project_project_members_path
(
@project
.
namespace
,
@project
),
title:
'Members'
,
class:
'team-tab tab'
,
data:
{
placement:
'right'
}
do
...
...
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