Mercurial > hg > fapweb
changeset 710:27f7f437d7d1
Add new class of settings, etc.
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Tue, 11 Nov 2014 00:32:05 +0200 |
parents | 1a9005eafb37 |
children | e8a115e222dc |
files | dbdefs.inc.php pages/vote.inc.php |
diffstat | 2 files changed, 16 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/dbdefs.inc.php Tue Nov 11 00:28:42 2014 +0200 +++ b/dbdefs.inc.php Tue Nov 11 00:32:05 2014 +0200 @@ -12,6 +12,7 @@ "register" => array("Registration", "Visitor registration"), "event" => array("Event / Schedule", "Event and schedule related settings"), "compos" => array("Compos", "Compo related settings"), + "voting" => array("Voting", "Voting related settings"), ); @@ -29,7 +30,6 @@ "showAdmin" => array(VT_BOOL, false, "Always show administration interface link on the menu"), "showAttendees" => array(VT_BOOL, true, "Show attendees list"), - "allowVoting" => array(VT_BOOL, false, "Enable voting (individual compos must be enabled as well)"), "showResults" => array(VT_BOOL, false, "Enable results page"), @@ -67,11 +67,6 @@ </div>", "About page text"), - "voteFinishedText" => array(VT_TEXT, " -<h1>Yay, you have voted!</h1> -<p>Now go FAP some more! And make a demo about it.</p>", - "Message shown after successful voting"), - ), // @@ -198,6 +193,21 @@ <h1>Compos</h1> ", "Compo general description"), ), + + // + // Voting + // + "voting" => array( + "allowVoting" => array(VT_BOOL, false, "Enable voting (individual compos must be enabled as well)"), + + "voteFinishedText" => array(VT_TEXT, " +<h1>Yay, you have voted!</h1> +<p>Now go FAP some more! And make a demo about it.</p> +<p>Or perhaps <a href=\"vote\">vote again!</a></p> +", + "Message shown after successful voting"), + + ), );
--- a/pages/vote.inc.php Tue Nov 11 00:28:42 2014 +0200 +++ b/pages/vote.inc.php Tue Nov 11 00:32:05 2014 +0200 @@ -189,7 +189,6 @@ { // Voting finished echo stGetSetting("voteFinishedText"); - echo "<p>Or perhaps <a href=\"vote\">vote again!</a></p>\n"; stSessionEnd(SESS_USER); } ?> \ No newline at end of file