# HG changeset patch
# User bsw
# Date 1612742665 -3600
# Node ID 181cf093becdb50aab8143e32515a4381e42c703
# Parent  94ce1cd6743548f25b25f4bd86483ae60e51021f
Reworked incoming vote delegation view

diff -r 94ce1cd67435 -r 181cf093becd app/main/vote/show_incoming.lua
--- a/app/main/vote/show_incoming.lua	Mon Feb 08 00:59:11 2021 +0100
+++ b/app/main/vote/show_incoming.lua	Mon Feb 08 01:04:25 2021 +0100
@@ -32,55 +32,50 @@
   :add_field("delegating_voter.ownweight", "ownweight")
   :join("issue", nil, "issue.id = delegating_voter.issue_id")
 
+execute.view{ module = "issue", view = "_head", params = { issue = issue, link_issue = true } }
+  
 
-execute.view{
-  module = "issue", view = "_head", params = {
-    issue = issue, initiative = initiative
-  }
-}
-
-execute.view{ module = "issue", view = "_sidebar_state", params = {
-  issue = issue,
-} }
+ui.grid{ content = function()
+  
+  ui.cell_main{ content = function()
 
-execute.view { 
-  module = "issue", view = "_sidebar_issue", params = {
-    issue = issue,
-    highlight_initiative_id = initiative and initiative.id or nil,
-  }
-}
+    ui.container { attr = { class = "mdl-card mdl-shadow--2dp mdl-card__fullwidth" }, content = function()
+      ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function()
+        ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = _("Incoming delegations for '#{member}'", { member = member.name }) }
+      end }
+      ui.container{ attr = { class = "mdl-card__content" }, content = function()
+        execute.view{
+          module = "member",
+          view = "_list",
+          params = { 
+            members_selector = members_selector,
+            issue = issue,
+            trustee = member
+            initiative = initiative,
+            for_votes = true, no_filter = true,
+          }
+        }
+      end }
+    end }
+  end }
+  
+  ui.cell_sidebar{ content = function()
+    execute.view {
+      module = "issue", view = "_sidebar", 
+      params = {
+        issue = issue,
+        member = app.session.member
+      }
+    }
 
-execute.view { 
-  module = "issue", view = "_sidebar_whatcanido", params = {
-    issue = issue
-  }
-}
+    execute.view { 
+      module = "issue", view = "_sidebar_members", params = {
+        issue = issue
+      }
+    }
 
-execute.view { 
-  module = "issue", view = "_sidebar_members", params = {
-    issue = issue,
-    initiative = initiative
-  }
-}
+  end }
+
+end }
 
 
-ui.section( function()
-    
-  ui.sectionHead( function()
-    ui.heading{ level = 1, content = _("Incoming delegations for '#{member}'", { member = member.name }) }
-  end)
-
-  execute.view{
-    module = "member",
-    view = "_list",
-    params = {
-      members_selector = members_selector,
-      trustee = member,
-      issue = issue,
-      initiative = initiative,
-      for_votes = true, no_filter = true,
-      
-    }
-  }
-  
-end )