changeset 274:81507072f25d

Add explanations of the different voting modes.
author Matti Hamalainen <ccr@tnsp.org>
date Sun, 24 Nov 2013 18:42:13 +0200
parents 39c247babc0c
children 11cd85bdfac7
files admajax.php msite.inc.php
diffstat 2 files changed, 17 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/admajax.php	Sun Nov 24 18:23:48 2013 +0200
+++ b/admajax.php	Sun Nov 24 18:42:13 2013 +0200
@@ -286,6 +286,7 @@
         // List of votekeys
         $vmode = stGetSetting("voteKeyMode");
         echo
+          "<div class=\"info\"><b>Voting mode: ".$voteModeData[$vmode][0]."</b>. ".$voteModeData[$vmode][1]."</div>\n".
           "<div class=\"tabHeadersSub\">\n".
           "<a href=\"print.php?type=votekeys\" target=\"_blank\">Printable key list</a>\n".
           "</div>\n";
--- a/msite.inc.php	Sun Nov 24 18:23:48 2013 +0200
+++ b/msite.inc.php	Sun Nov 24 18:42:13 2013 +0200
@@ -34,14 +34,24 @@
 //
 // Different voting modes
 //
-// VOTE_FREELY - Vote keys are not tied to attendees, and do not need to be activated
 define("VOTE_FREELY", 0);
+define("VOTE_ACTIVATE", 1);
+define("VOTE_ASSIGN", 2);
 
-// VOTE_ACTIVATE - Vote keys are not tied to attendees, but require manual activation.
-define("VOTE_ACTIVATE", 1);
-
-// VOTE_ASSIGN - Keys are tied to attendees, activated by assigning the key to attendee.
-define("VOTE_ASSIGN", 2);
+$voteModeData = array(
+  VOTE_FREELY => array("Freeform voting",
+    "Vote keys are not tied to attendees, and do not need to be activated.".
+    "Take one printed key slip, give it to attendee."
+    ),
+  VOTE_ACTIVATE => array("Key activation",
+    "Vote keys are not tied to attendees, but require manual activation. ".
+    "Take one printed key slip, find it by the index number in the list below, set to activated. ".
+    "Give key slip to attendee."
+    ),
+  VOTE_ASSIGN => array("Assigned keys",
+    "Votekeys are tied to attendees, activated by assigning the key to attendee. "
+    ),
+);
 
 
 function stReloadDisplayVars()