kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

add start date to sidebar and display dates on group and dashboard views when possible

Browse source
This commit is contained in:
Mike Greiling 2017-03-27 12:20:07 -05:00
parent 8dafec40cf
commit 3b513675d0
1 changed files with 35 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
app/views/shared/milestones/_sidebar.html.haml
View file

@ -17,26 +17,41 @@
.value.hide-collapsed .value.hide-collapsed
= milestone_progress_bar(milestone) = milestone_progress_bar(milestone)
- if project .block.start_date
.block.due_date .sidebar-collapsed-icon
.sidebar-collapsed-icon = icon('calendar', 'aria-hidden': 'true')
= icon('calendar', 'aria-hidden': 'true') %span.js-due-date-sidebar-value
%span.js-due-date-sidebar-value = milestone.start_date.try(:to_s, :medium) || 'None'
= milestone.due_date.try(:to_s, :medium) || 'None' .title.hide-collapsed
.title.hide-collapsed Start date
Due date - if @project && can?(current_user, :admin_milestone, @project)
- if can?(current_user, :admin_milestone, @project) = link_to 'Edit', edit_namespace_project_milestone_path(@project.namespace, @project, @milestone), class: 'edit-link pull-right'
= link_to 'Edit', edit_namespace_project_milestone_path(@project.namespace, @project, @milestone), class: 'edit-link pull-right' .value.hide-collapsed
.value.hide-collapsed %span.value-content
%span.value-content - if milestone.start_date
- if milestone.due_date %span.bold= milestone.start_date.to_s(:medium)
%span.bold= milestone.due_date.to_s(:medium) - else
- else %span.no-value No start date
%span.no-value No due date
- remaining_days = milestone_remaining_days(milestone) .block.due_date
- if remaining_days.present? .sidebar-collapsed-icon
= surround '(', ')' do = icon('calendar', 'aria-hidden': 'true')
%span.remaining-days= remaining_days %span.js-due-date-sidebar-value
= milestone.due_date.try(:to_s, :medium) || 'None'
.title.hide-collapsed
Due date
- if @project && 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
- if !project || can?(current_user, :read_issue, project) - if !project || can?(current_user, :read_issue, project)
.block .block