fedora-vote castvote.cgi, 1.11, 1.12 newelection.py, 1.7, 1.8 vote.cgi, 1.9, 1.10 votingadmin.py, 1.6, 1.7

[Toshio ãããã (toshio)]

Author: toshio

Update of /cvs/fedora/fedora-vote
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23145

Modified Files:
	castvote.cgi newelection.py vote.cgi votingadmin.py 
Log Message:
Docs Election.



Index: castvote.cgi
===================================================================
RCS file: /cvs/fedora/fedora-vote/castvote.cgi,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- castvote.cgi	4 Jul 2007 17:41:31 -0000	1.11
+++ castvote.cgi	15 Dec 2007 00:11:27 -0000	1.12
@@ -24,7 +24,7 @@
 import voting
 import votingadmin
 
-electionName = 'Fedora Project Board July 2007'
+electionName = 'Fedora Documentation Steering Committee December 2007'
 
 def make_thank_you(electionName, receipt):
     content = '''


Index: newelection.py
===================================================================
RCS file: /cvs/fedora/fedora-vote/newelection.py,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- newelection.py	4 Jul 2007 17:41:31 -0000	1.7
+++ newelection.py	15 Dec 2007 00:11:27 -0000	1.8
@@ -11,31 +11,29 @@
 import website
 
 dbName = 'elections'
-dbHost = 'db1.fedora.phx.redhat.com'
+dbHost = 'db2.fedora.phx.redhat.com'
 dbUser = 'electionsuser'
 
-electionName = 'Fedora Project Board July 2007'
-start = '2007-06-29 00:00:00'
-end = '2007-07-08 23:59:59'
+electionName = 'Fedora Documentation Steering Committee December 2007'
+start = '2007-12-14 00:00:00'
+end = '2007-12-24 23:59:59'
 #start = '2006-09-29 00:00:00'
 #end = '2006-10-05 23:59:59'
-seats = '6'
+seats = '5'
 
-votingGroups = ('cla_done',)
+votingGroups = ('cvsdocs',)
 
 candidates = (
-    # Brian Pepple
-    'bpepple',
-    # Christopher Aillon
-    'caillon',
-    # Dennis Gilmore
-    'ausil',
-    # Jef Spaleta
-    'jspaleta',
-    # Rahul Sundaram
-    'sundaram',
-    # Robert 'Bob' Jensen
-    'bjensen'
+    # Bart Couvreur
+    'couf',
+    # Jared Smith
+    'jsmith',
+    # John Babich
+    'jmbabich',
+    # Marc Wiriadisastra
+    'mwiriadi',
+    # Vladimir Kosovac
+    'vnk'
     )
 groupList = []
 candList = []


Index: vote.cgi
===================================================================
RCS file: /cvs/fedora/fedora-vote/vote.cgi,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- vote.cgi	4 Jul 2007 17:41:31 -0000	1.9
+++ vote.cgi	15 Dec 2007 00:11:27 -0000	1.10
@@ -11,7 +11,7 @@
 
 import voting
 
-electionName = 'Fedora Project Board July 2007'
+electionName = 'Fedora Documentation Steering Committee December 2007'
 
 def make_ballot(candidates, ballotName, openSeats):
     '''Return a string representing an html ballot.'''


Index: votingadmin.py
===================================================================
RCS file: /cvs/fedora/fedora-vote/votingadmin.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- votingadmin.py	15 Jun 2006 14:21:12 -0000	1.6
+++ votingadmin.py	15 Dec 2007 00:11:27 -0000	1.7
@@ -84,6 +84,6 @@
         # ballot.
         self.dbCmd.execute('COMMIT')
 
-        receiptList[0:0] = ('<p>Your ballot number was: %s</p>' % ballotId,)
+        receiptList[0:0] = ('<p>Your ballot identifier was: %s</p>' % ballotId,)
         
         return '\n'.join(receiptList)