1.1 --- a/app/main/area/show.lua	Wed Nov 18 12:00:00 2009 +0100
     1.2 +++ b/app/main/area/show.lua	Mon Nov 23 12:00:00 2009 +0100
     1.3 @@ -13,19 +13,19 @@
     1.4  slot.select("actions", function()
     1.5    ui.link{
     1.6      content = function()
     1.7 -      ui.image{ static = "icons/16/folder_add.png" }
     1.8 -      slot.put(_"Create new issue")
     1.9 +      ui.image{ static = "icons/16/table_go.png" }
    1.10 +      slot.put(_"Delegate")
    1.11      end,
    1.12 -    module = "initiative",
    1.13 +    module = "delegation",
    1.14      view = "new",
    1.15      params = { area_id = area.id }
    1.16    }
    1.17    ui.link{
    1.18      content = function()
    1.19 -      ui.image{ static = "icons/16/table_go.png" }
    1.20 -      slot.put(_"Delegate")
    1.21 +      ui.image{ static = "icons/16/folder_add.png" }
    1.22 +      slot.put(_"Create new issue")
    1.23      end,
    1.24 -    module = "delegation",
    1.25 +    module = "initiative",
    1.26      view = "new",
    1.27      params = { area_id = area.id }
    1.28    }
    1.29 @@ -45,68 +45,35 @@
    1.30  
    1.31  ui.tabs{
    1.32    {
    1.33 -    name = "new",
    1.34 -    label = _"New",
    1.35 -    content = function()
    1.36 -      execute.view{
    1.37 -        module = "issue",
    1.38 -        view = "_list",
    1.39 -        params = { issues_selector = area:get_reference_selector("issues"):add_where("issue.accepted ISNULL AND issue.closed ISNULL"), for_area_list = true }
    1.40 -      }
    1.41 -    end
    1.42 -  },
    1.43 -  {
    1.44 -    name = "accepted",
    1.45 -    label = _"In discussion",
    1.46 -    content = function()
    1.47 -      execute.view{
    1.48 -        module = "issue",
    1.49 -        view = "_list",
    1.50 -        params = { issues_selector = area:get_reference_selector("issues"):add_where("issue.accepted NOTNULL AND issue.half_frozen ISNULL AND issue.closed ISNULL"), for_area_list = true }
    1.51 -      }
    1.52 -    end
    1.53 -  },
    1.54 -  {
    1.55 -    name = "half_frozen",
    1.56 -    label = _"Frozen",
    1.57 +    name = "issues",
    1.58 +    label = _"Issues",
    1.59      content = function()
    1.60        execute.view{
    1.61          module = "issue",
    1.62          view = "_list",
    1.63 -        params = { issues_selector = area:get_reference_selector("issues"):add_where("issue.half_frozen NOTNULL AND issue.closed ISNULL"), for_area_list = true }
    1.64 -      }
    1.65 -    end
    1.66 -  },
    1.67 -  {
    1.68 -    name = "frozen",
    1.69 -    label = _"Voting",
    1.70 -    content = function()
    1.71 -      execute.view{
    1.72 -        module = "issue",
    1.73 -        view = "_list",
    1.74 -        params = { issues_selector = area:get_reference_selector("issues"):add_where("issue.fully_frozen NOTNULL AND issue.closed ISNULL"), for_area_list = true }
    1.75 +        params = { issues_selector = area:get_reference_selector("issues"), for_area_list = true }
    1.76        }
    1.77      end
    1.78    },
    1.79    {
    1.80 -    name = "finished",
    1.81 -    label = _"Finished",
    1.82 +    name = "members",
    1.83 +    label = _"Members",
    1.84      content = function()
    1.85        execute.view{
    1.86 -        module = "issue",
    1.87 +        module = "member",
    1.88          view = "_list",
    1.89 -        params = { issues_selector = area:get_reference_selector("issues"):add_where("issue.closed NOTNULL AND ranks_available"), for_area_list = true }
    1.90 +        params = { members_selector = area:get_reference_selector("members") }
    1.91        }
    1.92      end
    1.93    },
    1.94    {
    1.95 -    name = "cancelled",
    1.96 -    label = _"Cancelled",
    1.97 +    name = "delegations",
    1.98 +    label = _"Delegations",
    1.99      content = function()
   1.100        execute.view{
   1.101 -        module = "issue",
   1.102 +        module = "delegation",
   1.103          view = "_list",
   1.104 -        params = { issues_selector = area:get_reference_selector("issues"):add_where("issue.closed NOTNULL AND NOT ranks_available"), for_area_list = true }
   1.105 +        params = { delegations_selector = area:get_reference_selector("delegations") }
   1.106        }
   1.107      end
   1.108    },