1.1 --- a/app/main/admin/area_show.lua	Sun Jun 24 22:50:40 2012 +0200
     1.2 +++ b/app/main/admin/area_show.lua	Sun Jun 24 22:56:17 2012 +0200
     1.3 @@ -6,17 +6,7 @@
     1.4    area.unit_id = param.get("unit_id", atom.integer)
     1.5  end
     1.6  
     1.7 -slot.put_into("title", _"Create / edit area")
     1.8 -
     1.9 -slot.select("actions", function()
    1.10 -  ui.link{
    1.11 -    attr = { class = { "admin_only" } },
    1.12 -    text = _"Cancel",
    1.13 -    module = "admin",
    1.14 -    view = "area_list",
    1.15 -    params = { unit_id = area.unit_id }
    1.16 -  }
    1.17 -end)
    1.18 +ui.title(_"Create / edit area")
    1.19  
    1.20  ui.form{
    1.21    attr = { class = "vertical" },

     2.1 --- a/app/main/admin/member_edit.lua	Sun Jun 24 22:50:40 2012 +0200
     2.2 +++ b/app/main/admin/member_edit.lua	Sun Jun 24 22:56:17 2012 +0200
     2.3 @@ -62,7 +62,7 @@
     2.4      
     2.5      ui.field.boolean{ 
     2.6        label = _"Member inactive?", name = "deactivate",
     2.7 -      readonly = not member.active, value = member.active == false
     2.8 +      readonly = member and member.active, value = member and member.active == false
     2.9      }
    2.10      
    2.11      slot.put("<br />")

     3.1 --- a/app/main/admin/member_list.lua	Sun Jun 24 22:50:40 2012 +0200
     3.2 +++ b/app/main/admin/member_list.lua	Sun Jun 24 22:56:17 2012 +0200
     3.3 @@ -2,17 +2,13 @@
     3.4  
     3.5  ui.title(_"Member list")
     3.6  
     3.7 -slot.select("head", function()
     3.8 -  ui.container{ attr = { class = "content" }, content = function()
     3.9 -    ui.container{ attr = { class = "actions" }, content = function()
    3.10 -      ui.link{
    3.11 -        attr = { class = { "admin_only" } },
    3.12 -        text = _"Register new member",
    3.13 -        module = "admin",
    3.14 -        view = "member_edit"
    3.15 -      }
    3.16 -    end }
    3.17 -  end }
    3.18 +ui.actions(function()
    3.19 +  ui.link{
    3.20 +    attr = { class = { "admin_only" } },
    3.21 +    text = _"Register new member",
    3.22 +    module = "admin",
    3.23 +    view = "member_edit"
    3.24 +  }
    3.25  end)
    3.26  
    3.27  

     4.1 --- a/app/main/admin/policy_list.lua	Sun Jun 24 22:50:40 2012 +0200
     4.2 +++ b/app/main/admin/policy_list.lua	Sun Jun 24 22:56:17 2012 +0200
     4.3 @@ -3,14 +3,13 @@
     4.4  local policies = Policy:build_selector{ active = not show_not_in_use }:exec()
     4.5  
     4.6  
     4.7 -slot.put_into("title", _"Policy list")
     4.8 +ui.title(_"Policy list")
     4.9  
    4.10  
    4.11 -slot.select("actions", function()
    4.12 +ui.actions(function()
    4.13  
    4.14    if show_not_in_use then
    4.15      ui.link{
    4.16 -      attr = { class = { "admin_only" } },
    4.17        text = _"Show policies in use",
    4.18        module = "admin",
    4.19        view = "policy_list"
    4.20 @@ -18,13 +17,12 @@
    4.21  
    4.22    else
    4.23      ui.link{
    4.24 -      attr = { class = { "admin_only" } },
    4.25        text = _"Create new policy",
    4.26        module = "admin",
    4.27        view = "policy_show"
    4.28      }
    4.29 +    slot.put(" · ")
    4.30      ui.link{
    4.31 -      attr = { class = { "admin_only" } },
    4.32        text = _"Show policies not in use",
    4.33        module = "admin",
    4.34        view = "policy_list",
    4.35 @@ -44,7 +42,6 @@
    4.36  
    4.37      { content = function(record)
    4.38          ui.link{
    4.39 -          attr = { class = { "action admin_only" } },
    4.40            text = _"Edit",
    4.41            module = "admin",
    4.42            view = "policy_show",

     5.1 --- a/app/main/admin/policy_show.lua	Sun Jun 24 22:50:40 2012 +0200
     5.2 +++ b/app/main/admin/policy_show.lua	Sun Jun 24 22:56:17 2012 +0200
     5.3 @@ -1,18 +1,6 @@
     5.4  local policy = Policy:by_id(param.get_id()) or Policy:new()
     5.5  
     5.6 -
     5.7 -slot.put_into("title", _"Create / edit policy")
     5.8 -
     5.9 -
    5.10 -slot.select("actions", function()
    5.11 -  ui.link{
    5.12 -    attr = { class = { "admin_only" } },
    5.13 -    text = _"Cancel",
    5.14 -    module = "admin",
    5.15 -    view = "policy_list"
    5.16 -  }
    5.17 -end)
    5.18 -
    5.19 +ui.title(_"Create / edit policy")
    5.20  
    5.21  ui.form{
    5.22    attr = { class = "vertical" },

     6.1 --- a/app/main/admin/unit_edit.lua	Sun Jun 24 22:50:40 2012 +0200
     6.2 +++ b/app/main/admin/unit_edit.lua	Sun Jun 24 22:56:17 2012 +0200
     6.3 @@ -3,9 +3,9 @@
     6.4  local unit = Unit:by_id(id)
     6.5  
     6.6  if unit then
     6.7 -  slot.put_into("title", encode.html(_("Unit: '#{name}'", { name = unit.name })))
     6.8 +  ui.title(_("Unit: '#{name}'", { name = unit.name }))
     6.9  else
    6.10 -  slot.put_into("title", encode.html(_"Add new unit"))
    6.11 +  ui.title(_"Add new unit")
    6.12  end
    6.13  
    6.14  local units = {

     7.1 --- a/app/main/policy/list.lua	Sun Jun 24 22:50:40 2012 +0200
     7.2 +++ b/app/main/policy/list.lua	Sun Jun 24 22:56:17 2012 +0200
     7.3 @@ -1,4 +1,4 @@
     7.4 -slot.put_into("title", _"Policies")
     7.5 +ui.title(_"Policies")
     7.6  
     7.7  util.help("policy.list", _"Policies")
     7.8  local policies = Policy:new_selector()