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:
Antoine D 2013-06-18 16:13:28 +03:00 committed by flaburgan
parent 221c1bf959
commit 8e2633f8b3
5 changed files with 13 additions and 3 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 497 B

View file

@ -99,6 +99,8 @@ $(document).ready(function(){
},
trigger: 'manual'
});
$('.participants_link > span').tooltip({placement: 'bottom'});
$('.participants_link').click(function(e) {
e.stopPropagation();

View file

@ -2051,7 +2051,15 @@ ul#press_logos
:color $blue
.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
:display none

View file

@ -20,5 +20,5 @@
- if authors[conversation.id].present?
= 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 }

View file

@ -14,7 +14,7 @@ Feature: private messages
Given I send a message with subject "Greetings" and text "hello, alice!" to "Alice Awesome"
Then I should see "Greetings" within "#conversation_inbox"
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
And I should see "Alice Awesome" as part of the participants popover
And I should see "Robert Grimm" as part of the participants popover