1.1 --- a/app/main/policy/show.lua	Fri Feb 17 15:16:02 2012 +0100
     1.2 +++ b/app/main/policy/show.lua	Sat Feb 25 11:51:37 2012 +0100
     1.3 @@ -22,10 +22,36 @@
     1.4        value = "≥ " .. tostring(policy.initiative_quorum_num) .. "/" .. tostring(policy.initiative_quorum_den)
     1.5      }
     1.6      ui.field.text{
     1.7 -      label = _"Majority",
     1.8 -      value = (policy.majority_strict and ">" or "≥" ) .. " " .. tostring(policy.majority_num) .. "/" .. tostring(policy.majority_den)
     1.9 +      label = _"Direct majority",
    1.10 +      value = 
    1.11 +        (policy.direct_majority_strict and ">" or "≥" ) .. " "
    1.12 +        .. tostring(policy.direct_majority_num) .. "/"
    1.13 +        .. tostring(policy.direct_majority_den) 
    1.14 +        .. (policy.direct_majority_positive > 1 and ", " .. _("at least #{count} approvals", { count = policy.direct_majority_positive }) or "")
    1.15 +        .. (policy.direct_majority_non_negative > 1 and ", " .. _("at least #{count} approvals or abstentions", { count = policy.direct_majority_non_negative }) or "")
    1.16      }
    1.17  
    1.18 +    ui.field.text{
    1.19 +      label = _"Indirect majority",
    1.20 +      value = 
    1.21 +        (policy.indirect_majority_strict and ">" or "≥" ) .. " "
    1.22 +        .. tostring(policy.indirect_majority_num) .. "/"
    1.23 +        .. tostring(policy.indirect_majority_den) 
    1.24 +        .. (policy.indirect_majority_positive > 1 and ", " .. _("at least #{count} approvals", { count = policy.indirect_majority_positive }) or "")
    1.25 +        .. (policy.indirect_majority_non_negative > 1 and ", " .. _("at least #{count} approvals or abstentions", { count = policy.indirect_majority_non_negative }) or "")
    1.26 +    }
    1.27 +
    1.28 +    local texts = {}
    1.29 +    if policy.no_reverse_beat_path then
    1.30 +      texts[#texts+1] = _"no reverse beat path to status quo (including ties)"
    1.31 +    end
    1.32 +    if policy.no_multistage_majority then
    1.33 +      texts[#texts+1] = _"prohibit potentially instable results caused by multistage majorities"
    1.34 +    end
    1.35 +    ui.field.text{
    1.36 +      label = _"Options",
    1.37 +      value = table.concat(texts, ", ")
    1.38 +    }
    1.39      ui.container{
    1.40        attr = { class = "suggestion_content wiki" },
    1.41        content = function()