# HG changeset patch
# User bsw
# Date 1539877209 -7200
# Node ID 9a01089a670391e8962f168bda2511911f299d31
# Parent  29fc1f7e7880dc5fb36338861d3abc0d45d842cf
New layout for admin unit and area view

diff -r 29fc1f7e7880 -r 9a01089a6703 app/main/admin/area_show.lua
--- a/app/main/admin/area_show.lua	Thu Oct 18 17:38:36 2018 +0200
+++ b/app/main/admin/area_show.lua	Thu Oct 18 17:40:09 2018 +0200
@@ -10,70 +10,82 @@
 
 ui.titleAdmin(_"area")
 
-ui.form{
-  attr = { class = "vertical section" },
-  record = area,
-  module = "admin",
-  action = "area_update",
-  routing = {
-    ok = {
-      mode = "redirect",
-      module = "admin",
-      view = "index",
-      params = { unit_id = area.unit_id }
-    },
-  },
-  id = id,
-  content = function()
-    local policies = Policy:build_selector{ active = true }:exec()
-    local def_policy = {
-      {
-        id = "-1",
-        name = _"No default"
-      }
-    }
-    for i, record in ipairs(policies) do
-      def_policy[#def_policy+1] = record
-    end
+ui.grid{ content = function()
+
+  ui.cell_main{ content = function()
+    ui.container{ attr = { class = "mdl-card mdl-card__fullwidth mdl-shadow--2dp" }, 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 = _"Member list" }
+      end }
+      ui.container{ attr = { class = "mdl-card__content" }, content = function()
+        ui.form{
+          attr = { class = "vertical section" },
+          record = area,
+          module = "admin",
+          action = "area_update",
+          routing = {
+            ok = {
+              mode = "redirect",
+              module = "admin",
+              view = "index",
+              params = { unit_id = area.unit_id }
+            },
+          },
+          id = id,
+          content = function()
+            local policies = Policy:build_selector{ active = true }:exec()
+            local def_policy = {
+              {
+                id = "-1",
+                name = _"No default"
+              }
+            }
+            for i, record in ipairs(policies) do
+              def_policy[#def_policy+1] = record
+            end
 
-    
-    ui.section( function()
-      ui.sectionHead( function()
-        ui.heading { level = 1, content = area.name or _"New area" }
-      end )
-    
-      ui.sectionRow( function()
-        
-        ui.field.hidden{ name = "unit_id", value = area.unit_id }
-        ui.field.text{    label = _"Unit", value = area.unit.name, readonly = true }
-        ui.field.text{    label = _"Name",        name = "name" }
-        ui.field.text{    label = _"Description", name = "description", multiline = true }
-        ui.field.text{    label = _"External reference", name = "external_reference" }
-        ui.field.select{  label = _"Default Policy",   name = "default_policy",
-                    value=area.default_policy and area.default_policy.id or "-1",
-                    foreign_records = def_policy,
-                    foreign_id      = "id",
-                    foreign_name    = "name"
+            
+            ui.section( function()
+              ui.sectionHead( function()
+                ui.heading { level = 1, content = area.name or _"New area" }
+              end )
+            
+              ui.sectionRow( function()
+                
+                ui.field.hidden{ name = "unit_id", value = area.unit_id }
+                ui.field.text{    label = _"Unit", value = area.unit.name, readonly = true }
+                ui.field.text{    label = _"Name",        name = "name" }
+                ui.field.text{    label = _"Description", name = "description", multiline = true }
+                ui.field.text{    label = _"External reference", name = "external_reference" }
+                ui.field.select{  label = _"Default Policy",   name = "default_policy",
+                            value=area.default_policy and area.default_policy.id or "-1",
+                            foreign_records = def_policy,
+                            foreign_id      = "id",
+                            foreign_name    = "name"
+                }
+                ui.heading { level = 3, content = _"Allowed policies" }
+                ui.multiselect{   name = "allowed_policies[]",
+                                  foreign_records = policies,
+                                  foreign_id      = "id",
+                                  foreign_name    = "name",
+                                  connecting_records = area.allowed_policies or {},
+                                  foreign_reference  = "id",
+                }
+                ui.field.text{    label = _"Admission quorum standard", name = "quorum_standard", value = hint and 10 or nil }
+                ui.field.text{    label = _"Admission quorum issues", name = "quorum_issues", value = hint and 10 or nil }
+                ui.field.text{    label = _"Admission quorum time", name = "quorum_time", value = hint and "60 days" or nil }
+                ui.field.text{    label = _"Admission quorum exponent", name = "quorum_exponent", value = hint and 0.5 or nil }
+                ui.field.text{    label = _"Admission qourum factor", name = "quorum_factor", value = hint and 2 or nil }
+                slot.put("<br /><br />")
+                ui.field.boolean{ label = _"Active?",     name = "active", value = hint and true or nil }
+                ui.submit{ text = _"update area" }
+                slot.put(" ")
+                ui.link{ module = "admin", view = "index", content = _"cancel" }
+              end )
+            end )
+          end
         }
-        ui.heading { level = 3, content = _"Allowed policies" }
-        ui.multiselect{   name = "allowed_policies[]",
-                          foreign_records = policies,
-                          foreign_id      = "id",
-                          foreign_name    = "name",
-                          connecting_records = area.allowed_policies or {},
-                          foreign_reference  = "id",
-        }
-        ui.field.text{    label = _"Admission quorum standard", name = "quorum_standard", value = hint and 10 or nil }
-        ui.field.text{    label = _"Admission quorum issues", name = "quorum_issues", value = hint and 10 or nil }
-        ui.field.text{    label = _"Admission quorum time", name = "quorum_time", value = hint and "60 days" or nil }
-        ui.field.text{    label = _"Admission quorum exponent", name = "quorum_exponent", value = hint and 0.5 or nil }
-        ui.field.text{    label = _"Admission qourum factor", name = "quorum_factor", value = hint and 2 or nil }
-        slot.put("<br /><br />")
-        ui.field.boolean{ label = _"Active?",     name = "active", value = hint and true or nil }
-        ui.submit{ text = _"update area" }
-        slot.put(" ")
-        ui.link{ module = "admin", view = "index", content = _"cancel" }
-      end )
-    end )
-  end
-}
+      end }
+    end }
+  end }
+end }
diff -r 29fc1f7e7880 -r 9a01089a6703 app/main/admin/unit_edit.lua
--- a/app/main/admin/unit_edit.lua	Thu Oct 18 17:38:36 2018 +0200
+++ b/app/main/admin/unit_edit.lua	Thu Oct 18 17:40:09 2018 +0200
@@ -14,40 +14,52 @@
   units[#units+1] = { id = unit.id, name = unit.name }
 end
 
-ui.form{
-  attr = { class = "vertical section" },
-  module = "admin",
-  action = "unit_update",
-  id = unit and unit.id,
-  record = unit,
-  routing = {
-    default = {
-      mode = "redirect",
-      modules = "admin",
-      view = "index"
-    }
-  },
-  content = function()
-    ui.sectionHead( function()
-      ui.heading { level = 1, content = unit and unit.name or _"New organizational unit" }
-    end )
-    ui.sectionRow( function()
-      ui.field.select{
-        label = _"Parent unit",
-        name = "parent_id",
-        foreign_records = units,
-        foreign_id      = "id",
-        foreign_name    = "name"
-      }
-      ui.field.text{     label = _"Name",         name = "name" }
-      ui.field.text{     label = _"Description",  name = "description", multiline = true }
-      ui.field.text{     label = _"External reference",  name = "external_reference" }
-      ui.field.boolean{  label = _"Active?",      name = "active", value = hint and true or nil }
+ui.grid{ content = function()
 
-      slot.put("<br />")
-      ui.submit{         text  = _"update unit" }
-      slot.put(" ")
-      ui.link{ module = "admin", view = "index", content = _"cancel" }
-    end )
-  end
-}
+  ui.cell_main{ content = function()
+    ui.container{ attr = { class = "mdl-card mdl-card__fullwidth mdl-shadow--2dp" }, 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 = _"Member list" }
+      end }
+      ui.container{ attr = { class = "mdl-card__content" }, content = function()
+        ui.form{
+          attr = { class = "vertical section" },
+          module = "admin",
+          action = "unit_update",
+          id = unit and unit.id,
+          record = unit,
+          routing = {
+            default = {
+              mode = "redirect",
+              modules = "admin",
+              view = "index"
+            }
+          },
+          content = function()
+            ui.sectionHead( function()
+              ui.heading { level = 1, content = unit and unit.name or _"New organizational unit" }
+            end )
+            ui.sectionRow( function()
+              ui.field.select{
+                label = _"Parent unit",
+                name = "parent_id",
+                foreign_records = units,
+                foreign_id      = "id",
+                foreign_name    = "name"
+              }
+              ui.field.text{     label = _"Name",         name = "name" }
+              ui.field.text{     label = _"Description",  name = "description", multiline = true }
+              ui.field.text{     label = _"External reference",  name = "external_reference" }
+              ui.field.boolean{  label = _"Active?",      name = "active", value = hint and true or nil }
+
+              slot.put("<br />")
+              ui.submit{         text  = _"update unit" }
+              slot.put(" ")
+              ui.link{ module = "admin", view = "index", content = _"cancel" }
+            end )
+          end
+        }
+      end }
+    end }
+  end }
+end }