1.1 --- a/app/main/event/_list.lua	Mon Jun 25 01:17:27 2012 +0200
     1.2 +++ b/app/main/event/_list.lua	Mon Jun 25 14:40:34 2012 +0200
     1.3 @@ -45,23 +45,6 @@
     1.4      last_event_id = event.id
     1.5      event.issue:load_everything_for_member_id(app.session.member_id)
     1.6  
     1.7 -    if event.occurrence.date ~= last_event_date then
     1.8 -      local days_ago_text
     1.9 -      if event.time_ago == 0 then
    1.10 -        days_ago_text = _"Today"
    1.11 -      elseif event.time_ago == 1 then
    1.12 -        days_ago_text = _"Yesterday"
    1.13 -      else
    1.14 -        days_ago_text = _("#{count} days ago", { count = event.time_ago })
    1.15 -      end
    1.16 -      ui.container{ attr = { class = "date" }, content = function()
    1.17 -        ui.tag{ content = format.date(event.occurrence.date) }
    1.18 -        slot.put(" · ")
    1.19 -        ui.tag{ content = days_ago_text }
    1.20 -      end }
    1.21 -      
    1.22 -      last_event_date = event.occurrence.date
    1.23 -    end
    1.24      local class = "issue"
    1.25      if event.is_interested then
    1.26        class = class .. " interested"
    1.27 @@ -69,57 +52,70 @@
    1.28        class = class .. " interested_by_delegation"
    1.29      end
    1.30  
    1.31 -            ui.container{ attr = { class = "issue_policy_info" }, content = function()
    1.32 -          if (app.session.member_id or config.public_access == "pseudonym") and event.member_id then
    1.33 -            if app.session.member_id then
    1.34 -              ui.link{
    1.35 -                content = function()
    1.36 -                  execute.view{
    1.37 -                    module = "member_image",
    1.38 -                    view = "_show",
    1.39 -                    params = {
    1.40 -                      member = event.member,
    1.41 -                      image_type = "avatar",
    1.42 -                      show_dummy = true,
    1.43 -                      class = "micro_avatar",
    1.44 -                      popup_text = text
    1.45 -                    }
    1.46 -                  }
    1.47 -                end,
    1.48 -                module = "member", view = "show", id = event.member_id
    1.49 +    ui.container{ attr = { class = "issue_policy_info" }, content = function()
    1.50 +      if (app.session.member_id or config.public_access == "pseudonym") and event.member_id then
    1.51 +        if app.session.member_id then
    1.52 +          ui.link{
    1.53 +            content = function()
    1.54 +              execute.view{
    1.55 +                module = "member_image",
    1.56 +                view = "_show",
    1.57 +                params = {
    1.58 +                  member = event.member,
    1.59 +                  image_type = "avatar",
    1.60 +                  show_dummy = true,
    1.61 +                  class = "micro_avatar",
    1.62 +                  popup_text = text
    1.63 +                }
    1.64                }
    1.65 -              slot.put(" ")
    1.66 -            end
    1.67 -            ui.link{
    1.68 -              text = event.member.name,
    1.69 -              module = "member", view = "show", id = event.member_id
    1.70 -            }
    1.71 -            slot.put(" · ") 
    1.72 -          end
    1.73 -          local event_name = event.event_name
    1.74 -          local event_image
    1.75 -          if event.event == "issue_state_changed" then
    1.76 -            if event.state == "discussion" then
    1.77 -              event_name = _"Discussion started"
    1.78 -              event_image = "comments.png"
    1.79 -            elseif event.state == "verification" then
    1.80 -              event_name = _"Verification started"
    1.81 -              event_image = "lock.png"
    1.82 -            elseif event.state == "voting" then
    1.83 -              event_name = _"Voting started"
    1.84 -              event_image = "email_open.png"
    1.85 -            else
    1.86 -              event_name = event.state_name
    1.87 -            end
    1.88 -            if event_image then
    1.89 -              ui.image{ static = "icons/16/" .. event_image }
    1.90 -              slot.put(" ")
    1.91 -            end
    1.92 -          end
    1.93 -          ui.tag{ attr = { class = "event_name" }, content = event_name }
    1.94 -          slot.put(" · ") 
    1.95 -          ui.tag{ attr = { class = "time" }, content = format.time(event.occurrence) }
    1.96 -        end }
    1.97 +            end,
    1.98 +            module = "member", view = "show", id = event.member_id
    1.99 +          }
   1.100 +          slot.put(" ")
   1.101 +        end
   1.102 +        ui.link{
   1.103 +          text = event.member.name,
   1.104 +          module = "member", view = "show", id = event.member_id
   1.105 +        }
   1.106 +        slot.put(" · ") 
   1.107 +      end
   1.108 +      local event_name = event.event_name
   1.109 +      local event_image
   1.110 +      if event.event == "issue_state_changed" then
   1.111 +        if event.state == "discussion" then
   1.112 +          event_name = _"Discussion started"
   1.113 +          event_image = "comments.png"
   1.114 +        elseif event.state == "verification" then
   1.115 +          event_name = _"Verification started"
   1.116 +          event_image = "lock.png"
   1.117 +        elseif event.state == "voting" then
   1.118 +          event_name = _"Voting started"
   1.119 +          event_image = "email_open.png"
   1.120 +        else
   1.121 +          event_name = event.state_name
   1.122 +        end
   1.123 +        if event_image then
   1.124 +          ui.image{ static = "icons/16/" .. event_image }
   1.125 +          slot.put(" ")
   1.126 +        end
   1.127 +      end
   1.128 +      local days_ago_text
   1.129 +      if event.time_ago == 0 then
   1.130 +        days_ago_text = _("Today at #{time}", { time = format.time(event.occurrence) })
   1.131 +      elseif event.time_ago == 1 then
   1.132 +        days_ago_text = _("Yesterday at #{time}", { time = format.time(event.occurrence) })
   1.133 +      else
   1.134 +        days_ago_text = _("#{date} at #{time}", { date = format.date(event.occurrence.date), time = format.time(event.occurrence) })
   1.135 +      end
   1.136 +      ui.tag{ attr = { class = "event_name" }, content = event_name }
   1.137 +      slot.put(" · ") 
   1.138 +      ui.tag{ content = days_ago_text }
   1.139 +      if event.time_ago > 1 then
   1.140 +        slot.put(" (")
   1.141 +        ui.tag{ content = _("#{count} days ago", { count = event.time_ago }) }
   1.142 +        slot.put(")")
   1.143 +      end
   1.144 +    end }
   1.145  
   1.146      ui.container{ attr = { class = class }, content = function()
   1.147