Bug 629334: Move referenda page into the election page

This is accompanied by the following MySQL commands:
INSERT INTO elections ( type, name, voting_start, voting_end, choices_nb, question) VALUES (
'referendum', 'Anonymous Voting Referendum', '2004-09-27', '2004-10-08 25:59:59', 1, 'Do you agree with an anonymous voting process for any future GNOME Foundation elections and referenda?'
);

INSERT INTO election_results (election_id, result) VALUES (
LAST_INSERT_ID(), '<p><strong>Yes</strong>: all future GNOME Foundation elections and referenda will use
an anonymous voting process.</p><p>Please see the original <a href="2004-10/">referendum site</a> for more information on the results.</p>'
);

This commit will be followed by some cleaning up actions like fixing old references and finally removing the referenda directory.
This commit is contained in:
Tobias Mueller 2010-10-01 16:32:16 +03:00
parent b5310b0b12
commit 15e2716b4a
17 changed files with 14 additions and 17 deletions

View file

@ -1,7 +0,0 @@
rules.html
index.html
voters.html
preliminary-results.html
verify.html
Makefile.in
Makefile

View file

@ -1,5 +0,0 @@
rules.html
index.html
voters.html
Makefile.in
Makefile

View file

@ -23,8 +23,8 @@
<h2>Referenda Materials</h2>
<ul>
<li><a href="2005-10/">Material from the Reducing Board Size Referendum</a></li>
<li><a href="2004-10/">Material from the Anonymous Voting Referendum</a></li>
<li><a href="../vote/2005-10/">Material from the Reducing Board Size Referendum</a></li>
<li><a href="../vote/2004-10/">Material from the Anonymous Voting Referendum</a></li>
</ul>
</body>

View file

@ -1,6 +1,6 @@
SUBDIRS =
urlpath = /referenda/2004-10
urlpath = /vote/2004-10
page_SCRIPTS = \
index.html \

View file

@ -1,6 +1,6 @@
SUBDIRS =
urlpath = /referenda/2005-10
urlpath = /vote/2005-10
page_SCRIPTS = \
index.html \

View file

@ -1,8 +1,9 @@
SUBDIRS = include
SUBDIRS = include 2004-10 2005-10
urlpath = /vote
page_SCRIPTS = \
index.html \
index.php \
results.php \
votes.php \

View file

@ -17,6 +17,14 @@ require_once ("include/election-sql.php");
<p>Welcome to the anonymous voting system of the GNOME Foundation. This system is maintained by the Membership and Elections Committee, which can be reached at <a href="mailto:elections@gnome.org">elections@gnome.org</a>.</p>
<p>
Any member of the GNOME Foundation can suggest a referendum. To be
accepted, a request for a referendum must be endorsed by 10% of the
Membership. The overall referendum process is overseen by the
Membership and Elections Committee, which can be reached at <a
href="mailto:elections&#64;gnome&#46;org">elections&#64;gnome&#46;org</a>.
</p>
<?php
$handle = elec_sql_open ();