liquid_feedback_frontend
changeset 1027:0008714fd208
Better formatting of issue cancel messages
author | bsw |
---|---|
date | Sun Aug 11 22:58:14 2013 +0200 (2013-08-11) |
parents | 8e2dd941d404 |
children | 350a57518529 |
files | app/main/issue/_show.lua |
line diff
1.1 --- a/app/main/issue/_show.lua Sun Aug 11 22:24:26 2013 +0200 1.2 +++ b/app/main/issue/_show.lua Sun Aug 11 22:58:14 2013 +0200 1.3 @@ -255,6 +255,7 @@ 1.4 attr = { class = "not_admitted_info" }, 1.5 content = function() 1.6 ui.container{ content = _("This issue has been canceled by administrative intervention.") } 1.7 + slot.put("<br />") 1.8 if issue.admin_notice then 1.9 ui.container{ content = function() slot.put(encode.html_newlines(issue.admin_notice)) end } 1.10 end 1.11 @@ -273,7 +274,7 @@ 1.12 attr = { class = "not_admitted_info" }, 1.13 content = _("This issue has been canceled. It failed the quorum of #{quorum}.", { quorum = format.percentage(policy.issue_quorum_num / policy.issue_quorum_den) }) 1.14 } 1.15 - elseif issue.state:sub(1, #("canceled_")) == "canceled_" then 1.16 + elseif issue.state:sub(1, #("canceled_")) == "canceled_" and issue.state ~= "canceled_by_admin" then 1.17 ui.container{ 1.18 attr = { class = "not_admitted_info" }, 1.19 content = _("This issue has been canceled.")