1.1 --- a/app/main/admin/cancel_issue.lua	Thu Feb 03 12:42:29 2022 +0100
     1.2 +++ b/app/main/admin/cancel_issue.lua	Thu Feb 03 12:42:48 2022 +0100
     1.3 @@ -10,30 +10,57 @@
     1.4  
     1.5  ui.titleAdmin(_"Cancel issue")
     1.6  
     1.7 -ui.form{
     1.8 -  module = "admin",
     1.9 -  action = "cancel_issue",
    1.10 -  id = id,
    1.11 -  attr = { class = "vertical section" },
    1.12 -  content = function()
    1.13 -    
    1.14 -    ui.sectionHead( function()
    1.15 -      ui.heading { level = 1, content = _("Cancel issue ##{id}", { id = issue.id }) }
    1.16 -    end )
    1.17 +ui.grid{ content = function()
    1.18 +
    1.19 +  ui.cell_main{ content = function()
    1.20 +    ui.container{ attr = { class = "mdl-card mdl-card__fullwidth mdl-shadow--2dp" }, content = function()
    1.21 +      ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function()
    1.22 +        ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = _"public administrative notice:" }
    1.23 +      end }
    1.24 +      ui.container{ attr = { class = "mdl-card__content" }, content = function()
    1.25  
    1.26 -    ui.sectionRow( function()
    1.27 +        ui.form{
    1.28 +          module = "admin",
    1.29 +          action = "cancel_issue",
    1.30 +          id = id,
    1.31 +          attr = { class = "vertical section" },
    1.32 +          content = function()
    1.33 +            
    1.34 +            ui.sectionRow( function()
    1.35 +              ui.field.text{ name = "admin_notice", multiline = true }
    1.36 +              ui.tag{
    1.37 +                tag = "input",
    1.38 +                attr = {
    1.39 +                  type = "submit",
    1.40 +                  class = "mdl-button mdl-js-button mdl-button--raised",
    1.41 +                  value = _"cancel issue now"
    1.42 +                }
    1.43 +              }
    1.44 +              slot.put("   ")
    1.45 +              ui.link {
    1.46 +                attr = { class = "mdl-button mdl-js-button mdl-js-ripple-effect mdl-button--underlined" },
    1.47 +                module = "admin", view = "index", content = _"do nothing"
    1.48 +               }
    1.49 +            end )
    1.50 +          end
    1.51 +        }
    1.52 +      end }
    1.53 +    end }
    1.54 +  end }
    1.55 +
    1.56 +  ui.cell_sidebar{ content = function()
    1.57 +
    1.58 +    ui.container{ attr = { class = "mdl-card mdl-card__fullwidth mdl-shadow--2dp" }, content = function()
    1.59 +      ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function()
    1.60 +        ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = _("Issue ##{id}", { id = issue.id }) }
    1.61 +      end }
    1.62        execute.view{ module = "initiative", view = "_list", params = {
    1.63          issue = issue,
    1.64          initiatives = issue.initiatives
    1.65        } }
    1.66 -    end )
    1.67 -    
    1.68 -    ui.sectionRow( function()
    1.69 -      ui.field.text{ label = _"public administrative notice:", name = "admin_notice", multiline = true }
    1.70 -      ui.submit{ text = _"cancel issue now" }
    1.71 -      slot.put(" ")
    1.72 -      ui.link { module = "admin", view = "index", content = "go back to safety" }
    1.73 -    end )
    1.74 -  end
    1.75 -}
    1.76 +    end }
    1.77 +  end }
    1.78  
    1.79 +
    1.80 +end }
    1.81 +