diff options
| author | Greg Smethells <smethells@icloud.com> | 2015-11-30 14:47:44 -0600 |
|---|---|---|
| committer | Greg Smethells <smethells@icloud.com> | 2015-12-03 08:53:34 -0600 |
| commit | dbbd2b863b402e460ac1dc90f852fcae617a2351 (patch) | |
| tree | 64f4c67ede3405ee0b4a53bceeb8f6cf5ca8e126 /app/views | |
| parent | 76b2250c60c410121cccaea584ca5345fa30e69b (diff) | |
| download | gitlab-ce-dbbd2b863b402e460ac1dc90f852fcae617a2351.tar.gz | |
sort milestones by due_date
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/dashboard/milestones/_milestone.html.haml | 11 | ||||
| -rw-r--r-- | app/views/projects/milestones/_milestone.html.haml | 6 | ||||
| -rw-r--r-- | app/views/shared/_milestone_expired.html.haml | 5 |
3 files changed, 13 insertions, 9 deletions
diff --git a/app/views/dashboard/milestones/_milestone.html.haml b/app/views/dashboard/milestones/_milestone.html.haml index 55080d6b3fe..7c882a32702 100644 --- a/app/views/dashboard/milestones/_milestone.html.haml +++ b/app/views/dashboard/milestones/_milestone.html.haml @@ -16,7 +16,10 @@ = milestone_progress_bar(milestone) .row .col-sm-6 - - milestone.milestones.each do |milestone| - = link_to milestone_path(milestone) do - %span.label.label-gray - = milestone.project.name_with_namespace + .expiration + = render 'shared/milestone_expired', milestone: milestone + .projects + - milestone.milestones.each do |milestone| + = link_to milestone_path(milestone) do + %span.label.label-gray + = milestone.project.name_with_namespace diff --git a/app/views/projects/milestones/_milestone.html.haml b/app/views/projects/milestones/_milestone.html.haml index 334172b976f..d6a44c9f0a1 100644 --- a/app/views/projects/milestones/_milestone.html.haml +++ b/app/views/projects/milestones/_milestone.html.haml @@ -18,11 +18,7 @@ .row .col-sm-6 - - if milestone.expired? and not milestone.closed? - %span.cred (Expired) - - if milestone.expires_at - %span - = milestone.expires_at + = render 'shared/milestone_expired', milestone: milestone .col-sm-6 - if can?(current_user, :admin_milestone, milestone.project) and milestone.active? = link_to edit_namespace_project_milestone_path(milestone.project.namespace, milestone.project, milestone), class: "btn btn-xs edit-milestone-link btn-grouped" do diff --git a/app/views/shared/_milestone_expired.html.haml b/app/views/shared/_milestone_expired.html.haml new file mode 100644 index 00000000000..b8eef15fbec --- /dev/null +++ b/app/views/shared/_milestone_expired.html.haml @@ -0,0 +1,5 @@ +- if milestone.expired? and not milestone.closed? + %span.cred (Expired) +- if milestone.expires_at + %span + = milestone.expires_at |