Improve participants link style in conversation, close #4236
Move it to the right and replace the text by an image with the nice tooltip, modify the test.
This commit is contained in:
parent
221c1bf959
commit
8e2633f8b3
5 changed files with 13 additions and 3 deletions
BIN
app/assets/images/icons/users.png
Normal file
BIN
app/assets/images/icons/users.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 497 B |
|
|
@ -100,6 +100,8 @@ $(document).ready(function(){
|
||||||
trigger: 'manual'
|
trigger: 'manual'
|
||||||
});
|
});
|
||||||
|
|
||||||
|
$('.participants_link > span').tooltip({placement: 'bottom'});
|
||||||
|
|
||||||
$('.participants_link').click(function(e) {
|
$('.participants_link').click(function(e) {
|
||||||
e.stopPropagation();
|
e.stopPropagation();
|
||||||
var self = $(this);
|
var self = $(this);
|
||||||
|
|
|
||||||
|
|
@ -2051,7 +2051,15 @@ ul#press_logos
|
||||||
:color $blue
|
:color $blue
|
||||||
|
|
||||||
.participants_link
|
.participants_link
|
||||||
:float left
|
:margin-top 5px
|
||||||
|
:clear right
|
||||||
|
:float right
|
||||||
|
:color #aaa
|
||||||
|
|
||||||
|
.icons-users
|
||||||
|
:display block
|
||||||
|
:width 25px
|
||||||
|
:height 16px
|
||||||
|
|
||||||
.conversation_participants_popover_content
|
.conversation_participants_popover_content
|
||||||
:display none
|
:display none
|
||||||
|
|
|
||||||
|
|
@ -20,5 +20,5 @@
|
||||||
- if authors[conversation.id].present?
|
- if authors[conversation.id].present?
|
||||||
= authors[conversation.id].name
|
= authors[conversation.id].name
|
||||||
|
|
||||||
= link_to t('.participants'), '#', :class => 'participants_link', :"data-conversation-id" => conversation.id
|
= link_to content_tag(:span, nil, class: 'icons-users', title: t('.participants')), '#', :class => 'participants_link', "data-conversation-id" => conversation.id
|
||||||
= render :partial => 'participants_popover', :locals => { :conversation => conversation }
|
= render :partial => 'participants_popover', :locals => { :conversation => conversation }
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,7 @@ Feature: private messages
|
||||||
Given I send a message with subject "Greetings" and text "hello, alice!" to "Alice Awesome"
|
Given I send a message with subject "Greetings" and text "hello, alice!" to "Alice Awesome"
|
||||||
Then I should see "Greetings" within "#conversation_inbox"
|
Then I should see "Greetings" within "#conversation_inbox"
|
||||||
And I should see "Greetings" within "#conversation_show"
|
And I should see "Greetings" within "#conversation_show"
|
||||||
And I follow "Participants"
|
And I click on selector "a.participants_link"
|
||||||
Then I should see the participants popover
|
Then I should see the participants popover
|
||||||
And I should see "Alice Awesome" as part of the participants popover
|
And I should see "Alice Awesome" as part of the participants popover
|
||||||
And I should see "Robert Grimm" as part of the participants popover
|
And I should see "Robert Grimm" as part of the participants popover
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue