1.1 --- a/app/main/admin/index.lua	Thu Oct 18 17:11:15 2018 +0200
     1.2 +++ b/app/main/admin/index.lua	Thu Oct 18 17:12:47 2018 +0200
     1.3 @@ -61,103 +61,104 @@
     1.4    
     1.5    ui.cell_sidebar{ content = function()
     1.6  
     1.7 -  ui.container{ attr = { class = "mdl-card mdl-card__fullwidth mdl-shadow--2dp" }, content = function()
     1.8 -    ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function()
     1.9 -      ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = _"Members" }
    1.10 -    end }
    1.11 -    ui.container{ attr = { class = "mdl-card__content" }, content = function()
    1.12 -      ui.tag { tag = "ul", attr = { class = "ul" }, content = function()
    1.13 -        ui.tag { tag = "li", content = function()
    1.14 -          ui.form{
    1.15 -            module = "admin", view = "member_list",
    1.16 -            content = function()
    1.17 -            
    1.18 -              ui.field.text{ label = _"search", name = "search" }
    1.19 -              
    1.20 -              ui.submit{ value = _"search" }
    1.21 -            
    1.22 -            end
    1.23 -          }
    1.24 -        end }
    1.25 +    ui.container{ attr = { class = "mdl-card mdl-card__fullwidth mdl-shadow--2dp" }, content = function()
    1.26 +      ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function()
    1.27 +        ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = _"Members" }
    1.28        end }
    1.29 -      ui.sidebarSection( "moreLink", function()
    1.30 -        ui.link{
    1.31 -          text = _"Register new member",
    1.32 -          module = "admin",
    1.33 -          view = "member_edit"
    1.34 -        }
    1.35 -      end )
    1.36 -    end }
    1.37 -  end }
    1.38 -
    1.39 -  ui.container{ attr = { class = "mdl-card mdl-card__fullwidth mdl-shadow--2dp" }, content = function()
    1.40 -    ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function()
    1.41 -      ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = _"Newsletter" }
    1.42 -    end }
    1.43 -    ui.container{ attr = { class = "mdl-card__content" }, content = function()
    1.44 -      ui.link{
    1.45 -        text = _"Create a newsletter",
    1.46 -        module = "admin",
    1.47 -        view = "newsletter_edit"
    1.48 -      }
    1.49 -      ui.link{
    1.50 -        text = _"Manage newsletters",
    1.51 -        module = "admin",
    1.52 -        view = "newsletter_list"
    1.53 -      }
    1.54 -    end }
    1.55 -  end }
    1.56 -
    1.57 -  ui.container{ attr = { class = "mdl-card mdl-card__fullwidth mdl-shadow--2dp" }, content = function()
    1.58 -    ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function()
    1.59 -      ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = _"Cancel issue" }
    1.60 -    end }
    1.61 -    ui.container{ attr = { class = "mdl-card__content" }, content = function()
    1.62 -      ui.form{
    1.63 -        module = "admin",
    1.64 -        view = "cancel_issue",
    1.65 -        content = function()
    1.66 -          ui.tag { tag = "ul", attr = { class = "ul" }, content = function()
    1.67 -            ui.tag { tag = "li", content = function()
    1.68 -              ui.field.text{ label = _"Issue #", name = "id" }
    1.69 -              ui.submit{ text = _"cancel issue" }
    1.70 -            end }
    1.71 -          end }
    1.72 -        end
    1.73 -      }
    1.74 -    end }
    1.75 -  end }
    1.76 -
    1.77 -  ui.container{ attr = { class = "mdl-card mdl-card__fullwidth mdl-shadow--2dp" }, content = function()
    1.78 -    ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function()
    1.79 -      ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = _"Policies" }
    1.80 -    end }
    1.81 -    ui.container{ attr = { class = "mdl-card__content" }, content = function()
    1.82 -      ui.tag { tag = "ul", attr = { class = "ul" }, content = function()
    1.83 -        for i, policy in ipairs(policies) do
    1.84 +      ui.container{ attr = { class = "mdl-card__content" }, content = function()
    1.85 +        ui.tag { tag = "ul", attr = { class = "ul" }, content = function()
    1.86            ui.tag { tag = "li", content = function()
    1.87 -            ui.link{
    1.88 -              content = policy.name,
    1.89 -              module = "admin",
    1.90 -              view = "policy_show",
    1.91 -              id = policy.id
    1.92 +            ui.form{
    1.93 +              module = "admin", view = "member_list",
    1.94 +              content = function()
    1.95 +              
    1.96 +                ui.field.text{ label = _"search", name = "search" }
    1.97 +                
    1.98 +                ui.submit{ value = _"search" }
    1.99 +              
   1.100 +              end
   1.101              }
   1.102            end }
   1.103 -        end
   1.104 +        end }
   1.105 +        ui.sidebarSection( "moreLink", function()
   1.106 +          ui.link{
   1.107 +            text = _"Register new member",
   1.108 +            module = "admin",
   1.109 +            view = "member_edit"
   1.110 +          }
   1.111 +        end )
   1.112        end }
   1.113 +    end }
   1.114 +
   1.115 +    ui.container{ attr = { class = "mdl-card mdl-card__fullwidth mdl-shadow--2dp" }, content = function()
   1.116 +      ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function()
   1.117 +        ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = _"Newsletter" }
   1.118 +      end }
   1.119 +      ui.container{ attr = { class = "mdl-card__content" }, content = function()
   1.120 +        ui.link{
   1.121 +          text = _"Create a newsletter",
   1.122 +          module = "admin",
   1.123 +          view = "newsletter_edit"
   1.124 +        }
   1.125 +        ui.link{
   1.126 +          text = _"Manage newsletters",
   1.127 +          module = "admin",
   1.128 +          view = "newsletter_list"
   1.129 +        }
   1.130 +      end }
   1.131 +    end }
   1.132  
   1.133 -      ui.link{
   1.134 -        text = _"Create new policy",
   1.135 -        module = "admin",
   1.136 -        view = "policy_show"
   1.137 -      }
   1.138 +    ui.container{ attr = { class = "mdl-card mdl-card__fullwidth mdl-shadow--2dp" }, content = function()
   1.139 +      ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function()
   1.140 +        ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = _"Cancel issue" }
   1.141 +      end }
   1.142 +      ui.container{ attr = { class = "mdl-card__content" }, content = function()
   1.143 +        ui.form{
   1.144 +          module = "admin",
   1.145 +          view = "cancel_issue",
   1.146 +          content = function()
   1.147 +            ui.tag { tag = "ul", attr = { class = "ul" }, content = function()
   1.148 +              ui.tag { tag = "li", content = function()
   1.149 +                ui.field.text{ label = _"Issue #", name = "id" }
   1.150 +                ui.submit{ text = _"cancel issue" }
   1.151 +              end }
   1.152 +            end }
   1.153 +          end
   1.154 +        }
   1.155 +      end }
   1.156 +    end }
   1.157  
   1.158 -      ui.link{
   1.159 -        text = _"Show policies not in use",
   1.160 -        module = "admin",
   1.161 -        view = "policy_list",
   1.162 -        params = { show_not_in_use = true }
   1.163 -      }
   1.164 +    ui.container{ attr = { class = "mdl-card mdl-card__fullwidth mdl-shadow--2dp" }, content = function()
   1.165 +      ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function()
   1.166 +        ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = _"Policies" }
   1.167 +      end }
   1.168 +      ui.container{ attr = { class = "mdl-card__content" }, content = function()
   1.169 +        ui.tag { tag = "ul", attr = { class = "ul" }, content = function()
   1.170 +          for i, policy in ipairs(policies) do
   1.171 +            ui.tag { tag = "li", content = function()
   1.172 +              ui.link{
   1.173 +                content = policy.name,
   1.174 +                module = "admin",
   1.175 +                view = "policy_show",
   1.176 +                id = policy.id
   1.177 +              }
   1.178 +            end }
   1.179 +          end
   1.180 +        end }
   1.181 +
   1.182 +        ui.link{
   1.183 +          text = _"Create new policy",
   1.184 +          module = "admin",
   1.185 +          view = "policy_show"
   1.186 +        }
   1.187 +
   1.188 +        ui.link{
   1.189 +          text = _"Show policies not in use",
   1.190 +          module = "admin",
   1.191 +          view = "policy_list",
   1.192 +          params = { show_not_in_use = true }
   1.193 +        }
   1.194 +      end }
   1.195      end }
   1.196    end }
   1.197  end }