1.1 --- a/app/main/admin/unit_edit.lua	Thu Jul 10 01:02:43 2014 +0200
     1.2 +++ b/app/main/admin/unit_edit.lua	Thu Jul 10 01:19:48 2014 +0200
     1.3 @@ -3,9 +3,7 @@
     1.4  local unit = Unit:by_id(id)
     1.5  
     1.6  if unit then
     1.7 -  ui.title(_("Unit: '#{name}'", { name = unit.name }))
     1.8 -else
     1.9 -  ui.title(_"Add new unit")
    1.10 +  ui.titleAdmin(_"Organizational unit")
    1.11  end
    1.12  
    1.13  local units = {
    1.14 @@ -17,7 +15,7 @@
    1.15  end
    1.16  
    1.17  ui.form{
    1.18 -  attr = { class = "vertical" },
    1.19 +  attr = { class = "vertical section" },
    1.20    module = "admin",
    1.21    action = "unit_update",
    1.22    id = unit and unit.id,
    1.23 @@ -26,22 +24,29 @@
    1.24      default = {
    1.25        mode = "redirect",
    1.26        modules = "admin",
    1.27 -      view = "unit_list"
    1.28 +      view = "index"
    1.29      }
    1.30    },
    1.31    content = function()
    1.32 -    ui.field.select{
    1.33 -      label = _"Parent unit",
    1.34 -      name = "parent_id",
    1.35 -      foreign_records = units,
    1.36 -      foreign_id      = "id",
    1.37 -      foreign_name    = "name"
    1.38 -    }
    1.39 -    ui.field.text{     label = _"Name",         name = "name" }
    1.40 -    ui.field.text{     label = _"Description",  name = "description", multiline = true }
    1.41 -    ui.field.boolean{  label = _"Active?",      name = "active" }
    1.42 +    ui.sectionHead( function()
    1.43 +      ui.heading { level = 1, content = unit and unit.name or _"New organizational unit" }
    1.44 +    end )
    1.45 +    ui.sectionRow( function()
    1.46 +      ui.field.select{
    1.47 +        label = _"Parent unit",
    1.48 +        name = "parent_id",
    1.49 +        foreign_records = units,
    1.50 +        foreign_id      = "id",
    1.51 +        foreign_name    = "name"
    1.52 +      }
    1.53 +      ui.field.text{     label = _"Name",         name = "name" }
    1.54 +      ui.field.text{     label = _"Description",  name = "description", multiline = true }
    1.55 +      ui.field.boolean{  label = _"Active?",      name = "active" }
    1.56  
    1.57 -    slot.put("<br />")
    1.58 -    ui.submit{         text  = _"Save" }
    1.59 +      slot.put("<br />")
    1.60 +      ui.submit{         text  = _"update unit" }
    1.61 +      slot.put(" ")
    1.62 +      ui.link{ module = "admin", view = "index", content = _"cancel" }
    1.63 +    end )
    1.64    end
    1.65  }