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
Boxiang Sun
gitlab-ce
Commits
632b2482
Commit
632b2482
authored
Sep 06, 2017
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Moves the action buttons out of the breadcrumbs
Closes #36459
parent
cdd8f2f3
Changes
18
Hide whitespace changes
Inline
Side-by-side
Showing
18 changed files
with
21 additions
and
92 deletions
+21
-92
app/assets/stylesheets/new_nav.scss
app/assets/stylesheets/new_nav.scss
+0
-10
app/views/dashboard/_groups_head.html.haml
app/views/dashboard/_groups_head.html.haml
+2
-6
app/views/dashboard/_projects_head.html.haml
app/views/dashboard/_projects_head.html.haml
+2
-6
app/views/dashboard/_snippets_head.html.haml
app/views/dashboard/_snippets_head.html.haml
+4
-4
app/views/dashboard/issues.html.haml
app/views/dashboard/issues.html.haml
+1
-6
app/views/dashboard/merge_requests.html.haml
app/views/dashboard/merge_requests.html.haml
+1
-4
app/views/dashboard/milestones/index.html.haml
app/views/dashboard/milestones/index.html.haml
+1
-4
app/views/groups/issues.html.haml
app/views/groups/issues.html.haml
+1
-9
app/views/groups/labels/index.html.haml
app/views/groups/labels/index.html.haml
+1
-4
app/views/groups/merge_requests.html.haml
app/views/groups/merge_requests.html.haml
+1
-5
app/views/groups/milestones/index.html.haml
app/views/groups/milestones/index.html.haml
+1
-4
app/views/layouts/nav/_breadcrumbs.html.haml
app/views/layouts/nav/_breadcrumbs.html.haml
+0
-2
app/views/projects/issues/index.html.haml
app/views/projects/issues/index.html.haml
+1
-4
app/views/projects/labels/index.html.haml
app/views/projects/labels/index.html.haml
+1
-5
app/views/projects/merge_requests/index.html.haml
app/views/projects/merge_requests/index.html.haml
+1
-4
app/views/projects/milestones/index.html.haml
app/views/projects/milestones/index.html.haml
+1
-5
app/views/projects/pipeline_schedules/index.html.haml
app/views/projects/pipeline_schedules/index.html.haml
+1
-5
app/views/projects/snippets/index.html.haml
app/views/projects/snippets/index.html.haml
+1
-5
No files found.
app/assets/stylesheets/new_nav.scss
View file @
632b2482
...
...
@@ -515,16 +515,6 @@ header.navbar-gitlab-new {
}
}
.top-area
{
.nav-controls-new-nav
{
.dropdown
{
@media
(
min-width
:
$screen-sm-min
)
{
margin-right
:
0
;
}
}
}
}
.btn-sign-in
{
margin-top
:
3px
;
background-color
:
$indigo-100
;
...
...
app/views/dashboard/_groups_head.html.haml
View file @
632b2482
-
if
current_user
.
can_create_group?
-
content_for
:breadcrumbs_extra
do
=
link_to
"New group"
,
new_group_path
,
class:
"btn btn-new"
.top-area
%ul
.nav-links
=
nav_link
(
page:
dashboard_groups_path
)
do
...
...
@@ -10,8 +6,8 @@
=
nav_link
(
page:
explore_groups_path
)
do
=
link_to
explore_groups_path
,
title:
'Explore public groups'
do
Explore public groups
.nav-controls
.nav-controls-new-nav
.nav-controls
=
render
'shared/groups/search_form'
=
render
'shared/groups/dropdown'
-
if
current_user
.
can_create_group?
=
link_to
"New group"
,
new_group_path
,
class:
"btn btn-new
visible-xs
"
=
link_to
"New group"
,
new_group_path
,
class:
"btn btn-new"
app/views/dashboard/_projects_head.html.haml
View file @
632b2482
=
content_for
:flash_message
do
=
render
'shared/project_limit'
-
if
current_user
.
can_create_project?
-
content_for
:breadcrumbs_extra
do
=
link_to
"New project"
,
new_project_path
,
class:
'btn btn-new'
.top-area.scrolling-tabs-container.inner-page-scroll-tabs
.fade-left
=
icon
(
'angle-left'
)
.fade-right
=
icon
(
'angle-right'
)
...
...
@@ -19,8 +15,8 @@
=
link_to
explore_root_path
,
title:
'Explore'
,
data:
{
placement:
'right'
}
do
Explore projects
.nav-controls
.nav-controls-new-nav
.nav-controls
=
render
'shared/projects/search_form'
=
render
'shared/projects/dropdown'
-
if
current_user
.
can_create_project?
=
link_to
"New project"
,
new_project_path
,
class:
"btn btn-new
visible-xs
"
=
link_to
"New project"
,
new_project_path
,
class:
"btn btn-new"
app/views/dashboard/_snippets_head.html.haml
View file @
632b2482
-
if
current_user
-
content_for
:breadcrumbs_extra
do
=
link_to
"New snippet"
,
new_snippet_path
,
class:
"btn btn-new"
,
title:
"New snippet"
.top-area
%ul
.nav-links
=
nav_link
(
page:
dashboard_snippets_path
,
html_options:
{
class:
'home'
})
do
...
...
@@ -10,3 +6,7 @@
=
nav_link
(
page:
explore_snippets_path
)
do
=
link_to
explore_snippets_path
,
title:
'Explore snippets'
,
data:
{
placement:
'right'
}
do
Explore Snippets
-
if
current_user
.nav-controls.hidden-xs
=
link_to
"New snippet"
,
new_snippet_path
,
class:
"btn btn-new"
,
title:
"New snippet"
app/views/dashboard/issues.html.haml
View file @
632b2482
...
...
@@ -4,14 +4,9 @@
=
content_for
:meta_tags
do
=
auto_discovery_link_tag
(
:atom
,
params
.
merge
(
rss_url_options
),
title:
"
#{
current_user
.
name
}
issues"
)
-
content_for
:breadcrumbs_extra
do
=
link_to
params
.
merge
(
rss_url_options
),
class:
'btn has-tooltip append-right-10'
,
title:
'Subscribe'
do
=
icon
(
'rss'
)
=
render
'shared/new_project_item_select'
,
path:
'issues/new'
,
label:
"New issue"
,
with_feature_enabled:
'issues'
,
type: :issues
.top-area
=
render
'shared/issuable/nav'
,
type: :issues
.nav-controls
.visible-xs
.nav-controls
=
link_to
params
.
merge
(
rss_url_options
),
class:
'btn has-tooltip'
,
title:
'Subscribe'
do
=
icon
(
'rss'
)
=
render
'shared/new_project_item_select'
,
path:
'issues/new'
,
label:
"New issue"
,
with_feature_enabled:
'issues'
,
type: :issues
...
...
app/views/dashboard/merge_requests.html.haml
View file @
632b2482
...
...
@@ -2,12 +2,9 @@
-
page_title
"Merge Requests"
-
header_title
"Merge Requests"
,
merge_requests_dashboard_path
(
assignee_id:
current_user
.
id
)
-
content_for
:breadcrumbs_extra
do
=
render
'shared/new_project_item_select'
,
path:
'merge_requests/new'
,
label:
"New merge request"
,
with_feature_enabled:
'merge_requests'
,
type: :merge_requests
.top-area
=
render
'shared/issuable/nav'
,
type: :merge_requests
.nav-controls
.visible-xs
.nav-controls
=
render
'shared/new_project_item_select'
,
path:
'merge_requests/new'
,
label:
"New merge request"
,
with_feature_enabled:
'merge_requests'
,
type: :merge_requests
=
render
'shared/issuable/filter'
,
type: :merge_requests
...
...
app/views/dashboard/milestones/index.html.haml
View file @
632b2482
...
...
@@ -2,13 +2,10 @@
-
page_title
'Milestones'
-
header_title
'Milestones'
,
dashboard_milestones_path
-
content_for
:breadcrumbs_extra
do
=
render
'shared/new_project_item_select'
,
path:
'milestones/new'
,
label:
'New milestone'
,
include_groups:
true
,
type: :milestones
.top-area
=
render
'shared/milestones_filter'
,
counts:
@milestone_states
.nav-controls
.visible-xs
.nav-controls
=
render
'shared/new_project_item_select'
,
path:
'milestones/new'
,
label:
'New milestone'
,
include_groups:
true
,
type: :milestones
.milestones
...
...
app/views/groups/issues.html.haml
View file @
632b2482
...
...
@@ -8,18 +8,10 @@
=
webpack_bundle_tag
'common_vue'
=
webpack_bundle_tag
'filtered_search'
-
if
group_issues_exists
-
content_for
:breadcrumbs_extra
do
=
link_to
params
.
merge
(
rss_url_options
),
class:
'btn btn-default append-right-10'
do
=
icon
(
'rss'
)
%span
.icon-label
Subscribe
=
render
'shared/new_project_item_select'
,
path:
'issues/new'
,
label:
"New issue"
,
type: :issues
-
if
group_issues_exists
.top-area
=
render
'shared/issuable/nav'
,
type: :issues
.nav-controls
.visible-xs
.nav-controls
=
link_to
params
.
merge
(
rss_url_options
),
class:
'btn'
do
=
icon
(
'rss'
)
%span
.icon-label
...
...
app/views/groups/labels/index.html.haml
View file @
632b2482
-
page_title
'Labels'
-
if
can?
(
current_user
,
:admin_label
,
@group
)
-
content_for
:breadcrumbs_extra
do
=
link_to
"New label"
,
new_group_label_path
(
@group
),
class:
"btn btn-new"
=
render
"groups/head_issues"
...
...
@@ -10,7 +7,7 @@
.nav-text
Labels can be applied to issues and merge requests. Group labels are available for any project within the group.
.nav-controls
.visible-xs
.nav-controls
-
if
can?
(
current_user
,
:admin_label
,
@group
)
=
link_to
"New label"
,
new_group_label_path
(
@group
),
class:
"btn btn-new"
...
...
app/views/groups/merge_requests.html.haml
View file @
632b2482
...
...
@@ -4,17 +4,13 @@
=
webpack_bundle_tag
'common_vue'
=
webpack_bundle_tag
'filtered_search'
-
if
current_user
-
content_for
:breadcrumbs_extra
do
=
render
'shared/new_project_item_select'
,
path:
'merge_requests/new'
,
label:
"New merge request"
,
type: :merge_requests
-
if
@group_merge_requests
.
empty?
=
render
'shared/empty_states/merge_requests'
,
project_select_button:
true
-
else
.top-area
=
render
'shared/issuable/nav'
,
type: :merge_requests
-
if
current_user
.nav-controls
.visible-xs
.nav-controls
=
render
'shared/new_project_item_select'
,
path:
'merge_requests/new'
,
label:
"New merge request"
,
type: :merge_requests
=
render
'shared/issuable/search_bar'
,
type: :merge_requests
...
...
app/views/groups/milestones/index.html.haml
View file @
632b2482
-
page_title
"Milestones"
-
if
can?
(
current_user
,
:admin_milestones
,
@group
)
-
content_for
:breadcrumbs_extra
do
=
link_to
"New milestone"
,
new_group_milestone_path
(
@group
),
class:
"btn btn-new"
=
render
"groups/head_issues"
.top-area
=
render
'shared/milestones_filter'
,
counts:
@milestone_states
.nav-controls
.visible-xs
.nav-controls
-
if
can?
(
current_user
,
:admin_milestones
,
@group
)
=
link_to
"New milestone"
,
new_group_milestone_path
(
@group
),
class:
"btn btn-new"
...
...
app/views/layouts/nav/_breadcrumbs.html.haml
View file @
632b2482
...
...
@@ -17,6 +17,4 @@
=
render
"layouts/nav/breadcrumbs/collapsed_dropdown"
,
location: :after
%li
%h2
.breadcrumbs-sub-title
=
@breadcrumb_title
-
if
content_for?
(
:breadcrumbs_extra
)
.breadcrumbs-extra.hidden-xs
=
yield
:breadcrumbs_extra
=
yield
:header_content
app/views/projects/issues/index.html.haml
View file @
632b2482
...
...
@@ -13,14 +13,11 @@
=
content_for
:meta_tags
do
=
auto_discovery_link_tag
(
:atom
,
params
.
merge
(
rss_url_options
),
title:
"
#{
@project
.
name
}
issues"
)
-
content_for
:breadcrumbs_extra
do
=
render
"projects/issues/nav_btns"
-
if
project_issues
(
@project
).
exists?
%div
{
class:
(
container_class
)
}
.top-area
=
render
'shared/issuable/nav'
,
type: :issues
.nav-controls
.visible-xs
.nav-controls
=
render
"projects/issues/nav_btns"
=
render
'shared/issuable/search_bar'
,
type: :issues
...
...
app/views/projects/labels/index.html.haml
View file @
632b2482
...
...
@@ -3,10 +3,6 @@
-
hide_class
=
''
-
can_admin_label
=
can?
(
current_user
,
:admin_label
,
@project
)
-
if
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?
...
...
@@ -18,7 +14,7 @@
Star a label to make it a priority label. Order the prioritized labels to change their relative priority, by dragging.
-
if
can_admin_label
.nav-controls
.visible-xs
.nav-controls
=
link_to
new_project_label_path
(
@project
),
class:
"btn btn-new"
do
New label
...
...
app/views/projects/merge_requests/index.html.haml
View file @
632b2482
...
...
@@ -12,16 +12,13 @@
=
webpack_bundle_tag
'common_vue'
=
webpack_bundle_tag
'filtered_search'
-
content_for
:breadcrumbs_extra
do
=
render
"projects/merge_requests/nav_btns"
,
merge_project:
merge_project
,
new_merge_request_path:
new_merge_request_path
=
render
'projects/last_push'
-
if
@project
.
merge_requests
.
exists?
%div
{
class:
container_class
}
.top-area
=
render
'shared/issuable/nav'
,
type: :merge_requests
.nav-controls
.visible-xs
.nav-controls
=
render
"projects/merge_requests/nav_btns"
,
merge_project:
merge_project
,
new_merge_request_path:
new_merge_request_path
=
render
'shared/issuable/search_bar'
,
type: :merge_requests
...
...
app/views/projects/milestones/index.html.haml
View file @
632b2482
-
@no_container
=
true
-
page_title
'Milestones'
-
if
can?
(
current_user
,
:admin_milestone
,
@project
)
-
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
}
.top-area
=
render
'shared/milestones_filter'
,
counts:
milestone_counts
(
@project
.
milestones
)
.nav-controls
.nav-controls-new-nav
.nav-controls
=
render
'shared/milestones_sort_dropdown'
-
if
can?
(
current_user
,
:admin_milestone
,
@project
)
=
link_to
new_project_milestone_path
(
@project
),
class:
"btn btn-new visible-xs"
,
title:
'New milestone'
do
...
...
app/views/projects/pipeline_schedules/index.html.haml
View file @
632b2482
...
...
@@ -7,10 +7,6 @@
-
@no_container
=
true
-
page_title
_
(
"Pipeline Schedules"
)
-
if
can?
(
current_user
,
:create_pipeline_schedule
,
@project
)
-
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
}
...
...
@@ -20,7 +16,7 @@
=
render
"tabs"
,
schedule_path_proc:
schedule_path_proc
,
all_schedules:
@all_schedules
,
scope:
@scope
-
if
can?
(
current_user
,
:create_pipeline_schedule
,
@project
)
.nav-controls
.visible-xs
.nav-controls
=
link_to
new_project_pipeline_schedule_path
(
@project
),
class:
'btn btn-create'
do
%span
=
_
(
'New schedule'
)
...
...
app/views/projects/snippets/index.html.haml
View file @
632b2482
-
page_title
"Snippets"
-
if
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
.visible-xs
.nav-controls
-
if
can?
(
current_user
,
:create_project_snippet
,
@project
)
=
link_to
"New snippet"
,
new_project_snippet_path
(
@project
),
class:
"btn btn-new"
,
title:
"New snippet"
...
...
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