# HG changeset patch
# User bsw
# Date 1340571377 -7200
# Node ID b5684668ac4b5c4c3ec7f3bbae82c01c997df1a4
# Parent  ae14bf355868dfb62ff3aba017480ad4391f520c
Fixed titles and actions in admin section

diff -r ae14bf355868 -r b5684668ac4b app/main/admin/area_show.lua
--- a/app/main/admin/area_show.lua	Sun Jun 24 22:50:40 2012 +0200
+++ b/app/main/admin/area_show.lua	Sun Jun 24 22:56:17 2012 +0200
@@ -6,17 +6,7 @@
   area.unit_id = param.get("unit_id", atom.integer)
 end
 
-slot.put_into("title", _"Create / edit area")
-
-slot.select("actions", function()
-  ui.link{
-    attr = { class = { "admin_only" } },
-    text = _"Cancel",
-    module = "admin",
-    view = "area_list",
-    params = { unit_id = area.unit_id }
-  }
-end)
+ui.title(_"Create / edit area")
 
 ui.form{
   attr = { class = "vertical" },
diff -r ae14bf355868 -r b5684668ac4b app/main/admin/member_edit.lua
--- a/app/main/admin/member_edit.lua	Sun Jun 24 22:50:40 2012 +0200
+++ b/app/main/admin/member_edit.lua	Sun Jun 24 22:56:17 2012 +0200
@@ -62,7 +62,7 @@
     
     ui.field.boolean{ 
       label = _"Member inactive?", name = "deactivate",
-      readonly = not member.active, value = member.active == false
+      readonly = member and member.active, value = member and member.active == false
     }
     
     slot.put("<br />")
diff -r ae14bf355868 -r b5684668ac4b app/main/admin/member_list.lua
--- a/app/main/admin/member_list.lua	Sun Jun 24 22:50:40 2012 +0200
+++ b/app/main/admin/member_list.lua	Sun Jun 24 22:56:17 2012 +0200
@@ -2,17 +2,13 @@
 
 ui.title(_"Member list")
 
-slot.select("head", function()
-  ui.container{ attr = { class = "content" }, content = function()
-    ui.container{ attr = { class = "actions" }, content = function()
-      ui.link{
-        attr = { class = { "admin_only" } },
-        text = _"Register new member",
-        module = "admin",
-        view = "member_edit"
-      }
-    end }
-  end }
+ui.actions(function()
+  ui.link{
+    attr = { class = { "admin_only" } },
+    text = _"Register new member",
+    module = "admin",
+    view = "member_edit"
+  }
 end)
 
 
diff -r ae14bf355868 -r b5684668ac4b app/main/admin/policy_list.lua
--- a/app/main/admin/policy_list.lua	Sun Jun 24 22:50:40 2012 +0200
+++ b/app/main/admin/policy_list.lua	Sun Jun 24 22:56:17 2012 +0200
@@ -3,14 +3,13 @@
 local policies = Policy:build_selector{ active = not show_not_in_use }:exec()
 
 
-slot.put_into("title", _"Policy list")
+ui.title(_"Policy list")
 
 
-slot.select("actions", function()
+ui.actions(function()
 
   if show_not_in_use then
     ui.link{
-      attr = { class = { "admin_only" } },
       text = _"Show policies in use",
       module = "admin",
       view = "policy_list"
@@ -18,13 +17,12 @@
 
   else
     ui.link{
-      attr = { class = { "admin_only" } },
       text = _"Create new policy",
       module = "admin",
       view = "policy_show"
     }
+    slot.put(" &middot; ")
     ui.link{
-      attr = { class = { "admin_only" } },
       text = _"Show policies not in use",
       module = "admin",
       view = "policy_list",
@@ -44,7 +42,6 @@
 
     { content = function(record)
         ui.link{
-          attr = { class = { "action admin_only" } },
           text = _"Edit",
           module = "admin",
           view = "policy_show",
diff -r ae14bf355868 -r b5684668ac4b app/main/admin/policy_show.lua
--- a/app/main/admin/policy_show.lua	Sun Jun 24 22:50:40 2012 +0200
+++ b/app/main/admin/policy_show.lua	Sun Jun 24 22:56:17 2012 +0200
@@ -1,18 +1,6 @@
 local policy = Policy:by_id(param.get_id()) or Policy:new()
 
-
-slot.put_into("title", _"Create / edit policy")
-
-
-slot.select("actions", function()
-  ui.link{
-    attr = { class = { "admin_only" } },
-    text = _"Cancel",
-    module = "admin",
-    view = "policy_list"
-  }
-end)
-
+ui.title(_"Create / edit policy")
 
 ui.form{
   attr = { class = "vertical" },
diff -r ae14bf355868 -r b5684668ac4b app/main/admin/unit_edit.lua
--- a/app/main/admin/unit_edit.lua	Sun Jun 24 22:50:40 2012 +0200
+++ b/app/main/admin/unit_edit.lua	Sun Jun 24 22:56:17 2012 +0200
@@ -3,9 +3,9 @@
 local unit = Unit:by_id(id)
 
 if unit then
-  slot.put_into("title", encode.html(_("Unit: '#{name}'", { name = unit.name })))
+  ui.title(_("Unit: '#{name}'", { name = unit.name }))
 else
-  slot.put_into("title", encode.html(_"Add new unit"))
+  ui.title(_"Add new unit")
 end
 
 local units = {
diff -r ae14bf355868 -r b5684668ac4b app/main/policy/list.lua
--- a/app/main/policy/list.lua	Sun Jun 24 22:50:40 2012 +0200
+++ b/app/main/policy/list.lua	Sun Jun 24 22:56:17 2012 +0200
@@ -1,4 +1,4 @@
-slot.put_into("title", _"Policies")
+ui.title(_"Policies")
 
 util.help("policy.list", _"Policies")
 local policies = Policy:new_selector()