Download as
Browse Code »

Commit d2b8028978e4b26159fd9ac93eb8a4c52721685b

Authored by AntonioTerceiro
1 parent 9493ec05
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

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
  Diff comments   View file @d2b8028
... ... @@ -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
  Diff comments   View file @d2b8028
... ... @@ -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;
... ...