Download as
Browse Code »

Commit 0c76dfbb07c1ae7e018f602a401f88f5d95ba7ed

Authored by Daniela Feitosa
2 parents 778373b6 03c8d878
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

Merge commit 'refs/merge-requests/19' of git://gitorious.org/noosfero/noosfero i… 

…nto merge-requests/19
Showing 2 changed files with 13 additions and 7 deletions   Show diff stats
app/models/contact.rb
  Diff comments   View file @0c76dfb
... ... @@ -32,14 +32,15 @@ class Contact < ActiveRecord::Base #WithoutTable
32 32 if contact.receive_a_copy
33 33 cc "#{contact.name} <#{contact.email}>"
34 34 end
35   - subject contact.subject
  35 + subject "[#{contact.dest.short_name(30)}] " + contact.subject
36 36 body :name => contact.name,
37 37 :email => contact.email,
38 38 :city => contact.city,
39 39 :state => contact.state,
40 40 :message => contact.message,
41 41 :environment => contact.dest.environment.name,
42   - :url => url_for(:host => contact.dest.environment.default_hostname, :controller => 'home')
  42 + :url => url_for(:host => contact.dest.environment.default_hostname, :controller => 'home'),
  43 + :target => contact.dest.name
43 44 end
44 45 end
45 46  
... ...
app/views/contact/sender/mail.rhtml
  Diff comments   View file @0c76dfb
1   -<%= _('Name: %s') % @name %>
2   -<%= _('e-Mail: %s') % @email %>
3   -<% if @city || @state %>
4   - <%= _('City and state: %s/%s') % [@city || '?', @state || '?'] %>
5   -<% end %>
  1 +<%= _('This message was sent by %{sender} to %{target} on %{environment}.') %
  2 + {:sender => @name, :target => @target, :environment => @environment} %>
  3 +<%= _('Below here are the informations about the user who sent this message:')%>
  4 +<ul>
  5 + <li><%= content_tag('b', _('Name')+': ') + @name%></li>
  6 + <li><%= content_tag('b', _('Email')+': ') + @email%></li>
  7 + <% if @city || @state %>
  8 + <li><%= content_tag('b', _('City and state')+': ') + (@city || '?')+'/'+(@state || '?') %></li>
  9 + <% end %>
  10 +</ul>
6 11  
7 12 <%= _('Message:') %>
8 13 -------------------------------------------------------------------------------
... ...