diff options
| author | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-09-12 14:27:28 -0700 |
|---|---|---|
| committer | Annabel Dunstone Gray <annabel.dunstone@gmail.com> | 2017-09-13 09:48:52 -0700 |
| commit | 129c00852ae4a7b67e6791034fb8f4b52bcae774 (patch) | |
| tree | 7128b76b811f926a86e5c219569b86c18a4bcfc6 | |
| parent | eefea7984688660495c199b4d6797f2bbb9c866d (diff) | |
| download | gitlab-ce-35978-milestone-title.tar.gz | |
Update tooltip on milestone change35978-milestone-title
| -rw-r--r-- | app/assets/javascripts/milestone_select.js | 3 | ||||
| -rw-r--r-- | app/assets/stylesheets/pages/issuable.scss | 2 | ||||
| -rw-r--r-- | app/views/shared/issuable/_sidebar.html.haml | 7 |
3 files changed, 7 insertions, 5 deletions
diff --git a/app/assets/javascripts/milestone_select.js b/app/assets/javascripts/milestone_select.js index 04579058688..4675b1fcb8f 100644 --- a/app/assets/javascripts/milestone_select.js +++ b/app/assets/javascripts/milestone_select.js @@ -45,7 +45,7 @@ import _ from 'underscore'; if (issueUpdateURL) { milestoneLinkTemplate = _.template('<a href="/<%- full_path %>/milestones/<%- iid %>" class="bold has-tooltip" data-container="body" title="<%- remaining %>"><%- title %></a>'); milestoneLinkNoneTemplate = '<span class="no-value">None</span>'; - collapsedSidebarLabelTemplate = _.template('<span class="has-tooltip" data-container="body" title="<%- remaining %>" data-placement="left"> <%- title %> </span>'); + collapsedSidebarLabelTemplate = _.template('<span class="has-tooltip" data-container="body" title="<%- name %><br /><%- remaining %>" data-placement="left" data-html="true"> <%- title %> </span>'); } return $dropdown.glDropdown({ showMenuAbove: showMenuAbove, @@ -208,6 +208,7 @@ import _ from 'underscore'; if (data.milestone != null) { data.milestone.full_path = _this.currentProject.full_path; data.milestone.remaining = gl.utils.timeFor(data.milestone.due_date); + data.milestone.name = data.milestone.title; $value.html(milestoneLinkTemplate(data.milestone)); return $sidebarCollapsedValue.find('span').html(collapsedSidebarLabelTemplate(data.milestone)); } else { diff --git a/app/assets/stylesheets/pages/issuable.scss b/app/assets/stylesheets/pages/issuable.scss index 2c5bd6d3d3e..d01ee4b033c 100644 --- a/app/assets/stylesheets/pages/issuable.scss +++ b/app/assets/stylesheets/pages/issuable.scss @@ -450,7 +450,7 @@ } } - .milestone .milestone-title { + .milestone-title span { @include str-truncated(100%); display: block; margin: 0 4px; diff --git a/app/views/shared/issuable/_sidebar.html.haml b/app/views/shared/issuable/_sidebar.html.haml index e263d056cee..9cae3f51825 100644 --- a/app/views/shared/issuable/_sidebar.html.haml +++ b/app/views/shared/issuable/_sidebar.html.haml @@ -22,11 +22,12 @@ .block.assignee = render "shared/issuable/sidebar_assignees", issuable: issuable, can_edit_issuable: can_edit_issuable, signed_in: current_user.present? .block.milestone - .sidebar-collapsed-icon.has-tooltip{ title: issuable.try(:milestone).try(:title) || 'No milestone', data: { container: 'body', html: 1, placement: 'left' } } + .sidebar-collapsed-icon = icon('clock-o', 'aria-hidden': 'true') - .milestone-title + %span.milestone-title - if issuable.milestone - = issuable.milestone.title + %span.has-tooltip{ title: "#{issuable.milestone.title}<br>#{milestone_remaining_days(issuable.milestone)}", data: { container: 'body', html: 1, placement: 'left' } } + = issuable.milestone.title - else None .title.hide-collapsed |