1.1 --- a/app/main/initiative/revoke.lua	Tue Nov 10 21:06:29 2020 +0100
     1.2 +++ b/app/main/initiative/revoke.lua	Tue Nov 10 21:09:34 2020 +0100
     1.3 @@ -29,105 +29,85 @@
     1.4      member = member
     1.5    }
     1.6  }
     1.7 -execute.view{ module = "issue", view = "_sidebar_state", params = {
     1.8 -  initiative = initiative
     1.9 -} }
    1.10 +
    1.11 +ui.grid{ content = function()
    1.12 +  ui.cell_main{ content = function()
    1.13 +
    1.14 +    ui.container{ attr = { class = "mdl-card mdl-card__fullwidth mdl-shadow--2dp" }, content = function()
    1.15  
    1.16 -execute.view { 
    1.17 -  module = "issue", view = "_sidebar_issue", 
    1.18 -  params = {
    1.19 -    issue = initiative.issue,
    1.20 -    highlight_initiative_id = initiative.id
    1.21 -  }
    1.22 -}
    1.23 +      ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function()
    1.24 +        ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = _"Revoke initiative" }
    1.25 +      end }
    1.26  
    1.27 -execute.view {
    1.28 -  module = "issue", view = "_sidebar_whatcanido",
    1.29 -  params = { initiative = initiative }
    1.30 -}
    1.31 +      ui.container{ attr = { class = "mdl-card__content" }, content = function()
    1.32  
    1.33 -execute.view { 
    1.34 -  module = "issue", view = "_sidebar_members", params = {
    1.35 -    issue = initiative.issue, initiative = initiative
    1.36 -  }
    1.37 -}
    1.38 -
    1.39 +        ui.form{
    1.40 +          attr = { class = "wide section" },
    1.41 +          module = "initiative",
    1.42 +          action = "revoke",
    1.43 +          id = initiative.id,
    1.44 +          routing = {
    1.45 +            ok = {
    1.46 +              mode = "redirect",
    1.47 +              module = "initiative",
    1.48 +              view = "show",
    1.49 +              id = initiative.id
    1.50 +            }
    1.51 +          },
    1.52 +          content = function()
    1.53  
    1.54 -ui.form{
    1.55 -  attr = { class = "wide section" },
    1.56 -  module = "initiative",
    1.57 -  action = "revoke",
    1.58 -  id = initiative.id,
    1.59 -  routing = {
    1.60 -    ok = {
    1.61 -      mode = "redirect",
    1.62 -      module = "initiative",
    1.63 -      view = "show",
    1.64 -      id = initiative.id
    1.65 -    }
    1.66 -  },
    1.67 -  content = function()
    1.68 +            ui.container{ content = _"Do you want to suggest to support another initiative?" }
    1.69 +            ui.container{ content = _"You may choose one of the ongoing initiatives you are currently supporting" }
    1.70 +
    1.71 +            slot.put("<br />")          
    1.72  
    1.73 -    ui.sectionHead( function()
    1.74 -      ui.link{
    1.75 -        module = "initiative", view = "show", id = initiative.id,
    1.76 -        content = function ()
    1.77 -          ui.heading { 
    1.78 -            level = 1,
    1.79 -            content = initiative.display_name
    1.80 -          }
    1.81 -        end
    1.82 -      }
    1.83 -      ui.heading { level = 2, content = _"Revoke initiative" }
    1.84 -    end )
    1.85 -
    1.86 -    ui.sectionRow( function()
    1.87 +            ui.field.select{
    1.88 +              name = "suggested_initiative_id",
    1.89 +              foreign_records = tmp,
    1.90 +              foreign_id = "id",
    1.91 +              foreign_name = "myname",
    1.92 +              value = param.get("suggested_initiative_id", atom.integer)
    1.93 +            }
    1.94 +            slot.put("<br />")
    1.95 +            ui.container { content = _"Are you aware that revoking an initiative is irrevocable?" }
    1.96 +            slot.put("<br />")          
    1.97 +            ui.container{ content = function()
    1.98 +              ui.tag{ tag = "input", attr = {
    1.99 +                type = "checkbox",
   1.100 +                name = "are_you_sure",
   1.101 +                value = "1"
   1.102 +              } }
   1.103 +              ui.tag { content = _"I understand, that this is not revocable" }
   1.104 +            end }
   1.105 +            
   1.106 +            
   1.107 +            slot.put("<br />")
   1.108 +            ui.tag{
   1.109 +              tag = "input",
   1.110 +              attr = {
   1.111 +                type = "submit",
   1.112 +                class = "mdl-button mdl-js-button mdl-button--raised mdl-button--colored",
   1.113 +                value = _"Revoke now"
   1.114 +              },
   1.115 +              content = ""
   1.116 +            }
   1.117 +            slot.put(" &nbsp; ")
   1.118  
   1.119 -      ui.heading{ level = 2, content = _"Do you want to suggest to support another initiative?" }
   1.120 -    
   1.121 -      ui.field.select{
   1.122 -        name = "suggested_initiative_id",
   1.123 -        foreign_records = tmp,
   1.124 -        foreign_id = "id",
   1.125 -        foreign_name = "myname",
   1.126 -        value = param.get("suggested_initiative_id", atom.integer)
   1.127 -      }
   1.128 -      ui.container{ content = _"You may choose one of the ongoing initiatives you are currently supporting" }
   1.129 -      slot.put("<br />")
   1.130 -      ui.heading { level = 2, content = _"Are you aware that revoking an initiative is irrevocable?" }
   1.131 -      ui.container{ content = function()
   1.132 -        ui.tag{ tag = "input", attr = {
   1.133 -          type = "checkbox",
   1.134 -          name = "are_you_sure",
   1.135 -          value = "1"
   1.136 -        } }
   1.137 -        ui.tag { content = _"I understand, that this is not revocable" }
   1.138 +            ui.link{
   1.139 +              attr = { class = "mdl-button mdl-js-button mdl-button--raised" },
   1.140 +              content = _"Cancel",
   1.141 +              module = "initiative",
   1.142 +              view = "show",
   1.143 +              id = initiative.id,
   1.144 +              params = {
   1.145 +                tab = "initiators"
   1.146 +              }
   1.147 +            }
   1.148 +
   1.149 +          end
   1.150 +        }
   1.151 +
   1.152        end }
   1.153 -      
   1.154 -      
   1.155 -      slot.put("<br />")
   1.156 -      ui.tag{
   1.157 -        tag = "input",
   1.158 -        attr = {
   1.159 -          type = "submit",
   1.160 -          class = "btn btn-dangerous",
   1.161 -          value = _"Revoke now"
   1.162 -        },
   1.163 -        content = ""
   1.164 -      }
   1.165 -      slot.put("<br />")
   1.166 -      slot.put("<br />")
   1.167 -
   1.168 -      ui.link{
   1.169 -        content = _"Cancel",
   1.170 -        module = "initiative",
   1.171 -        view = "show",
   1.172 -        id = initiative.id,
   1.173 -        params = {
   1.174 -          tab = "initiators"
   1.175 -        }
   1.176 -      }
   1.177 -    end )
   1.178 -
   1.179 -  end
   1.180 -}
   1.181 \ No newline at end of file
   1.182 +    end }
   1.183 +  end }
   1.184 +end }