1.1 --- a/app/main/initiative/remove_initiator.lua	Tue Nov 10 20:59:34 2020 +0100
     1.2 +++ b/app/main/initiative/remove_initiator.lua	Tue Nov 10 21:06:29 2020 +0100
     1.3 @@ -18,92 +18,71 @@
     1.4    }
     1.5  }
     1.6  
     1.7 -execute.view{ module = "issue", view = "_sidebar_state", params = {
     1.8 -  initiative = initiative
     1.9 -} }
    1.10 +ui.grid{ content = function()
    1.11 +  ui.cell_main{ content = function()
    1.12 +
    1.13 +    ui.container{ attr = { class = "mdl-card mdl-card__fullwidth mdl-shadow--2dp" }, content = function()
    1.14  
    1.15 -execute.view { 
    1.16 -  module = "issue", view = "_sidebar_issue", 
    1.17 -  params = {
    1.18 -    issue = initiative.issue,
    1.19 -    highlight_initiative_id = initiative.id
    1.20 -  }
    1.21 -}
    1.22 +      ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function()
    1.23 +        ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = initiative.display_name }
    1.24 +      end }
    1.25  
    1.26 -execute.view {
    1.27 -  module = "issue", view = "_sidebar_whatcanido",
    1.28 -  params = { initiative = initiative }
    1.29 -}
    1.30 +      ui.container{ attr = { class = "mdl-card__content" }, content = function()
    1.31  
    1.32 -execute.view { 
    1.33 -  module = "issue", view = "_sidebar_members", params = {
    1.34 -    issue = initiative.issue, initiative = initiative
    1.35 -  }
    1.36 -}
    1.37 +        ui.form{
    1.38 +          attr = { class = "vertical section" },
    1.39 +          module = "initiative",
    1.40 +          action = "remove_initiator",
    1.41 +          params = {
    1.42 +            initiative_id = initiative.id,
    1.43 +          },
    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 +              params = {
    1.51 +                tab = "initiators",
    1.52 +              }
    1.53 +            }
    1.54 +          },
    1.55 +          content = function()
    1.56  
    1.57 -ui.form{
    1.58 -  attr = { class = "vertical section" },
    1.59 -  module = "initiative",
    1.60 -  action = "remove_initiator",
    1.61 -  params = {
    1.62 -    initiative_id = initiative.id,
    1.63 -  },
    1.64 -  routing = {
    1.65 -    ok = {
    1.66 -      mode = "redirect",
    1.67 -      module = "initiative",
    1.68 -      view = "show",
    1.69 -      id = initiative.id,
    1.70 -      params = {
    1.71 -        tab = "initiators",
    1.72 -      }
    1.73 -    }
    1.74 -  },
    1.75 -  content = function()
    1.76 +            ui.heading { level = 3, content = _"Remove an initiator from initiative" }
    1.77  
    1.78 -    ui.sectionHead( function()
    1.79 -      ui.link{
    1.80 -        module = "initiative", view = "show", id = initiative.id,
    1.81 -        content = function ()
    1.82 -          ui.heading { 
    1.83 -            level = 1,
    1.84 -            content = initiative.display_name
    1.85 -          }
    1.86 -        end
    1.87 -      }
    1.88 -      ui.heading { level = 2, content = _"Remove an initiator from initiative" }
    1.89 -    end )
    1.90 +            local records = initiative:get_reference_selector("initiating_members"):add_where("accepted OR accepted ISNULL"):exec()
    1.91  
    1.92 -    ui.sectionRow( function()
    1.93 -      local records = initiative:get_reference_selector("initiating_members"):add_where("accepted OR accepted ISNULL"):exec()
    1.94 -      ui.heading{ level = 2, content = _"Choose an initiator to remove" }
    1.95 -      ui.field.select{
    1.96 -        name = "member_id",
    1.97 -        foreign_records = records,
    1.98 -        foreign_id = "id",
    1.99 -        foreign_name = "name",
   1.100 -      }
   1.101 -      slot.put("<br />")
   1.102 -      ui.tag{
   1.103 -        tag = "input",
   1.104 -        attr = {
   1.105 -          type = "submit",
   1.106 -          class = "btn btn-dangerous",
   1.107 -          value = _"Remove initiator"
   1.108 -        },
   1.109 -        content = ""
   1.110 -      }
   1.111 -      slot.put("<br />")
   1.112 -      slot.put("<br />")
   1.113 -      ui.link{
   1.114 -        content = _"Cancel",
   1.115 -        module = "initiative",
   1.116 -        view = "show",
   1.117 -        id = initiative.id,
   1.118 -        params = {
   1.119 -          tab = "initiators"
   1.120 +            ui.field.select{
   1.121 +              name = "member_id",
   1.122 +              foreign_records = records,
   1.123 +              foreign_id = "id",
   1.124 +              foreign_name = "name",
   1.125 +            }
   1.126 +            slot.put("<br />")
   1.127 +            ui.tag{
   1.128 +              tag = "input",
   1.129 +              attr = {
   1.130 +                type = "submit",
   1.131 +                class = "mdl-button mdl-js-button mdl-button--raised mdl-button--colored",
   1.132 +                value = _"Remove initiator"
   1.133 +              },
   1.134 +              content = ""
   1.135 +            }
   1.136 +            slot.put(" &nbsp; ")
   1.137 +            ui.link{
   1.138 +              attr = { class = "mdl-button mdl-js-button mdl-button--raised" },
   1.139 +              content = _"Cancel",
   1.140 +              module = "initiative",
   1.141 +              view = "show",
   1.142 +              id = initiative.id,
   1.143 +              params = {
   1.144 +                tab = "initiators"
   1.145 +              }
   1.146 +            }
   1.147 +          end
   1.148          }
   1.149 -      }
   1.150 -    end )
   1.151 -  end
   1.152 -}
   1.153 +      end }
   1.154 +    end }
   1.155 +  end }
   1.156 +end }