1.1 --- a/app/main/admin/index.lua	Thu Feb 03 12:43:02 2022 +0100
     1.2 +++ b/app/main/admin/index.lua	Thu Feb 03 12:43:18 2022 +0100
     1.3 @@ -1,8 +1,11 @@
     1.4  local inactive = param.get("inactive", atom.boolean)
     1.5 +local inactive_policies = param.get("inactive_policies", atom.boolean)
     1.6 +
     1.7 +
     1.8  
     1.9  local units = Unit:get_flattened_tree{ include_inactive = inactive, include_hidden = true }
    1.10  
    1.11 -local policies = Policy:build_selector{ active = not inactive }:exec()
    1.12 +local policies = Policy:build_selector{ active = not inactive_policies }:exec()
    1.13  --local policies = Policy:build_selector{}:add_order_by("index"):exec()
    1.14  
    1.15  ui.titleAdmin()
    1.16 @@ -51,16 +54,24 @@
    1.17              end
    1.18            }
    1.19          end
    1.20 -        
    1.21 -        slot.put("<br />")
    1.22 -        ui.link { module = "admin", view = "unit_edit", content = _"Create new unit" }
    1.23 -        slot.put("<br />")
    1.24 -        slot.put("<br />")
    1.25 +     end }
    1.26 +
    1.27 +     ui.container{ attr = { class = "mdl-card__actions mdl-card--border" }, content = function()
    1.28 +        ui.link {
    1.29 +          attr = { class = "mdl-button mdl-js-button" },
    1.30 +          module = "admin", view = "unit_edit", content = _"Create new unit"
    1.31 +        }
    1.32          
    1.33          if (not inactive) then
    1.34 -          ui.link { module = "admin", view = "index", params = { inactive = true }, content = _"Show inactive" }
    1.35 +          ui.link {
    1.36 +            attr = { class = "mdl-button mdl-js-button" },
    1.37 +            module = "admin", view = "index", params = { inactive = true }, content = _"Show inactive"
    1.38 +          }
    1.39          else
    1.40 -          ui.link { module = "admin", view = "index", content = _"Hide inactive" }
    1.41 +          ui.link {
    1.42 +            attr = { class = "mdl-button mdl-js-button" },
    1.43 +            module = "admin", view = "index", content = _"Hide inactive"
    1.44 +          }
    1.45          end
    1.46      
    1.47        end }
    1.48 @@ -74,27 +85,23 @@
    1.49          ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = _"Members" }
    1.50        end }
    1.51        ui.container{ attr = { class = "mdl-card__content" }, content = function()
    1.52 -        ui.tag { tag = "ul", attr = { class = "ul" }, content = function()
    1.53 -          ui.tag { tag = "li", content = function()
    1.54 -            ui.form{
    1.55 -              module = "admin", view = "member_list",
    1.56 -              content = function()
    1.57 -              
    1.58 -                ui.field.text{ container_attr = { style = "display: inline-block;" }, label = _"search", name = "search" }
    1.59 -                
    1.60 -                ui.submit{ value = _"search" }
    1.61 -              
    1.62 -              end
    1.63 -            }
    1.64 -          end }
    1.65 -        end }
    1.66 -        ui.sidebarSection( "moreLink", function()
    1.67 -          ui.link{
    1.68 -            text = _"Register new member",
    1.69 -            module = "admin",
    1.70 -            view = "member_edit"
    1.71 -          }
    1.72 -        end )
    1.73 +        ui.form{
    1.74 +          module = "admin", view = "member_list",
    1.75 +          content = function()
    1.76 +            ui.field.text{ container_attr = { style = "display: inline-block;" }, label = _"search", name = "search" }
    1.77 +            slot.put(" ")
    1.78 +            ui.submit{ value = _"OK" }
    1.79 +          end
    1.80 +        }
    1.81 +      end }
    1.82 +
    1.83 +      ui.container{ attr = { class = "mdl-card__actions mdl-card--border" }, content = function()
    1.84 +        ui.link{
    1.85 +          attr = { class = "mdl-button mdl-js-button" },
    1.86 +          text = _"Add member",
    1.87 +          module = "admin",
    1.88 +          view = "member_edit"
    1.89 +        }
    1.90        end }
    1.91      end }
    1.92  
    1.93 @@ -115,17 +122,26 @@
    1.94              end }
    1.95            end
    1.96          end }
    1.97 +      end }
    1.98  
    1.99 +      ui.container{ attr = { class = "mdl-card__actions mdl-card--border" }, content = function()
   1.100          ui.link{
   1.101 -          text = _"Create new policy",
   1.102 +          attr = { class = "mdl-button mdl-js-button" },
   1.103 +          text = _"Add policy",
   1.104            module = "admin",
   1.105            view = "policy_show"
   1.106          }
   1.107          slot.put(" &nbsp; ")
   1.108 -        if (not inactive) then
   1.109 -          ui.link { module = "admin", view = "index", params = { inactive = true }, content = _"Show inactive" }
   1.110 +        if (not inactive_policies) then
   1.111 +          ui.link {
   1.112 +            attr = { class = "mdl-button mdl-js-button" },
   1.113 +            module = "admin", view = "index", params = { inactive_policies = true }, content = _"Show inactive"
   1.114 +          }
   1.115          else
   1.116 -          ui.link { module = "admin", view = "index", content = _"Hide inactive" }
   1.117 +          ui.link {
   1.118 +            attr = { class = "mdl-button mdl-js-button" },
   1.119 +            module = "admin", view = "index", content = _"Hide inactive"
   1.120 +          }
   1.121          end
   1.122        end }
   1.123      end }
   1.124 @@ -158,12 +174,9 @@
   1.125            module = "admin",
   1.126            view = "cancel_issue",
   1.127            content = function()
   1.128 -            ui.tag { tag = "ul", attr = { class = "ul" }, content = function()
   1.129 -              ui.tag { tag = "li", content = function()
   1.130 -                ui.field.text{ container_attr = { style = "display: inline-block;" }, label = _"Issue #", name = "id" }
   1.131 -                ui.submit{ text = _"cancel issue" }
   1.132 -              end }
   1.133 -            end }
   1.134 +            ui.field.text{ container_attr = { style = "display: inline-block;" }, label = _"Issue #", name = "id" }
   1.135 +            slot.put(" ")
   1.136 +            ui.submit{ text = _"OK" }
   1.137            end
   1.138          }
   1.139        end }