1.1 --- a/app/main/admin/member_edit.lua	Thu Jul 10 01:02:43 2014 +0200
     1.2 +++ b/app/main/admin/member_edit.lua	Thu Jul 10 01:19:48 2014 +0200
     1.3 @@ -2,11 +2,7 @@
     1.4  
     1.5  local member = Member:by_id(id)
     1.6  
     1.7 -if member then
     1.8 -  ui.title(_("Member: '#{identification}' (#{name})", { identification = member.identification, name = member.name }))
     1.9 -else
    1.10 -  ui.title(_"Register new member")
    1.11 -end
    1.12 +ui.title(_"member")
    1.13  
    1.14  local units_selector = Unit:new_selector()
    1.15    
    1.16 @@ -19,7 +15,7 @@
    1.17  local units = units_selector:exec()
    1.18    
    1.19  ui.form{
    1.20 -  attr = { class = "vertical" },
    1.21 +  attr = { class = "vertical section" },
    1.22    module = "admin",
    1.23    action = "member_update",
    1.24    id = member and member.id,
    1.25 @@ -29,43 +25,54 @@
    1.26      default = {
    1.27        mode = "redirect",
    1.28        modules = "admin",
    1.29 -      view = "member_list"
    1.30 +      view = "index"
    1.31      }
    1.32    },
    1.33    content = function()
    1.34 -    ui.field.text{     label = _"Identification", name = "identification" }
    1.35 -    ui.field.text{     label = _"Notification email", name = "notify_email" }
    1.36 -    if member and member.activated then
    1.37 -      ui.field.text{     label = _"Screen name",        name = "name" }
    1.38 -      ui.field.text{     label = _"Login name",        name = "login" }
    1.39 -    end
    1.40 -    ui.field.boolean{  label = _"Admin?",       name = "admin" }
    1.41  
    1.42 -    slot.put("<br />")
    1.43 -    
    1.44 -    for i, unit in ipairs(units) do
    1.45 -      ui.field.boolean{
    1.46 -        name = "unit_" .. unit.id,
    1.47 -        label = unit.name,
    1.48 -        value = unit.voting_right
    1.49 +    ui.sectionHead( function()
    1.50 +      ui.heading { level = 1, content = member and member.name or _"New member" }
    1.51 +      if member and member.identification then
    1.52 +        ui.heading { level = 3, content = member.identification }
    1.53 +      end
    1.54 +    end )
    1.55 +  
    1.56 +    ui.sectionRow( function()
    1.57 +      ui.field.text{     label = _"Identification", name = "identification" }
    1.58 +      ui.field.text{     label = _"Notification email", name = "notify_email" }
    1.59 +      if member and member.activated then
    1.60 +        ui.field.text{     label = _"Screen name",        name = "name" }
    1.61 +        ui.field.text{     label = _"Login name",        name = "login" }
    1.62 +      end
    1.63 +      
    1.64 +      for i, unit in ipairs(units) do
    1.65 +        ui.field.boolean{
    1.66 +          name = "unit_" .. unit.id,
    1.67 +          label = unit.name,
    1.68 +          value = unit.voting_right
    1.69 +        }
    1.70 +      end
    1.71 +      slot.put("<br /><br />")
    1.72 +
    1.73 +      if not member or not member.activated then
    1.74 +        ui.field.boolean{  label = _"Send invite?",       name = "invite_member" }
    1.75 +      end
    1.76 +      
    1.77 +      if member and member.activated then
    1.78 +        ui.field.boolean{  label = _"Lock member?",       name = "locked" }
    1.79 +      end
    1.80 +      
    1.81 +      ui.field.boolean{ 
    1.82 +        label = _"Member inactive?", name = "deactivate",
    1.83 +        readonly = member and member.active, value = member and member.active == false
    1.84        }
    1.85 -    end
    1.86 -    slot.put("<br /><br />")
    1.87 -
    1.88 -    if not member or not member.activated then
    1.89 -      ui.field.boolean{  label = _"Send invite?",       name = "invite_member" }
    1.90 -    end
    1.91 -    
    1.92 -    if member and member.activated then
    1.93 -      ui.field.boolean{  label = _"Lock member?",       name = "locked" }
    1.94 -    end
    1.95 -    
    1.96 -    ui.field.boolean{ 
    1.97 -      label = _"Member inactive?", name = "deactivate",
    1.98 -      readonly = member and member.active, value = member and member.active == false
    1.99 -    }
   1.100 -    
   1.101 -    slot.put("<br />")
   1.102 -    ui.submit{         text  = _"Save" }
   1.103 +      
   1.104 +      slot.put("<br />")
   1.105 +      ui.field.boolean{  label = _"Admin?",       name = "admin" }
   1.106 +      slot.put("<br />")
   1.107 +      ui.submit{         text  = _"update member" }
   1.108 +      slot.put(" ")
   1.109 +      ui.link { module = "admin", view = "index", content = _"cancel" }
   1.110 +    end )
   1.111    end
   1.112  }