1.1 --- a/app/main/unit/show.lua	Thu Jul 10 01:02:43 2014 +0200
     1.2 +++ b/app/main/unit/show.lua	Thu Jul 10 01:19:48 2014 +0200
     1.3 @@ -2,19 +2,14 @@
     1.4  
     1.5  local unit = Unit:by_id(unit_id)
     1.6  
     1.7 -slot.select("head", function()
     1.8 -  execute.view{ module = "unit", view = "_head", params = { unit = unit, show_content = true, member = app.session.member } }
     1.9 -end)
    1.10 +if not unit then
    1.11 +  execute.view { module = "index", view = "404" }
    1.12 +  request.set_status("404 Not Found")
    1.13 +  return
    1.14 +end
    1.15  
    1.16 -if config.single_unit_id and not app.session.member_id and config.motd_public then
    1.17 -  local help_text = config.motd_public
    1.18 -  ui.container{
    1.19 -    attr = { class = "wiki motd" },
    1.20 -    content = function()
    1.21 -      slot.put(format.wiki_text(help_text))
    1.22 -    end
    1.23 -  }
    1.24 -end
    1.25 +
    1.26 +unit:load_delegation_info_once_for_member_id(app.session.member_id)
    1.27  
    1.28  local areas_selector = Area:build_selector{ active = true, unit_id = unit_id }
    1.29  areas_selector:add_order_by("member_weight DESC")
    1.30 @@ -43,49 +38,38 @@
    1.31    :add_where("issue.closed NOTNULL")
    1.32    :add_order_by("issue.closed DESC")
    1.33  
    1.34 -local tabs = {
    1.35 -  module = "unit",
    1.36 -  view = "show",
    1.37 -  id = unit.id
    1.38 -}
    1.39 +  
    1.40  
    1.41 -tabs[#tabs+1] = {
    1.42 -  name = "areas",
    1.43 -  label = _"Areas",
    1.44 -  module = "area",
    1.45 -  view = "_list",
    1.46 -  params = { areas_selector = areas_selector, member = app.session.member }
    1.47 -}
    1.48 +execute.view { module = "unit", view = "_head", params = { unit = unit } }
    1.49  
    1.50 -tabs[#tabs+1] = {
    1.51 -  name = "timeline",
    1.52 -  label = _"Latest events",
    1.53 -  module = "event",
    1.54 -  view = "_list",
    1.55 -  params = { for_unit = unit }
    1.56 -}
    1.57  
    1.58 -tabs[#tabs+1] = {
    1.59 -  name = "open",
    1.60 -  label = _"Open issues",
    1.61 -  module = "issue",
    1.62 -  view = "_list",
    1.63 -  params = {
    1.64 -    for_state = "open",
    1.65 -    issues_selector = open_issues_selector, for_unit = true
    1.66 -  }
    1.67 -}
    1.68 -tabs[#tabs+1] = {
    1.69 -  name = "closed",
    1.70 -  label = _"Closed issues",
    1.71 -  module = "issue",
    1.72 -  view = "_list",
    1.73 -  params = {
    1.74 -    for_state = "closed",
    1.75 -    issues_selector = closed_issues_selector, for_unit = true
    1.76 +execute.view { 
    1.77 +  module = "unit", view = "_sidebar", params = { 
    1.78 +    unit = unit
    1.79    }
    1.80  }
    1.81  
    1.82 +execute.view { 
    1.83 +  module = "unit", view = "_sidebar_whatcanido", params = { 
    1.84 +    unit = unit
    1.85 +  }
    1.86 +}
    1.87 +
    1.88 +execute.view { 
    1.89 +  module = "unit", view = "_sidebar_members", params = { 
    1.90 +    unit = unit
    1.91 +  }
    1.92 +}
    1.93 +
    1.94 +execute.view {
    1.95 +  module = "issue",
    1.96 +  view = "_list2",
    1.97 +  params = { for_unit = unit, head = function ()
    1.98 +    ui.heading { attr = { class = "left" }, level = 1, content = unit.name }
    1.99 +  end }
   1.100 +}
   1.101 +
   1.102 +--[[
   1.103  if app.session:has_access("all_pseudonymous") then
   1.104    tabs[#tabs+1] = {
   1.105      name = "eligible_voters",
   1.106 @@ -104,4 +88,6 @@
   1.107    }
   1.108  end
   1.109  
   1.110 -ui.tabs(tabs)
   1.111 \ No newline at end of file
   1.112 +ui.tabs(tabs)
   1.113 +
   1.114 +--]]
   1.115 \ No newline at end of file