1.1 --- a/app/main/area/show_tab.lua	Sun Jun 24 23:27:22 2012 +0200
     1.2 +++ b/app/main/area/show_tab.lua	Sun Jun 24 23:27:40 2012 +0200
     1.3 @@ -8,7 +8,7 @@
     1.4    :add_where("issue.closed NOTNULL")
     1.5    :add_order_by("issue.closed DESC")
     1.6  
     1.7 -local members_selector = area:get_reference_selector("members")
     1.8 +local members_selector = area:get_reference_selector("members"):add_where("member.active")
     1.9  local delegations_selector = area:get_reference_selector("delegations")
    1.10  
    1.11  local tabs = {

     2.1 --- a/app/main/index/_index_member.lua	Sun Jun 24 23:27:22 2012 +0200
     2.2 +++ b/app/main/index/_index_member.lua	Sun Jun 24 23:27:40 2012 +0200
     2.3 @@ -57,7 +57,7 @@
     2.4    label = _"Members",
     2.5    module = 'member',
     2.6    view   = '_list',
     2.7 -  params = { members_selector = Member:new_selector() }
     2.8 +  params = { members_selector = Member:new_selector():add_where("active") }
     2.9  }
    2.10  
    2.11  

     3.1 --- a/app/main/index/broken_delegations.lua	Sun Jun 24 23:27:22 2012 +0200
     3.2 +++ b/app/main/index/broken_delegations.lua	Sun Jun 24 23:27:40 2012 +0200
     3.3 @@ -1,3 +1,5 @@
     3.4 +ui.title(_"Broken delegations")
     3.5 +
     3.6  execute.view{
     3.7    module = "delegation",
     3.8    view = "_list",

     4.1 --- a/app/main/index/search.lua	Sun Jun 24 23:27:22 2012 +0200
     4.2 +++ b/app/main/index/search.lua	Sun Jun 24 23:27:40 2012 +0200
     4.3 @@ -21,8 +21,7 @@
     4.4        foreign_records = {
     4.5          { id = "global", name = _"Global search" },
     4.6          { id = "member", name = _"Search for members" },
     4.7 -        { id = "issue", name = _"Search for issues" },
     4.8 -        { id = "initiative", name = _"Search for initiatives" },
     4.9 +        { id = "issue", name = _"Search for issues" }
    4.10        },
    4.11        foreign_id = "id",
    4.12        foreign_name = "name",
    4.13 @@ -45,16 +44,7 @@
    4.14      }
    4.15    end
    4.16  
    4.17 -  if search_for == "global" or search_for == "initiative" then
    4.18 -    local initiatives_selector = Initiative:get_search_selector(search_string)
    4.19 -    execute.view{
    4.20 -      module = "initiative",
    4.21 -      view = "_list",
    4.22 -      params = { initiatives_selector = initiatives_selector },
    4.23 -    }
    4.24 -  end
    4.25 -
    4.26 -  if search_for == "issue" then
    4.27 +  if search_for == "global" or search_for == "issue" then
    4.28      local issues_selector = Issue:get_search_selector(search_string)
    4.29      execute.view{
    4.30        module = "issue",

     5.1 --- a/app/main/member/_show_thumb.lua	Sun Jun 24 23:27:22 2012 +0200
     5.2 +++ b/app/main/member/_show_thumb.lua	Sun Jun 24 23:27:40 2012 +0200
     5.3 @@ -5,11 +5,11 @@
     5.4  local initiative = param.get("initiative", "table")
     5.5  local trustee = param.get("trustee", "table")
     5.6  
     5.7 -local name
     5.8 +local name_html
     5.9  if member.name_highlighted then
    5.10 -  name = encode.highlight(member.name_highlighted)
    5.11 +  name_html = encode.highlight(member.name_highlighted)
    5.12  else
    5.13 -  name = encode.html(member.name)
    5.14 +  name_html = encode.html(member.name)
    5.15  end
    5.16  
    5.17  local container_class = "member_thumb"
    5.18 @@ -171,7 +171,7 @@
    5.19          }
    5.20          ui.container{
    5.21            attr = { class = "member_name" },
    5.22 -          content = name
    5.23 +          content = function() slot.put(name_html) end
    5.24          }
    5.25        end
    5.26      }

     6.1 --- a/app/main/member/show.lua	Sun Jun 24 23:27:22 2012 +0200
     6.2 +++ b/app/main/member/show.lua	Sun Jun 24 23:27:40 2012 +0200
     6.3 @@ -45,7 +45,14 @@
     6.4        slot.put(" · ")
     6.5        ui.tag{
     6.6          attr = { class = "interest deactivated_member_info" },
     6.7 -        content = _"This member is deactivated."
     6.8 +        content = _"This member is inactive"
     6.9 +      }
    6.10 +    end
    6.11 +    if member.locked then
    6.12 +      slot.put(" · ")
    6.13 +      ui.tag{
    6.14 +        attr = { class = "interest deactivated_member_info" },
    6.15 +        content = _"This member is locked"
    6.16        }
    6.17      end
    6.18      if not (member.id == app.session.member.id) then

     7.1 --- a/model/delegation.lua	Sun Jun 24 23:27:22 2012 +0200
     7.2 +++ b/model/delegation.lua	Sun Jun 24 23:27:40 2012 +0200
     7.3 @@ -64,7 +64,8 @@
     7.4  
     7.5  function Delegation:selector_for_broken(member_id)
     7.6    return Delegation:new_selector()
     7.7 -    :join("issue", nil, "issue.id = delegation.issue_id AND issue.closed ISNULL")
     7.8 +    :left_join("issue", nil, "issue.id = delegation.issue_id")
     7.9 +    :add_where("issue.id ISNULL OR issue.closed ISNULL")
    7.10      :join("member", nil, "delegation.trustee_id = member.id")
    7.11      :add_where{"delegation.truster_id = ?", member_id}
    7.12      :add_where{"member.active = 'f' OR (member.last_activity IS NULL OR age(member.last_activity) > ?::interval)", config.delegation_warning_time }

     8.1 --- a/model/issue.lua	Sun Jun 24 23:27:22 2012 +0200
     8.2 +++ b/model/issue.lua	Sun Jun 24 23:27:40 2012 +0200
     8.3 @@ -215,8 +215,6 @@
     8.4      :add_group_by('"issue"."discussion_time"')
     8.5      :add_group_by('"issue"."verification_time"')
     8.6      :add_group_by('"issue"."voting_time"')
     8.7 -    :add_group_by('"_interest"."member_id"')
     8.8 -    :add_group_by("_delegating_interest.delegate_member_ids")
     8.9      --:set_distinct()
    8.10  end
    8.11  

     9.1 --- a/static/style.css	Sun Jun 24 23:27:22 2012 +0200
     9.2 +++ b/static/style.css	Sun Jun 24 23:27:40 2012 +0200
     9.3 @@ -412,6 +412,7 @@
     9.4  
     9.5  .page_head .unit_head .title,
     9.6  .page_head .area_head .title,
     9.7 +.area_list .area .title,
     9.8  .issue .title {
     9.9    background-color: #eee;
    9.10    background-image: linear-gradient(top, #eee 0%, #f7f7f7 10%, #fff 100%);