1.1 --- a/app/main/admin/member_list.lua	Wed Jun 20 13:30:47 2012 +0200
     1.2 +++ b/app/main/admin/member_list.lua	Wed Jun 20 13:31:09 2012 +0200
     1.3 @@ -1,40 +1,63 @@
     1.4  local show_locked = param.get("show_locked", atom.boolean)
     1.5  
     1.6 -local members_selector = Member:build_selector{ 
     1.7 -  active = not show_locked,
     1.8 -  order = "login"
     1.9 +local locked = show_locked or false
    1.10 +local search = param.get("search")
    1.11 +if search then
    1.12 +  locked = nil
    1.13 +end
    1.14 +
    1.15 +local members_selector = Member:build_selector{
    1.16 +  admin_search = search,
    1.17 +  locked = locked,
    1.18 +  order = "identification"
    1.19  }
    1.20  
    1.21  
    1.22 -slot.put_into("title", _"Member list")
    1.23 +ui.title(_"Member list")
    1.24  
    1.25  
    1.26 -slot.select("actions", function()
    1.27 -  ui.link{
    1.28 -    attr = { class = { "admin_only" } },
    1.29 -    text = _"Register new member",
    1.30 -    module = "admin",
    1.31 -    view = "member_edit"
    1.32 -  }
    1.33 -  if show_locked then
    1.34 -    ui.link{
    1.35 -      attr = { class = { "admin_only" } },
    1.36 -      text = _"Show active members",
    1.37 -      module = "admin",
    1.38 -      view = "member_list"
    1.39 -    }
    1.40 -  else
    1.41 -    ui.link{
    1.42 -      attr = { class = { "admin_only" } },
    1.43 -      text = _"Show locked members",
    1.44 -      module = "admin",
    1.45 -      view = "member_list",
    1.46 -      params = { show_locked = true }
    1.47 -    }
    1.48 -  end
    1.49 +slot.select("head", function()
    1.50 +  ui.container{ attr = { class = "content" }, content = function()
    1.51 +    ui.container{ attr = { class = "actions" }, content = function()
    1.52 +      ui.link{
    1.53 +        attr = { class = { "admin_only" } },
    1.54 +        text = _"Register new member",
    1.55 +        module = "admin",
    1.56 +        view = "member_edit"
    1.57 +      }
    1.58 +      slot.put(" · ")
    1.59 +      if show_locked then
    1.60 +        ui.link{
    1.61 +          attr = { class = { "admin_only" } },
    1.62 +          text = _"Show active members",
    1.63 +          module = "admin",
    1.64 +          view = "member_list"
    1.65 +        }
    1.66 +      else
    1.67 +        ui.link{
    1.68 +          attr = { class = { "admin_only" } },
    1.69 +          text = _"Show locked members",
    1.70 +          module = "admin",
    1.71 +          view = "member_list",
    1.72 +          params = { show_locked = true }
    1.73 +        }
    1.74 +      end
    1.75 +    end }
    1.76 +  end }
    1.77  end)
    1.78  
    1.79  
    1.80 +ui.form{
    1.81 +  module = "admin", view = "member_list",
    1.82 +  content = function()
    1.83 +  
    1.84 +    ui.field.text{ label = _"Search for members", name = "search" }
    1.85 +    
    1.86 +    ui.submit{ value = _"Start search" }
    1.87 +  
    1.88 +  end
    1.89 +}
    1.90 +
    1.91  ui.paginate{
    1.92    selector = members_selector,
    1.93    per_page = 30,
    1.94 @@ -48,27 +71,29 @@
    1.95            name = "id"
    1.96          },
    1.97          {
    1.98 -          label = _"Login",
    1.99 -          name = "login"
   1.100 +          label = _"Identification",
   1.101 +          name = "identification"
   1.102          },
   1.103          {
   1.104 -          label = _"Name",
   1.105 +          label = _"Screen name",
   1.106 +          name = "name"
   1.107 +        },
   1.108 +        {
   1.109 +          label = _"Admin?",
   1.110            content = function(record)
   1.111 -            util.put_highlighted_string(record.name)
   1.112 +            if record.admin then
   1.113 +              ui.field.text{ value = "admin" }
   1.114 +            end
   1.115            end
   1.116          },
   1.117          {
   1.118 -          label = _"Ident number",
   1.119 -          name = "ident_number"
   1.120 -        },
   1.121 -        {
   1.122 -          label = _"Admin?",
   1.123 -          name = "admin"
   1.124 -        },
   1.125 -        {
   1.126            content = function(record)
   1.127 -            if not record.active then
   1.128 +            if record.locked then
   1.129                ui.field.text{ value = "locked" }
   1.130 +            elseif not record.activated then
   1.131 +              ui.field.text{ value = "not activated" }
   1.132 +            elseif not record.active then
   1.133 +              ui.field.text{ value = "inactive" }
   1.134              end
   1.135            end
   1.136          },