1.1 --- a/app/main/admin/_action/member_update.lua	Tue Dec 27 03:34:35 2011 +0100
     1.2 +++ b/app/main/admin/_action/member_update.lua	Mon Jan 09 20:03:48 2012 +0100
     1.3 @@ -1,6 +1,6 @@
     1.4  local member = Member:by_id(param.get_id()) or Member:new()
     1.5  
     1.6 -param.update(member, "login", "admin", "name", "active")
     1.7 +param.update(member, "identification", "login", "admin", "name", "active")
     1.8  
     1.9  local password = param.get("password")
    1.10  if password == "********" or #password == 0 then

     2.1 --- a/app/main/admin/member_edit.lua	Tue Dec 27 03:34:35 2011 +0100
     2.2 +++ b/app/main/admin/member_edit.lua	Mon Jan 09 20:03:48 2012 +0100
     2.3 @@ -23,11 +23,12 @@
     2.4      }
     2.5    },
     2.6    content = function()
     2.7 -    ui.field.text{     label = _"Login",        name = "login" }
     2.8 -    ui.field.text{     label = _"Name",         name = "name" }
     2.9 -    ui.field.password{ label = _"Password",     name = "password", value = (member and member.password) and "********" or "" }
    2.10 -    ui.field.boolean{  label = _"Admin?",       name = "admin" }
    2.11 -    ui.field.boolean{  label = _"Active?",      name = "active" }
    2.12 +    ui.field.text{     label = _"Identification", name = "identification" }
    2.13 +    ui.field.text{     label = _"Login",          name = "login" }
    2.14 +    ui.field.text{     label = _"Name",           name = "name" }
    2.15 +    ui.field.password{ label = _"Password",       name = "password", value = (member and member.password) and "********" or "" }
    2.16 +    ui.field.boolean{  label = _"Active?",        name = "active" }
    2.17 +    ui.field.boolean{  label = _"Admin?",         name = "admin" }
    2.18      ui.submit{         text  = _"Save" }
    2.19    end
    2.20  }

     3.1 --- a/app/main/admin/member_list.lua	Tue Dec 27 03:34:35 2011 +0100
     3.2 +++ b/app/main/admin/member_list.lua	Mon Jan 09 20:03:48 2012 +0100
     3.3 @@ -58,8 +58,8 @@
     3.4            end
     3.5          },
     3.6          {
     3.7 -          label = _"Ident number",
     3.8 -          name = "ident_number"
     3.9 +          label = _"Identification",
    3.10 +          name = "identification"
    3.11          },
    3.12          {
    3.13            label = _"Admin?",

     4.1 --- a/app/main/member/_profile.lua	Tue Dec 27 03:34:35 2011 +0100
     4.2 +++ b/app/main/member/_profile.lua	Mon Jan 09 20:03:48 2012 +0100
     4.3 @@ -42,8 +42,8 @@
     4.4      if member.locked then
     4.5        ui.field.boolean{ label = _"Locked?",      name = "locked" }
     4.6      end
     4.7 -    if member.ident_number then
     4.8 -      ui.field.text{    label = _"Ident number", name = "ident_number" }
     4.9 +    if member.identification then
    4.10 +      ui.field.text{    label = _"Identification", name = "identification" }
    4.11      end
    4.12      ui.field.text{ label = _"Name", name = "name" }
    4.13