1.1 --- a/app/main/member/_profile.lua	Fri Feb 17 15:16:02 2012 +0100
     1.2 +++ b/app/main/member/_profile.lua	Sat Feb 25 11:51:37 2012 +0100
     1.3 @@ -1,5 +1,7 @@
     1.4  local member = param.get("member", "table")
     1.5  
     1.6 +local include_private_data = param.get("include_private_data", atom.boolean)
     1.7 +
     1.8  if not member then
     1.9    local member_id = param.get("member_id", atom.integer)
    1.10    if member_id then
    1.11 @@ -70,12 +72,18 @@
    1.12  
    1.13        end
    1.14      }
    1.15 -
    1.16 -    if member.ident_number then
    1.17 -      ui.field.text{    label = _"Ident number", name = "ident_number" }
    1.18 +    
    1.19 +    if member.identification then
    1.20 +      ui.field.text{    label = _"Identification", name = "identification" }
    1.21      end
    1.22 -    ui.field.text{ label = _"Name", name = "name" }
    1.23 -
    1.24 +    if member.name then
    1.25 +      ui.field.text{ label = _"Screen name", name = "name" }
    1.26 +    end
    1.27 +    if include_private_data and member.login then
    1.28 +      ui.field.text{    label = _"Login name", name = "login" }
    1.29 +      ui.field.text{    label = _"Notification email", name = "notify_email" }
    1.30 +    end
    1.31 +    
    1.32      if member.realname and #member.realname > 0 then
    1.33        ui.field.text{ label = _"Real name", name = "realname" }
    1.34      end
    1.35 @@ -128,8 +136,16 @@
    1.36      end
    1.37      if member.external_posts and #member.external_posts > 0 then
    1.38        ui.field.text{ label = _"Posts", name = "external_posts", multiline = true }
    1.39 +    end    
    1.40 +    if member.admin then
    1.41 +      ui.field.boolean{ label = _"Admin?",       name = "admin" }
    1.42      end
    1.43 -    slot.put('<br style="clear: right;" />')
    1.44 +    if member.locked then
    1.45 +      ui.field.boolean{ label = _"Locked?",      name = "locked" }
    1.46 +    end
    1.47 +    if member.last_activity then
    1.48 +      ui.field.text{ label = _"Last activity (updated daily)", value = format.date(member.last_activity) or _"not yet" }
    1.49 +    end
    1.50  
    1.51      if member.statement and #member.statement > 0 then
    1.52        ui.container{
    1.53 @@ -139,14 +155,5 @@
    1.54          end
    1.55        }
    1.56      end
    1.57 -    
    1.58 -    if member.admin then
    1.59 -      ui.field.boolean{ label = _"Admin?",       name = "admin" }
    1.60 -    end
    1.61 -    if member.locked then
    1.62 -      ui.field.boolean{ label = _"Locked?",      name = "locked" }
    1.63 -    end
    1.64 -    ui.field.text{ label = _"Last activity (updated daily)", value = format.date(member.last_activity) or _"not yet" }
    1.65 -    
    1.66    end
    1.67  }