3 files changed, 95 insertions, 3 deletions
diff --git a/app/helpers/admin_helper.rb b/app/helpers/admin_helper.rb
index 059cebdfa..151e53758 100644
--- a/app/helpers/admin_helper.rb
+++ b/app/helpers/admin_helper.rb
@@ -33,5 +33,10 @@ module AdminHelper
       link_to(eye, user_path(user), :title => "view user's page on public website") + " " +
         link_to(h(user.name), admin_user_show_path(user), :title => "view full details")
   end
+
+  def comment_visibility(comment)
+      comment.visible? ? 'Visible' : 'Hidden'
+  end
+
 end
 
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 154697377..33525cb3d 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -136,5 +136,47 @@ module ApplicationHelper
             nil
         end
     end
+
+    def event_description(event)
+        body_link = public_body_link_absolute(event.info_request.public_body)
+        user_link = request_user_link_absolute(event.info_request)
+        date = simple_date(event.created_at)
+        case event.event_type
+        when 'sent'
+            _('Request sent to {{public_body_name}} by {{info_request_user}} on {{date}}.',
+             :public_body_name => body_link,
+             :info_request_user => user_link,
+             :date => date)
+        when 'followup_sent'
+            case event.calculated_state
+            when 'internal_review'
+                _('Internal review request sent to {{public_body_name}} by {{info_request_user}} on {{date}}.',
+                 :public_body_name => body_link,
+                 :info_request_user => user_link,
+                 :date => date)
+            when 'waiting_response'
+                _('Clarification sent to {{public_body_name}} by {{info_request_user}} on {{date}}.',
+                 :public_body_name => body_link,
+                 :info_request_user => user_link,
+                 :date => date)
+            else
+                _('Follow up sent to {{public_body_name}} by {{info_request_user}} on {{date}}.',
+                 :public_body_name => body_link,
+                 :info_request_user => user_link,
+                 :date => date)
+            end
+        when 'response'
+            _('Response by {{public_body_name}} to {{info_request_user}} on {{date}}.',
+             :public_body_name => body_link,
+             :info_request_user => user_link,
+             :date => date)
+        when 'comment'
+            _('Request to {{public_body_name}} by {{info_request_user}}. Annotated by {{event_comment_user}} on {{date}}.',
+             :public_body_name => body_link,
+             :info_request_user => user_link,
+             :event_comment_user => user_link_absolute(event.comment.user),
+             :date => date)
+        end
+    end
 end
 
diff --git a/app/helpers/link_to_helper.rb b/app/helpers/link_to_helper.rb
index 50ed3c339..dd6ffa805 100755
--- a/app/helpers/link_to_helper.rb
+++ b/app/helpers/link_to_helper.rb
@@ -279,13 +279,58 @@ module LinkToHelper
         end
     end
 
-    # Basic date format
-    def simple_date(date)
+    # Public: Usually-correct format for a DateTime-ish object
+    # To define a new new format define the `simple_date_{FORMAT}` method
+    #
+    # date - a DateTime, Date or Time
+    # opts - a Hash of options (default: { format: :html})
+    #        :format - :html returns a HTML <time> tag
+    #                  :text returns a plain String
+    #
+    # Examples
+    #
+    #   simple_date(Time.now)
+    #   # => "<time>..."
+    #
+    #   simple_date(Time.now, :format => :text)
+    #   # => "March 10, 2014"
+    #
+    # Returns a String
+    # Raises ArgumentError if the format is unrecognized
+    def simple_date(date, opts = {})
+        opts = { :format => :html }.merge(opts)
+        date_formatter = "simple_date_#{ opts[:format] }"
+
+        if respond_to?(date_formatter)
+            send(date_formatter, date)
+        else
+            raise ArgumentError, "Unrecognised format :#{ opts[:format] }"
+        end
+    end
+
+    # Usually-correct HTML formatting of a DateTime-ish object
+    # Use LinkToHelper#simple_date with desired formatting options
+    #
+    # date - a DateTime, Date or Time
+    #
+    # Returns a String
+    def simple_date_html(date)
+        date = date.in_time_zone unless date.is_a? Date
+        time_tag date, simple_date_text(date), :title => date.to_s
+    end
+
+    # Usually-correct plain text formatting of a DateTime-ish object
+    # Use LinkToHelper#simple_date with desired formatting options
+    #
+    # date - a DateTime, Date or Time
+    #
+    # Returns a String
+    def simple_date_text(date)
         date = date.in_time_zone.to_date unless date.is_a? Date
 
         date_format = _("simple_date_format")
         date_format = :long if date_format == "simple_date_format"
-        return I18n.l(date, :format => date_format)
+        I18n.l(date, :format => date_format)
     end
 
     def simple_time(date)