# HG changeset patch
# User bsw
# Date 1605038789 -3600
# Node ID ca68bd1c851d71078fa1c01b0a6c6586b49738e5
# Parent fce3409bc9b08d2aff449fd8bcaab930c1884fe6
Fixed layout in remove initiator view
diff -r fce3409bc9b0 -r ca68bd1c851d app/main/initiative/remove_initiator.lua
--- a/app/main/initiative/remove_initiator.lua Tue Nov 10 20:59:34 2020 +0100
+++ b/app/main/initiative/remove_initiator.lua Tue Nov 10 21:06:29 2020 +0100
@@ -18,92 +18,71 @@
}
}
-execute.view{ module = "issue", view = "_sidebar_state", params = {
- initiative = initiative
-} }
+ui.grid{ content = function()
+ ui.cell_main{ content = function()
+
+ ui.container{ attr = { class = "mdl-card mdl-card__fullwidth mdl-shadow--2dp" }, content = function()
-execute.view {
- module = "issue", view = "_sidebar_issue",
- params = {
- issue = initiative.issue,
- highlight_initiative_id = initiative.id
- }
-}
+ ui.container{ attr = { class = "mdl-card__title mdl-card--border" }, content = function()
+ ui.heading { attr = { class = "mdl-card__title-text" }, level = 2, content = initiative.display_name }
+ end }
-execute.view {
- module = "issue", view = "_sidebar_whatcanido",
- params = { initiative = initiative }
-}
+ ui.container{ attr = { class = "mdl-card__content" }, content = function()
-execute.view {
- module = "issue", view = "_sidebar_members", params = {
- issue = initiative.issue, initiative = initiative
- }
-}
+ ui.form{
+ attr = { class = "vertical section" },
+ module = "initiative",
+ action = "remove_initiator",
+ params = {
+ initiative_id = initiative.id,
+ },
+ routing = {
+ ok = {
+ mode = "redirect",
+ module = "initiative",
+ view = "show",
+ id = initiative.id,
+ params = {
+ tab = "initiators",
+ }
+ }
+ },
+ content = function()
-ui.form{
- attr = { class = "vertical section" },
- module = "initiative",
- action = "remove_initiator",
- params = {
- initiative_id = initiative.id,
- },
- routing = {
- ok = {
- mode = "redirect",
- module = "initiative",
- view = "show",
- id = initiative.id,
- params = {
- tab = "initiators",
- }
- }
- },
- content = function()
+ ui.heading { level = 3, content = _"Remove an initiator from initiative" }
- ui.sectionHead( function()
- ui.link{
- module = "initiative", view = "show", id = initiative.id,
- content = function ()
- ui.heading {
- level = 1,
- content = initiative.display_name
- }
- end
- }
- ui.heading { level = 2, content = _"Remove an initiator from initiative" }
- end )
+ local records = initiative:get_reference_selector("initiating_members"):add_where("accepted OR accepted ISNULL"):exec()
- ui.sectionRow( function()
- local records = initiative:get_reference_selector("initiating_members"):add_where("accepted OR accepted ISNULL"):exec()
- ui.heading{ level = 2, content = _"Choose an initiator to remove" }
- ui.field.select{
- name = "member_id",
- foreign_records = records,
- foreign_id = "id",
- foreign_name = "name",
- }
- slot.put("
")
- ui.tag{
- tag = "input",
- attr = {
- type = "submit",
- class = "btn btn-dangerous",
- value = _"Remove initiator"
- },
- content = ""
- }
- slot.put("
")
- slot.put("
")
- ui.link{
- content = _"Cancel",
- module = "initiative",
- view = "show",
- id = initiative.id,
- params = {
- tab = "initiators"
+ ui.field.select{
+ name = "member_id",
+ foreign_records = records,
+ foreign_id = "id",
+ foreign_name = "name",
+ }
+ slot.put("
")
+ ui.tag{
+ tag = "input",
+ attr = {
+ type = "submit",
+ class = "mdl-button mdl-js-button mdl-button--raised mdl-button--colored",
+ value = _"Remove initiator"
+ },
+ content = ""
+ }
+ slot.put(" ")
+ ui.link{
+ attr = { class = "mdl-button mdl-js-button mdl-button--raised" },
+ content = _"Cancel",
+ module = "initiative",
+ view = "show",
+ id = initiative.id,
+ params = {
+ tab = "initiators"
+ }
+ }
+ end
}
- }
- end )
- end
-}
+ end }
+ end }
+ end }
+end }