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
bb5a7ef0
Commit
bb5a7ef0
authored
Jul 22, 2016
by
Dan Rowden
Committed by
Alfredo Sumaran
Sep 07, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Show badges in Milestone tabs and padding in Milestone list (both to match Issues page)
parent
13a91b56
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
26 additions
and
6 deletions
+26
-6
app/assets/stylesheets/pages/milestone.scss
app/assets/stylesheets/pages/milestone.scss
+10
-6
app/helpers/milestones_helper.rb
app/helpers/milestones_helper.rb
+13
-0
app/views/shared/_milestones_filter.html.haml
app/views/shared/_milestones_filter.html.haml
+3
-0
No files found.
app/assets/stylesheets/pages/milestone.scss
View file @
bb5a7ef0
...
@@ -2,7 +2,10 @@
...
@@ -2,7 +2,10 @@
max-width
:
90%
;
max-width
:
90%
;
}
}
li
.milestone
{
.milestones
{
.milestone
{
padding
:
10px
16px
;
h4
{
h4
{
font-weight
:
bold
;
font-weight
:
bold
;
}
}
...
@@ -10,6 +13,7 @@ li.milestone {
...
@@ -10,6 +13,7 @@ li.milestone {
.progress
{
.progress
{
height
:
6px
;
height
:
6px
;
}
}
}
}
}
.milestone-content
{
.milestone-content
{
...
...
app/helpers/milestones_helper.rb
View file @
bb5a7ef0
...
@@ -35,6 +35,19 @@ module MilestonesHelper
...
@@ -35,6 +35,19 @@ module MilestonesHelper
milestone
.
issues
.
with_label
(
label
.
title
).
send
(
state
).
size
milestone
.
issues
.
with_label
(
label
.
title
).
send
(
state
).
size
end
end
def
milestone_count_by_state
(
project
,
state
)
if
project
.
nil?
nil
else
case
state
when
'all'
then
@project
.
milestones
.
size
when
'closed'
then
@project
.
milestones
.
closed
.
size
when
'opened'
then
@project
.
milestones
.
active
.
size
else
nil
end
end
end
def
milestone_progress_bar
(
milestone
)
def
milestone_progress_bar
(
milestone
)
options
=
{
options
=
{
class:
'progress-bar progress-bar-success'
,
class:
'progress-bar progress-bar-success'
,
...
...
app/views/shared/_milestones_filter.html.haml
View file @
bb5a7ef0
...
@@ -2,9 +2,12 @@
...
@@ -2,9 +2,12 @@
%li
{
class:
(
"active"
if
params
[
:state
].
blank?
||
params
[
:state
]
==
'opened'
)}
%li
{
class:
(
"active"
if
params
[
:state
].
blank?
||
params
[
:state
]
==
'opened'
)}
=
link_to
milestones_filter_path
(
state:
'opened'
)
do
=
link_to
milestones_filter_path
(
state:
'opened'
)
do
Open
Open
%span
.badge
#{
milestone_count_by_state
(
@project
,
'opened'
)
}
%li
{
class:
(
"active"
if
params
[
:state
]
==
'closed'
)}
%li
{
class:
(
"active"
if
params
[
:state
]
==
'closed'
)}
=
link_to
milestones_filter_path
(
state:
'closed'
)
do
=
link_to
milestones_filter_path
(
state:
'closed'
)
do
Closed
Closed
%span
.badge
#{
milestone_count_by_state
(
@project
,
'closed'
)
}
%li
{
class:
(
"active"
if
params
[
:state
]
==
'all'
)}
%li
{
class:
(
"active"
if
params
[
:state
]
==
'all'
)}
=
link_to
milestones_filter_path
(
state:
'all'
)
do
=
link_to
milestones_filter_path
(
state:
'all'
)
do
All
All
%span
.badge
#{
milestone_count_by_state
(
@project
,
'all'
)
}
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