Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
dae629e5
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
未验证
提交
dae629e5
编写于
8月 17, 2017
作者:
P
Phil Hughes
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
fix some inconsistencies with the breadcrumbs
上级
a10cc220
变更
17
隐藏空白更改
内联
并排
Showing
17 changed file
with
50 addition
and
29 deletion
+50
-29
app/assets/javascripts/breadcrumb.js
app/assets/javascripts/breadcrumb.js
+3
-2
app/assets/stylesheets/new_nav.scss
app/assets/stylesheets/new_nav.scss
+2
-5
app/helpers/groups_helper.rb
app/helpers/groups_helper.rb
+1
-1
app/helpers/issuables_helper.rb
app/helpers/issuables_helper.rb
+14
-5
app/helpers/projects_helper.rb
app/helpers/projects_helper.rb
+1
-1
app/views/layouts/nav/_breadcrumbs.html.haml
app/views/layouts/nav/_breadcrumbs.html.haml
+2
-3
app/views/projects/commit/show.html.haml
app/views/projects/commit/show.html.haml
+2
-1
app/views/projects/environments/show.html.haml
app/views/projects/environments/show.html.haml
+2
-1
app/views/projects/issues/show.html.haml
app/views/projects/issues/show.html.haml
+2
-1
app/views/projects/jobs/show.html.haml
app/views/projects/jobs/show.html.haml
+2
-1
app/views/projects/merge_requests/show.html.haml
app/views/projects/merge_requests/show.html.haml
+2
-1
app/views/projects/milestones/show.html.haml
app/views/projects/milestones/show.html.haml
+2
-1
app/views/projects/pipelines/show.html.haml
app/views/projects/pipelines/show.html.haml
+2
-1
app/views/projects/snippets/show.html.haml
app/views/projects/snippets/show.html.haml
+2
-1
app/views/projects/tags/show.html.haml
app/views/projects/tags/show.html.haml
+2
-1
app/views/shared/snippets/_header.html.haml
app/views/shared/snippets/_header.html.haml
+7
-3
app/views/snippets/show.html.haml
app/views/snippets/show.html.haml
+2
-0
未找到文件。
app/assets/javascripts/breadcrumb.js
浏览文件 @
dae629e5
...
...
@@ -14,7 +14,8 @@ export default () => {
topLevelLinks
.
forEach
(
el
=>
addTooltipToEl
(
el
));
$expander
.
closest
(
'
.dropdown
'
)
.
on
(
'
show.bs.dropdown hide.bs.dropdown
'
,
()
=>
{
$expander
.
toggleClass
(
'
open
'
);
.
on
(
'
show.bs.dropdown hide.bs.dropdown
'
,
(
e
)
=>
{
$
(
'
.js-breadcrumbs-collapsed-expander
'
,
e
.
currentTarget
).
toggleClass
(
'
open
'
)
.
tooltip
(
'
hide
'
);
});
};
app/assets/stylesheets/new_nav.scss
浏览文件 @
dae629e5
...
...
@@ -330,6 +330,7 @@ header.navbar-gitlab-new {
.breadcrumbs-list
{
display
:
flex
;
flex-wrap
:
wrap
;
margin-bottom
:
0
;
>
li
{
...
...
@@ -338,11 +339,7 @@ header.navbar-gitlab-new {
position
:
relative
;
&
:not
(
:last-child
)
{
margin-right
:
10px
;
}
&
:not
(
:first-child
)
{
margin-left
:
10px
;
margin-right
:
20px
;
}
>
a
{
...
...
app/helpers/groups_helper.rb
浏览文件 @
dae629e5
...
...
@@ -22,7 +22,7 @@ module GroupsHelper
full_title
+=
if
show_new_nav?
breadcrumb_list_item
group_title_link
(
parent
,
hidable:
false
)
else
group_title_link
(
parent
,
hidable:
true
)
"
#{
group_title_link
(
parent
,
hidable:
true
)
}
<span class='hidable'> / </span>"
.
html_safe
end
end
end
...
...
app/helpers/issuables_helper.rb
浏览文件 @
dae629e5
...
...
@@ -126,12 +126,21 @@ module IssuablesHelper
end
def
issuable_meta
(
issuable
,
project
,
text
)
output
=
content_tag
(
:strong
,
class:
"identifier"
)
do
concat
(
"
#{
text
}
"
)
concat
(
to_url_reference
(
issuable
))
output
=
""
unless
show_new_nav?
output
<<
content_tag
(
:strong
,
class:
"identifier"
)
do
concat
(
"
#{
text
}
"
)
concat
(
to_url_reference
(
issuable
))
end
end
output
<<
" opened
#{
time_ago_with_tooltip
(
issuable
.
created_at
)
}
by "
.
html_safe
opened_text
=
if
show_new_nav?
"Opened"
else
" opened"
end
output
<<
"
#{
opened_text
}
#{
time_ago_with_tooltip
(
issuable
.
created_at
)
}
by "
.
html_safe
output
<<
content_tag
(
:strong
)
do
author_output
=
link_to_member
(
project
,
issuable
.
author
,
size:
24
,
mobile_classes:
"hidden-xs"
,
tooltip:
true
)
author_output
<<
link_to_member
(
project
,
issuable
.
author
,
size:
24
,
by_username:
true
,
avatar:
false
,
mobile_classes:
"hidden-sm hidden-md hidden-lg"
)
...
...
@@ -141,7 +150,7 @@ module IssuablesHelper
output
<<
content_tag
(
:span
,
(
issuable
.
task_status
if
issuable
.
tasks?
),
id:
"task_status"
,
class:
"hidden-xs hidden-sm"
)
output
<<
content_tag
(
:span
,
(
issuable
.
task_status_short
if
issuable
.
tasks?
),
id:
"task_status_short"
,
class:
"hidden-md hidden-lg"
)
output
output
.
html_safe
end
def
issuable_todo
(
issuable
)
...
...
app/helpers/projects_helper.rb
浏览文件 @
dae629e5
...
...
@@ -81,7 +81,7 @@ module ProjectsHelper
end
end
"
#{
namespace_link
}
#{
project_link
}
"
.
html_safe
"
#{
namespace_link
}
#{
(
'/'
unless
show_new_nav?
)
}
#{
project_link
}
"
.
html_safe
end
def
remove_project_message
(
project
)
...
...
app/views/layouts/nav/_breadcrumbs.html.haml
浏览文件 @
dae629e5
-
breadcrumb_link
=
breadcrumb_title_link
-
hide_top_links
=
@hide_top_links
||
false
%nav
.breadcrumbs
{
role:
"navigation"
}
.breadcrumbs-container
{
class:
[
container_class
,
@content_class
]
}
%nav
.breadcrumbs
{
role:
"navigation"
,
class:
[
container_class
,
@content_class
]
}
.breadcrumbs-container
-
if
defined?
(
@new_sidebar
)
=
button_tag
class:
'toggle-mobile-nav'
,
type:
'button'
do
%span
.sr-only
Open sidebar
...
...
app/views/projects/commit/show.html.haml
浏览文件 @
dae629e5
-
@no_container
=
true
-
breadcrumb_title
"Commit
#{
@commit
.
short_id
}
"
-
add_to_breadcrumbs
"Commit"
,
project_commits_path
(
@project
)
-
breadcrumb_title
@commit
.
short_id
-
container_class
=
!
fluid_layout
&&
diff_view
==
:inline
?
'container-limited'
:
''
-
limited_container_width
=
fluid_layout
?
''
:
'limit-container-width'
-
@content_class
=
limited_container_width
...
...
app/views/projects/environments/show.html.haml
浏览文件 @
dae629e5
-
@no_container
=
true
-
breadcrumb_title
"Enviroment '
#{
@environment
.
name
}
'"
-
add_to_breadcrumbs
"Environments"
,
project_environments_path
(
@project
)
-
breadcrumb_title
@environment
.
name
-
page_title
"Environments"
=
render
"projects/pipelines/head"
...
...
app/views/projects/issues/show.html.haml
浏览文件 @
dae629e5
-
@content_class
=
"limit-container-width"
unless
fluid_layout
-
breadcrumb_title
"Issues
#{
@issue
.
to_reference
}
"
-
add_to_breadcrumbs
"Issues"
,
project_issues_path
(
@project
)
-
breadcrumb_title
@issue
.
to_reference
-
page_title
"
#{
@issue
.
title
}
(
#{
@issue
.
to_reference
}
)"
,
"Issues"
-
page_description
@issue
.
description
-
page_card_attributes
@issue
.
card_attributes
...
...
app/views/projects/jobs/show.html.haml
浏览文件 @
dae629e5
-
@no_container
=
true
-
breadcrumb_title
"Jobs #
#{
@build
.
id
}
"
-
add_to_breadcrumbs
"Jobs"
,
project_jobs_path
(
@project
)
-
breadcrumb_title
"#
#{
@build
.
id
}
"
-
page_title
"
#{
@build
.
name
}
(#
#{
@build
.
id
}
)"
,
"Jobs"
=
render
"projects/pipelines/head"
...
...
app/views/projects/merge_requests/show.html.haml
浏览文件 @
dae629e5
-
@content_class
=
"limit-container-width"
unless
fluid_layout
-
breadcrumb_title
"Merge Requests
#{
@merge_request
.
to_reference
}
"
-
add_to_breadcrumbs
"Merge Requests"
,
project_merge_requests_path
(
@project
)
-
breadcrumb_title
@merge_request
.
to_reference
-
page_title
"
#{
@merge_request
.
title
}
(
#{
@merge_request
.
to_reference
}
)"
,
"Merge Requests"
-
page_description
@merge_request
.
description
-
page_card_attributes
@merge_request
.
card_attributes
...
...
app/views/projects/milestones/show.html.haml
浏览文件 @
dae629e5
-
@no_container
=
true
-
breadcrumb_title
"Milestone
#{
@milestone
.
title
}
"
-
add_to_breadcrumbs
"Milestones"
,
project_milestones_path
(
@project
)
-
breadcrumb_title
@milestone
.
title
-
page_title
@milestone
.
title
,
"Milestones"
-
page_description
@milestone
.
description
=
render
"shared/mr_head"
...
...
app/views/projects/pipelines/show.html.haml
浏览文件 @
dae629e5
-
@no_container
=
true
-
breadcrumb_title
"Pipelines #
#{
@pipeline
.
id
}
"
-
add_to_breadcrumbs
"Pipelines"
,
project_pipelines_path
(
@project
)
-
breadcrumb_title
"#
#{
@pipeline
.
id
}
"
-
page_title
"Pipeline"
=
render
"projects/pipelines/head"
...
...
app/views/projects/snippets/show.html.haml
浏览文件 @
dae629e5
-
@content_class
=
"limit-container-width limited-inner-width-container"
unless
fluid_layout
-
breadcrumb_title
"Snippet
#{
@snippet
.
to_reference
}
"
-
add_to_breadcrumbs
"Snippets"
,
dashboard_snippets_path
-
breadcrumb_title
@snippet
.
to_reference
-
page_title
"
#{
@snippet
.
title
}
(
#{
@snippet
.
to_reference
}
)"
,
"Snippets"
=
render
'shared/snippets/header'
...
...
app/views/projects/tags/show.html.haml
浏览文件 @
dae629e5
-
@no_container
=
true
-
breadcrumb_title
"Tags
#{
@tag
.
name
}
"
-
add_to_breadcrumbs
"Tags"
,
project_tags_path
(
@project
)
-
breadcrumb_title
@tag
.
name
-
page_title
@tag
.
name
,
"Tags"
=
render
"projects/commits/head"
...
...
app/views/shared/snippets/_header.html.haml
浏览文件 @
dae629e5
...
...
@@ -3,10 +3,14 @@
%span
.sr-only
=
visibility_level_label
(
@snippet
.
visibility_level
)
=
visibility_level_icon
(
@snippet
.
visibility_level
,
fw:
false
)
%strong
.item-title
Snippet
#{
@snippet
.
to_reference
}
-
unless
show_new_nav?
%strong
.item-title
Snippet
#{
@snippet
.
to_reference
}
%span
.creator
authored
-
if
show_new_nav?
Authored
-
else
authored
=
time_ago_with_tooltip
(
@snippet
.
created_at
,
placement:
'bottom'
,
html_class:
'snippet_updated_ago'
)
by
#{
link_to_member
(
@project
,
@snippet
.
author
,
size:
24
,
author_class:
"author item-title"
,
avatar_class:
"hidden-xs"
)
}
...
...
app/views/snippets/show.html.haml
浏览文件 @
dae629e5
-
@hide_top_links
=
true
-
@content_class
=
"limit-container-width limited-inner-width-container"
unless
fluid_layout
-
add_to_breadcrumbs
"Snippets"
,
dashboard_snippets_path
-
breadcrumb_title
@snippet
.
to_reference
-
page_title
"
#{
@snippet
.
title
}
(
#{
@snippet
.
to_reference
}
)"
,
"Snippets"
=
render
'shared/snippets/header'
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录