# HG changeset patch
# User bsw
# Date 1376254694 -7200
# Node ID 0008714fd208f7341e46489a8e69744732b66978
# Parent  8e2dd941d404aed89f18735971593ae413fda351
Better formatting of issue cancel messages

diff -r 8e2dd941d404 -r 0008714fd208 app/main/issue/_show.lua
--- a/app/main/issue/_show.lua	Sun Aug 11 22:24:26 2013 +0200
+++ b/app/main/issue/_show.lua	Sun Aug 11 22:58:14 2013 +0200
@@ -255,6 +255,7 @@
         attr = { class = "not_admitted_info" },
         content = function()
           ui.container{ content = _("This issue has been canceled by administrative intervention.") }
+          slot.put("<br />")
           if issue.admin_notice then
             ui.container{ content = function() slot.put(encode.html_newlines(issue.admin_notice)) end }
           end
@@ -273,7 +274,7 @@
         attr = { class = "not_admitted_info" },
         content = _("This issue has been canceled. It failed the quorum of #{quorum}.", { quorum = format.percentage(policy.issue_quorum_num / policy.issue_quorum_den) })
       }
-    elseif issue.state:sub(1, #("canceled_")) == "canceled_" then
+    elseif issue.state:sub(1, #("canceled_")) == "canceled_" and issue.state ~= "canceled_by_admin" then
       ui.container{
         attr = { class = "not_admitted_info" },
         content = _("This issue has been canceled.")