1.1 --- a/app/main/vote/show_incoming.lua	Mon Feb 08 00:59:11 2021 +0100
     1.2 +++ b/app/main/vote/show_incoming.lua	Mon Feb 08 01:04:25 2021 +0100
     1.3 @@ -32,55 +32,50 @@
     1.4    :add_field("delegating_voter.ownweight", "ownweight")
     1.5    :join("issue", nil, "issue.id = delegating_voter.issue_id")
     1.6  
     1.7 +execute.view{ module = "issue", view = "_head", params = { issue = issue, link_issue = true } }
     1.8 +  
     1.9  
    1.10 -execute.view{
    1.11 -  module = "issue", view = "_head", params = {
    1.12 -    issue = issue, initiative = initiative
    1.13 -  }
    1.14 -}
    1.15 -
    1.16 -execute.view{ module = "issue", view = "_sidebar_state", params = {
    1.17 -  issue = issue,
    1.18 -} }
    1.19 +ui.grid{ content = function()
    1.20 +  
    1.21 +  ui.cell_main{ content = function()
    1.22  
    1.23 -execute.view { 
    1.24 -  module = "issue", view = "_sidebar_issue", params = {
    1.25 -    issue = issue,
    1.26 -    highlight_initiative_id = initiative and initiative.id or nil,
    1.27 -  }
    1.28 -}
    1.29 +    ui.container { attr = { class = "mdl-card mdl-shadow--2dp mdl-card__fullwidth" }, content = function()
    1.30 +      ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function()
    1.31 +        ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = _("Incoming delegations for '#{member}'", { member = member.name }) }
    1.32 +      end }
    1.33 +      ui.container{ attr = { class = "mdl-card__content" }, content = function()
    1.34 +        execute.view{
    1.35 +          module = "member",
    1.36 +          view = "_list",
    1.37 +          params = { 
    1.38 +            members_selector = members_selector,
    1.39 +            issue = issue,
    1.40 +            trustee = member
    1.41 +            initiative = initiative,
    1.42 +            for_votes = true, no_filter = true,
    1.43 +          }
    1.44 +        }
    1.45 +      end }
    1.46 +    end }
    1.47 +  end }
    1.48 +  
    1.49 +  ui.cell_sidebar{ content = function()
    1.50 +    execute.view {
    1.51 +      module = "issue", view = "_sidebar", 
    1.52 +      params = {
    1.53 +        issue = issue,
    1.54 +        member = app.session.member
    1.55 +      }
    1.56 +    }
    1.57  
    1.58 -execute.view { 
    1.59 -  module = "issue", view = "_sidebar_whatcanido", params = {
    1.60 -    issue = issue
    1.61 -  }
    1.62 -}
    1.63 +    execute.view { 
    1.64 +      module = "issue", view = "_sidebar_members", params = {
    1.65 +        issue = issue
    1.66 +      }
    1.67 +    }
    1.68  
    1.69 -execute.view { 
    1.70 -  module = "issue", view = "_sidebar_members", params = {
    1.71 -    issue = issue,
    1.72 -    initiative = initiative
    1.73 -  }
    1.74 -}
    1.75 +  end }
    1.76 +
    1.77 +end }
    1.78  
    1.79  
    1.80 -ui.section( function()
    1.81 -    
    1.82 -  ui.sectionHead( function()
    1.83 -    ui.heading{ level = 1, content = _("Incoming delegations for '#{member}'", { member = member.name }) }
    1.84 -  end)
    1.85 -
    1.86 -  execute.view{
    1.87 -    module = "member",
    1.88 -    view = "_list",
    1.89 -    params = {
    1.90 -      members_selector = members_selector,
    1.91 -      trustee = member,
    1.92 -      issue = issue,
    1.93 -      initiative = initiative,
    1.94 -      for_votes = true, no_filter = true,
    1.95 -      
    1.96 -    }
    1.97 -  }
    1.98 -  
    1.99 -end )