[foundation-web] Bug 629334: Move referenda page into the election page

[Tobias Mueller <tobiasmue src gnome org>]

commit 15e2716b4aa5f9f8044258b41ee0b71c41c6f82c
Author: Tobias Mueller <tobiasmue gnome org>
Date:   Fri Oct 1 16:32:16 2010 +0300

    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.

 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 21440 -> 21440 bytes
 .../{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(-)
---
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 @@
     <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>
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");
 
 <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 ();