Commit 75e1e5f096b95d03d971c71abdda3b978977553a
1 parent
e531dd97
Exists in
master
and in
22 other branches
ActionItem235: more beaulty
git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1575 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing
2 changed files
with
6 additions
and
5 deletions
Show diff stats
app/models/person.rb
@@ -6,11 +6,11 @@ class Person < Profile | @@ -6,11 +6,11 @@ class Person < Profile | ||
6 | has_many :friends, :class_name => 'Person', :through => :friendships | 6 | has_many :friends, :class_name => 'Person', :through => :friendships |
7 | 7 | ||
8 | def suggested_friend_groups | 8 | def suggested_friend_groups |
9 | - (friend_groups + [ _('friends'), _('work'), _('school'), _('family') ]).uniq | 9 | + (friend_groups + [ _('friends'), _('work'), _('school'), _('family') ]).map {|i| i if !i.empty?}.compact.uniq |
10 | end | 10 | end |
11 | 11 | ||
12 | def friend_groups | 12 | def friend_groups |
13 | - friendships.map {|item| item.group}.uniq | 13 | + friendships.map { |item| item.group }.uniq |
14 | end | 14 | end |
15 | 15 | ||
16 | def add_friend(friend, group = nil) | 16 | def add_friend(friend, group = nil) |
app/views/tasks/_add_friend.rhtml
@@ -2,7 +2,8 @@ | @@ -2,7 +2,8 @@ | ||
2 | 2 | ||
3 | <%= link_to( profile_image(task.requestor, :minor, :border => 0), task.requestor.public_profile_url ) %> | 3 | <%= link_to( profile_image(task.requestor, :minor, :border => 0), task.requestor.public_profile_url ) %> |
4 | 4 | ||
5 | -<%= _('%s wants to connect to you as a friend.') % link_to( task.requestor.name, task.requestor.public_profile_url ) %> | 5 | +<%= _('%s wants to connect to you as a friend.') % |
6 | + content_tag('b', link_to( task.requestor.name, task.requestor.public_profile_url ) ) %> | ||
6 | 7 | ||
7 | <% form_for('task', task, :url => { :action => 'close', :id => task.id } ) do |f| %> | 8 | <% form_for('task', task, :url => { :action => 'close', :id => task.id } ) do |f| %> |
8 | 9 | ||
@@ -11,14 +12,14 @@ | @@ -11,14 +12,14 @@ | ||
11 | <%= radio_button_tag(:decision, 'finish', true, | 12 | <%= radio_button_tag(:decision, 'finish', true, |
12 | :id => "decision-finish-#{task.id}", | 13 | :id => "decision-finish-#{task.id}", |
13 | :onclick => "Element.show('group-for-friend-#{task.id}')") %> | 14 | :onclick => "Element.show('group-for-friend-#{task.id}')") %> |
14 | - <label for="<%= "decision-finish-#{task.id}" %>"><%= _('Accept') %></label> | 15 | + <label for="<%= "decision-finish-#{task.id}" %>"><b><%= _('Accept') %></b></label> |
15 | 16 | ||
16 | | 17 | |
17 | 18 | ||
18 | <%= radio_button_tag(:decision, 'cancel', false, | 19 | <%= radio_button_tag(:decision, 'cancel', false, |
19 | :id => "decision-cancel-#{task.id}", | 20 | :id => "decision-cancel-#{task.id}", |
20 | :onclick => "Element.hide('group-for-friend-#{task.id}')") %> | 21 | :onclick => "Element.hide('group-for-friend-#{task.id}')") %> |
21 | - <label for="<%= "decision-cancel-#{task.id}" %>"><%= _('Ignore') %></label> | 22 | + <label for="<%= "decision-cancel-#{task.id}" %>"><b><%= _('Ignore') %></b></label> |
22 | 23 | ||
23 | <% | 24 | <% |
24 | content_tag('div', :id => "group-for-friend-#{task.id}", | 25 | content_tag('div', :id => "group-for-friend-#{task.id}", |