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.
This commit is contained in:
Tobias Mueller
parent
117be799c5
commit
75909de3ed
93 changed files with 60 additions and 65 deletions
|
|
@ -1,8 +0,0 @@
|
||||||
voters.html
|
|
||||||
verify.html
|
|
||||||
rules.html
|
|
||||||
results.html
|
|
||||||
index.html
|
|
||||||
candidates.html
|
|
||||||
Makefile.in
|
|
||||||
Makefile
|
|
||||||
|
|
@ -1,7 +0,0 @@
|
||||||
voters.html
|
|
||||||
verify.html
|
|
||||||
rules.html
|
|
||||||
index.html
|
|
||||||
candidates.html
|
|
||||||
Makefile.in
|
|
||||||
Makefile
|
|
||||||
|
|
@ -1,8 +0,0 @@
|
||||||
voters.html
|
|
||||||
verify.html
|
|
||||||
rules.html
|
|
||||||
index.html
|
|
||||||
candidates.html
|
|
||||||
preliminary-results.html
|
|
||||||
Makefile.in
|
|
||||||
Makefile
|
|
||||||
|
|
@ -1,8 +0,0 @@
|
||||||
candidates.html
|
|
||||||
preliminary-results.html
|
|
||||||
verify.html
|
|
||||||
voters.html
|
|
||||||
rules.html
|
|
||||||
index.html
|
|
||||||
Makefile.in
|
|
||||||
Makefile
|
|
||||||
|
|
@ -1,8 +0,0 @@
|
||||||
candidates.html
|
|
||||||
preliminary-results.html
|
|
||||||
verify.html
|
|
||||||
voters.html
|
|
||||||
rules.html
|
|
||||||
index.html
|
|
||||||
Makefile.in
|
|
||||||
Makefile
|
|
||||||
|
|
@ -1,6 +0,0 @@
|
||||||
candidates.html
|
|
||||||
voters.html
|
|
||||||
rules.html
|
|
||||||
index.html
|
|
||||||
Makefile.in
|
|
||||||
Makefile
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
SUBDIRS =
|
SUBDIRS =
|
||||||
|
|
||||||
urlpath = /elections/2000
|
urlpath = /vote/2000
|
||||||
|
|
||||||
page_SCRIPTS = \
|
page_SCRIPTS = \
|
||||||
index.html \
|
index.html \
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
SUBDIRS =
|
SUBDIRS =
|
||||||
|
|
||||||
urlpath = /elections/2001
|
urlpath = /vote/2001
|
||||||
|
|
||||||
page_SCRIPTS = \
|
page_SCRIPTS = \
|
||||||
index.html \
|
index.html \
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
SUBDIRS =
|
SUBDIRS =
|
||||||
|
|
||||||
urlpath = /elections/2002
|
urlpath = /vote/2002
|
||||||
|
|
||||||
page_SCRIPTS = \
|
page_SCRIPTS = \
|
||||||
index.html \
|
index.html \
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
SUBDIRS =
|
SUBDIRS =
|
||||||
|
|
||||||
urlpath = /elections/2003
|
urlpath = /vote/2003
|
||||||
|
|
||||||
page_SCRIPTS = \
|
page_SCRIPTS = \
|
||||||
index.html \
|
index.html \
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
SUBDIRS =
|
SUBDIRS =
|
||||||
|
|
||||||
urlpath = /elections/2004
|
urlpath = /vote/2004
|
||||||
|
|
||||||
page_SCRIPTS = \
|
page_SCRIPTS = \
|
||||||
index.html \
|
index.html \
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
SUBDIRS =
|
SUBDIRS =
|
||||||
|
|
||||||
urlpath = /elections/2005
|
urlpath = /vote/2005
|
||||||
|
|
||||||
page_SCRIPTS = \
|
page_SCRIPTS = \
|
||||||
index.html \
|
index.html \
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
SUBDIRS =
|
SUBDIRS =
|
||||||
|
|
||||||
urlpath = /elections/2006
|
urlpath = /vote/2006
|
||||||
|
|
||||||
page_SCRIPTS = \
|
page_SCRIPTS = \
|
||||||
index.html \
|
index.html \
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
SUBDIRS =
|
SUBDIRS =
|
||||||
|
|
||||||
urlpath = /elections/2007
|
urlpath = /vote/2007
|
||||||
|
|
||||||
page_SCRIPTS = \
|
page_SCRIPTS = \
|
||||||
index.html \
|
index.html \
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
SUBDIRS =
|
SUBDIRS =
|
||||||
|
|
||||||
urlpath = /elections/2009
|
urlpath = /vote/2009
|
||||||
|
|
||||||
page_SCRIPTS = \
|
page_SCRIPTS = \
|
||||||
index.html \
|
index.html \
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
SUBDIRS =
|
SUBDIRS =
|
||||||
|
|
||||||
urlpath = /elections/2010
|
urlpath = /vote/2010
|
||||||
|
|
||||||
page_SCRIPTS = \
|
page_SCRIPTS = \
|
||||||
index.html \
|
index.html \
|
||||||
|
|
@ -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
|
urlpath = /vote
|
||||||
|
|
||||||
|
|
@ -8,6 +8,7 @@ page_SCRIPTS = \
|
||||||
results.php \
|
results.php \
|
||||||
votes.php \
|
votes.php \
|
||||||
vote.php \
|
vote.php \
|
||||||
|
overview.html \
|
||||||
blt.php
|
blt.php
|
||||||
|
|
||||||
page_DATA = \
|
page_DATA = \
|
||||||
|
|
|
||||||
|
|
@ -1,21 +1,46 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
|
||||||
<html>
|
<html>
|
||||||
|
|
||||||
<head>
|
<head>
|
||||||
<link rel="stylesheet" type="text/css" href="vote.css" />
|
<link rel="stylesheet" type="text/css" href="vote.css" />
|
||||||
<title>The GNOME Foundation - Votes</title>
|
<title>GNOME Foundation Elections and Referenda</title>
|
||||||
<meta name="cvsdate" content="$Date$" />
|
<meta name="cvsdate" content="$Date$" />
|
||||||
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
|
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
|
||||||
</head>
|
</head>
|
||||||
|
|
||||||
<body>
|
<body>
|
||||||
<?php
|
<?php
|
||||||
require_once ("include/election-sql.php");
|
//require_once ("include/election-sql.php");
|
||||||
?>
|
?>
|
||||||
|
|
||||||
<h1>GNOME Foundation Voting System</h1>
|
<h1>GNOME Foundation Elections and Referenda</h1>
|
||||||
|
|
||||||
<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>
|
<h2>Election Materials</h2>
|
||||||
|
|
||||||
|
<p>
|
||||||
|
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 <a
|
||||||
|
href="mailto:elections@gnome.org">elections@gnome.org</a>.
|
||||||
|
</p>
|
||||||
|
|
||||||
|
<ul>
|
||||||
|
<li><a href="2010/">Material from the Spring 2010 Elections</a></li>
|
||||||
|
<li><a href="2009/">Material from the Spring 2009 Elections</a></li>
|
||||||
|
<li><a href="2007/">Material from the Fall 2007 Elections</a></li>
|
||||||
|
<li><a href="2006/">Material from the Fall 2006 Elections</a></li>
|
||||||
|
<li><a href="2005/">Material from the Fall 2005 Elections</a></li>
|
||||||
|
<li><a href="2004/">Material from the Fall 2004 Elections</a></li>
|
||||||
|
<li><a href="2003/">Material from the Fall 2003 Elections</a></li>
|
||||||
|
<li><a href="2002/">Material from the Fall 2002 Elections</a></li>
|
||||||
|
<li><a href="2001/">Material from the Fall 2001 Elections</a></li>
|
||||||
|
<li><a href="2000/">Material from the Fall 2000 Elections</a></li>
|
||||||
|
</ul>
|
||||||
|
|
||||||
|
|
||||||
|
<h2>Referenda Materials</h2>
|
||||||
|
|
||||||
<p>
|
<p>
|
||||||
Any member of the GNOME Foundation can suggest a referendum. To be
|
Any member of the GNOME Foundation can suggest a referendum. To be
|
||||||
|
|
@ -25,8 +50,21 @@ require_once ("include/election-sql.php");
|
||||||
href="mailto:elections@gnome.org">elections@gnome.org</a>.
|
href="mailto:elections@gnome.org">elections@gnome.org</a>.
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
|
<ul>
|
||||||
|
<li><a href="../vote/2005-10/index.html">Material from the Office Term Referendum</a></li>
|
||||||
|
<li><a href="../vote/results.php?election_id=1">Material from the Reducing Board Size Referendum</a></li><!-- This is ugly, ideally we'd have an information page as with the other elections and referenda -->
|
||||||
|
<li><a href="../vote/2004-10/index.html">Material from the Anonymous Voting Referendum</a></li>
|
||||||
|
</ul>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
<?php
|
<?php
|
||||||
|
|
||||||
|
/* ATTENTION: All the code is eleminated. The reason for it being here is that
|
||||||
|
it might become useful again.
|
||||||
|
*/
|
||||||
|
|
||||||
|
if (0) { /* BEGIN OF Big Disable If */
|
||||||
|
|
||||||
$handle = elec_sql_open ();
|
$handle = elec_sql_open ();
|
||||||
if ($handle === FALSE) {
|
if ($handle === FALSE) {
|
||||||
echo "<div class=\"error\">Can not open the database.</div>\n";
|
echo "<div class=\"error\">Can not open the database.</div>\n";
|
||||||
|
|
@ -71,4 +109,5 @@ if (count ($previous_elections) > 0) {
|
||||||
</ul>
|
</ul>
|
||||||
<?php
|
<?php
|
||||||
}
|
}
|
||||||
|
} /* END OF Big Disable If */
|
||||||
?>
|
?>
|
||||||
|
|
|
||||||
|
|
@ -47,7 +47,7 @@
|
||||||
<li><a href="http://blogs.gnome.org/foundation/">Blog</a></li>
|
<li><a href="http://blogs.gnome.org/foundation/">Blog</a></li>
|
||||||
<li><a href="{$root}/reports/">Reports</a></li>
|
<li><a href="{$root}/reports/">Reports</a></li>
|
||||||
<li><a href="{$root}/membership/">Membership</a></li>
|
<li><a href="{$root}/membership/">Membership</a></li>
|
||||||
<li><a href="{$root}/elections/">Elections and Referenda</a></li>
|
<li><a href="{$root}/vote/">Elections and Referenda</a></li>
|
||||||
<li><a href="{$root}/legal/">Legal</a></li>
|
<li><a href="{$root}/legal/">Legal</a></li>
|
||||||
<li><a href="{$root}/finance/">Finance</a></li>
|
<li><a href="{$root}/finance/">Finance</a></li>
|
||||||
<li><a href="{$root}/contact/">Contact</a></li>
|
<li><a href="{$root}/contact/">Contact</a></li>
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,7 @@ cat <<-FOOT
|
||||||
<li><a href="http://blogs.gnome.org/foundation/">Blog</a></li>
|
<li><a href="http://blogs.gnome.org/foundation/">Blog</a></li>
|
||||||
<li><a href="$ROOT/reports/">Reports</a></li>
|
<li><a href="$ROOT/reports/">Reports</a></li>
|
||||||
<li><a href="$ROOT/membership/">Membership</a></li>
|
<li><a href="$ROOT/membership/">Membership</a></li>
|
||||||
<li><a href="$ROOT/elections/">Elections and Referenda</a></li>
|
<li><a href="$ROOT/vote/">Elections and Referenda</a></li>
|
||||||
<li><a href="$ROOT/legal/">Legal</a></li>
|
<li><a href="$ROOT/legal/">Legal</a></li>
|
||||||
<li><a href="$ROOT/finance/">Finance</a></li>
|
<li><a href="$ROOT/finance/">Finance</a></li>
|
||||||
<li><a href="$ROOT/contact/">Contact</a></li>
|
<li><a href="$ROOT/contact/">Contact</a></li>
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue