From 75909de3ed7717c8cacde28b36699066df95d605 Mon Sep 17 00:00:00 2001 From: Tobias Mueller Date: Wed, 4 May 2011 14:53:04 +0200 Subject: [PATCH] Merged everything from elections/ into vote/ To fix bug 629334. On the way, some old .cvsignore files were deleted. Also, Makefiles and headers were adapted to show the new URL. Calendars have not been updated. --- .../elections/2000/.cvsignore | 8 --- .../elections/2001/.cvsignore | 7 --- .../elections/2002/.cvsignore | 8 --- .../elections/2003/.cvsignore | 8 --- .../elections/2004/.cvsignore | 8 --- .../elections/2005/.cvsignore | 6 -- .../{elections => vote}/2000/Makefile.am | 2 +- .../{elections => vote}/2000/candidates.wml | 0 .../{elections => vote}/2000/index.wml | 0 .../2000/list-addresses.py | 0 .../2000/registered-voters.txt | 0 .../{elections => vote}/2000/results.wml | 0 .../{elections => vote}/2000/rules.wml | 0 .../{elections => vote}/2000/verify.wml | 0 .../2000/vote-archives.diff | 0 .../{elections => vote}/2000/vote-counter.py | 0 .../{elections => vote}/2000/voters.wml | 0 .../{elections => vote}/2001/Makefile.am | 2 +- .../{elections => vote}/2001/candidates.wml | 0 .../{elections => vote}/2001/index.wml | 0 .../2001/list-addresses.py | 0 .../2001/registered-voters.txt | 0 .../{elections => vote}/2001/results.txt | 0 .../{elections => vote}/2001/rules.wml | 0 .../{elections => vote}/2001/verify.wml | 0 .../2001/vote-archives.diff | 0 .../{elections => vote}/2001/vote-counter.py | 0 .../{elections => vote}/2001/voters.wml | 0 .../{elections => vote}/2002/Makefile.am | 2 +- .../{elections => vote}/2002/candidates.wml | 0 .../{elections => vote}/2002/index.wml | 0 .../2002/list-addresses.py | 0 .../2002/preliminary-results.wml | 0 .../2002/registered-voters.txt | 0 .../{elections => vote}/2002/results.txt | 0 .../{elections => vote}/2002/rules.wml | 0 .../{elections => vote}/2002/verify.wml | 0 .../2002/vote-archives.diff | 0 .../{elections => vote}/2002/vote-counter.py | 0 .../{elections => vote}/2002/voters.wml | 0 .../2003/2003-verif.tar.gz | Bin .../{elections => vote}/2003/Makefile.am | 2 +- .../{elections => vote}/2003/candidates.wml | 0 .../{elections => vote}/2003/index.wml | 0 .../2003/preliminary-results.wml | 0 .../{elections => vote}/2003/results.txt | 0 .../{elections => vote}/2003/rules.wml | 0 .../{elections => vote}/2003/verify.wml | 0 .../{elections => vote}/2003/voters.wml | 0 .../2004/2004-verif.tar.gz | Bin .../{elections => vote}/2004/Makefile.am | 2 +- .../{elections => vote}/2004/candidates.wml | 0 .../{elections => vote}/2004/index.wml | 0 .../2004/preliminary-results.wml | 0 .../{elections => vote}/2004/rules.wml | 0 .../{elections => vote}/2004/timeline.ics | 0 .../{elections => vote}/2004/verify.wml | 0 .../{elections => vote}/2004/voters.wml | 0 .../{elections => vote}/2005/Makefile.am | 2 +- .../{elections => vote}/2005/candidates.wml | 0 .../{elections => vote}/2005/index.wml | 0 .../{elections => vote}/2005/rules.wml | 0 .../{elections => vote}/2005/timeline.ics | 0 .../{elections => vote}/2005/voters.wml | 0 .../{elections => vote}/2006/Makefile.am | 2 +- .../{elections => vote}/2006/candidates.wml | 0 .../{elections => vote}/2006/index.wml | 0 .../{elections => vote}/2006/rules.wml | 0 .../{elections => vote}/2006/timeline.ics | 0 .../{elections => vote}/2007/Makefile.am | 2 +- .../{elections => vote}/2007/candidates.wml | 0 .../{elections => vote}/2007/index.wml | 0 .../{elections => vote}/2007/rules.wml | 0 .../{elections => vote}/2007/timeline.ics | 0 .../{elections => vote}/2009/Makefile.am | 2 +- .../{elections => vote}/2009/candidates.wml | 0 .../{elections => vote}/2009/index.wml | 0 .../{elections => vote}/2009/mkical.py | 0 .../{elections => vote}/2009/rules.wml | 0 .../{elections => vote}/2009/timeline.ics | 0 .../2009/voting-instructions.txt | 0 .../{elections => vote}/2010/Makefile.am | 2 +- .../{elections => vote}/2010/candidates.wml | 0 .../{elections => vote}/2010/index.wml | 0 .../{elections => vote}/2010/mkical.py | 0 .../{elections => vote}/2010/rules.wml | 0 .../{elections => vote}/2010/timeline.ics | 0 .../2010/voting-instructions.txt | 0 foundation.gnome.org/vote/Makefile.am | 3 +- foundation.gnome.org/vote/index.wml | 53 +++++++++++++++--- .../{elections => vote}/overview.wml | 0 include/add-header.xsl | 2 +- include/evilsedhack | 2 +- 93 files changed, 60 insertions(+), 65 deletions(-) delete mode 100644 foundation.gnome.org/elections/2000/.cvsignore delete mode 100644 foundation.gnome.org/elections/2001/.cvsignore delete mode 100644 foundation.gnome.org/elections/2002/.cvsignore delete mode 100644 foundation.gnome.org/elections/2003/.cvsignore delete mode 100644 foundation.gnome.org/elections/2004/.cvsignore delete mode 100644 foundation.gnome.org/elections/2005/.cvsignore rename foundation.gnome.org/{elections => vote}/2000/Makefile.am (90%) rename foundation.gnome.org/{elections => vote}/2000/candidates.wml (100%) rename foundation.gnome.org/{elections => vote}/2000/index.wml (100%) rename foundation.gnome.org/{elections => vote}/2000/list-addresses.py (100%) rename foundation.gnome.org/{elections => vote}/2000/registered-voters.txt (100%) rename foundation.gnome.org/{elections => vote}/2000/results.wml (100%) rename foundation.gnome.org/{elections => vote}/2000/rules.wml (100%) rename foundation.gnome.org/{elections => vote}/2000/verify.wml (100%) rename foundation.gnome.org/{elections => vote}/2000/vote-archives.diff (100%) rename foundation.gnome.org/{elections => vote}/2000/vote-counter.py (100%) rename foundation.gnome.org/{elections => vote}/2000/voters.wml (100%) rename foundation.gnome.org/{elections => vote}/2001/Makefile.am (90%) rename foundation.gnome.org/{elections => vote}/2001/candidates.wml (100%) rename foundation.gnome.org/{elections => vote}/2001/index.wml (100%) rename foundation.gnome.org/{elections => vote}/2001/list-addresses.py (100%) rename foundation.gnome.org/{elections => vote}/2001/registered-voters.txt (100%) rename foundation.gnome.org/{elections => vote}/2001/results.txt (100%) rename foundation.gnome.org/{elections => vote}/2001/rules.wml (100%) rename foundation.gnome.org/{elections => vote}/2001/verify.wml (100%) rename foundation.gnome.org/{elections => vote}/2001/vote-archives.diff (100%) rename foundation.gnome.org/{elections => vote}/2001/vote-counter.py (100%) rename foundation.gnome.org/{elections => vote}/2001/voters.wml (100%) rename foundation.gnome.org/{elections => vote}/2002/Makefile.am (91%) rename foundation.gnome.org/{elections => vote}/2002/candidates.wml (100%) rename foundation.gnome.org/{elections => vote}/2002/index.wml (100%) rename foundation.gnome.org/{elections => vote}/2002/list-addresses.py (100%) rename foundation.gnome.org/{elections => vote}/2002/preliminary-results.wml (100%) rename foundation.gnome.org/{elections => vote}/2002/registered-voters.txt (100%) rename foundation.gnome.org/{elections => vote}/2002/results.txt (100%) rename foundation.gnome.org/{elections => vote}/2002/rules.wml (100%) rename foundation.gnome.org/{elections => vote}/2002/verify.wml (100%) rename foundation.gnome.org/{elections => vote}/2002/vote-archives.diff (100%) rename foundation.gnome.org/{elections => vote}/2002/vote-counter.py (100%) rename foundation.gnome.org/{elections => vote}/2002/voters.wml (100%) rename foundation.gnome.org/{elections => vote}/2003/2003-verif.tar.gz (100%) rename foundation.gnome.org/{elections => vote}/2003/Makefile.am (89%) rename foundation.gnome.org/{elections => vote}/2003/candidates.wml (100%) rename foundation.gnome.org/{elections => vote}/2003/index.wml (100%) rename foundation.gnome.org/{elections => vote}/2003/preliminary-results.wml (100%) rename foundation.gnome.org/{elections => vote}/2003/results.txt (100%) rename foundation.gnome.org/{elections => vote}/2003/rules.wml (100%) rename foundation.gnome.org/{elections => vote}/2003/verify.wml (100%) rename foundation.gnome.org/{elections => vote}/2003/voters.wml (100%) rename foundation.gnome.org/{elections => vote}/2004/2004-verif.tar.gz (100%) rename foundation.gnome.org/{elections => vote}/2004/Makefile.am (89%) rename foundation.gnome.org/{elections => vote}/2004/candidates.wml (100%) rename foundation.gnome.org/{elections => vote}/2004/index.wml (100%) rename foundation.gnome.org/{elections => vote}/2004/preliminary-results.wml (100%) rename foundation.gnome.org/{elections => vote}/2004/rules.wml (100%) rename foundation.gnome.org/{elections => vote}/2004/timeline.ics (100%) rename foundation.gnome.org/{elections => vote}/2004/verify.wml (100%) rename foundation.gnome.org/{elections => vote}/2004/voters.wml (100%) rename foundation.gnome.org/{elections => vote}/2005/Makefile.am (85%) rename foundation.gnome.org/{elections => vote}/2005/candidates.wml (100%) rename foundation.gnome.org/{elections => vote}/2005/index.wml (100%) rename foundation.gnome.org/{elections => vote}/2005/rules.wml (100%) rename foundation.gnome.org/{elections => vote}/2005/timeline.ics (100%) rename foundation.gnome.org/{elections => vote}/2005/voters.wml (100%) rename foundation.gnome.org/{elections => vote}/2006/Makefile.am (84%) rename foundation.gnome.org/{elections => vote}/2006/candidates.wml (100%) rename foundation.gnome.org/{elections => vote}/2006/index.wml (100%) rename foundation.gnome.org/{elections => vote}/2006/rules.wml (100%) rename foundation.gnome.org/{elections => vote}/2006/timeline.ics (100%) rename foundation.gnome.org/{elections => vote}/2007/Makefile.am (84%) rename foundation.gnome.org/{elections => vote}/2007/candidates.wml (100%) rename foundation.gnome.org/{elections => vote}/2007/index.wml (100%) rename foundation.gnome.org/{elections => vote}/2007/rules.wml (100%) rename foundation.gnome.org/{elections => vote}/2007/timeline.ics (100%) rename foundation.gnome.org/{elections => vote}/2009/Makefile.am (85%) rename foundation.gnome.org/{elections => vote}/2009/candidates.wml (100%) rename foundation.gnome.org/{elections => vote}/2009/index.wml (100%) rename foundation.gnome.org/{elections => vote}/2009/mkical.py (100%) rename foundation.gnome.org/{elections => vote}/2009/rules.wml (100%) rename foundation.gnome.org/{elections => vote}/2009/timeline.ics (100%) rename foundation.gnome.org/{elections => vote}/2009/voting-instructions.txt (100%) rename foundation.gnome.org/{elections => vote}/2010/Makefile.am (85%) rename foundation.gnome.org/{elections => vote}/2010/candidates.wml (100%) rename foundation.gnome.org/{elections => vote}/2010/index.wml (100%) rename foundation.gnome.org/{elections => vote}/2010/mkical.py (100%) rename foundation.gnome.org/{elections => vote}/2010/rules.wml (100%) rename foundation.gnome.org/{elections => vote}/2010/timeline.ics (100%) rename foundation.gnome.org/{elections => vote}/2010/voting-instructions.txt (100%) rename foundation.gnome.org/{elections => vote}/overview.wml (100%) diff --git a/foundation.gnome.org/elections/2000/.cvsignore b/foundation.gnome.org/elections/2000/.cvsignore deleted file mode 100644 index f17e1e7..0000000 --- a/foundation.gnome.org/elections/2000/.cvsignore +++ /dev/null @@ -1,8 +0,0 @@ -voters.html -verify.html -rules.html -results.html -index.html -candidates.html -Makefile.in -Makefile diff --git a/foundation.gnome.org/elections/2001/.cvsignore b/foundation.gnome.org/elections/2001/.cvsignore deleted file mode 100644 index 81e13b2..0000000 --- a/foundation.gnome.org/elections/2001/.cvsignore +++ /dev/null @@ -1,7 +0,0 @@ -voters.html -verify.html -rules.html -index.html -candidates.html -Makefile.in -Makefile diff --git a/foundation.gnome.org/elections/2002/.cvsignore b/foundation.gnome.org/elections/2002/.cvsignore deleted file mode 100644 index 9d7886f..0000000 --- a/foundation.gnome.org/elections/2002/.cvsignore +++ /dev/null @@ -1,8 +0,0 @@ -voters.html -verify.html -rules.html -index.html -candidates.html -preliminary-results.html -Makefile.in -Makefile diff --git a/foundation.gnome.org/elections/2003/.cvsignore b/foundation.gnome.org/elections/2003/.cvsignore deleted file mode 100644 index 96eb3bc..0000000 --- a/foundation.gnome.org/elections/2003/.cvsignore +++ /dev/null @@ -1,8 +0,0 @@ -candidates.html -preliminary-results.html -verify.html -voters.html -rules.html -index.html -Makefile.in -Makefile diff --git a/foundation.gnome.org/elections/2004/.cvsignore b/foundation.gnome.org/elections/2004/.cvsignore deleted file mode 100644 index 96eb3bc..0000000 --- a/foundation.gnome.org/elections/2004/.cvsignore +++ /dev/null @@ -1,8 +0,0 @@ -candidates.html -preliminary-results.html -verify.html -voters.html -rules.html -index.html -Makefile.in -Makefile diff --git a/foundation.gnome.org/elections/2005/.cvsignore b/foundation.gnome.org/elections/2005/.cvsignore deleted file mode 100644 index 545f467..0000000 --- a/foundation.gnome.org/elections/2005/.cvsignore +++ /dev/null @@ -1,6 +0,0 @@ -candidates.html -voters.html -rules.html -index.html -Makefile.in -Makefile diff --git a/foundation.gnome.org/elections/2000/Makefile.am b/foundation.gnome.org/vote/2000/Makefile.am similarity index 90% rename from foundation.gnome.org/elections/2000/Makefile.am rename to foundation.gnome.org/vote/2000/Makefile.am index 57b136f..b89d07b 100644 --- a/foundation.gnome.org/elections/2000/Makefile.am +++ b/foundation.gnome.org/vote/2000/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS = -urlpath = /elections/2000 +urlpath = /vote/2000 page_SCRIPTS = \ index.html \ diff --git a/foundation.gnome.org/elections/2000/candidates.wml b/foundation.gnome.org/vote/2000/candidates.wml similarity index 100% rename from foundation.gnome.org/elections/2000/candidates.wml rename to foundation.gnome.org/vote/2000/candidates.wml diff --git a/foundation.gnome.org/elections/2000/index.wml b/foundation.gnome.org/vote/2000/index.wml similarity index 100% rename from foundation.gnome.org/elections/2000/index.wml rename to foundation.gnome.org/vote/2000/index.wml diff --git a/foundation.gnome.org/elections/2000/list-addresses.py b/foundation.gnome.org/vote/2000/list-addresses.py similarity index 100% rename from foundation.gnome.org/elections/2000/list-addresses.py rename to foundation.gnome.org/vote/2000/list-addresses.py diff --git a/foundation.gnome.org/elections/2000/registered-voters.txt b/foundation.gnome.org/vote/2000/registered-voters.txt similarity index 100% rename from foundation.gnome.org/elections/2000/registered-voters.txt rename to foundation.gnome.org/vote/2000/registered-voters.txt diff --git a/foundation.gnome.org/elections/2000/results.wml b/foundation.gnome.org/vote/2000/results.wml similarity index 100% rename from foundation.gnome.org/elections/2000/results.wml rename to foundation.gnome.org/vote/2000/results.wml diff --git a/foundation.gnome.org/elections/2000/rules.wml b/foundation.gnome.org/vote/2000/rules.wml similarity index 100% rename from foundation.gnome.org/elections/2000/rules.wml rename to foundation.gnome.org/vote/2000/rules.wml diff --git a/foundation.gnome.org/elections/2000/verify.wml b/foundation.gnome.org/vote/2000/verify.wml similarity index 100% rename from foundation.gnome.org/elections/2000/verify.wml rename to foundation.gnome.org/vote/2000/verify.wml diff --git a/foundation.gnome.org/elections/2000/vote-archives.diff b/foundation.gnome.org/vote/2000/vote-archives.diff similarity index 100% rename from foundation.gnome.org/elections/2000/vote-archives.diff rename to foundation.gnome.org/vote/2000/vote-archives.diff diff --git a/foundation.gnome.org/elections/2000/vote-counter.py b/foundation.gnome.org/vote/2000/vote-counter.py similarity index 100% rename from foundation.gnome.org/elections/2000/vote-counter.py rename to foundation.gnome.org/vote/2000/vote-counter.py diff --git a/foundation.gnome.org/elections/2000/voters.wml b/foundation.gnome.org/vote/2000/voters.wml similarity index 100% rename from foundation.gnome.org/elections/2000/voters.wml rename to foundation.gnome.org/vote/2000/voters.wml diff --git a/foundation.gnome.org/elections/2001/Makefile.am b/foundation.gnome.org/vote/2001/Makefile.am similarity index 90% rename from foundation.gnome.org/elections/2001/Makefile.am rename to foundation.gnome.org/vote/2001/Makefile.am index 2369dfb..21a6a6c 100644 --- a/foundation.gnome.org/elections/2001/Makefile.am +++ b/foundation.gnome.org/vote/2001/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS = -urlpath = /elections/2001 +urlpath = /vote/2001 page_SCRIPTS = \ index.html \ diff --git a/foundation.gnome.org/elections/2001/candidates.wml b/foundation.gnome.org/vote/2001/candidates.wml similarity index 100% rename from foundation.gnome.org/elections/2001/candidates.wml rename to foundation.gnome.org/vote/2001/candidates.wml diff --git a/foundation.gnome.org/elections/2001/index.wml b/foundation.gnome.org/vote/2001/index.wml similarity index 100% rename from foundation.gnome.org/elections/2001/index.wml rename to foundation.gnome.org/vote/2001/index.wml diff --git a/foundation.gnome.org/elections/2001/list-addresses.py b/foundation.gnome.org/vote/2001/list-addresses.py similarity index 100% rename from foundation.gnome.org/elections/2001/list-addresses.py rename to foundation.gnome.org/vote/2001/list-addresses.py diff --git a/foundation.gnome.org/elections/2001/registered-voters.txt b/foundation.gnome.org/vote/2001/registered-voters.txt similarity index 100% rename from foundation.gnome.org/elections/2001/registered-voters.txt rename to foundation.gnome.org/vote/2001/registered-voters.txt diff --git a/foundation.gnome.org/elections/2001/results.txt b/foundation.gnome.org/vote/2001/results.txt similarity index 100% rename from foundation.gnome.org/elections/2001/results.txt rename to foundation.gnome.org/vote/2001/results.txt diff --git a/foundation.gnome.org/elections/2001/rules.wml b/foundation.gnome.org/vote/2001/rules.wml similarity index 100% rename from foundation.gnome.org/elections/2001/rules.wml rename to foundation.gnome.org/vote/2001/rules.wml diff --git a/foundation.gnome.org/elections/2001/verify.wml b/foundation.gnome.org/vote/2001/verify.wml similarity index 100% rename from foundation.gnome.org/elections/2001/verify.wml rename to foundation.gnome.org/vote/2001/verify.wml diff --git a/foundation.gnome.org/elections/2001/vote-archives.diff b/foundation.gnome.org/vote/2001/vote-archives.diff similarity index 100% rename from foundation.gnome.org/elections/2001/vote-archives.diff rename to foundation.gnome.org/vote/2001/vote-archives.diff diff --git a/foundation.gnome.org/elections/2001/vote-counter.py b/foundation.gnome.org/vote/2001/vote-counter.py similarity index 100% rename from foundation.gnome.org/elections/2001/vote-counter.py rename to foundation.gnome.org/vote/2001/vote-counter.py diff --git a/foundation.gnome.org/elections/2001/voters.wml b/foundation.gnome.org/vote/2001/voters.wml similarity index 100% rename from foundation.gnome.org/elections/2001/voters.wml rename to foundation.gnome.org/vote/2001/voters.wml diff --git a/foundation.gnome.org/elections/2002/Makefile.am b/foundation.gnome.org/vote/2002/Makefile.am similarity index 91% rename from foundation.gnome.org/elections/2002/Makefile.am rename to foundation.gnome.org/vote/2002/Makefile.am index 033c11a..d0d3fb9 100644 --- a/foundation.gnome.org/elections/2002/Makefile.am +++ b/foundation.gnome.org/vote/2002/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS = -urlpath = /elections/2002 +urlpath = /vote/2002 page_SCRIPTS = \ index.html \ diff --git a/foundation.gnome.org/elections/2002/candidates.wml b/foundation.gnome.org/vote/2002/candidates.wml similarity index 100% rename from foundation.gnome.org/elections/2002/candidates.wml rename to foundation.gnome.org/vote/2002/candidates.wml diff --git a/foundation.gnome.org/elections/2002/index.wml b/foundation.gnome.org/vote/2002/index.wml similarity index 100% rename from foundation.gnome.org/elections/2002/index.wml rename to foundation.gnome.org/vote/2002/index.wml diff --git a/foundation.gnome.org/elections/2002/list-addresses.py b/foundation.gnome.org/vote/2002/list-addresses.py similarity index 100% rename from foundation.gnome.org/elections/2002/list-addresses.py rename to foundation.gnome.org/vote/2002/list-addresses.py diff --git a/foundation.gnome.org/elections/2002/preliminary-results.wml b/foundation.gnome.org/vote/2002/preliminary-results.wml similarity index 100% rename from foundation.gnome.org/elections/2002/preliminary-results.wml rename to foundation.gnome.org/vote/2002/preliminary-results.wml diff --git a/foundation.gnome.org/elections/2002/registered-voters.txt b/foundation.gnome.org/vote/2002/registered-voters.txt similarity index 100% rename from foundation.gnome.org/elections/2002/registered-voters.txt rename to foundation.gnome.org/vote/2002/registered-voters.txt diff --git a/foundation.gnome.org/elections/2002/results.txt b/foundation.gnome.org/vote/2002/results.txt similarity index 100% rename from foundation.gnome.org/elections/2002/results.txt rename to foundation.gnome.org/vote/2002/results.txt diff --git a/foundation.gnome.org/elections/2002/rules.wml b/foundation.gnome.org/vote/2002/rules.wml similarity index 100% rename from foundation.gnome.org/elections/2002/rules.wml rename to foundation.gnome.org/vote/2002/rules.wml diff --git a/foundation.gnome.org/elections/2002/verify.wml b/foundation.gnome.org/vote/2002/verify.wml similarity index 100% rename from foundation.gnome.org/elections/2002/verify.wml rename to foundation.gnome.org/vote/2002/verify.wml diff --git a/foundation.gnome.org/elections/2002/vote-archives.diff b/foundation.gnome.org/vote/2002/vote-archives.diff similarity index 100% rename from foundation.gnome.org/elections/2002/vote-archives.diff rename to foundation.gnome.org/vote/2002/vote-archives.diff diff --git a/foundation.gnome.org/elections/2002/vote-counter.py b/foundation.gnome.org/vote/2002/vote-counter.py similarity index 100% rename from foundation.gnome.org/elections/2002/vote-counter.py rename to foundation.gnome.org/vote/2002/vote-counter.py diff --git a/foundation.gnome.org/elections/2002/voters.wml b/foundation.gnome.org/vote/2002/voters.wml similarity index 100% rename from foundation.gnome.org/elections/2002/voters.wml rename to foundation.gnome.org/vote/2002/voters.wml diff --git a/foundation.gnome.org/elections/2003/2003-verif.tar.gz b/foundation.gnome.org/vote/2003/2003-verif.tar.gz similarity index 100% rename from foundation.gnome.org/elections/2003/2003-verif.tar.gz rename to foundation.gnome.org/vote/2003/2003-verif.tar.gz diff --git a/foundation.gnome.org/elections/2003/Makefile.am b/foundation.gnome.org/vote/2003/Makefile.am similarity index 89% rename from foundation.gnome.org/elections/2003/Makefile.am rename to foundation.gnome.org/vote/2003/Makefile.am index 118a54d..5d9ea7d 100644 --- a/foundation.gnome.org/elections/2003/Makefile.am +++ b/foundation.gnome.org/vote/2003/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS = -urlpath = /elections/2003 +urlpath = /vote/2003 page_SCRIPTS = \ index.html \ diff --git a/foundation.gnome.org/elections/2003/candidates.wml b/foundation.gnome.org/vote/2003/candidates.wml similarity index 100% rename from foundation.gnome.org/elections/2003/candidates.wml rename to foundation.gnome.org/vote/2003/candidates.wml diff --git a/foundation.gnome.org/elections/2003/index.wml b/foundation.gnome.org/vote/2003/index.wml similarity index 100% rename from foundation.gnome.org/elections/2003/index.wml rename to foundation.gnome.org/vote/2003/index.wml diff --git a/foundation.gnome.org/elections/2003/preliminary-results.wml b/foundation.gnome.org/vote/2003/preliminary-results.wml similarity index 100% rename from foundation.gnome.org/elections/2003/preliminary-results.wml rename to foundation.gnome.org/vote/2003/preliminary-results.wml diff --git a/foundation.gnome.org/elections/2003/results.txt b/foundation.gnome.org/vote/2003/results.txt similarity index 100% rename from foundation.gnome.org/elections/2003/results.txt rename to foundation.gnome.org/vote/2003/results.txt diff --git a/foundation.gnome.org/elections/2003/rules.wml b/foundation.gnome.org/vote/2003/rules.wml similarity index 100% rename from foundation.gnome.org/elections/2003/rules.wml rename to foundation.gnome.org/vote/2003/rules.wml diff --git a/foundation.gnome.org/elections/2003/verify.wml b/foundation.gnome.org/vote/2003/verify.wml similarity index 100% rename from foundation.gnome.org/elections/2003/verify.wml rename to foundation.gnome.org/vote/2003/verify.wml diff --git a/foundation.gnome.org/elections/2003/voters.wml b/foundation.gnome.org/vote/2003/voters.wml similarity index 100% rename from foundation.gnome.org/elections/2003/voters.wml rename to foundation.gnome.org/vote/2003/voters.wml diff --git a/foundation.gnome.org/elections/2004/2004-verif.tar.gz b/foundation.gnome.org/vote/2004/2004-verif.tar.gz similarity index 100% rename from foundation.gnome.org/elections/2004/2004-verif.tar.gz rename to foundation.gnome.org/vote/2004/2004-verif.tar.gz diff --git a/foundation.gnome.org/elections/2004/Makefile.am b/foundation.gnome.org/vote/2004/Makefile.am similarity index 89% rename from foundation.gnome.org/elections/2004/Makefile.am rename to foundation.gnome.org/vote/2004/Makefile.am index 1cb6844..c7118b0 100644 --- a/foundation.gnome.org/elections/2004/Makefile.am +++ b/foundation.gnome.org/vote/2004/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS = -urlpath = /elections/2004 +urlpath = /vote/2004 page_SCRIPTS = \ index.html \ diff --git a/foundation.gnome.org/elections/2004/candidates.wml b/foundation.gnome.org/vote/2004/candidates.wml similarity index 100% rename from foundation.gnome.org/elections/2004/candidates.wml rename to foundation.gnome.org/vote/2004/candidates.wml diff --git a/foundation.gnome.org/elections/2004/index.wml b/foundation.gnome.org/vote/2004/index.wml similarity index 100% rename from foundation.gnome.org/elections/2004/index.wml rename to foundation.gnome.org/vote/2004/index.wml diff --git a/foundation.gnome.org/elections/2004/preliminary-results.wml b/foundation.gnome.org/vote/2004/preliminary-results.wml similarity index 100% rename from foundation.gnome.org/elections/2004/preliminary-results.wml rename to foundation.gnome.org/vote/2004/preliminary-results.wml diff --git a/foundation.gnome.org/elections/2004/rules.wml b/foundation.gnome.org/vote/2004/rules.wml similarity index 100% rename from foundation.gnome.org/elections/2004/rules.wml rename to foundation.gnome.org/vote/2004/rules.wml diff --git a/foundation.gnome.org/elections/2004/timeline.ics b/foundation.gnome.org/vote/2004/timeline.ics similarity index 100% rename from foundation.gnome.org/elections/2004/timeline.ics rename to foundation.gnome.org/vote/2004/timeline.ics diff --git a/foundation.gnome.org/elections/2004/verify.wml b/foundation.gnome.org/vote/2004/verify.wml similarity index 100% rename from foundation.gnome.org/elections/2004/verify.wml rename to foundation.gnome.org/vote/2004/verify.wml diff --git a/foundation.gnome.org/elections/2004/voters.wml b/foundation.gnome.org/vote/2004/voters.wml similarity index 100% rename from foundation.gnome.org/elections/2004/voters.wml rename to foundation.gnome.org/vote/2004/voters.wml diff --git a/foundation.gnome.org/elections/2005/Makefile.am b/foundation.gnome.org/vote/2005/Makefile.am similarity index 85% rename from foundation.gnome.org/elections/2005/Makefile.am rename to foundation.gnome.org/vote/2005/Makefile.am index 9443172..bb8b8ae 100644 --- a/foundation.gnome.org/elections/2005/Makefile.am +++ b/foundation.gnome.org/vote/2005/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS = -urlpath = /elections/2005 +urlpath = /vote/2005 page_SCRIPTS = \ index.html \ diff --git a/foundation.gnome.org/elections/2005/candidates.wml b/foundation.gnome.org/vote/2005/candidates.wml similarity index 100% rename from foundation.gnome.org/elections/2005/candidates.wml rename to foundation.gnome.org/vote/2005/candidates.wml diff --git a/foundation.gnome.org/elections/2005/index.wml b/foundation.gnome.org/vote/2005/index.wml similarity index 100% rename from foundation.gnome.org/elections/2005/index.wml rename to foundation.gnome.org/vote/2005/index.wml diff --git a/foundation.gnome.org/elections/2005/rules.wml b/foundation.gnome.org/vote/2005/rules.wml similarity index 100% rename from foundation.gnome.org/elections/2005/rules.wml rename to foundation.gnome.org/vote/2005/rules.wml diff --git a/foundation.gnome.org/elections/2005/timeline.ics b/foundation.gnome.org/vote/2005/timeline.ics similarity index 100% rename from foundation.gnome.org/elections/2005/timeline.ics rename to foundation.gnome.org/vote/2005/timeline.ics diff --git a/foundation.gnome.org/elections/2005/voters.wml b/foundation.gnome.org/vote/2005/voters.wml similarity index 100% rename from foundation.gnome.org/elections/2005/voters.wml rename to foundation.gnome.org/vote/2005/voters.wml diff --git a/foundation.gnome.org/elections/2006/Makefile.am b/foundation.gnome.org/vote/2006/Makefile.am similarity index 84% rename from foundation.gnome.org/elections/2006/Makefile.am rename to foundation.gnome.org/vote/2006/Makefile.am index 6ffac0f..58b5b9e 100644 --- a/foundation.gnome.org/elections/2006/Makefile.am +++ b/foundation.gnome.org/vote/2006/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS = -urlpath = /elections/2006 +urlpath = /vote/2006 page_SCRIPTS = \ index.html \ diff --git a/foundation.gnome.org/elections/2006/candidates.wml b/foundation.gnome.org/vote/2006/candidates.wml similarity index 100% rename from foundation.gnome.org/elections/2006/candidates.wml rename to foundation.gnome.org/vote/2006/candidates.wml diff --git a/foundation.gnome.org/elections/2006/index.wml b/foundation.gnome.org/vote/2006/index.wml similarity index 100% rename from foundation.gnome.org/elections/2006/index.wml rename to foundation.gnome.org/vote/2006/index.wml diff --git a/foundation.gnome.org/elections/2006/rules.wml b/foundation.gnome.org/vote/2006/rules.wml similarity index 100% rename from foundation.gnome.org/elections/2006/rules.wml rename to foundation.gnome.org/vote/2006/rules.wml diff --git a/foundation.gnome.org/elections/2006/timeline.ics b/foundation.gnome.org/vote/2006/timeline.ics similarity index 100% rename from foundation.gnome.org/elections/2006/timeline.ics rename to foundation.gnome.org/vote/2006/timeline.ics diff --git a/foundation.gnome.org/elections/2007/Makefile.am b/foundation.gnome.org/vote/2007/Makefile.am similarity index 84% rename from foundation.gnome.org/elections/2007/Makefile.am rename to foundation.gnome.org/vote/2007/Makefile.am index a56b36f..43d1a2d 100644 --- a/foundation.gnome.org/elections/2007/Makefile.am +++ b/foundation.gnome.org/vote/2007/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS = -urlpath = /elections/2007 +urlpath = /vote/2007 page_SCRIPTS = \ index.html \ diff --git a/foundation.gnome.org/elections/2007/candidates.wml b/foundation.gnome.org/vote/2007/candidates.wml similarity index 100% rename from foundation.gnome.org/elections/2007/candidates.wml rename to foundation.gnome.org/vote/2007/candidates.wml diff --git a/foundation.gnome.org/elections/2007/index.wml b/foundation.gnome.org/vote/2007/index.wml similarity index 100% rename from foundation.gnome.org/elections/2007/index.wml rename to foundation.gnome.org/vote/2007/index.wml diff --git a/foundation.gnome.org/elections/2007/rules.wml b/foundation.gnome.org/vote/2007/rules.wml similarity index 100% rename from foundation.gnome.org/elections/2007/rules.wml rename to foundation.gnome.org/vote/2007/rules.wml diff --git a/foundation.gnome.org/elections/2007/timeline.ics b/foundation.gnome.org/vote/2007/timeline.ics similarity index 100% rename from foundation.gnome.org/elections/2007/timeline.ics rename to foundation.gnome.org/vote/2007/timeline.ics diff --git a/foundation.gnome.org/elections/2009/Makefile.am b/foundation.gnome.org/vote/2009/Makefile.am similarity index 85% rename from foundation.gnome.org/elections/2009/Makefile.am rename to foundation.gnome.org/vote/2009/Makefile.am index 5218d21..825ea6b 100644 --- a/foundation.gnome.org/elections/2009/Makefile.am +++ b/foundation.gnome.org/vote/2009/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS = -urlpath = /elections/2009 +urlpath = /vote/2009 page_SCRIPTS = \ index.html \ diff --git a/foundation.gnome.org/elections/2009/candidates.wml b/foundation.gnome.org/vote/2009/candidates.wml similarity index 100% rename from foundation.gnome.org/elections/2009/candidates.wml rename to foundation.gnome.org/vote/2009/candidates.wml diff --git a/foundation.gnome.org/elections/2009/index.wml b/foundation.gnome.org/vote/2009/index.wml similarity index 100% rename from foundation.gnome.org/elections/2009/index.wml rename to foundation.gnome.org/vote/2009/index.wml diff --git a/foundation.gnome.org/elections/2009/mkical.py b/foundation.gnome.org/vote/2009/mkical.py similarity index 100% rename from foundation.gnome.org/elections/2009/mkical.py rename to foundation.gnome.org/vote/2009/mkical.py diff --git a/foundation.gnome.org/elections/2009/rules.wml b/foundation.gnome.org/vote/2009/rules.wml similarity index 100% rename from foundation.gnome.org/elections/2009/rules.wml rename to foundation.gnome.org/vote/2009/rules.wml diff --git a/foundation.gnome.org/elections/2009/timeline.ics b/foundation.gnome.org/vote/2009/timeline.ics similarity index 100% rename from foundation.gnome.org/elections/2009/timeline.ics rename to foundation.gnome.org/vote/2009/timeline.ics diff --git a/foundation.gnome.org/elections/2009/voting-instructions.txt b/foundation.gnome.org/vote/2009/voting-instructions.txt similarity index 100% rename from foundation.gnome.org/elections/2009/voting-instructions.txt rename to foundation.gnome.org/vote/2009/voting-instructions.txt diff --git a/foundation.gnome.org/elections/2010/Makefile.am b/foundation.gnome.org/vote/2010/Makefile.am similarity index 85% rename from foundation.gnome.org/elections/2010/Makefile.am rename to foundation.gnome.org/vote/2010/Makefile.am index 009787e..8677640 100644 --- a/foundation.gnome.org/elections/2010/Makefile.am +++ b/foundation.gnome.org/vote/2010/Makefile.am @@ -1,6 +1,6 @@ SUBDIRS = -urlpath = /elections/2010 +urlpath = /vote/2010 page_SCRIPTS = \ index.html \ diff --git a/foundation.gnome.org/elections/2010/candidates.wml b/foundation.gnome.org/vote/2010/candidates.wml similarity index 100% rename from foundation.gnome.org/elections/2010/candidates.wml rename to foundation.gnome.org/vote/2010/candidates.wml diff --git a/foundation.gnome.org/elections/2010/index.wml b/foundation.gnome.org/vote/2010/index.wml similarity index 100% rename from foundation.gnome.org/elections/2010/index.wml rename to foundation.gnome.org/vote/2010/index.wml diff --git a/foundation.gnome.org/elections/2010/mkical.py b/foundation.gnome.org/vote/2010/mkical.py similarity index 100% rename from foundation.gnome.org/elections/2010/mkical.py rename to foundation.gnome.org/vote/2010/mkical.py diff --git a/foundation.gnome.org/elections/2010/rules.wml b/foundation.gnome.org/vote/2010/rules.wml similarity index 100% rename from foundation.gnome.org/elections/2010/rules.wml rename to foundation.gnome.org/vote/2010/rules.wml diff --git a/foundation.gnome.org/elections/2010/timeline.ics b/foundation.gnome.org/vote/2010/timeline.ics similarity index 100% rename from foundation.gnome.org/elections/2010/timeline.ics rename to foundation.gnome.org/vote/2010/timeline.ics diff --git a/foundation.gnome.org/elections/2010/voting-instructions.txt b/foundation.gnome.org/vote/2010/voting-instructions.txt similarity index 100% rename from foundation.gnome.org/elections/2010/voting-instructions.txt rename to foundation.gnome.org/vote/2010/voting-instructions.txt diff --git a/foundation.gnome.org/vote/Makefile.am b/foundation.gnome.org/vote/Makefile.am index d86ae7a..580c0b5 100644 --- a/foundation.gnome.org/vote/Makefile.am +++ b/foundation.gnome.org/vote/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = include 2004-10 2005-10 +SUBDIRS = include 2004-10 2005-10 2000 2001 2002 2003 2004 2005 2006 2007 2009 2010 urlpath = /vote @@ -8,6 +8,7 @@ page_SCRIPTS = \ results.php \ votes.php \ vote.php \ + overview.html \ blt.php page_DATA = \ diff --git a/foundation.gnome.org/vote/index.wml b/foundation.gnome.org/vote/index.wml index bdfeae4..72c3ac2 100644 --- a/foundation.gnome.org/vote/index.wml +++ b/foundation.gnome.org/vote/index.wml @@ -1,32 +1,70 @@ + - The GNOME Foundation - Votes + GNOME Foundation Elections and Referenda -

GNOME Foundation Voting System

+

GNOME Foundation Elections and Referenda

-

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.

+

Election Materials

-

+

+ The GNOME Foundation Membership elects the Board of Directors each + November. Any member can nominate themself to run in the election. The + overall election process is overseen by the Membership and Elections + Committee, which can be reached at elections@gnome.org. +

+ + + + +

Referenda Materials

+ +

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. -

- +

+ + + Can not open the database.\n"; @@ -71,4 +109,5 @@ if (count ($previous_elections) > 0) { diff --git a/foundation.gnome.org/elections/overview.wml b/foundation.gnome.org/vote/overview.wml similarity index 100% rename from foundation.gnome.org/elections/overview.wml rename to foundation.gnome.org/vote/overview.wml diff --git a/include/add-header.xsl b/include/add-header.xsl index e813081..6e9e02e 100644 --- a/include/add-header.xsl +++ b/include/add-header.xsl @@ -47,7 +47,7 @@
  • Blog
  • Reports
  • Membership
    • -
  • Elections and Referenda
    • +
  • Elections and Referenda
  • Legal
  • Finance
  • Contact
    • diff --git a/include/evilsedhack b/include/evilsedhack index 7a7b9cd..de852c3 100755 --- a/include/evilsedhack +++ b/include/evilsedhack @@ -14,7 +14,7 @@ cat <<-FOOT
  • Blog
  • Reports
  • Membership
    • -
  • Elections and Referenda
    • +
  • Elections and Referenda
  • Legal
  • Finance
  • Contact