Refactor Milestone view for Dashboard.
This commit is contained in:
parent
ed48085558
commit
32f8fc1f9a
|
@ -1,10 +0,0 @@
|
||||||
%li{ id: dom_id(issue, 'sortable'), class: 'issue-row', 'data-iid' => issue.iid }
|
|
||||||
%span.milestone-row
|
|
||||||
- project = issue.project
|
|
||||||
%strong #{project.name_with_namespace} ·
|
|
||||||
= link_to [project.namespace.becomes(Namespace), project, issue] do
|
|
||||||
%span.cgray ##{issue.iid}
|
|
||||||
= link_to_gfm issue.title, [project.namespace.becomes(Namespace), project, issue], title: issue.title
|
|
||||||
.pull-right.assignee-icon
|
|
||||||
- if issue.assignee
|
|
||||||
= image_tag avatar_icon(issue.assignee, 16), class: "avatar s16"
|
|
|
@ -1,6 +0,0 @@
|
||||||
.panel.panel-default
|
|
||||||
.panel-heading= title
|
|
||||||
%ul{ class: "well-list issues-sortable-list" }
|
|
||||||
- if issues
|
|
||||||
- issues.each do |issue|
|
|
||||||
= render 'issue', issue: issue
|
|
|
@ -1,10 +0,0 @@
|
||||||
%li{ id: dom_id(merge_request, 'sortable'), class: 'mr-row', 'data-iid' => merge_request.iid }
|
|
||||||
%span.milestone-row
|
|
||||||
- project = merge_request.project
|
|
||||||
%strong #{project.name_with_namespace} ·
|
|
||||||
= link_to [project.namespace.becomes(Namespace), project, merge_request] do
|
|
||||||
%span.cgray ##{merge_request.iid}
|
|
||||||
= link_to_gfm merge_request.title, [project.namespace.becomes(Namespace), project, merge_request], title: merge_request.title
|
|
||||||
.pull-right.assignee-icon
|
|
||||||
- if merge_request.assignee
|
|
||||||
= image_tag avatar_icon(merge_request.assignee, 16), class: "avatar s16"
|
|
|
@ -1,6 +0,0 @@
|
||||||
.panel.panel-default
|
|
||||||
.panel-heading= title
|
|
||||||
%ul{ class: "well-list merge_requests-sortable-list" }
|
|
||||||
- if merge_requests
|
|
||||||
- merge_requests.each do |merge_request|
|
|
||||||
= render 'merge_request', merge_request: merge_request
|
|
|
@ -61,45 +61,17 @@
|
||||||
= link_to '#tab-participants', 'data-toggle' => 'tab' do
|
= link_to '#tab-participants', 'data-toggle' => 'tab' do
|
||||||
Participants
|
Participants
|
||||||
%span.badge= @milestone.participants.count
|
%span.badge= @milestone.participants.count
|
||||||
|
%li
|
||||||
|
= link_to '#tab-labels', 'data-toggle' => 'tab', 'data-show' => '.tab-issues-buttons' do
|
||||||
|
Labels
|
||||||
|
%span.badge= @milestone.labels.count
|
||||||
|
|
||||||
.tab-content
|
.tab-content.milestone-content
|
||||||
.tab-pane.active#tab-issues
|
.tab-pane.active#tab-issues
|
||||||
.gray-content-block.middle-block
|
= render 'shared/milestones/issues_tab', unassigned: @milestone.opened_issues.unassigned, assigned: @milestone.opened_issues.assigned, closed: @milestone.closed_issues
|
||||||
.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
|
|
||||||
= render 'issues', title: "Open", issues: @milestone.opened_issues
|
|
||||||
.col-md-6
|
|
||||||
= render 'issues', title: "Closed", issues: @milestone.closed_issues
|
|
||||||
|
|
||||||
.tab-pane#tab-merge-requests
|
.tab-pane#tab-merge-requests
|
||||||
.gray-content-block.middle-block
|
= render 'shared/milestones/merge_requests_tab', unassigned: @milestone.opened_merge_requests.unassigned, assigned: @milestone.opened_merge_requests.assigned, closed: @milestone.merge_requests.closed, merged: @milestone.merge_requests.merged
|
||||||
.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
|
|
||||||
= render 'merge_requests', title: "Open", merge_requests: @milestone.opened_merge_requests
|
|
||||||
.col-md-6
|
|
||||||
= render 'merge_requests', title: "Closed", merge_requests: @milestone.closed_merge_requests
|
|
||||||
|
|
||||||
.tab-pane#tab-participants
|
.tab-pane#tab-participants
|
||||||
.gray-content-block.middle-block
|
= render 'shared/milestones/participants_tab', users: @milestone.participants
|
||||||
.oneline
|
.tab-pane#tab-labels
|
||||||
All participants to this milestone
|
= render 'shared/milestones/labels_tab', labels: @milestone.labels
|
||||||
%ul.bordered-list
|
|
||||||
- @milestone.participants.each do |user|
|
|
||||||
%li
|
|
||||||
= link_to user, title: user.name, class: "darken" do
|
|
||||||
= image_tag avatar_icon(user, 32), class: "avatar s32"
|
|
||||||
%strong= truncate(user.name, lenght: 40)
|
|
||||||
%br
|
|
||||||
%small.cgray= user.username
|
|
||||||
|
|
Loading…
Reference in New Issue