diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/helpers/link_to_helper.rb | 8 | ||||
| -rw-r--r-- | app/views/request/_request_listing_via_event.rhtml | 18 |
2 files changed, 16 insertions, 10 deletions
diff --git a/app/helpers/link_to_helper.rb b/app/helpers/link_to_helper.rb index 16aa59117..4cba2b663 100644 --- a/app/helpers/link_to_helper.rb +++ b/app/helpers/link_to_helper.rb @@ -5,7 +5,7 @@ # Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved. # Email: francis@mysociety.org; WWW: http://www.mysociety.org/ # -# $Id: link_to_helper.rb,v 1.48 2008-11-07 00:47:23 francis Exp $ +# $Id: link_to_helper.rb,v 1.49 2008-12-17 13:01:35 francis Exp $ module LinkToHelper @@ -60,6 +60,9 @@ module LinkToHelper def public_body_link(public_body) link_to h(public_body.name), public_body_url(public_body) end + def public_body_link_absolute(public_body) # e.g. for in RSS + link_to h(public_body.name), main_url(public_body_url(public_body)) + end def public_body_admin_url(public_body) return admin_url('body/show/' + public_body.id.to_s) end @@ -77,6 +80,9 @@ module LinkToHelper def user_link(user) link_to h(user.name), user_url(user) end + def user_link_absolute(user) + link_to h(user.name), main_url(user_url(user)) + end def user_or_you_link(user) if @user && user == @user link_to h("you"), user_url(user) diff --git a/app/views/request/_request_listing_via_event.rhtml b/app/views/request/_request_listing_via_event.rhtml index d59ba1bd7..8ffb738ce 100644 --- a/app/views/request/_request_listing_via_event.rhtml +++ b/app/views/request/_request_listing_via_event.rhtml @@ -25,23 +25,23 @@ end %> </strong><br> <% if event.event_type == 'sent' %> - Request sent to <%= public_body_link(info_request.public_body) %> - by <%= user_link(info_request.user) %> + Request sent to <%= public_body_link_absolute(info_request.public_body) %> + by <%= user_link_absolute(info_request.user) %> on <%= simple_date(event.created_at) %>. <% elsif event.event_type == 'followup_sent' %> <%=event.display_status %> - sent to <%= public_body_link(info_request.public_body) %> - by <%= user_link(info_request.user) %> + sent to <%= public_body_link_absolute(info_request.public_body) %> + by <%= user_link_absolute(info_request.user) %> on <%= simple_date(event.created_at) %>. <% elsif event.event_type == 'response' %> <%=event.display_status %> - by <%= public_body_link(info_request.public_body) %> - to <%= user_link(info_request.user) %> + by <%= public_body_link_absolute(info_request.public_body) %> + to <%= user_link_absolute(info_request.user) %> on <%= simple_date(event.created_at) %>. <% elsif event.event_type == 'comment' %> - Request to <%= public_body_link(info_request.public_body) %> - by <%= user_link(info_request.user) %>. - Annotated by <%= user_link(event.comment.user) %> + Request to <%= public_body_link_absolute(info_request.public_body) %> + by <%= user_link_absolute(info_request.user) %>. + Annotated by <%= user_link_absolute(event.comment.user) %> on <%= simple_date(event.created_at) %>. <% else %> <% raise "unknown event type indexed " + event.event_type %> |