# HG changeset patch # User bsw # Date 1605038974 -3600 # Node ID 15f33adc0e31b63ad711574847c82217c9d786dc # Parent ca68bd1c851d71078fa1c01b0a6c6586b49738e5 Fixed layout in revoke initiative view diff -r ca68bd1c851d -r 15f33adc0e31 app/main/initiative/revoke.lua --- a/app/main/initiative/revoke.lua Tue Nov 10 21:06:29 2020 +0100 +++ b/app/main/initiative/revoke.lua Tue Nov 10 21:09:34 2020 +0100 @@ -29,105 +29,85 @@ member = member } } -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 = _"Revoke initiative" } + 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 = "wide section" }, + module = "initiative", + action = "revoke", + id = initiative.id, + routing = { + ok = { + mode = "redirect", + module = "initiative", + view = "show", + id = initiative.id + } + }, + content = function() -ui.form{ - attr = { class = "wide section" }, - module = "initiative", - action = "revoke", - id = initiative.id, - routing = { - ok = { - mode = "redirect", - module = "initiative", - view = "show", - id = initiative.id - } - }, - content = function() + ui.container{ content = _"Do you want to suggest to support another initiative?" } + ui.container{ content = _"You may choose one of the ongoing initiatives you are currently supporting" } + + slot.put("
") - 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 = _"Revoke initiative" } - end ) - - ui.sectionRow( function() + ui.field.select{ + name = "suggested_initiative_id", + foreign_records = tmp, + foreign_id = "id", + foreign_name = "myname", + value = param.get("suggested_initiative_id", atom.integer) + } + slot.put("
") + ui.container { content = _"Are you aware that revoking an initiative is irrevocable?" } + slot.put("
") + ui.container{ content = function() + ui.tag{ tag = "input", attr = { + type = "checkbox", + name = "are_you_sure", + value = "1" + } } + ui.tag { content = _"I understand, that this is not revocable" } + end } + + + slot.put("
") + ui.tag{ + tag = "input", + attr = { + type = "submit", + class = "mdl-button mdl-js-button mdl-button--raised mdl-button--colored", + value = _"Revoke now" + }, + content = "" + } + slot.put("   ") - ui.heading{ level = 2, content = _"Do you want to suggest to support another initiative?" } - - ui.field.select{ - name = "suggested_initiative_id", - foreign_records = tmp, - foreign_id = "id", - foreign_name = "myname", - value = param.get("suggested_initiative_id", atom.integer) - } - ui.container{ content = _"You may choose one of the ongoing initiatives you are currently supporting" } - slot.put("
") - ui.heading { level = 2, content = _"Are you aware that revoking an initiative is irrevocable?" } - ui.container{ content = function() - ui.tag{ tag = "input", attr = { - type = "checkbox", - name = "are_you_sure", - value = "1" - } } - ui.tag { content = _"I understand, that this is not revocable" } + 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 } - - - slot.put("
") - ui.tag{ - tag = "input", - attr = { - type = "submit", - class = "btn btn-dangerous", - value = _"Revoke now" - }, - content = "" - } - slot.put("
") - slot.put("
") - - ui.link{ - content = _"Cancel", - module = "initiative", - view = "show", - id = initiative.id, - params = { - tab = "initiators" - } - } - end ) - - end -} \ No newline at end of file + end } + end } +end }