1.1 --- a/app/main/admin/index.lua	Thu Oct 18 17:13:59 2018 +0200
     1.2 +++ b/app/main/admin/index.lua	Thu Oct 18 17:16:44 2018 +0200
     1.3 @@ -7,56 +7,60 @@
     1.4  ui.grid{ content = function()
     1.5  
     1.6    ui.cell_main{ content = function()
     1.7 -
     1.8 -    ui.heading { level = 1, content = _"Organizational units and subject areas" }
     1.9 +    ui.container{ attr = { class = "mdl-card mdl-card__fullwidth mdl-shadow--2dp" }, content = function()
    1.10 +      ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function()
    1.11 +        ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = _"Organizational units and subject areas" }
    1.12 +      ui.container{ attr = { class = "mdl-card__content" }, content = function()
    1.13  
    1.14 -    for i_unit, unit in ipairs(units) do
    1.15 -      ui.container { 
    1.16 -        attr = { style = "margin-left: " .. ((unit.depth - 1)* 2) .. "em;" },
    1.17 -        content = function ()
    1.18 -          ui.heading { level = 1, content = function ()
    1.19 -            local class
    1.20 -            if unit.active == false then
    1.21 -              class = "inactive"
    1.22 -            end
    1.23 -            ui.link{ attr = { class = class }, text = unit.name, module = "admin", view = "unit_edit", id = unit.id }
    1.24 -          end }
    1.25 -          ui.tag { tag = "ul", attr = { class = "ul" }, content = function ()
    1.26 -            local areas
    1.27 -            if not inactive then
    1.28 -              areas = unit:get_reference_selector("areas"):add_order_by("name"):add_where("active"):exec()
    1.29 -            else
    1.30 -              areas = unit:get_reference_selector("areas"):add_order_by("name"):exec()
    1.31 -            end
    1.32 -            for i, area in ipairs(areas) do
    1.33 -              ui.tag { tag = "li", content = function ()
    1.34 +        for i_unit, unit in ipairs(units) do
    1.35 +          ui.container { 
    1.36 +            attr = { style = "margin-left: " .. ((unit.depth - 1)* 2) .. "em;" },
    1.37 +            content = function ()
    1.38 +              ui.heading { level = 1, content = function ()
    1.39                  local class
    1.40 -                if area.active == false then
    1.41 +                if unit.active == false then
    1.42                    class = "inactive"
    1.43                  end
    1.44 -                ui.link{ attr = { class = class }, text = area.name, module = "admin", view = "area_show", id = area.id }
    1.45 +                ui.link{ attr = { class = class }, text = unit.name, module = "admin", view = "unit_edit", id = unit.id }
    1.46 +              end }
    1.47 +              ui.tag { tag = "ul", attr = { class = "ul" }, content = function ()
    1.48 +                local areas
    1.49 +                if not inactive then
    1.50 +                  areas = unit:get_reference_selector("areas"):add_order_by("name"):add_where("active"):exec()
    1.51 +                else
    1.52 +                  areas = unit:get_reference_selector("areas"):add_order_by("name"):exec()
    1.53 +                end
    1.54 +                for i, area in ipairs(areas) do
    1.55 +                  ui.tag { tag = "li", content = function ()
    1.56 +                    local class
    1.57 +                    if area.active == false then
    1.58 +                      class = "inactive"
    1.59 +                    end
    1.60 +                    ui.link{ attr = { class = class }, text = area.name, module = "admin", view = "area_show", id = area.id }
    1.61 +                  end }
    1.62 +                end
    1.63 +                ui.tag { tag = "li", content = function ()
    1.64 +                  ui.link { module = "admin", view = "area_show", params = { unit_id = unit.id }, content = _"+ add new subject area" }
    1.65 +                end }
    1.66 +                slot.put("<br />")
    1.67                end }
    1.68              end
    1.69 -            ui.tag { tag = "li", content = function ()
    1.70 -              ui.link { module = "admin", view = "area_show", params = { unit_id = unit.id }, content = _"+ add new subject area" }
    1.71 -            end }
    1.72 -            slot.put("<br />")
    1.73 -          end }
    1.74 +          }
    1.75          end
    1.76 -      }
    1.77 -    end
    1.78 -    
    1.79 -    slot.put("<br />")
    1.80 -    ui.link { module = "admin", view = "unit_edit", content = _"Create new unit" }
    1.81 -    slot.put("<br />")
    1.82 -    slot.put("<br />")
    1.83 -    
    1.84 -    if (not inactive) then
    1.85 -      ui.link { module = "admin", view = "index", params = { inactive = true }, content = _"Show inactive" }
    1.86 -    else
    1.87 -      ui.link { module = "admin", view = "index", content = _"Hide inactive" }
    1.88 -    end
    1.89 +        
    1.90 +        slot.put("<br />")
    1.91 +        ui.link { module = "admin", view = "unit_edit", content = _"Create new unit" }
    1.92 +        slot.put("<br />")
    1.93 +        slot.put("<br />")
    1.94 +        
    1.95 +        if (not inactive) then
    1.96 +          ui.link { module = "admin", view = "index", params = { inactive = true }, content = _"Show inactive" }
    1.97 +        else
    1.98 +          ui.link { module = "admin", view = "index", content = _"Hide inactive" }
    1.99 +        end
   1.100        
   1.101 +      end }
   1.102 +    end }
   1.103    end }
   1.104    
   1.105    ui.cell_sidebar{ content = function()