diff options
| author | Mike Greiling <mike@pixelcog.com> | 2017-03-24 12:13:29 -0500 |
|---|---|---|
| committer | Mike Greiling <mike@pixelcog.com> | 2017-03-24 17:06:48 -0500 |
| commit | 9023526c053529ea9e5c4898cdc577fe0e547dac (patch) | |
| tree | 57cbe9d97c1ed6285e0efcbfdf346c1d76d7382e /app/views/shared/milestones | |
| parent | 92e0bd9b672061cfd3172624db85847993f31beb (diff) | |
| download | gitlab-ce-9023526c053529ea9e5c4898cdc577fe0e547dac.tar.gz | |
move milestone due date info to sidebar
Diffstat (limited to 'app/views/shared/milestones')
| -rw-r--r-- | app/views/shared/milestones/_sidebar.html.haml | 22 | ||||
| -rw-r--r-- | app/views/shared/milestones/_summary.html.haml | 4 |
2 files changed, 22 insertions, 4 deletions
diff --git a/app/views/shared/milestones/_sidebar.html.haml b/app/views/shared/milestones/_sidebar.html.haml index d955ef52676..4f95d789942 100644 --- a/app/views/shared/milestones/_sidebar.html.haml +++ b/app/views/shared/milestones/_sidebar.html.haml @@ -1,4 +1,5 @@ - affix_offset = local_assigns.fetch(:affix_offset, "102") +- project = local_assigns[:project] %aside.right-sidebar.js-right-sidebar{ data: { "offset-top" => affix_offset, "spy" => "affix" }, class: sidebar_gutter_collapsed_class, 'aria-live' => 'polite' } .issuable-sidebar @@ -9,6 +10,27 @@ %span.issuable-header-text.hide-collapsed Milestone #{milestone.try(:to_reference) || milestone.title} + - if project + .block.due_date + .sidebar-collapsed-icon + = icon('calendar', 'aria-hidden': 'true') + %span.js-due-date-sidebar-value + = milestone.due_date.try(:to_s, :medium) || 'None' + .title.hide-collapsed + Due date + - if can?(current_user, :admin_milestone, @project) + = link_to 'Edit', edit_namespace_project_milestone_path(@project.namespace, @project, @milestone), class: 'edit-link pull-right' + .value.hide-collapsed + %span.value-content + - if milestone.due_date + %span.bold= milestone.due_date.to_s(:medium) + - else + %span.no-value No due date + - remaining_days = milestone_remaining_days(milestone) + - if remaining_days.present? + = surround '(', ')' do + %span.remaining-days= remaining_days + - milestone_ref = milestone.try(:to_reference, full: true) - if milestone_ref.present? .block diff --git a/app/views/shared/milestones/_summary.html.haml b/app/views/shared/milestones/_summary.html.haml index 78079f633d5..7ee7ce047b9 100644 --- a/app/views/shared/milestones/_summary.html.haml +++ b/app/views/shared/milestones/_summary.html.haml @@ -26,10 +26,6 @@ %span.milestone-stat %strong== #{milestone.percent_complete(current_user)}% complete - - remaining_days = milestone_remaining_days(milestone) - - if remaining_days.present? - %span.milestone-stat - %span.remaining-days= remaining_days .milestone-progress-buttons %span.tab-issues-buttons |