Merge branch 'issuable-sidebar-collapsed-tooltip' into 'master'
Changed collapsed assignee tooltip to users name ## What does this MR do? - Changes the collapsed assignee tooltip the users name rather than the username - Updates the tooltip after updating the assignee ## What are the relevant issue numbers? Closes #19280, #19281 ## Screenshots (if relevant) ![Screen_Shot_2016-06-28_at_17.55.52](/uploads/e6ccc1703f59966c978e731a841aabdc/Screen_Shot_2016-06-28_at_17.55.52.png) See merge request !4976
This commit is contained in:
commit
877c77ccdb
3 changed files with 7 additions and 2 deletions
|
@ -35,6 +35,7 @@ v 8.10.0 (unreleased)
|
|||
- Fix pagination when sorting by columns with lots of ties (like priority)
|
||||
- The Markdown reference parsers now re-use query results to prevent running the same queries multiple times !5020
|
||||
- Updated project header design
|
||||
- Issuable collapsed assignee tooltip is now the users name
|
||||
- Exclude email check from the standard health check
|
||||
- Updated layout for Projects, Groups, Users on Admin area !4424
|
||||
- Fix changing issue state columns in milestone view
|
||||
|
|
|
@ -56,6 +56,11 @@ class @UsersSelect
|
|||
username: ''
|
||||
avatar: ''
|
||||
$value.html(assigneeTemplate(user))
|
||||
|
||||
$collapsedSidebar
|
||||
.attr('title', user.name)
|
||||
.tooltip('fixTitle')
|
||||
|
||||
$collapsedSidebar.html(collapsedAssigneeTemplate(user))
|
||||
|
||||
|
||||
|
@ -63,7 +68,6 @@ class @UsersSelect
|
|||
'<% if( avatar ) { %>
|
||||
<a class="author_link" href="/u/<%- username %>">
|
||||
<img width="24" class="avatar avatar-inline s24" alt="" src="<%- avatar %>">
|
||||
<span class="author">Toni Boehm</span>
|
||||
</a>
|
||||
<% } else { %>
|
||||
<i class="fa fa-user"></i>
|
||||
|
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
= form_for [@project.namespace.becomes(Namespace), @project, issuable], remote: true, format: :json, html: {class: 'issuable-context-form inline-update js-issuable-update'} do |f|
|
||||
.block.assignee
|
||||
.sidebar-collapsed-icon.sidebar-collapsed-user{data: {toggle: "tooltip", placement: "left", container: "body"}, title: (issuable.assignee.to_reference if issuable.assignee)}
|
||||
.sidebar-collapsed-icon.sidebar-collapsed-user{data: {toggle: "tooltip", placement: "left", container: "body"}, title: (issuable.assignee.name if issuable.assignee)}
|
||||
- if issuable.assignee
|
||||
= link_to_member(@project, issuable.assignee, size: 24)
|
||||
- else
|
||||
|
|
Loading…
Reference in a new issue