Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
6a790b79
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,体验更适合开发者的 AI 搜索 >>
提交
6a790b79
编写于
4月 01, 2015
作者:
D
Dmitriy Zaporozhets
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Better looking milestone lists
上级
0191857f
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
62 addition
and
57 deletion
+62
-57
app/assets/stylesheets/generic/common.scss
app/assets/stylesheets/generic/common.scss
+1
-1
app/helpers/gitlab_routing_helper.rb
app/helpers/gitlab_routing_helper.rb
+4
-0
app/views/dashboard/milestones/_milestone.html.haml
app/views/dashboard/milestones/_milestone.html.haml
+20
-0
app/views/dashboard/milestones/index.html.haml
app/views/dashboard/milestones/index.html.haml
+1
-19
app/views/groups/milestones/_milestone.html.haml
app/views/groups/milestones/_milestone.html.haml
+25
-0
app/views/groups/milestones/index.html.haml
app/views/groups/milestones/index.html.haml
+1
-25
app/views/projects/milestones/_milestone.html.haml
app/views/projects/milestones/_milestone.html.haml
+10
-12
未找到文件。
app/assets/stylesheets/generic/common.scss
浏览文件 @
6a790b79
...
...
@@ -246,7 +246,7 @@ li.note {
.milestone
{
&
.milestone-closed
{
background
:
#
eee
;
background
:
#
f9f9f9
;
}
.progress
{
margin-bottom
:
0
;
...
...
app/helpers/gitlab_routing_helper.rb
浏览文件 @
6a790b79
...
...
@@ -29,6 +29,10 @@ module GitlabRoutingHelper
namespace_project_merge_request_path
(
entity
.
project
.
namespace
,
entity
.
project
,
entity
,
*
args
)
end
def
milestone_path
(
entity
,
*
args
)
namespace_project_milestone_path
(
entity
.
project
.
namespace
,
entity
.
project
,
entity
,
*
args
)
end
def
project_url
(
project
,
*
args
)
namespace_project_url
(
project
.
namespace
,
project
,
*
args
)
end
...
...
app/views/dashboard/milestones/_milestone.html.haml
0 → 100644
浏览文件 @
6a790b79
%li
{
class:
"milestone milestone-#{milestone.closed? ? 'closed' : 'open'}"
,
id:
dom_id
(
milestone
.
milestones
.
first
)
}
%h4
=
link_to_gfm
truncate
(
milestone
.
title
,
length:
100
),
dashboard_milestone_path
(
milestone
.
safe_title
,
title:
milestone
.
title
)
.row
.col-sm-6
=
link_to
dashboard_milestone_path
(
milestone
.
safe_title
,
title:
milestone
.
title
)
do
=
pluralize
milestone
.
issue_count
,
'Issue'
=
link_to
dashboard_milestone_path
(
milestone
.
safe_title
,
title:
milestone
.
title
)
do
=
pluralize
milestone
.
merge_requests_count
,
'Merge Request'
%span
.light
#{
milestone
.
percent_complete
}
% complete
.col-sm-6
=
milestone_progress_bar
(
milestone
)
%div
-
milestone
.
milestones
.
each
do
|
milestone
|
=
link_to
milestone_path
(
milestone
)
do
%span
.label.label-gray
=
milestone
.
project
.
name_with_namespace
app/views/dashboard/milestones/index.html.haml
浏览文件 @
6a790b79
...
...
@@ -16,23 +16,5 @@
.nothing-here-block
No milestones to show
-
else
-
@dashboard_milestones
.
each
do
|
milestone
|
%li
{
class:
"milestone milestone-#{milestone.closed? ? 'closed' : 'open'}"
,
id:
dom_id
(
milestone
.
milestones
.
first
)
}
%h4
=
link_to_gfm
truncate
(
milestone
.
title
,
length:
100
),
dashboard_milestone_path
(
milestone
.
safe_title
,
title:
milestone
.
title
)
%div
%div
=
link_to
dashboard_milestone_path
(
milestone
.
safe_title
,
title:
milestone
.
title
)
do
=
pluralize
milestone
.
issue_count
,
'Issue'
=
link_to
dashboard_milestone_path
(
milestone
.
safe_title
,
title:
milestone
.
title
)
do
=
pluralize
milestone
.
merge_requests_count
,
'Merge Request'
%span
.light
#{
milestone
.
percent_complete
}
% complete
=
milestone_progress_bar
(
milestone
)
%div
%br
-
milestone
.
milestones
.
each
do
|
milestone
|
=
link_to
namespace_project_milestone_path
(
milestone
.
project
.
namespace
,
milestone
.
project
,
milestone
)
do
%span
.label.label-default
=
milestone
.
project
.
name_with_namespace
=
render
'milestone'
,
milestone:
milestone
=
paginate
@dashboard_milestones
,
theme:
"gitlab"
app/views/groups/milestones/_milestone.html.haml
0 → 100644
浏览文件 @
6a790b79
%li
{
class:
"milestone milestone-#{milestone.closed? ? 'closed' : 'open'}"
,
id:
dom_id
(
milestone
.
milestones
.
first
)
}
.pull-right
-
if
can?
(
current_user
,
:manage_group
,
@group
)
-
if
milestone
.
closed?
=
link_to
'Reopen Milestone'
,
group_milestone_path
(
@group
,
milestone
.
safe_title
,
title:
milestone
.
title
,
milestone:
{
state_event: :activate
}),
method: :put
,
class:
"btn btn-sm btn-grouped btn-reopen"
-
else
=
link_to
'Close Milestone'
,
group_milestone_path
(
@group
,
milestone
.
safe_title
,
title:
milestone
.
title
,
milestone:
{
state_event: :close
}),
method: :put
,
class:
"btn btn-sm btn-close"
%h4
=
link_to_gfm
truncate
(
milestone
.
title
,
length:
100
),
group_milestone_path
(
@group
,
milestone
.
safe_title
,
title:
milestone
.
title
)
.row
.col-sm-6
=
link_to
group_milestone_path
(
@group
,
milestone
.
safe_title
,
title:
milestone
.
title
)
do
=
pluralize
milestone
.
issue_count
,
'Issue'
=
link_to
group_milestone_path
(
@group
,
milestone
.
safe_title
,
title:
milestone
.
title
)
do
=
pluralize
milestone
.
merge_requests_count
,
'Merge Request'
%span
.light
#{
milestone
.
percent_complete
}
% complete
.col-sm-6
=
milestone_progress_bar
(
milestone
)
%div
-
milestone
.
milestones
.
each
do
|
milestone
|
=
link_to
milestone_path
(
milestone
)
do
%span
.label.label-gray
=
milestone
.
project
.
name
app/views/groups/milestones/index.html.haml
浏览文件 @
6a790b79
...
...
@@ -18,29 +18,5 @@
.nothing-here-block
No milestones to show
-
else
-
@group_milestones
.
each
do
|
milestone
|
%li
{
class:
"milestone milestone-#{milestone.closed? ? 'closed' : 'open'}"
,
id:
dom_id
(
milestone
.
milestones
.
first
)
}
.pull-right
-
if
can?
(
current_user
,
:manage_group
,
@group
)
-
if
milestone
.
closed?
=
link_to
'Reopen Milestone'
,
group_milestone_path
(
@group
,
milestone
.
safe_title
,
title:
milestone
.
title
,
milestone:
{
state_event: :activate
}),
method: :put
,
class:
"btn btn-sm btn-grouped btn-reopen"
-
else
=
link_to
'Close Milestone'
,
group_milestone_path
(
@group
,
milestone
.
safe_title
,
title:
milestone
.
title
,
milestone:
{
state_event: :close
}),
method: :put
,
class:
"btn btn-sm btn-close"
%h4
=
link_to_gfm
truncate
(
milestone
.
title
,
length:
100
),
group_milestone_path
(
@group
,
milestone
.
safe_title
,
title:
milestone
.
title
)
%div
%div
=
link_to
group_milestone_path
(
@group
,
milestone
.
safe_title
,
title:
milestone
.
title
)
do
=
pluralize
milestone
.
issue_count
,
'Issue'
=
link_to
group_milestone_path
(
@group
,
milestone
.
safe_title
,
title:
milestone
.
title
)
do
=
pluralize
milestone
.
merge_requests_count
,
'Merge Request'
%span
.light
#{
milestone
.
percent_complete
}
% complete
=
milestone_progress_bar
(
milestone
)
%div
%br
-
milestone
.
milestones
.
each
do
|
milestone
|
=
link_to
namespace_project_milestone_path
(
milestone
.
project
.
namespace
,
milestone
.
project
,
milestone
)
do
%span
.label.label-default
=
milestone
.
project
.
name
=
render
'milestone'
,
milestone:
milestone
=
paginate
@group_milestones
,
theme:
"gitlab"
app/views/projects/milestones/_milestone.html.haml
浏览文件 @
6a790b79
...
...
@@ -11,16 +11,14 @@
%span
.cred
(Expired)
%small
=
milestone
.
expires_at
-
if
milestone
.
is_empty?
%span
.muted
Empty
-
else
%div
%div
=
link_to
namespace_project_issues_path
(
milestone
.
project
.
namespace
,
milestone
.
project
,
milestone_id:
milestone
.
id
)
do
=
pluralize
milestone
.
issues
.
count
,
'Issue'
=
link_to
namespace_project_merge_requests_path
(
milestone
.
project
.
namespace
,
milestone
.
project
,
milestone_id:
milestone
.
id
)
do
=
pluralize
milestone
.
merge_requests
.
count
,
'Merge Request'
%span
.light
#{
milestone
.
percent_complete
}
% complete
.row
.col-sm-6
=
link_to
namespace_project_issues_path
(
milestone
.
project
.
namespace
,
milestone
.
project
,
milestone_id:
milestone
.
id
)
do
=
pluralize
milestone
.
issues
.
count
,
'Issue'
=
link_to
namespace_project_merge_requests_path
(
milestone
.
project
.
namespace
,
milestone
.
project
,
milestone_id:
milestone
.
id
)
do
=
pluralize
milestone
.
merge_requests
.
count
,
'Merge Request'
%span
.light
#{
milestone
.
percent_complete
}
% complete
.col-sm-6
=
milestone_progress_bar
(
milestone
)
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录