# HG changeset patch
# User bsw
# Date 1329470426 -3600
# Node ID 7f41f3c44fae4c4433e9690d227d6c82097d5ab6
# Parent  b77e6a17ca77e991c7e6a1d37d3631c11476ff15
Changes in policy admin interface for core 2.0

diff -r b77e6a17ca77 -r 7f41f3c44fae app/main/admin/_action/policy_update.lua
--- a/app/main/admin/_action/policy_update.lua	Thu Feb 16 15:01:49 2012 +0100
+++ b/app/main/admin/_action/policy_update.lua	Fri Feb 17 10:20:26 2012 +0100
@@ -6,7 +6,9 @@
   "admission_time", "discussion_time", "verification_time", "voting_time", 
   "issue_quorum_num", "issue_quorum_den", 
   "initiative_quorum_num", "initiative_quorum_den", 
-  "majority_num", "majority_den", "majority_strict"
+  "direct_majority_num", "direct_majority_den", "direct_majority_strict", "direct_majority_positive", "direct_majority_non_negative",
+  "indirect_majority_num", "indirect_majority_den", "indirect_majority_strict", "indirect_majority_positive", "indirect_majority_non_negative",
+  "no_reverse_beat_path", "no_multistage_majority"
 )
 
 policy:save()
diff -r b77e6a17ca77 -r 7f41f3c44fae app/main/admin/policy_show.lua
--- a/app/main/admin/policy_show.lua	Thu Feb 16 15:01:49 2012 +0100
+++ b/app/main/admin/policy_show.lua	Fri Feb 17 10:20:26 2012 +0100
@@ -47,10 +47,21 @@
     ui.field.text{ label = _"Initiative quorum numerator",   name = "initiative_quorum_num" }
     ui.field.text{ label = _"Initiative quorum denumerator", name = "initiative_quorum_den" }
 
-    ui.field.text{ label = _"Majority numerator",   name = "majority_num" }
-    ui.field.text{ label = _"Majority denumerator", name = "majority_den" }
+    ui.field.text{ label = _"Direct majority numerator",   name = "direct_majority_num" }
+    ui.field.text{ label = _"Direct majority denumerator", name = "direct_majority_den" }
+    ui.field.boolean{ label = _"Strict direct majority", name = "direct_majority_strict" }
+    ui.field.text{ label = _"Direct majority positive",   name = "direct_majority_positive" }
+    ui.field.text{ label = _"Direct majority non negative", name = "direct_majority_non_negative" }
 
-    ui.field.boolean{ label = _"Strict majority", name = "majority_strict" }
+    ui.field.text{ label = _"Indirect majority numerator",   name = "indirect_majority_num" }
+    ui.field.text{ label = _"Indirect majority denumerator", name = "indirect_majority_den" }
+    ui.field.boolean{ label = _"Strict indirect majority", name = "indirect_majority_strict" }
+    ui.field.text{ label = _"Indirect majority positive",   name = "indirect_majority_positive" }
+    ui.field.text{ label = _"Indirect majority non negative", name = "indirect_majority_non_negative" }
+
+    ui.field.boolean{ label = _"No reverse beat path", name = "no_reverse_beat_path" }
+    ui.field.boolean{ label = _"No multistage majority", name = "no_multistage_majority" }
+
 
     ui.field.boolean{ label = _"Active?", name = "active" }