From 15e2716b4aa5f9f8044258b41ee0b71c41c6f82c Mon Sep 17 00:00:00 2001 From: Tobias Mueller Date: Fri, 1 Oct 2010 16:32:16 +0300 Subject: [PATCH] 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(), '

Yes: all future GNOME Foundation elections and referenda will use an anonymous voting process.

Please see the original referendum site for more information on the results.

' ); This commit will be followed by some cleaning up actions like fixing old references and finally removing the referenda directory. --- foundation.gnome.org/referenda/2004-10/.cvsignore | 7 ------- foundation.gnome.org/referenda/2005-10/.cvsignore | 5 ----- foundation.gnome.org/referenda/index.wml | 4 ++-- .../2004-10/2004-10-verif.tar.gz | Bin .../{referenda => vote}/2004-10/Makefile.am | 2 +- .../{referenda => vote}/2004-10/index.wml | 0 .../2004-10/preliminary-results.wml | 0 .../{referenda => vote}/2004-10/rules.wml | 0 .../{referenda => vote}/2004-10/verify.wml | 0 .../{referenda => vote}/2004-10/voters.wml | 0 .../{referenda => vote}/2005-10/Makefile.am | 2 +- .../{referenda => vote}/2005-10/index.wml | 0 .../{referenda => vote}/2005-10/rules.wml | 0 .../{referenda => vote}/2005-10/timeline.ics | 0 .../{referenda => vote}/2005-10/voters.wml | 0 foundation.gnome.org/vote/Makefile.am | 3 ++- foundation.gnome.org/vote/index.wml | 8 ++++++++ 17 files changed, 14 insertions(+), 17 deletions(-) delete mode 100644 foundation.gnome.org/referenda/2004-10/.cvsignore delete mode 100644 foundation.gnome.org/referenda/2005-10/.cvsignore rename foundation.gnome.org/{referenda => vote}/2004-10/2004-10-verif.tar.gz (100%) rename foundation.gnome.org/{referenda => vote}/2004-10/Makefile.am (86%) rename foundation.gnome.org/{referenda => vote}/2004-10/index.wml (100%) rename foundation.gnome.org/{referenda => vote}/2004-10/preliminary-results.wml (100%) rename foundation.gnome.org/{referenda => vote}/2004-10/rules.wml (100%) rename foundation.gnome.org/{referenda => vote}/2004-10/verify.wml (100%) rename foundation.gnome.org/{referenda => vote}/2004-10/voters.wml (100%) rename foundation.gnome.org/{referenda => vote}/2005-10/Makefile.am (82%) rename foundation.gnome.org/{referenda => vote}/2005-10/index.wml (100%) rename foundation.gnome.org/{referenda => vote}/2005-10/rules.wml (100%) rename foundation.gnome.org/{referenda => vote}/2005-10/timeline.ics (100%) rename foundation.gnome.org/{referenda => vote}/2005-10/voters.wml (100%) diff --git a/foundation.gnome.org/referenda/2004-10/.cvsignore b/foundation.gnome.org/referenda/2004-10/.cvsignore deleted file mode 100644 index fbb78a7..0000000 --- a/foundation.gnome.org/referenda/2004-10/.cvsignore +++ /dev/null @@ -1,7 +0,0 @@ -rules.html -index.html -voters.html -preliminary-results.html -verify.html -Makefile.in -Makefile diff --git a/foundation.gnome.org/referenda/2005-10/.cvsignore b/foundation.gnome.org/referenda/2005-10/.cvsignore deleted file mode 100644 index 9834d43..0000000 --- a/foundation.gnome.org/referenda/2005-10/.cvsignore +++ /dev/null @@ -1,5 +0,0 @@ -rules.html -index.html -voters.html -Makefile.in -Makefile diff --git a/foundation.gnome.org/referenda/index.wml b/foundation.gnome.org/referenda/index.wml index 091fe18..1bc9231 100644 --- a/foundation.gnome.org/referenda/index.wml +++ b/foundation.gnome.org/referenda/index.wml @@ -23,8 +23,8 @@

Referenda Materials

diff --git a/foundation.gnome.org/referenda/2004-10/2004-10-verif.tar.gz b/foundation.gnome.org/vote/2004-10/2004-10-verif.tar.gz similarity index 100% rename from foundation.gnome.org/referenda/2004-10/2004-10-verif.tar.gz rename to foundation.gnome.org/vote/2004-10/2004-10-verif.tar.gz diff --git a/foundation.gnome.org/referenda/2004-10/Makefile.am b/foundation.gnome.org/vote/2004-10/Makefile.am similarity index 86% rename from foundation.gnome.org/referenda/2004-10/Makefile.am rename to foundation.gnome.org/vote/2004-10/Makefile.am index 935db31..b73bd63 100644 --- a/foundation.gnome.org/referenda/2004-10/Makefile.am +++ b/foundation.gnome.org/vote/2004-10/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS = -urlpath = /referenda/2004-10 +urlpath = /vote/2004-10 page_SCRIPTS = \ index.html \ diff --git a/foundation.gnome.org/referenda/2004-10/index.wml b/foundation.gnome.org/vote/2004-10/index.wml similarity index 100% rename from foundation.gnome.org/referenda/2004-10/index.wml rename to foundation.gnome.org/vote/2004-10/index.wml diff --git a/foundation.gnome.org/referenda/2004-10/preliminary-results.wml b/foundation.gnome.org/vote/2004-10/preliminary-results.wml similarity index 100% rename from foundation.gnome.org/referenda/2004-10/preliminary-results.wml rename to foundation.gnome.org/vote/2004-10/preliminary-results.wml diff --git a/foundation.gnome.org/referenda/2004-10/rules.wml b/foundation.gnome.org/vote/2004-10/rules.wml similarity index 100% rename from foundation.gnome.org/referenda/2004-10/rules.wml rename to foundation.gnome.org/vote/2004-10/rules.wml diff --git a/foundation.gnome.org/referenda/2004-10/verify.wml b/foundation.gnome.org/vote/2004-10/verify.wml similarity index 100% rename from foundation.gnome.org/referenda/2004-10/verify.wml rename to foundation.gnome.org/vote/2004-10/verify.wml diff --git a/foundation.gnome.org/referenda/2004-10/voters.wml b/foundation.gnome.org/vote/2004-10/voters.wml similarity index 100% rename from foundation.gnome.org/referenda/2004-10/voters.wml rename to foundation.gnome.org/vote/2004-10/voters.wml diff --git a/foundation.gnome.org/referenda/2005-10/Makefile.am b/foundation.gnome.org/vote/2005-10/Makefile.am similarity index 82% rename from foundation.gnome.org/referenda/2005-10/Makefile.am rename to foundation.gnome.org/vote/2005-10/Makefile.am index 8215936..7f6cdec 100644 --- a/foundation.gnome.org/referenda/2005-10/Makefile.am +++ b/foundation.gnome.org/vote/2005-10/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS = -urlpath = /referenda/2005-10 +urlpath = /vote/2005-10 page_SCRIPTS = \ index.html \ diff --git a/foundation.gnome.org/referenda/2005-10/index.wml b/foundation.gnome.org/vote/2005-10/index.wml similarity index 100% rename from foundation.gnome.org/referenda/2005-10/index.wml rename to foundation.gnome.org/vote/2005-10/index.wml diff --git a/foundation.gnome.org/referenda/2005-10/rules.wml b/foundation.gnome.org/vote/2005-10/rules.wml similarity index 100% rename from foundation.gnome.org/referenda/2005-10/rules.wml rename to foundation.gnome.org/vote/2005-10/rules.wml diff --git a/foundation.gnome.org/referenda/2005-10/timeline.ics b/foundation.gnome.org/vote/2005-10/timeline.ics similarity index 100% rename from foundation.gnome.org/referenda/2005-10/timeline.ics rename to foundation.gnome.org/vote/2005-10/timeline.ics diff --git a/foundation.gnome.org/referenda/2005-10/voters.wml b/foundation.gnome.org/vote/2005-10/voters.wml similarity index 100% rename from foundation.gnome.org/referenda/2005-10/voters.wml rename to foundation.gnome.org/vote/2005-10/voters.wml diff --git a/foundation.gnome.org/vote/Makefile.am b/foundation.gnome.org/vote/Makefile.am index aabc62c..d86ae7a 100644 --- a/foundation.gnome.org/vote/Makefile.am +++ b/foundation.gnome.org/vote/Makefile.am @@ -1,8 +1,9 @@ -SUBDIRS = include +SUBDIRS = include 2004-10 2005-10 urlpath = /vote page_SCRIPTS = \ + index.html \ index.php \ results.php \ votes.php \ diff --git a/foundation.gnome.org/vote/index.wml b/foundation.gnome.org/vote/index.wml index 77ffe8b..bdfeae4 100644 --- a/foundation.gnome.org/vote/index.wml +++ b/foundation.gnome.org/vote/index.wml @@ -17,6 +17,14 @@ require_once ("include/election-sql.php");

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 elections@gnome.org.

+

+ 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 elections@gnome.org. +

+