1.1 --- a/app/main/area/show.lua	Thu Jun 23 03:30:57 2016 +0200
     1.2 +++ b/app/main/area/show.lua	Sun Jul 15 14:07:29 2018 +0200
     1.3 @@ -6,59 +6,68 @@
     1.4    return
     1.5  end
     1.6  
     1.7 +app.current_area = area
     1.8 +
     1.9 +
    1.10  area:load_delegation_info_once_for_member_id(app.session.member_id)
    1.11  
    1.12  app.html_title.title = area.name
    1.13  app.html_title.subtitle = _("Area")
    1.14  
    1.15 -execute.view {
    1.16 -  module = "area", view = "_head", params = {
    1.17 -    area = area, member = app.session.member
    1.18 -  }
    1.19 -}
    1.20 +ui.container{ attr = { class = "mdl-grid" }, content = function()
    1.21 +  ui.container{ attr = { class = "mdl-cell mdl-cell--12-col" }, content = function()
    1.22 +    ui.heading{ content = area.unit.name .. " / " .. area.name }
    1.23  
    1.24 -execute.view {
    1.25 -  module = "area", view = "_sidebar_whatcanido", params = {
    1.26 -    area = area
    1.27 -  }
    1.28 -}
    1.29 +    execute.view {
    1.30 +      module = "area", view = "_head", params = {
    1.31 +        area = area, member = app.session.member
    1.32 +      }
    1.33 +    }
    1.34 +
    1.35 +    execute.view {
    1.36 +      module = "area", view = "_sidebar_whatcanido", params = {
    1.37 +        area = area
    1.38 +      }
    1.39 +    }
    1.40  
    1.41 -execute.view {
    1.42 -  module = "area", view = "_sidebar_members", params = {
    1.43 -    area = area
    1.44 -  }
    1.45 -}
    1.46 +    execute.view {
    1.47 +      module = "area", view = "_sidebar_members", params = {
    1.48 +        area = area
    1.49 +      }
    1.50 +    }
    1.51  
    1.52 -local function getOpenIssuesSelector()
    1.53 -  return area:get_reference_selector("issues")
    1.54 -    :add_order_by("coalesce(issue.fully_frozen + issue.voting_time, issue.half_frozen + issue.verification_time, issue.accepted + issue.discussion_time, issue.created + issue.max_admission_time) - now()")
    1.55 -end
    1.56 +    local function getOpenIssuesSelector()
    1.57 +      return area:get_reference_selector("issues")
    1.58 +        :add_order_by("coalesce(issue.fully_frozen + issue.voting_time, issue.half_frozen + issue.verification_time, issue.accepted + issue.discussion_time, issue.created + issue.max_admission_time) - now()")
    1.59 +    end
    1.60  
    1.61 -local admission_selector = getOpenIssuesSelector()
    1.62 -  :add_where("issue.state = 'admission'");
    1.63 +    local admission_selector = getOpenIssuesSelector()
    1.64 +      :add_where("issue.state = 'admission'");
    1.65  
    1.66 -local discussion_selector = getOpenIssuesSelector()
    1.67 -  :add_where("issue.state = 'discussion'");
    1.68 +    local discussion_selector = getOpenIssuesSelector()
    1.69 +      :add_where("issue.state = 'discussion'");
    1.70  
    1.71 -local verification_selector = getOpenIssuesSelector()
    1.72 -  :add_where("issue.state = 'verification'");
    1.73 +    local verification_selector = getOpenIssuesSelector()
    1.74 +      :add_where("issue.state = 'verification'");
    1.75  
    1.76 -local voting_selector = getOpenIssuesSelector()
    1.77 -  :add_where("issue.state = 'voting'");
    1.78 +    local voting_selector = getOpenIssuesSelector()
    1.79 +      :add_where("issue.state = 'voting'");
    1.80  
    1.81  
    1.82 -local closed_selector = area:get_reference_selector("issues")
    1.83 -  :add_where("issue.closed NOTNULL")
    1.84 -  :add_order_by("issue.closed DESC")
    1.85 +    local closed_selector = area:get_reference_selector("issues")
    1.86 +      :add_where("issue.closed NOTNULL")
    1.87 +      :add_order_by("issue.closed DESC")
    1.88  
    1.89 -local members_selector = area:get_reference_selector("members"):add_where("member.active")
    1.90 -local delegations_selector = area:get_reference_selector("delegations")
    1.91 -  :join("member", "truster", "truster.id = delegation.truster_id AND truster.active")
    1.92 -  :join("member", "trustee", "trustee.id = delegation.trustee_id AND trustee.active")
    1.93 +    local members_selector = area:get_reference_selector("members"):add_where("member.active")
    1.94 +    local delegations_selector = area:get_reference_selector("delegations")
    1.95 +      :join("member", "truster", "truster.id = delegation.truster_id AND truster.active")
    1.96 +      :join("member", "trustee", "trustee.id = delegation.trustee_id AND trustee.active")
    1.97  
    1.98  
    1.99 -execute.view {
   1.100 -  module = "issue",
   1.101 -  view = "_list2",
   1.102 -  params = { for_area = area }
   1.103 -}
   1.104 +    execute.view {
   1.105 +      module = "issue",
   1.106 +      view = "_list",
   1.107 +      params = { for_area = area }
   1.108 +    }
   1.109 +  end }
   1.110 +end }