1.1 --- a/app/main/member/history.lua	Thu Jul 08 21:11:56 2010 +0200
     1.2 +++ b/app/main/member/history.lua	Wed Jul 14 13:58:44 2010 +0200
     1.3 @@ -14,6 +14,15 @@
     1.4    }
     1.5  end)
     1.6  
     1.7 +ui.form{
     1.8 +  attr = { class = "vertical" },
     1.9 +  content = function()
    1.10 +    ui.field.text{ label = _"Current name", value = member.name }
    1.11 +    ui.field.text{ label = _"Current status", value = member.active and _'activated' or _'deactivated' }
    1.12 +  end
    1.13 +}
    1.14 +
    1.15 +
    1.16  local entries = member:get_reference_selector("history_entries"):add_order_by("id DESC"):exec()
    1.17  
    1.18  ui.tag{
    1.19 @@ -28,47 +37,32 @@
    1.20          }
    1.21          ui.tag{
    1.22            tag = "th",
    1.23 -          content = _("Used until")
    1.24 -        }
    1.25 -      end
    1.26 -    }
    1.27 -    ui.tag{
    1.28 -      tag = "tr",
    1.29 -      content = function()
    1.30 -        ui.tag{
    1.31 -          tag = "td",
    1.32 -          content = member.name
    1.33 +          content = _("Status")
    1.34          }
    1.35          ui.tag{
    1.36 -          tag = "td",
    1.37 -          content = _"continuing"
    1.38 +          tag = "th",
    1.39 +          content = _("until")
    1.40          }
    1.41        end
    1.42      }
    1.43      for i, entry in ipairs(entries) do
    1.44 -      local display = false
    1.45 -      if (i == 1) then
    1.46 -        if entry.name ~= member.name then
    1.47 -          display = true
    1.48 +      ui.tag{
    1.49 +        tag = "tr",
    1.50 +        content = function()
    1.51 +          ui.tag{
    1.52 +            tag = "td",
    1.53 +            content = entry.name
    1.54 +          }
    1.55 +          ui.tag{
    1.56 +            tag = "td",
    1.57 +            content =  member.active and _'activated' or _'deactivated',
    1.58 +          }
    1.59 +          ui.tag{
    1.60 +            tag = "td",
    1.61 +            content = format.timestamp(entry["until"])
    1.62 +          }
    1.63          end
    1.64 -      elseif entry.name ~= entries[i-1].name then
    1.65 -        display = true
    1.66 -      end
    1.67 -      if display then
    1.68 -        ui.tag{
    1.69 -          tag = "tr",
    1.70 -          content = function()
    1.71 -            ui.tag{
    1.72 -              tag = "td",
    1.73 -              content = entry.name
    1.74 -            }
    1.75 -            ui.tag{
    1.76 -              tag = "td",
    1.77 -              content = format.timestamp(entry["until"])
    1.78 -            }
    1.79 -          end
    1.80 -        }
    1.81 -      end
    1.82 +      }
    1.83      end
    1.84    end
    1.85  }