Added ability to close milestone with opened issues. UI for milestone page improved
This commit is contained in:
parent
b6d0dd871c
commit
7683efc6be
5 changed files with 34 additions and 29 deletions
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -30,3 +30,4 @@ vendor/bundle/*
|
|||
rails_best_practices_output.html
|
||||
doc/code/*
|
||||
.secret
|
||||
*.log
|
||||
|
|
|
@ -83,4 +83,13 @@ ul.bordered-list {
|
|||
a { color: #777; }
|
||||
}
|
||||
}
|
||||
|
||||
&.top-list {
|
||||
li:first-child {
|
||||
padding-top: 0;
|
||||
h4, h5 {
|
||||
margin-top: 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -36,7 +36,7 @@
|
|||
= label.name
|
||||
|
||||
.span9
|
||||
%ul.bordered-list.my-projects
|
||||
%ul.bordered-list.my-projects.top-list
|
||||
- @projects.each do |project|
|
||||
%li
|
||||
%h4.project-title
|
||||
|
|
|
@ -4,8 +4,7 @@
|
|||
= link_to edit_project_milestone_path(milestone.project, milestone), class: "btn btn-small edit-milestone-link grouped" do
|
||||
%i.icon-edit
|
||||
Edit
|
||||
- if milestone.can_be_closed?
|
||||
= link_to 'Close', project_milestone_path(@project, milestone, milestone: {state_event: :close }), method: :put, remote: true, class: "btn btn-small btn-remove"
|
||||
= link_to 'Close Milestone', project_milestone_path(@project, milestone, milestone: {state_event: :close }), method: :put, remote: true, class: "btn btn-small btn-remove"
|
||||
%h4
|
||||
= link_to_gfm truncate(milestone.title, length: 100), project_milestone_path(milestone.project, milestone)
|
||||
- if milestone.expired? and not milestone.closed?
|
||||
|
|
|
@ -1,32 +1,23 @@
|
|||
= render "projects/issues/head"
|
||||
.row
|
||||
.span6
|
||||
%h3.page-title
|
||||
%h3.page-title
|
||||
Milestone ##{@milestone.id}
|
||||
%small
|
||||
= @milestone.expires_at
|
||||
.back-link
|
||||
= link_to project_milestones_path(@project) do
|
||||
← To milestones list
|
||||
.span6
|
||||
.pull-right
|
||||
- unless @milestone.closed?
|
||||
= link_to new_project_issue_path(@project, issue: { milestone_id: @milestone.id }), class: "btn btn-small grouped", title: "New Issue" do
|
||||
%i.icon-plus
|
||||
New Issue
|
||||
= link_to 'Browse Issues', project_issues_path(@milestone.project, milestone_id: @milestone.id), class: "btn edit-milestone-link small grouped"
|
||||
- if can?(current_user, :admin_milestone, @project)
|
||||
= link_to edit_project_milestone_path(@project, @milestone), class: "btn btn-small grouped" do
|
||||
= link_to edit_project_milestone_path(@project, @milestone), class: "btn grouped" do
|
||||
%i.icon-edit
|
||||
Edit
|
||||
= link_to 'Close Milestone', project_milestone_path(@project, @milestone, milestone: {state_event: :close }), method: :put, class: "btn btn-remove"
|
||||
|
||||
|
||||
|
||||
- if @milestone.can_be_closed?
|
||||
%hr
|
||||
%p
|
||||
- if @milestone.issues.any? && @milestone.can_be_closed?
|
||||
.alert.alert-success
|
||||
%span All issues for this milestone are closed. You may close milestone now.
|
||||
= link_to 'Close Milestone', project_milestone_path(@project, @milestone, milestone: {state_event: :close }), method: :put, class: "btn btn-small btn-remove"
|
||||
|
||||
.back-link
|
||||
= link_to project_milestones_path(@project) do
|
||||
← To milestones list
|
||||
|
||||
|
||||
.ui-box.ui-box-show
|
||||
.ui-box-head
|
||||
|
@ -69,6 +60,11 @@
|
|||
Participants
|
||||
%span.badge= @users.count
|
||||
|
||||
.pull-right
|
||||
= link_to new_project_issue_path(@project, issue: { milestone_id: @milestone.id }), class: "btn btn-small grouped", title: "New Issue" do
|
||||
%i.icon-plus
|
||||
New Issue
|
||||
= link_to 'Browse Issues', project_issues_path(@milestone.project, milestone_id: @milestone.id), class: "btn btn-small edit-milestone-link grouped"
|
||||
|
||||
.tab-content
|
||||
.tab-pane.active#tab-issues
|
||||
|
|
Loading…
Reference in a new issue