Commit d2b8028978e4b26159fd9ac93eb8a4c52721685b
1 parent
9493ec05
Exists in
master
and in
29 other branches
ActionItem555: fixing manage friends screen
git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@2279 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing
2 changed files
with
14 additions
and
13 deletions
Show diff stats
app/views/friends/index.rhtml
... | ... | @@ -3,9 +3,12 @@ |
3 | 3 | <h1><%= _("%s's friends") % profile.name %></h1> |
4 | 4 | |
5 | 5 | <ul class='profile-list'> |
6 | -<% @friends.each do |friend| %> | |
7 | - <li> | |
8 | - <%= profile_image_link friend %> | |
6 | + <% @friends.each do |friend| %> | |
7 | + <li> | |
8 | + <center> | |
9 | + <%= link_to_profile(profile_image(friend) + '<br/>' + friend.name, friend.identifier) %> | |
10 | + </center> | |
11 | + <!--<%= button(:delete, _('Remove'), {:action => 'remove', :id => friend.id}, :method => :post) %>--> | |
9 | 12 | <div class="controll"> |
10 | 13 | <%= link_to content_tag('span',_('remove')), |
11 | 14 | { :action => 'remove', :id => friend.id }, |
... | ... | @@ -13,8 +16,9 @@ |
13 | 16 | :title => _('remove'), |
14 | 17 | :help => _('Clicking on this button will remove your friend relation with %s.') % friend.name %> |
15 | 18 | </div><!-- end class="controll" --> |
16 | - </li> | |
17 | -<% end %> | |
19 | + | |
20 | + </li> | |
21 | + <% end %> | |
18 | 22 | </ul> |
19 | 23 | |
20 | 24 | <% if @friends.empty? %> | ... | ... |
public/stylesheets/controller_friends.css
... | ... | @@ -8,7 +8,7 @@ |
8 | 8 | #content #manage_friends li { |
9 | 9 | float: left; |
10 | 10 | width: 200px; |
11 | - height: 68px; | |
11 | + height: 100px; | |
12 | 12 | margin: 5px; |
13 | 13 | padding: 5px; |
14 | 14 | border: 2px solid #B8CFE7; |
... | ... | @@ -21,8 +21,11 @@ |
21 | 21 | background: #729FCF; |
22 | 22 | } |
23 | 23 | |
24 | -.profile-list img { | |
24 | +#content #manage_friends li center { | |
25 | 25 | float: left; |
26 | +} | |
27 | + | |
28 | +.profile-list img { | |
26 | 29 | border: none; |
27 | 30 | } |
28 | 31 | |
... | ... | @@ -36,12 +39,6 @@ |
36 | 39 | overflow: hidden; |
37 | 40 | } |
38 | 41 | |
39 | -.controll { | |
40 | - position: absolute; | |
41 | - right: 5px; | |
42 | - bottom: 10px; | |
43 | -} | |
44 | - | |
45 | 42 | #manage_friends .button-bar { |
46 | 43 | clear: both; |
47 | 44 | padding-top: 20px; | ... | ... |