# HG changeset patch
# User bsw
# Date 1612186367 -3600
# Node ID a3a7120a67be417be09de7444caa6be8a2192976
# Parent  7da942c0ed5da02700e05430f3c2736449a0f4b8
Show unit and area head in sidebar

diff -r 7da942c0ed5d -r a3a7120a67be app/main/area/_head.lua
--- a/app/main/area/_head.lua	Mon Feb 01 12:58:17 2021 +0100
+++ b/app/main/area/_head.lua	Mon Feb 01 14:32:47 2021 +0100
@@ -1,5 +1,4 @@
 local area = param.get("area", "table")
-local member = param.get("member", "table")
 
 ui.title ( function ()
 
@@ -10,30 +9,13 @@
       ui.tag{ attr = { class = "name" }, content = area.unit.name }
     end,
     module = "index", view = "index",
-    unit = area.unit_id
+    params = { unit = area.unit_id }
   }
 
   ui.tag { attr = { class = "spacer" }, content = function()
     slot.put ( " » " )
   end }
 
-  ui.tag { attr = { class = "area" }, content = function()
-    -- area link
-    ui.link {
-      content = function()
-        ui.tag{ attr = { class = "name" }, content = area.name }
-      end,
-      module = "index", view = "index",
-      params = { unit = area.unit_id, area = area.id }
-    }
-    
-    slot.put ( " " )
-
-    execute.view {
-      module = "delegation", view = "_info", params = { 
-        area = area, member = member, for_title = true
-      }
-    }
-  end }
+  ui.tag{ content = area.name }
   
 end )
diff -r 7da942c0ed5d -r a3a7120a67be app/main/index/_head.lua
--- a/app/main/index/_head.lua	Mon Feb 01 12:58:17 2021 +0100
+++ b/app/main/index/_head.lua	Mon Feb 01 14:32:47 2021 +0100
@@ -1,5 +1,13 @@
 local unit_id = config.single_unit_id or request.get_param{ name = "unit" }
 local area_id = config.single_area_id or request.get_param{ name = "area" }
+
+local initiative = param.get("initiative", "table")
+local issue = param.get("issue", "table")
+if issue then
+  area_id = issue.area_id
+  unit_id = issue.area.unit_id
+end
+
 if unit_id == "all" then
   unit_id = nil 
   area_id = nil
diff -r 7da942c0ed5d -r a3a7120a67be app/main/index/index.lua
--- a/app/main/index/index.lua	Mon Feb 01 12:58:17 2021 +0100
+++ b/app/main/index/index.lua	Mon Feb 01 14:32:47 2021 +0100
@@ -25,6 +25,7 @@
     request.set_status("404 Not Found")
     return
   end
+  unit:load_delegation_info_once_for_member_id(app.session.member_id)
 end
 
 
@@ -35,17 +36,27 @@
     request.set_status("404 Not Found")
     return
   end
+  area:load_delegation_info_once_for_member_id(app.session.member_id)
 end
 
+if area then
+  execute.view{ module = "area", view = "_head", params = { area = area } }
+elseif unit then
+  execute.view{ module = "unit", view = "_head", params = { unit = unit } }
+end
+
+
 ui.grid{ content = function()
   ui.cell_main{ content = function()
 
     execute.view{ module = "index", view = "_sidebar_motd_public" }
-    
+
     execute.view{ module = "issue", view = "_list" }
   end }
 
   ui.cell_sidebar{ content = function()
+    execute.view{ module = "index", view = "_head" }
+    
     execute.view{ module = "index", view = "_sidebar_motd" }
     if app.session.member then
       execute.view{ module = "index", view = "_sidebar_notifications" }
diff -r 7da942c0ed5d -r a3a7120a67be app/main/initiative/show.lua
--- a/app/main/initiative/show.lua	Mon Feb 01 12:58:17 2021 +0100
+++ b/app/main/initiative/show.lua	Mon Feb 01 14:32:47 2021 +0100
@@ -202,6 +202,9 @@
     if config.logo then
       config.logo()
     end
+    execute.view{ module = "index", view = "_head", params = {
+      issue = initiative.issue, initiative = initiative
+    } }
     execute.view {
       module = "issue", view = "_sidebar", 
       params = {
diff -r 7da942c0ed5d -r a3a7120a67be app/main/issue/_list.lua
--- a/app/main/issue/_list.lua	Mon Feb 01 12:58:17 2021 +0100
+++ b/app/main/issue/_list.lua	Mon Feb 01 14:32:47 2021 +0100
@@ -386,7 +386,6 @@
 if mode == "timeline" then
   --dotabs()
   filters.content = function()
-    execute.view{ module = "index", view = "_head" }
     doit()
   end
 else
@@ -405,7 +404,7 @@
       selector:add_order_by ( "id" )
     end
     if not search then
-      execute.view{ module = "index", view = "_head" }
+--      execute.view{ module = "index", view = "_head" }
     end
     ui.paginate{
       selector = selector,
diff -r 7da942c0ed5d -r a3a7120a67be app/main/issue/show.lua
--- a/app/main/issue/show.lua	Mon Feb 01 12:58:17 2021 +0100
+++ b/app/main/issue/show.lua	Mon Feb 01 14:32:47 2021 +0100
@@ -108,6 +108,9 @@
     if config.logo then
       config.logo()
     end
+    
+    execute.view{ module = "index", view = "_head", params = { issue = issue } }
+
     execute.view {
       module = "issue", view = "_sidebar", 
       params = {
diff -r 7da942c0ed5d -r a3a7120a67be app/main/unit/_head.lua
--- a/app/main/unit/_head.lua	Mon Feb 01 12:58:17 2021 +0100
+++ b/app/main/unit/_head.lua	Mon Feb 01 14:32:47 2021 +0100
@@ -2,31 +2,6 @@
 
 ui.title ( function ()
 
-  ui.tag{ attr = { class = "unit" }, content = function()
-    -- unit link
-    ui.link {
-      attr = { class = "unit" },
-      content = function()
-        ui.tag{ attr = { class = "name" }, content = unit.name }
-      end,
-      module = "unit", view = "show",
-      id = unit.id
-    }
-
-    execute.view {
-      module = "delegation", view = "_info", params = { 
-        unit = unit, member = member
-      }
-    }
-
-    if config.single_unit_id and not app.session.member_id and config.motd_public then
-      ui.container{
-        attr = { class = "wiki motd" },
-        content = function()
-          slot.put(config.motd_public)
-        end
-      }
-    end
-  end }
+  ui.tag{ content = unit.name }
   
 end )