# HG changeset patch # User bsw # Date 1539875475 -7200 # Node ID b86558a65a2030e59d7ae8c6378eda57b629dfa9 # Parent 627ab810458216664918d841a73d9643a6c36c77 New layout for admin index view diff -r 627ab8104582 -r b86558a65a20 app/main/admin/index.lua --- a/app/main/admin/index.lua Thu Oct 18 13:21:27 2018 +0200 +++ b/app/main/admin/index.lua Thu Oct 18 17:11:15 2018 +0200 @@ -4,122 +4,11 @@ local policies = Policy:build_selector{}:add_order_by("index"):exec() -ui.titleAdmin() - -ui.sidebar( "tab-members", function() - ui.sidebarHead( function() - ui.heading { level = 2, content = _"Members" } - end ) - - ui.sidebarSection( function() - ui.tag { tag = "ul", attr = { class = "ul" }, content = function() - ui.tag { tag = "li", content = function() - ui.form{ - module = "admin", view = "member_list", - content = function() - - ui.field.text{ label = _"search", name = "search" } - - ui.submit{ value = _"search" } - - end - } - end } - end } - end ) - ui.sidebarSection( "moreLink", function() - ui.link{ - text = _"Register new member", - module = "admin", - view = "member_edit" - } - end ) -end ) - -ui.sidebar( "tab-whatcanido", function() - ui.sidebarHead( function() - ui.heading { level = 2, content = _"Newsletter" } - end ) - - ui.sidebarSection( "moreLink", function() - ui.link{ - text = _"Create a newsletter", - module = "admin", - view = "newsletter_edit" - } - end ) - ui.sidebarSection( "moreLink", function() - ui.link{ - text = _"Manage newsletters", - module = "admin", - view = "newsletter_list" - } - end ) -end ) +ui.grid{ content = function() -ui.sidebar( "tab-whatcanido", function() - ui.sidebarHead( function() - ui.heading { level = 2, content = _"Cancel issue" } - end ) - - ui.sidebarSection( function() - ui.form{ - module = "admin", - view = "cancel_issue", - content = function() - ui.tag { tag = "ul", attr = { class = "ul" }, content = function() - ui.tag { tag = "li", content = function() - ui.field.text{ label = _"Issue #", name = "id" } - ui.submit{ text = _"cancel issue" } - end } - end } - end - } - end ) -end ) + ui.cell_main{ content = function() -ui.sidebar("tab-whatcanido", function() - ui.sidebarHead( function() - ui.heading { level = 2, content = _"Policies" } - end ) - - ui.sidebarSection( function() - ui.tag { tag = "ul", attr = { class = "ul" }, content = function() - for i, policy in ipairs(policies) do - ui.tag { tag = "li", content = function() - ui.link{ - content = policy.name, - module = "admin", - view = "policy_show", - id = policy.id - } - end } - end - end } - end ) - ui.sidebarSection( "moreLink", function() - ui.link{ - text = _"Create new policy", - module = "admin", - view = "policy_show" - } - end ) - ui.sidebarSection( "moreLink", function() - ui.link{ - text = _"Show policies not in use", - module = "admin", - view = "policy_list", - params = { show_not_in_use = true } - } - end ) -end ) - - -ui.section( function() - ui.sectionHead( function() ui.heading { level = 1, content = _"Organizational units and subject areas" } - end ) - ui.sectionRow( function() for i_unit, unit in ipairs(units) do ui.container { @@ -168,5 +57,109 @@ ui.link { module = "admin", view = "index", content = _"Hide inactive" } end - end) -end) + end } + + ui.cell_sidebar{ 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 = _"Members" } + end } + ui.container{ attr = { class = "mdl-card__content" }, content = function() + ui.tag { tag = "ul", attr = { class = "ul" }, content = function() + ui.tag { tag = "li", content = function() + ui.form{ + module = "admin", view = "member_list", + content = function() + + ui.field.text{ label = _"search", name = "search" } + + ui.submit{ value = _"search" } + + end + } + end } + end } + ui.sidebarSection( "moreLink", function() + ui.link{ + text = _"Register new member", + module = "admin", + view = "member_edit" + } + end ) + end } + end } + + 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 = _"Newsletter" } + end } + ui.container{ attr = { class = "mdl-card__content" }, content = function() + ui.link{ + text = _"Create a newsletter", + module = "admin", + view = "newsletter_edit" + } + ui.link{ + text = _"Manage newsletters", + module = "admin", + view = "newsletter_list" + } + end } + end } + + 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 = _"Cancel issue" } + end } + ui.container{ attr = { class = "mdl-card__content" }, content = function() + ui.form{ + module = "admin", + view = "cancel_issue", + content = function() + ui.tag { tag = "ul", attr = { class = "ul" }, content = function() + ui.tag { tag = "li", content = function() + ui.field.text{ label = _"Issue #", name = "id" } + ui.submit{ text = _"cancel issue" } + end } + end } + end + } + end } + end } + + 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 = _"Policies" } + end } + ui.container{ attr = { class = "mdl-card__content" }, content = function() + ui.tag { tag = "ul", attr = { class = "ul" }, content = function() + for i, policy in ipairs(policies) do + ui.tag { tag = "li", content = function() + ui.link{ + content = policy.name, + module = "admin", + view = "policy_show", + id = policy.id + } + end } + end + end } + + ui.link{ + text = _"Create new policy", + module = "admin", + view = "policy_show" + } + + ui.link{ + text = _"Show policies not in use", + module = "admin", + view = "policy_list", + params = { show_not_in_use = true } + } + end } + end } +end } + +