1.1 --- a/app/main/admin/area_show.lua	Thu Jul 10 01:02:43 2014 +0200
     1.2 +++ b/app/main/admin/area_show.lua	Thu Jul 10 01:19:48 2014 +0200
     1.3 @@ -1,25 +1,27 @@
     1.4  local id = param.get_id()
     1.5  
     1.6 +local hint = not id
     1.7 +
     1.8  local area = Area:by_id(id) or Area:new()
     1.9  
    1.10  if not area.unit_id then
    1.11    area.unit_id = param.get("unit_id", atom.integer)
    1.12  end
    1.13  
    1.14 -ui.title(_"Create / edit area")
    1.15 +ui.titleAdmin(_"area")
    1.16  
    1.17  ui.form{
    1.18 -  attr = { class = "vertical" },
    1.19 +  attr = { class = "vertical section" },
    1.20    record = area,
    1.21    module = "admin",
    1.22    action = "area_update",
    1.23    routing = {
    1.24 -    default = {
    1.25 +    ok = {
    1.26        mode = "redirect",
    1.27        module = "admin",
    1.28 -      view = "area_list",
    1.29 +      view = "index",
    1.30        params = { unit_id = area.unit_id }
    1.31 -    }
    1.32 +    },
    1.33    },
    1.34    id = id,
    1.35    content = function()
    1.36 @@ -34,25 +36,38 @@
    1.37        def_policy[#def_policy+1] = record
    1.38      end
    1.39  
    1.40 -    ui.field.hidden{ name = "unit_id", value = area.unit_id }
    1.41 -    ui.field.text{    label = _"Unit", value = area.unit.name, readonly = true }
    1.42 -    ui.field.text{    label = _"Name",        name = "name" }
    1.43 -    ui.field.text{    label = _"Description", name = "description", multiline = true }
    1.44 -    ui.field.select{  label = _"Default Policy",   name = "default_policy",
    1.45 -                 value=area.default_policy and area.default_policy.id or "-1",
    1.46 -                 foreign_records = def_policy,
    1.47 -                 foreign_id      = "id",
    1.48 -                 foreign_name    = "name"
    1.49 -    }
    1.50 -    ui.multiselect{   label = _"Policies",    name = "allowed_policies[]",
    1.51 -                      foreign_records = policies,
    1.52 -                      foreign_id      = "id",
    1.53 -                      foreign_name    = "name",
    1.54 -                      connecting_records = area.allowed_policies or {},
    1.55 -                      foreign_reference  = "id",
    1.56 -    }
    1.57 -    slot.put("<br /><br />")
    1.58 -    ui.field.boolean{ label = _"Active?",     name = "active" }
    1.59 -    ui.submit{ text = _"Save" }
    1.60 +    
    1.61 +    ui.section( function()
    1.62 +      ui.sectionHead( function()
    1.63 +        ui.heading { level = 1, content = area.name or _"New area" }
    1.64 +      end )
    1.65 +    
    1.66 +      ui.sectionRow( function()
    1.67 +        
    1.68 +        ui.field.hidden{ name = "unit_id", value = area.unit_id }
    1.69 +        ui.field.text{    label = _"Unit", value = area.unit.name, readonly = true }
    1.70 +        ui.field.text{    label = _"Name",        name = "name" }
    1.71 +        ui.field.text{    label = _"Description", name = "description", multiline = true }
    1.72 +        ui.field.select{  label = _"Default Policy",   name = "default_policy",
    1.73 +                    value=area.default_policy and area.default_policy.id or "-1",
    1.74 +                    foreign_records = def_policy,
    1.75 +                    foreign_id      = "id",
    1.76 +                    foreign_name    = "name"
    1.77 +        }
    1.78 +        ui.heading { level = 3, content = _"Allowed policies" }
    1.79 +        ui.multiselect{   name = "allowed_policies[]",
    1.80 +                          foreign_records = policies,
    1.81 +                          foreign_id      = "id",
    1.82 +                          foreign_name    = "name",
    1.83 +                          connecting_records = area.allowed_policies or {},
    1.84 +                          foreign_reference  = "id",
    1.85 +        }
    1.86 +        slot.put("<br /><br />")
    1.87 +        ui.field.boolean{ label = _"Active?",     name = "active", value = hint and true or nil }
    1.88 +        ui.submit{ text = _"update area" }
    1.89 +        slot.put(" ")
    1.90 +        ui.link{ module = "admin", view = "index", content = _"cancel" }
    1.91 +      end )
    1.92 +    end )
    1.93    end
    1.94  }