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
Léo-Paul Géneau
gitlab-ce
Commits
e95f81d2
Commit
e95f81d2
authored
Jul 03, 2017
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Contextual breadcrumb title fixes
Also moves action buttons into the new breadcrumbs Closes #34030, #34033
parent
4eb6b7c1
Changes
9
Show whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
31 additions
and
19 deletions
+31
-19
app/assets/stylesheets/new_nav.scss
app/assets/stylesheets/new_nav.scss
+1
-1
app/views/groups/show.html.haml
app/views/groups/show.html.haml
+1
-0
app/views/layouts/nav/_new_dashboard.html.haml
app/views/layouts/nav/_new_dashboard.html.haml
+1
-1
app/views/projects/labels/index.html.haml
app/views/projects/labels/index.html.haml
+7
-3
app/views/projects/milestones/index.html.haml
app/views/projects/milestones/index.html.haml
+6
-2
app/views/projects/pipeline_schedules/index.html.haml
app/views/projects/pipeline_schedules/index.html.haml
+7
-3
app/views/projects/show.html.haml
app/views/projects/show.html.haml
+1
-0
app/views/projects/snippets/index.html.haml
app/views/projects/snippets/index.html.haml
+6
-9
app/views/projects/tree/show.html.haml
app/views/projects/tree/show.html.haml
+1
-0
No files found.
app/assets/stylesheets/new_nav.scss
View file @
e95f81d2
...
...
@@ -323,7 +323,7 @@ header.navbar-gitlab-new {
white-space
:
nowrap
;
>
a
{
&
:last-of-type
{
&
:last-of-type
:not
(
:first-child
)
{
font-weight
:
600
;
}
}
...
...
app/views/groups/show.html.haml
View file @
e95f81d2
-
@no_container
=
true
-
@breadcrumb_title
=
"Group"
=
content_for
:meta_tags
do
=
auto_discovery_link_tag
(
:atom
,
group_url
(
@group
,
rss_url_options
),
title:
"
#{
@group
.
name
}
activity"
)
...
...
app/views/layouts/nav/_new_dashboard.html.haml
View file @
e95f81d2
...
...
@@ -3,7 +3,7 @@
=
link_to
dashboard_projects_path
,
title:
'Projects'
,
class:
'dashboard-shortcuts-projects'
do
Projects
=
nav_link
(
controller:
[
:groups
,
'groups/milestones'
,
'groups/group_member
s'
])
do
=
nav_link
(
controller:
[
'dashboard/groups'
,
'explore/group
s'
])
do
=
link_to
dashboard_groups_path
,
class:
'dashboard-shortcuts-groups'
,
title:
'Groups'
do
Groups
...
...
app/views/projects/labels/index.html.haml
View file @
e95f81d2
-
@no_container
=
true
-
page_title
"Labels"
-
hide_class
=
''
-
if
show_new_nav?
&&
can?
(
current_user
,
:admin_label
,
@project
)
-
content_for
:breadcrumbs_extra
do
=
link_to
"New label"
,
new_namespace_project_label_path
(
@project
.
namespace
,
@project
),
class:
"btn btn-new"
=
render
"shared/mr_head"
-
if
@labels
.
exists?
||
@prioritized_labels
.
exists?
...
...
@@ -9,10 +14,9 @@
.nav-text
Labels can be applied to issues and merge requests. Star a label to make it a priority label. Order the prioritized labels to change their relative priority, by dragging.
.nav-controls
.nav-controls
{
class:
(
"visible-xs"
if
show_new_nav?
)
}
-
if
can?
(
current_user
,
:admin_label
,
@project
)
=
link_to
new_namespace_project_label_path
(
@project
.
namespace
,
@project
),
class:
"btn btn-new"
do
New label
=
link_to
"New label"
,
new_namespace_project_label_path
(
@project
.
namespace
,
@project
),
class:
"btn btn-new"
.labels
-
if
can?
(
current_user
,
:admin_label
,
@project
)
...
...
app/views/projects/milestones/index.html.haml
View file @
e95f81d2
-
@no_container
=
true
-
page_title
'Milestones'
-
if
show_new_nav?
-
content_for
:breadcrumbs_extra
do
=
link_to
"New milestone"
,
new_namespace_project_milestone_path
(
@project
.
namespace
,
@project
),
class:
'btn btn-new'
,
title:
'New milestone'
=
render
"shared/mr_head"
%div
{
class:
container_class
}
...
...
@@ -9,8 +14,7 @@
.nav-controls
=
render
'shared/milestones_sort_dropdown'
-
if
can?
(
current_user
,
:admin_milestone
,
@project
)
=
link_to
new_namespace_project_milestone_path
(
@project
.
namespace
,
@project
),
class:
'btn btn-new'
,
title:
'New milestone'
do
New milestone
=
link_to
"New milestone"
,
new_namespace_project_milestone_path
(
@project
.
namespace
,
@project
),
class:
"btn btn-new
#{
(
"visible-xs hidden-sm hidden-md hidden-lg"
if
show_new_nav?
)
}
"
,
title:
'New milestone'
.milestones
%ul
.content-list
...
...
app/views/projects/pipeline_schedules/index.html.haml
View file @
e95f81d2
...
...
@@ -4,6 +4,11 @@
-
@no_container
=
true
-
page_title
_
(
"Pipeline Schedules"
)
-
if
show_new_nav?
-
content_for
:breadcrumbs_extra
do
=
link_to
_
(
'New schedule'
),
new_namespace_project_pipeline_schedule_path
(
@project
.
namespace
,
@project
),
class:
'btn btn-create'
=
render
"projects/pipelines/head"
%div
{
class:
container_class
}
...
...
@@ -12,9 +17,8 @@
-
schedule_path_proc
=
->
(
scope
)
{
pipeline_schedules_path
(
@project
,
scope:
scope
)
}
=
render
"tabs"
,
schedule_path_proc:
schedule_path_proc
,
all_schedules:
@all_schedules
,
scope:
@scope
.nav-controls
=
link_to
new_namespace_project_pipeline_schedule_path
(
@project
.
namespace
,
@project
),
class:
'btn btn-create'
do
%span
=
_
(
'New schedule'
)
.nav-controls
{
class:
(
"visible-xs"
if
show_new_nav?
)
}
=
link_to
_
(
'New schedule'
),
new_namespace_project_pipeline_schedule_path
(
@project
.
namespace
,
@project
),
class:
'btn btn-create'
-
if
@schedules
.
present?
%ul
.content-list
...
...
app/views/projects/show.html.haml
View file @
e95f81d2
-
@no_container
=
true
-
@breadcrumb_title
=
"Project"
=
content_for
:meta_tags
do
=
auto_discovery_link_tag
(
:atom
,
namespace_project_path
(
@project
.
namespace
,
@project
,
rss_url_options
),
title:
"
#{
@project
.
name
}
activity"
)
...
...
app/views/projects/snippets/index.html.haml
View file @
e95f81d2
-
page_title
"Snippets"
-
if
show_new_nav?
&&
can?
(
current_user
,
:create_project_snippet
,
@project
)
-
content_for
:breadcrumbs_extra
do
=
link_to
"New snippet"
,
new_namespace_project_snippet_path
(
@project
.
namespace
,
@project
),
class:
"btn btn-new"
,
title:
"New snippet"
-
if
current_user
.top-area
-
include_private
=
@project
.
team
.
member?
(
current_user
)
||
current_user
.
admin?
=
render
partial:
'snippets/snippets_scope_menu'
,
locals:
{
subject:
@project
,
include_private:
include_private
}
.nav-controls
.hidden-xs
.nav-controls
{
class:
(
"visible-xs"
if
show_new_nav?
)
}
-
if
can?
(
current_user
,
:create_project_snippet
,
@project
)
=
link_to
new_namespace_project_snippet_path
(
@project
.
namespace
,
@project
),
class:
"btn btn-new"
,
title:
"New snippet"
do
New snippet
-
if
can?
(
current_user
,
:create_project_snippet
,
@project
)
.visible-xs
=
link_to
new_namespace_project_snippet_path
(
@project
.
namespace
,
@project
),
class:
"btn btn-new btn-block"
,
title:
"New snippet"
do
New snippet
=
link_to
"New snippet"
,
new_namespace_project_snippet_path
(
@project
.
namespace
,
@project
),
class:
"btn btn-new"
,
title:
"New snippet"
=
render
'snippets/snippets'
app/views/projects/tree/show.html.haml
View file @
e95f81d2
-
@no_container
=
true
-
@breadcrumb_title
=
_
(
"Files"
)
-
page_title
@path
.
presence
||
_
(
"Files"
),
@ref
=
content_for
:meta_tags
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