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
Tatuya Kamada
gitlab-ce
Commits
08330574
Commit
08330574
authored
Dec 02, 2015
by
Douwe Maan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use new style for milestone detail page
parent
b66694d2
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
140 additions
and
86 deletions
+140
-86
app/views/dashboard/milestones/show.html.haml
app/views/dashboard/milestones/show.html.haml
+35
-17
app/views/groups/milestones/show.html.haml
app/views/groups/milestones/show.html.haml
+39
-22
app/views/projects/milestones/show.html.haml
app/views/projects/milestones/show.html.haml
+66
-47
No files found.
app/views/dashboard/milestones/show.html.haml
View file @
08330574
-
page_title
@milestone
.
title
,
"Milestones"
-
page_title
@milestone
.
title
,
"Milestones"
%h4
.page-title
-
header_title
"Milestones"
,
dashboard_milestones_path
.issuable-details
.page-title
.issue-box
{
class:
"issue-box-#{@milestone.closed? ? 'closed' : 'open'}"
}
.issue-box
{
class:
"issue-box-#{@milestone.closed? ? 'closed' : 'open'}"
}
-
if
@milestone
.
closed?
-
if
@milestone
.
closed?
Closed
Closed
...
@@ -7,13 +10,14 @@
...
@@ -7,13 +10,14 @@
Open
Open
Milestone
#{
@milestone
.
title
}
Milestone
#{
@milestone
.
title
}
%hr
.gray-content-block.middle-block
%h2
.issue-title
=
gfm
escape_once
(
@milestone
.
title
)
-
if
@milestone
.
complete?
&&
@milestone
.
active?
-
if
@milestone
.
complete?
&&
@milestone
.
active?
.alert.alert-success
.alert.alert-success
.prepend-top-default
%span
All issues for this milestone are closed. You may close the milestone now.
%span
All issues for this milestone are closed. You may close the milestone now.
.description
.table-holder
.table-holder
%table
.table
%table
.table
%thead
%thead
...
@@ -44,7 +48,7 @@
...
@@ -44,7 +48,7 @@
#{
@milestone
.
open_items_count
}
open
#{
@milestone
.
open_items_count
}
open
=
milestone_progress_bar
(
@milestone
)
=
milestone_progress_bar
(
@milestone
)
%ul
.
nav.nav-tabs
%ul
.
center-top-menu.no-top.no-bottom
%li
.active
%li
.active
=
link_to
'#tab-issues'
,
'data-toggle'
=>
'tab'
do
=
link_to
'#tab-issues'
,
'data-toggle'
=>
'tab'
do
Issues
Issues
...
@@ -58,25 +62,39 @@
...
@@ -58,25 +62,39 @@
Participants
Participants
%span
.badge
=
@milestone
.
participants
.
count
%span
.badge
=
@milestone
.
participants
.
count
.pull-right
=
link_to
'Browse Issues'
,
issues_dashboard_path
(
milestone_title:
@milestone
.
title
),
class:
"btn edit-milestone-link btn-grouped"
.tab-content
.tab-content
.tab-pane.active
#tab-issues
.tab-pane.active
#tab-issues
.row
.gray-content-block.middle-block
.pull-right
=
link_to
'Browse Issues'
,
issues_dashboard_path
(
milestone_title:
@milestone
.
title
),
class:
"btn btn-grouped"
.oneline
All issues in this milestone
.row.prepend-top-default
.col-md-6
.col-md-6
=
render
'issues'
,
title:
"Open"
,
issues:
@milestone
.
opened_issues
=
render
'issues'
,
title:
"Open"
,
issues:
@milestone
.
opened_issues
.col-md-6
.col-md-6
=
render
'issues'
,
title:
"Closed"
,
issues:
@milestone
.
closed_issues
=
render
'issues'
,
title:
"Closed"
,
issues:
@milestone
.
closed_issues
.tab-pane
#tab-merge-requests
.tab-pane
#tab-merge-requests
.row
.gray-content-block.middle-block
.pull-right
=
link_to
'Browse Merge Requests'
,
merge_requests_dashboard_path
(
milestone_title:
@milestone
.
title
),
class:
"btn btn-grouped"
.oneline
All merge requests in this milestone
.row.prepend-top-default
.col-md-6
.col-md-6
=
render
'merge_requests'
,
title:
"Open"
,
merge_requests:
@milestone
.
opened_merge_requests
=
render
'merge_requests'
,
title:
"Open"
,
merge_requests:
@milestone
.
opened_merge_requests
.col-md-6
.col-md-6
=
render
'merge_requests'
,
title:
"Closed"
,
merge_requests:
@milestone
.
closed_merge_requests
=
render
'merge_requests'
,
title:
"Closed"
,
merge_requests:
@milestone
.
closed_merge_requests
.tab-pane
#tab-participants
.tab-pane
#tab-participants
.gray-content-block.middle-block
.oneline
All participants to this milestone
%ul
.bordered-list
%ul
.bordered-list
-
@milestone
.
participants
.
each
do
|
user
|
-
@milestone
.
participants
.
each
do
|
user
|
%li
%li
...
...
app/views/groups/milestones/show.html.haml
View file @
08330574
-
page_title
@milestone
.
title
,
"Milestones"
-
page_title
@milestone
.
title
,
"Milestones"
=
render
"header_title"
=
render
"header_title"
%h4
.page-title
.issuable-details
.page-title
.issue-box
{
class:
"issue-box-#{@milestone.closed? ? 'closed' : 'open'}"
}
.issue-box
{
class:
"issue-box-#{@milestone.closed? ? 'closed' : 'open'}"
}
-
if
@milestone
.
closed?
-
if
@milestone
.
closed?
Closed
Closed
...
@@ -11,17 +12,18 @@
...
@@ -11,17 +12,18 @@
.pull-right
.pull-right
-
if
can?
(
current_user
,
:admin_milestones
,
@group
)
-
if
can?
(
current_user
,
:admin_milestones
,
@group
)
-
if
@milestone
.
active?
-
if
@milestone
.
active?
=
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"
=
link_to
'Close Milestone'
,
group_milestone_path
(
@group
,
@milestone
.
safe_title
,
title:
@milestone
.
title
,
milestone:
{
state_event: :close
}),
method: :put
,
class:
"btn btn-grouped
btn-close"
-
else
-
else
=
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"
=
link_to
'Reopen Milestone'
,
group_milestone_path
(
@group
,
@milestone
.
safe_title
,
title:
@milestone
.
title
,
milestone:
{
state_event: :activate
}),
method: :put
,
class:
"btn btn-grouped btn-reopen"
.gray-content-block.middle-block
%h2
.issue-title
=
gfm
escape_once
(
@milestone
.
title
)
%hr
-
if
@milestone
.
complete?
&&
@milestone
.
active?
-
if
@milestone
.
complete?
&&
@milestone
.
active?
.alert.alert-success
.alert.alert-success
.prepend-top-default
%span
All issues for this milestone are closed. You may close the milestone now.
%span
All issues for this milestone are closed. You may close the milestone now.
.description
.table-holder
.table-holder
%table
.table
%table
.table
%thead
%thead
...
@@ -52,7 +54,7 @@
...
@@ -52,7 +54,7 @@
#{
@milestone
.
open_items_count
}
open
#{
@milestone
.
open_items_count
}
open
=
milestone_progress_bar
(
@milestone
)
=
milestone_progress_bar
(
@milestone
)
%ul
.
nav.nav-tabs
%ul
.
center-top-menu.no-top.no-bottom
%li
.active
%li
.active
=
link_to
'#tab-issues'
,
'data-toggle'
=>
'tab'
do
=
link_to
'#tab-issues'
,
'data-toggle'
=>
'tab'
do
Issues
Issues
...
@@ -66,25 +68,40 @@
...
@@ -66,25 +68,40 @@
Participants
Participants
%span
.badge
=
@milestone
.
participants
.
count
%span
.badge
=
@milestone
.
participants
.
count
.pull-right
=
link_to
'Browse Issues'
,
issues_group_path
(
@group
,
milestone_title:
@milestone
.
title
),
class:
"btn edit-milestone-link btn-grouped"
.tab-content
.tab-content
.tab-pane.active
#tab-issues
.tab-pane.active
#tab-issues
.row
.gray-content-block.middle-block
.pull-right
=
link_to
'Browse Issues'
,
issues_group_path
(
@group
,
milestone_title:
@milestone
.
title
),
class:
"btn btn-grouped"
.oneline
All issues in this milestone
.row.prepend-top-default
.col-md-6
.col-md-6
=
render
'issues'
,
title:
"Open"
,
issues:
@milestone
.
opened_issues
=
render
'issues'
,
title:
"Open"
,
issues:
@milestone
.
opened_issues
.col-md-6
.col-md-6
=
render
'issues'
,
title:
"Closed"
,
issues:
@milestone
.
closed_issues
=
render
'issues'
,
title:
"Closed"
,
issues:
@milestone
.
closed_issues
.tab-pane
#tab-merge-requests
.tab-pane
#tab-merge-requests
.row
.gray-content-block.middle-block
.pull-right
=
link_to
'Browse Merge Requests'
,
merge_requests_group_path
(
@group
,
milestone_title:
@milestone
.
title
),
class:
"btn btn-grouped"
.oneline
All merge requests in this milestone
.row.prepend-top-default
.col-md-6
.col-md-6
=
render
'merge_requests'
,
title:
"Open"
,
merge_requests:
@milestone
.
opened_merge_requests
=
render
'merge_requests'
,
title:
"Open"
,
merge_requests:
@milestone
.
opened_merge_requests
.col-md-6
.col-md-6
=
render
'merge_requests'
,
title:
"Closed"
,
merge_requests:
@milestone
.
closed_merge_requests
=
render
'merge_requests'
,
title:
"Closed"
,
merge_requests:
@milestone
.
closed_merge_requests
.tab-pane
#tab-participants
.tab-pane
#tab-participants
.gray-content-block.middle-block
.oneline
All participants to this milestone
%ul
.bordered-list
%ul
.bordered-list
-
@milestone
.
participants
.
each
do
|
user
|
-
@milestone
.
participants
.
each
do
|
user
|
%li
%li
...
...
app/views/projects/milestones/show.html.haml
View file @
08330574
-
page_title
@milestone
.
title
,
"Milestones"
-
page_title
@milestone
.
title
,
"Milestones"
=
render
"header_title"
=
render
"header_title"
%h4
.page-title
.issuable-details
.page-title
.issue-box
{
class:
issue_box_class
(
@milestone
)
}
.issue-box
{
class:
issue_box_class
(
@milestone
)
}
-
if
@milestone
.
closed?
-
if
@milestone
.
closed?
Closed
Closed
...
@@ -10,37 +11,40 @@
...
@@ -10,37 +11,40 @@
-
else
-
else
Open
Open
Milestone ##{@milestone.iid}
Milestone ##{@milestone.iid}
%small
.creator
-
if
@milestone
.
expires_at
%span
.creator
·
=
@milestone
.
expires_at
=
@milestone
.
expires_at
.pull-right
.pull-right
-
if
can?
(
current_user
,
:admin_milestone
,
@project
)
-
if
can?
(
current_user
,
:admin_milestone
,
@project
)
=
link_to
edit_namespace_project_milestone_path
(
@project
.
namespace
,
@project
,
@milestone
),
class:
"btn btn-grouped"
do
=
link_to
edit_namespace_project_milestone_path
(
@project
.
namespace
,
@project
,
@milestone
),
class:
"btn btn-grouped"
do
%i
.fa.fa-pencil-square-o
%i
.fa.fa-pencil-square-o
Edit
Edit
-
if
@milestone
.
active?
-
if
@milestone
.
active?
=
link_to
'Close Milestone'
,
namespace_project_milestone_path
(
@project
.
namespace
,
@project
,
@milestone
,
milestone:
{
state_event: :close
}),
method: :put
,
class:
"btn btn-close btn-grouped"
=
link_to
'Close Milestone'
,
namespace_project_milestone_path
(
@project
.
namespace
,
@project
,
@milestone
,
milestone:
{
state_event: :close
}),
method: :put
,
class:
"btn btn-close btn-grouped"
-
else
-
else
=
link_to
'Reopen Milestone'
,
namespace_project_milestone_path
(
@project
.
namespace
,
@project
,
@milestone
,
milestone:
{
state_event: :activate
}),
method: :put
,
class:
"btn btn-reopen btn-grouped"
=
link_to
'Reopen Milestone'
,
namespace_project_milestone_path
(
@project
.
namespace
,
@project
,
@milestone
,
milestone:
{
state_event: :activate
}),
method: :put
,
class:
"btn btn-reopen btn-grouped"
=
link_to
namespace_project_milestone_path
(
@project
.
namespace
,
@project
,
@milestone
),
data:
{
confirm:
'Are you sure?'
},
method: :delete
,
class:
"btn btn-grouped btn-remove"
do
=
link_to
namespace_project_milestone_path
(
@project
.
namespace
,
@project
,
@milestone
),
data:
{
confirm:
'Are you sure?'
},
method: :delete
,
class:
"btn btn-grouped btn-remove"
do
%i
.fa.fa-trash-o
%i
.fa.fa-trash-o
Remove
Delete
%hr
-
if
@milestone
.
issues
.
any?
&&
@milestone
.
can_be_closed?
.alert.alert-success
%span
All issues for this milestone are closed. You may close milestone now.
%h3
.issue-title
.gray-content-block.middle-block
%h2
.issue-title
=
gfm
escape_once
(
@milestone
.
title
)
=
gfm
escape_once
(
@milestone
.
title
)
%div
%div
-
if
@milestone
.
description
.
present?
-
if
@milestone
.
description
.
present?
.description
.description
.wiki
.wiki
=
preserve
do
=
preserve
do
=
markdown
@milestone
.
description
=
markdown
@milestone
.
description
%hr
-
if
@milestone
.
issues
.
any?
&&
@milestone
.
can_be_closed?
.context
.alert.alert-success.prepend-top-default
%span
All issues for this milestone are closed. You may close milestone now.
.context.prepend-top-default
%p
.lead
%p
.lead
Progress:
Progress:
#{
@milestone
.
closed_items_count
}
closed
#{
@milestone
.
closed_items_count
}
closed
...
@@ -51,8 +55,7 @@
...
@@ -51,8 +55,7 @@
%span
.pull-right
=
@milestone
.
expires_at
%span
.pull-right
=
@milestone
.
expires_at
=
milestone_progress_bar
(
@milestone
)
=
milestone_progress_bar
(
@milestone
)
%ul
.center-top-menu.no-top.no-bottom
%ul
.nav.nav-tabs
%li
.active
%li
.active
=
link_to
'#tab-issues'
,
'data-toggle'
=>
'tab'
do
=
link_to
'#tab-issues'
,
'data-toggle'
=>
'tab'
do
Issues
Issues
...
@@ -66,17 +69,21 @@
...
@@ -66,17 +69,21 @@
Participants
Participants
%span
.badge
=
@users
.
count
%span
.badge
=
@users
.
count
.tab-content
.tab-pane.active
#tab-issues
.gray-content-block.middle-block
.pull-right
.pull-right
-
if
can?
(
current_user
,
:create_issue
,
@project
)
-
if
can?
(
current_user
,
:create_issue
,
@project
)
=
link_to
new_namespace_project_issue_path
(
@project
.
namespace
,
@project
,
issue:
{
milestone_id:
@milestone
.
id
}),
class:
"btn btn-grouped"
,
title:
"New Issue"
do
=
link_to
new_namespace_project_issue_path
(
@project
.
namespace
,
@project
,
issue:
{
milestone_id:
@milestone
.
id
}),
class:
"btn btn-grouped"
,
title:
"New Issue"
do
%i
.fa.fa-plus
%i
.fa.fa-plus
New Issue
New Issue
-
if
can?
(
current_user
,
:read_issue
,
@project
)
-
if
can?
(
current_user
,
:read_issue
,
@project
)
=
link_to
'Browse Issues'
,
namespace_project_issues_path
(
@milestone
.
project
.
namespace
,
@milestone
.
project
,
milestone_title:
@milestone
.
title
),
class:
"btn edit-milestone-link
btn-grouped"
=
link_to
'Browse Issues'
,
namespace_project_issues_path
(
@milestone
.
project
.
namespace
,
@milestone
.
project
,
milestone_title:
@milestone
.
title
),
class:
"btn
btn-grouped"
.tab-content
.oneline
.tab-pane.active
#tab-issues
All issues in this milestone
.row
.row.prepend-top-default
.col-md-4
.col-md-4
=
render
(
'issues'
,
title:
'Unstarted Issues (open and unassigned)'
,
issues:
@issues
.
opened
.
unassigned
,
id:
'unassigned'
)
=
render
(
'issues'
,
title:
'Unstarted Issues (open and unassigned)'
,
issues:
@issues
.
opened
.
unassigned
,
id:
'unassigned'
)
.col-md-4
.col-md-4
...
@@ -85,7 +92,15 @@
...
@@ -85,7 +92,15 @@
=
render
(
'issues'
,
title:
'Completed Issues (closed)'
,
issues:
@issues
.
closed
,
id:
'closed'
)
=
render
(
'issues'
,
title:
'Completed Issues (closed)'
,
issues:
@issues
.
closed
,
id:
'closed'
)
.tab-pane
#tab-merge-requests
.tab-pane
#tab-merge-requests
.row
.gray-content-block.middle-block
.pull-right
-
if
can?
(
current_user
,
:read_merge_request
,
@project
)
=
link_to
'Browse Merge Requests'
,
namespace_project_merge_requests_path
(
@milestone
.
project
.
namespace
,
@milestone
.
project
,
milestone_title:
@milestone
.
title
),
class:
"btn btn-grouped"
.oneline
All merge requests in this milestone
.row.prepend-top-default
.col-md-3
.col-md-3
=
render
(
'merge_requests'
,
title:
'Work in progress (open and unassigned)'
,
merge_requests:
@merge_requests
.
opened
.
unassigned
,
id:
'unassigned'
)
=
render
(
'merge_requests'
,
title:
'Work in progress (open and unassigned)'
,
merge_requests:
@merge_requests
.
opened
.
unassigned
,
id:
'unassigned'
)
.col-md-3
.col-md-3
...
@@ -100,6 +115,10 @@
...
@@ -100,6 +115,10 @@
=
render
'merge_request'
,
merge_request:
merge_request
=
render
'merge_request'
,
merge_request:
merge_request
.tab-pane
#tab-participants
.tab-pane
#tab-participants
.gray-content-block.middle-block
.oneline
All participants to this milestone
%ul
.bordered-list
%ul
.bordered-list
-
@users
.
each
do
|
user
|
-
@users
.
each
do
|
user
|
%li
%li
...
...
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