diff options
author | Seb Bacon <seb.bacon@gmail.com> | 2012-05-15 11:04:50 +0100 |
---|---|---|
committer | Seb Bacon <seb.bacon@gmail.com> | 2012-05-15 11:04:50 +0100 |
commit | f9fc1fd6509bc89394ff0735ab4efc46492f7bd3 (patch) | |
tree | 86d7ec44d64aa65ccdb101b2a7a2b2f5c1d0f6e8 /app/helpers/application_helper.rb | |
parent | 95e7cd60a2ff78aa8550dc1855ee7c01a0f4c6f2 (diff) |
Merge from wombleton:feature/440_sparkly_admin_css
Includes a couple of additional fixes:
* Remember to HTML-quote things that could come from users
* Fix form post action for editing users
Diffstat (limited to 'app/helpers/application_helper.rb')
-rw-r--r-- | app/helpers/application_helper.rb | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index df89a372c..0520a8c77 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -113,5 +113,19 @@ module ApplicationHelper end end + def admin_value(v) + if v.nil? + nil + elsif v.instance_of?(Time) + admin_date(v) + else + h(v) + end + end + + def admin_date(date) + "#{I18n.l(date, :format => "%e %B %Y %H:%M:%S")} (#{_('{{length_of_time}} ago', :length_of_time => time_ago_in_words(date))})" + end + end |