1.1 --- a/app/main/admin/_action/policy_update.lua	Thu Feb 16 15:01:49 2012 +0100
     1.2 +++ b/app/main/admin/_action/policy_update.lua	Fri Feb 17 10:20:26 2012 +0100
     1.3 @@ -6,7 +6,9 @@
     1.4    "admission_time", "discussion_time", "verification_time", "voting_time", 
     1.5    "issue_quorum_num", "issue_quorum_den", 
     1.6    "initiative_quorum_num", "initiative_quorum_den", 
     1.7 -  "majority_num", "majority_den", "majority_strict"
     1.8 +  "direct_majority_num", "direct_majority_den", "direct_majority_strict", "direct_majority_positive", "direct_majority_non_negative",
     1.9 +  "indirect_majority_num", "indirect_majority_den", "indirect_majority_strict", "indirect_majority_positive", "indirect_majority_non_negative",
    1.10 +  "no_reverse_beat_path", "no_multistage_majority"
    1.11  )
    1.12  
    1.13  policy:save()

     2.1 --- a/app/main/admin/policy_show.lua	Thu Feb 16 15:01:49 2012 +0100
     2.2 +++ b/app/main/admin/policy_show.lua	Fri Feb 17 10:20:26 2012 +0100
     2.3 @@ -47,10 +47,21 @@
     2.4      ui.field.text{ label = _"Initiative quorum numerator",   name = "initiative_quorum_num" }
     2.5      ui.field.text{ label = _"Initiative quorum denumerator", name = "initiative_quorum_den" }
     2.6  
     2.7 -    ui.field.text{ label = _"Majority numerator",   name = "majority_num" }
     2.8 -    ui.field.text{ label = _"Majority denumerator", name = "majority_den" }
     2.9 +    ui.field.text{ label = _"Direct majority numerator",   name = "direct_majority_num" }
    2.10 +    ui.field.text{ label = _"Direct majority denumerator", name = "direct_majority_den" }
    2.11 +    ui.field.boolean{ label = _"Strict direct majority", name = "direct_majority_strict" }
    2.12 +    ui.field.text{ label = _"Direct majority positive",   name = "direct_majority_positive" }
    2.13 +    ui.field.text{ label = _"Direct majority non negative", name = "direct_majority_non_negative" }
    2.14  
    2.15 -    ui.field.boolean{ label = _"Strict majority", name = "majority_strict" }
    2.16 +    ui.field.text{ label = _"Indirect majority numerator",   name = "indirect_majority_num" }
    2.17 +    ui.field.text{ label = _"Indirect majority denumerator", name = "indirect_majority_den" }
    2.18 +    ui.field.boolean{ label = _"Strict indirect majority", name = "indirect_majority_strict" }
    2.19 +    ui.field.text{ label = _"Indirect majority positive",   name = "indirect_majority_positive" }
    2.20 +    ui.field.text{ label = _"Indirect majority non negative", name = "indirect_majority_non_negative" }
    2.21 +
    2.22 +    ui.field.boolean{ label = _"No reverse beat path", name = "no_reverse_beat_path" }
    2.23 +    ui.field.boolean{ label = _"No multistage majority", name = "no_multistage_majority" }
    2.24 +
    2.25  
    2.26      ui.field.boolean{ label = _"Active?", name = "active" }
    2.27