elections-devel June 2008

elections-devel@lists.stg.fedorahosted.org

4 participants
20 discussions

r51 - branches/0.1.0-STABLE branches/0.1.0-STABLE/elections/templates trunk/elections/templates
by Nigel Jones 12 Jun '08

12 Jun '08

Author: nigelj Date: 2008-06-12 23:00:12 +0000 (Thu, 12 Jun 2008) New Revision: 51 Modified: branches/0.1.0-STABLE/elections.sql branches/0.1.0-STABLE/elections/templates/master.html branches/0.1.0-STABLE/elections/templates/results.html trunk/elections/templates/master.html trunk/elections/templates/results.html Log: Merge Rickys fix and fix links as reported to webmaster Modified: branches/0.1.0-STABLE/elections/templates/master.html =================================================================== --- branches/0.1.0-STABLE/elections/templates/master.html 2008-06-12 12:38:02 UTC (rev 50) +++ branches/0.1.0-STABLE/elections/templates/master.html 2008-06-12 23:00:12 UTC (rev 51) @@ -19,10 +19,10 @@ <div id="nav"> <h2>Navigation</h2> <ul> - <li id="nav-home"><a href="/en/index">Home</a></li> - - <li id="nav-get"><a href="/en/get-fedora">Get Fedora</a></li> - <li id="nav-join"><a href="/en/join-fedora">Join Fedora</a></li> + <li id="nav-home"><a href="http://fedoraproject.org/en/index">Home</a></li> + <li id="nav-get"><a href="http://fedoraproject.org/en/get-fedora">Get Fedora</a></li> + <li id="nav-join"><a href="http://fedoraproject.org/en/join-fedora">Join Fedora</a></li> + <li id="nav-help"><a href="http://fedoraproject.org/en/get-help">Get Help</a></li> </ul> </div> </div> @@ -43,6 +43,9 @@ </div> <div py:replace="select('*|text()')" /> </div> + <p> + Please report voting issues to the <a href="https://fedorahosted.org/fedora-infrastructure/">Fedora Infrastructure ticket system</a> selecting the Elections component. + </p> </div> Modified: branches/0.1.0-STABLE/elections/templates/results.html =================================================================== --- branches/0.1.0-STABLE/elections/templates/results.html 2008-06-12 12:38:02 UTC (rev 50) +++ branches/0.1.0-STABLE/elections/templates/results.html 2008-06-12 23:00:12 UTC (rev 51) @@ -4,7 +4,7 @@ xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:include href="master.html" /> <head> - <title>Welcome to TurboGears</title> + <title>${appTitle}</title> </head> <body> <h1>${election.name} Results</h1> Modified: branches/0.1.0-STABLE/elections.sql =================================================================== --- branches/0.1.0-STABLE/elections.sql 2008-06-12 12:38:02 UTC (rev 50) +++ branches/0.1.0-STABLE/elections.sql 2008-06-12 23:00:12 UTC (rev 51) @@ -42,7 +42,7 @@ id serial, -- voter_id will refer to someones fas ID voter text not null, -"timestamp" timestamp without time zone DEFAULT '2008-01-01 00:00:00'::timestamp without time zone NOT NULL +"timestamp" timestamp without time zone DEFAULT '2008-01-01 00:00:00'::timestamp without time zone NOT NULL, candidate_id integer not null, weight integer not null, election_id integer not null, Modified: trunk/elections/templates/master.html =================================================================== --- trunk/elections/templates/master.html 2008-06-12 12:38:02 UTC (rev 50) +++ trunk/elections/templates/master.html 2008-06-12 23:00:12 UTC (rev 51) @@ -19,10 +19,10 @@ <div id="nav"> <h2>Navigation</h2> <ul> - <li id="nav-home"><a href="/en/index">Home</a></li> - - <li id="nav-get"><a href="/en/get-fedora">Get Fedora</a></li> - <li id="nav-join"><a href="/en/join-fedora">Join Fedora</a></li> + <li id="nav-home"><a href="http://fedoraproject.org/en/index">Home</a></li> + <li id="nav-get"><a href="http://fedoraproject.org/en/get-fedora">Get Fedora</a></li> + <li id="nav-join"><a href="http://fedoraproject.org/en/join-fedora">Join Fedora</a></li> + <li id="nav-help"><a href="http://fedoraproject.org/en/get-help">Get Help</a></li> </ul> </div> </div> @@ -43,6 +43,9 @@ </div> <div py:replace="select('*|text()')" /> </div> + <p> + Please report voting issues to the <a href="https://fedorahosted.org/fedora-infrastructure/">Fedora Infrastructure ticket system</a> selecting the Elections component. + </p> </div> Modified: trunk/elections/templates/results.html =================================================================== --- trunk/elections/templates/results.html 2008-06-12 12:38:02 UTC (rev 50) +++ trunk/elections/templates/results.html 2008-06-12 23:00:12 UTC (rev 51) @@ -4,7 +4,7 @@ xmlns:xi="http://www.w3.org/2001/XInclude"> <xi:include href="master.html" /> <head> - <title>Welcome to TurboGears</title> + <title>${appTitle}</title> </head> <body> <h1>${election.name} Results</h1>

1 0

r50 - trunk
by Ricky Zhou 12 Jun '08

12 Jun '08

Author: ricky Date: 2008-06-12 12:38:02 +0000 (Thu, 12 Jun 2008) New Revision: 50 Modified: trunk/elections.sql Log: Add missing comma. Modified: trunk/elections.sql =================================================================== --- trunk/elections.sql 2008-06-11 23:34:14 UTC (rev 49) +++ trunk/elections.sql 2008-06-12 12:38:02 UTC (rev 50) @@ -42,7 +42,7 @@ id serial, -- voter_id will refer to someones fas ID voter text not null, -"timestamp" timestamp without time zone DEFAULT '2008-01-01 00:00:00'::timestamp without time zone NOT NULL +"timestamp" timestamp without time zone DEFAULT '2008-01-01 00:00:00'::timestamp without time zone NOT NULL, candidate_id integer not null, weight integer not null, election_id integer not null,

1 0

r49 - branches/0.1.0-STABLE branches/0.1.0-STABLE/elections/templates trunk trunk/elections/templates
by Nigel Jones 11 Jun '08

11 Jun '08

Author: nigelj Date: 2008-06-11 23:34:14 +0000 (Wed, 11 Jun 2008) New Revision: 49 Modified: branches/0.1.0-STABLE/elections.sql branches/0.1.0-STABLE/elections/templates/master.html trunk/elections.sql trunk/elections/templates/master.html Log: More bugfixes Modified: branches/0.1.0-STABLE/elections/templates/master.html =================================================================== --- branches/0.1.0-STABLE/elections/templates/master.html 2008-06-11 22:13:01 UTC (rev 48) +++ branches/0.1.0-STABLE/elections/templates/master.html 2008-06-11 23:34:14 UTC (rev 49) @@ -6,7 +6,7 @@ <head py:match="head" py:attrs="select('@*')"> <meta py:replace="select('*|text()')" /> <link rel="stylesheet" type="text/css" media="screen" href="${tg.url('/static/css/style.css')}" /> - <link rel="stylesheet" type="text/css" media="screen" href="http://fedoraproject.org/static/css/fedora.css" /> + <link rel="stylesheet" type="text/css" media="screen" href="https://fedoraproject.org/static/css/fedora.css" /> </head> <body py:match="body" py:attrs="select('@*')"> <div id="wrapper"> Modified: branches/0.1.0-STABLE/elections.sql =================================================================== --- branches/0.1.0-STABLE/elections.sql 2008-06-11 22:13:01 UTC (rev 48) +++ branches/0.1.0-STABLE/elections.sql 2008-06-11 23:34:14 UTC (rev 49) @@ -24,7 +24,7 @@ id serial, election_id integer not null, group_name text not null, -foreign key (election_id) references elections (id) +foreign key (election_id) references elections (id), primary key (id) ); @@ -42,6 +42,7 @@ id serial, -- voter_id will refer to someones fas ID voter text not null, +"timestamp" timestamp without time zone DEFAULT '2008-01-01 00:00:00'::timestamp without time zone NOT NULL candidate_id integer not null, weight integer not null, election_id integer not null, Modified: trunk/elections/templates/master.html =================================================================== --- trunk/elections/templates/master.html 2008-06-11 22:13:01 UTC (rev 48) +++ trunk/elections/templates/master.html 2008-06-11 23:34:14 UTC (rev 49) @@ -6,7 +6,7 @@ <head py:match="head" py:attrs="select('@*')"> <meta py:replace="select('*|text()')" /> <link rel="stylesheet" type="text/css" media="screen" href="${tg.url('/static/css/style.css')}" /> - <link rel="stylesheet" type="text/css" media="screen" href="http://fedoraproject.org/static/css/fedora.css" /> + <link rel="stylesheet" type="text/css" media="screen" href="https://fedoraproject.org/static/css/fedora.css" /> </head> <body py:match="body" py:attrs="select('@*')"> <div id="wrapper"> Modified: trunk/elections.sql =================================================================== --- trunk/elections.sql 2008-06-11 22:13:01 UTC (rev 48) +++ trunk/elections.sql 2008-06-11 23:34:14 UTC (rev 49) @@ -24,7 +24,7 @@ id serial, election_id integer not null, group_name text not null, -foreign key (election_id) references elections (id) +foreign key (election_id) references elections (id), primary key (id) ); @@ -42,6 +42,7 @@ id serial, -- voter_id will refer to someones fas ID voter text not null, +"timestamp" timestamp without time zone DEFAULT '2008-01-01 00:00:00'::timestamp without time zone NOT NULL candidate_id integer not null, weight integer not null, election_id integer not null,

1 0

r48 - branches/0.1.0-STABLE branches/0.1.0-STABLE/elections branches/0.1.0-STABLE/elections/templates trunk trunk/elections trunk/elections/templates
by Nigel Jones 11 Jun '08

11 Jun '08

Author: nigelj Date: 2008-06-11 22:13:01 +0000 (Wed, 11 Jun 2008) New Revision: 48 Modified: branches/0.1.0-STABLE/elections.cfg branches/0.1.0-STABLE/elections/controllers.py branches/0.1.0-STABLE/elections/templates/vote.html trunk/elections.cfg trunk/elections/controllers.py trunk/elections/templates/vote.html Log: Small spelling corrections Modified: branches/0.1.0-STABLE/elections/controllers.py =================================================================== --- branches/0.1.0-STABLE/elections/controllers.py 2008-06-11 13:53:02 UTC (rev 47) +++ branches/0.1.0-STABLE/elections/controllers.py 2008-06-11 22:13:01 UTC (rev 48) @@ -185,6 +185,9 @@ elif election.start_date > curtime: turbogears.flash("We are sorry, the results for this election cannot be viewed at this time because the election has not started.") raise turbogears.redirect("/") + elif election.public_results == 0: + turbogears.flash("We are sorry, the results for this election cannot be viewed at this time because the results are currently embargoed pending formal announcement.") + raise turbogears.redirect("/") votecount = VoteTally.query.filter_by(election_id=eid).order_by(VoteTally.novotes.desc()).all() return dict(votecount=votecount, election=election, appTitle=self.appTitle) Modified: branches/0.1.0-STABLE/elections/templates/vote.html =================================================================== --- branches/0.1.0-STABLE/elections/templates/vote.html 2008-06-11 13:53:02 UTC (rev 47) +++ branches/0.1.0-STABLE/elections/templates/vote.html 2008-06-11 22:13:01 UTC (rev 48) @@ -35,7 +35,7 @@ <h2>Information on Range Voting</h2> <p>Fedora Project has implemented <a href="http://rangevoting.org/">Range Voting</a> for this election, in particular the "Range (score-summing, blanks treated as zero score, no quorum rule)" range voting system.</p> <p>To cast your vote in this election simply select a value between 0 and ${len(candidates)} with 0 as 'least or no preference' and ${len(candidates)} as 'highest preference'.</p> - <p>At the end of the election, the highest ranking candidate(s) will be marked as the winners.</p> + <p>At the end of the election, the highest ranking candidate(s) are marked as the winners.</p> <p>For more information about Range Voting, visit the <a href="http://rangevoting.org/">Center for Range Voting</a>.</p> </div> </body> Modified: branches/0.1.0-STABLE/elections.cfg =================================================================== --- branches/0.1.0-STABLE/elections.cfg 2008-06-11 13:53:02 UTC (rev 47) +++ branches/0.1.0-STABLE/elections.cfg 2008-06-11 22:13:01 UTC (rev 48) @@ -36,7 +36,7 @@ server.socket_port=80 # Enable the debug output at the end on pages. -log_debug_info_filter.on = True +log_debug_info_filter.on = False server.environment="development" autoreload.package="elections" Modified: trunk/elections/controllers.py =================================================================== --- trunk/elections/controllers.py 2008-06-11 13:53:02 UTC (rev 47) +++ trunk/elections/controllers.py 2008-06-11 22:13:01 UTC (rev 48) @@ -185,6 +185,9 @@ elif election.start_date > curtime: turbogears.flash("We are sorry, the results for this election cannot be viewed at this time because the election has not started.") raise turbogears.redirect("/") + elif election.public_results == 0: + turbogears.flash("We are sorry, the results for this election cannot be viewed at this time because the results are currently embargoed pending formal announcement.") + raise turbogears.redirect("/") votecount = VoteTally.query.filter_by(election_id=eid).order_by(VoteTally.novotes.desc()).all() return dict(votecount=votecount, election=election, appTitle=self.appTitle) Modified: trunk/elections/templates/vote.html =================================================================== --- trunk/elections/templates/vote.html 2008-06-11 13:53:02 UTC (rev 47) +++ trunk/elections/templates/vote.html 2008-06-11 22:13:01 UTC (rev 48) @@ -35,7 +35,7 @@ <h2>Information on Range Voting</h2> <p>Fedora Project has implemented <a href="http://rangevoting.org/">Range Voting</a> for this election, in particular the "Range (score-summing, blanks treated as zero score, no quorum rule)" range voting system.</p> <p>To cast your vote in this election simply select a value between 0 and ${len(candidates)} with 0 as 'least or no preference' and ${len(candidates)} as 'highest preference'.</p> - <p>At the end of the election, the highest ranking candidate(s) will be marked as the winners.</p> + <p>At the end of the election, the highest ranking candidate(s) are marked as the winners.</p> <p>For more information about Range Voting, visit the <a href="http://rangevoting.org/">Center for Range Voting</a>.</p> </div> </body> Modified: trunk/elections.cfg =================================================================== --- trunk/elections.cfg 2008-06-11 13:53:02 UTC (rev 47) +++ trunk/elections.cfg 2008-06-11 22:13:01 UTC (rev 48) @@ -36,7 +36,7 @@ server.socket_port=80 # Enable the debug output at the end on pages. -log_debug_info_filter.on = True +log_debug_info_filter.on = False server.environment="development" autoreload.package="elections"

1 0

r47 - in branches/0.1.0-STABLE: . elections elections/templates
by Nigel Jones 11 Jun '08

11 Jun '08

Author: nigelj Date: 2008-06-11 13:53:02 +0000 (Wed, 11 Jun 2008) New Revision: 47 Modified: branches/0.1.0-STABLE/elections.sql branches/0.1.0-STABLE/elections/controllers.py branches/0.1.0-STABLE/elections/model.py branches/0.1.0-STABLE/elections/release.py branches/0.1.0-STABLE/elections/templates/about.html branches/0.1.0-STABLE/elections/templates/vote.html branches/0.1.0-STABLE/fedora-elections.spec Log: Small schema change but release 0.1.0 Modified: branches/0.1.0-STABLE/elections/controllers.py =================================================================== --- branches/0.1.0-STABLE/elections/controllers.py 2008-06-11 13:49:51 UTC (rev 46) +++ branches/0.1.0-STABLE/elections/controllers.py 2008-06-11 13:53:02 UTC (rev 47) @@ -64,7 +64,6 @@ votergroups = LegalVoters.query.filter_by(election_id=eid).all() candidates = Candidates.query.filter_by(election_id=eid).order_by(Candidates.name).all() - votergroups = LegalVoters.query.filter_by(election_id=eid).all() curtime = datetime.utcnow() Modified: branches/0.1.0-STABLE/elections/model.py =================================================================== --- branches/0.1.0-STABLE/elections/model.py 2008-06-11 13:49:51 UTC (rev 46) +++ branches/0.1.0-STABLE/elections/model.py 2008-06-11 13:53:02 UTC (rev 47) @@ -27,11 +27,7 @@ ElectionsTable = Table('elections', metadata, autoload=True) VotesTable = Table('votes', metadata, autoload=True) CandidatesTable = Table('candidates', metadata, autoload=True) -LegalVotersTable = Table('legalvoters', metadata, - Column('election_id', Integer, - ForeignKey('elections.id'), primary_key=True), - Column('group_name', String, nullable=False) -) +LegalVotersTable = Table('legalvoters', metadata, autoload=True) # View in the DB. Needs to have the column keys defined VoteTallyTable = Table('votecount', metadata, Modified: branches/0.1.0-STABLE/elections/release.py =================================================================== --- branches/0.1.0-STABLE/elections/release.py 2008-06-11 13:49:51 UTC (rev 46) +++ branches/0.1.0-STABLE/elections/release.py 2008-06-11 13:53:02 UTC (rev 47) @@ -24,7 +24,7 @@ # Release information about elections -version = "0.0.9.1" +version = "0.1.0" description = "Elections Application for Fedora Project" # long_description = "More description about your plan" Modified: branches/0.1.0-STABLE/elections/templates/about.html =================================================================== --- branches/0.1.0-STABLE/elections/templates/about.html 2008-06-11 13:49:51 UTC (rev 46) +++ branches/0.1.0-STABLE/elections/templates/about.html 2008-06-11 13:53:02 UTC (rev 47) @@ -21,7 +21,7 @@ </table> <p>To vote in this election you must be a member of any one of the following groups:</p> <ul> - <li py:for="g in votergroups">${g.group_name}</li> + <li py:for="g in votergroups"><py:choose test="g.group_name == 'anyany'"><py:when test="0">${g.group_name}</py:when><py:when test="1">Any Group</py:when></py:choose></li> </ul> </body> </html> Modified: branches/0.1.0-STABLE/elections/templates/vote.html =================================================================== --- branches/0.1.0-STABLE/elections/templates/vote.html 2008-06-11 13:49:51 UTC (rev 46) +++ branches/0.1.0-STABLE/elections/templates/vote.html 2008-06-11 13:53:02 UTC (rev 47) @@ -10,6 +10,7 @@ <h1>${election.name}</h1> <p>${election.info}</p> <p py:if="election.url"><a href="${election.url}">[More Information]</a></p> + <div> <form action="${tg.url('/vote/' + str(election.id))}" method="post"> <table border="1" cellpadding="1"> <tr py:for="candidate in candidates"> @@ -24,10 +25,18 @@ </py:if> </tr> <tr> - <td><input py:if="nextaction=='confirm'" type="button" value="Go Back" onClick="javascript.history.back(1)" /></td> + <td><input py:if="nextaction=='confirm'" type="button" value="Go Back" onClick="history.go(-1)" /></td> <td><input type="submit" name="${nextaction}" value="Submit" /></td> </tr> </table> - </form> + </form> + </div> + <div> + <h2>Information on Range Voting</h2> + <p>Fedora Project has implemented <a href="http://rangevoting.org/">Range Voting</a> for this election, in particular the "Range (score-summing, blanks treated as zero score, no quorum rule)" range voting system.</p> + <p>To cast your vote in this election simply select a value between 0 and ${len(candidates)} with 0 as 'least or no preference' and ${len(candidates)} as 'highest preference'.</p> + <p>At the end of the election, the highest ranking candidate(s) will be marked as the winners.</p> + <p>For more information about Range Voting, visit the <a href="http://rangevoting.org/">Center for Range Voting</a>.</p> + </div> </body> </html> Modified: branches/0.1.0-STABLE/elections.sql =================================================================== --- branches/0.1.0-STABLE/elections.sql 2008-06-11 13:49:51 UTC (rev 46) +++ branches/0.1.0-STABLE/elections.sql 2008-06-11 13:53:02 UTC (rev 47) @@ -21,10 +21,11 @@ ); create table legalVoters ( +id serial, election_id integer not null, group_name text not null, foreign key (election_id) references elections (id) --- primary key (election_id) +primary key (id) ); create table candidates ( Modified: branches/0.1.0-STABLE/fedora-elections.spec =================================================================== --- branches/0.1.0-STABLE/fedora-elections.spec 2008-06-11 13:49:51 UTC (rev 46) +++ branches/0.1.0-STABLE/fedora-elections.spec 2008-06-11 13:53:02 UTC (rev 47) @@ -2,14 +2,14 @@ %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")} Name: fedora-elections -Version: 0.0.5 -Release: 2%{?dist} +Version: 0.1.0 +Release: 1%{?dist} Summary: Elections Application for Fedora Project Group: Development/Languages License: GPLv2 URL: http://www.fedorahosted.org/elections -Source0: elections-0.0.5.tar.gz +Source0: elections-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -52,7 +52,11 @@ %changelog -* Fri May 23 2008 Nigel Jones <dev(a)nigelj.com> - 0.0.5-2 -- Bug Fixes +* Wed Jun 11 2008 Nigel Jones <dev(a)nigelj.com> - 0.1.0-1 +- Ready for initial deployment + +* Fri Jun 6 2008 Nigel Jones <dev(a)nigelj.com> - 0.0.9-1 +- Bump + * Thu May 22 2008 Nigel Jones <dev(a)nigelj.com> - 0.0.5-1 - Initial RPM - Ready to go!

1 0

r46 - in trunk: . elections elections/templates
by Nigel Jones 11 Jun '08

11 Jun '08

Author: nigelj Date: 2008-06-11 13:49:51 +0000 (Wed, 11 Jun 2008) New Revision: 46 Modified: trunk/elections.sql trunk/elections/controllers.py trunk/elections/model.py trunk/elections/release.py trunk/elections/templates/about.html trunk/elections/templates/vote.html trunk/fedora-elections.spec Log: Update to 0.1.0! Modified: trunk/elections/controllers.py =================================================================== --- trunk/elections/controllers.py 2008-06-11 12:30:41 UTC (rev 45) +++ trunk/elections/controllers.py 2008-06-11 13:49:51 UTC (rev 46) @@ -64,7 +64,6 @@ votergroups = LegalVoters.query.filter_by(election_id=eid).all() candidates = Candidates.query.filter_by(election_id=eid).order_by(Candidates.name).all() - votergroups = LegalVoters.query.filter_by(election_id=eid).all() curtime = datetime.utcnow() Modified: trunk/elections/model.py =================================================================== --- trunk/elections/model.py 2008-06-11 12:30:41 UTC (rev 45) +++ trunk/elections/model.py 2008-06-11 13:49:51 UTC (rev 46) @@ -27,11 +27,7 @@ ElectionsTable = Table('elections', metadata, autoload=True) VotesTable = Table('votes', metadata, autoload=True) CandidatesTable = Table('candidates', metadata, autoload=True) -LegalVotersTable = Table('legalvoters', metadata, - Column('election_id', Integer, - ForeignKey('elections.id'), primary_key=True), - Column('group_name', String, nullable=False) -) +LegalVotersTable = Table('legalvoters', metadata, autoload=True) # View in the DB. Needs to have the column keys defined VoteTallyTable = Table('votecount', metadata, Modified: trunk/elections/release.py =================================================================== --- trunk/elections/release.py 2008-06-11 12:30:41 UTC (rev 45) +++ trunk/elections/release.py 2008-06-11 13:49:51 UTC (rev 46) @@ -24,7 +24,7 @@ # Release information about elections -version = "0.0.5" +version = "0.1.0" description = "Elections Application for Fedora Project" # long_description = "More description about your plan" Modified: trunk/elections/templates/about.html =================================================================== --- trunk/elections/templates/about.html 2008-06-11 12:30:41 UTC (rev 45) +++ trunk/elections/templates/about.html 2008-06-11 13:49:51 UTC (rev 46) @@ -21,7 +21,7 @@ </table> <p>To vote in this election you must be a member of any one of the following groups:</p> <ul> - <li py:for="g in votergroups">${g.group_name}</li> + <li py:for="g in votergroups"><py:choose test="g.group_name == 'anyany'"><py:when test="0">${g.group_name}</py:when><py:when test="1">Any Group</py:when></py:choose></li> </ul> </body> </html> Modified: trunk/elections/templates/vote.html =================================================================== --- trunk/elections/templates/vote.html 2008-06-11 12:30:41 UTC (rev 45) +++ trunk/elections/templates/vote.html 2008-06-11 13:49:51 UTC (rev 46) @@ -10,6 +10,7 @@ <h1>${election.name}</h1> <p>${election.info}</p> <p py:if="election.url"><a href="${election.url}">[More Information]</a></p> + <div> <form action="${tg.url('/vote/' + str(election.id))}" method="post"> <table border="1" cellpadding="1"> <tr py:for="candidate in candidates"> @@ -24,10 +25,18 @@ </py:if> </tr> <tr> - <td><input py:if="nextaction=='confirm'" type="button" value="Go Back" onClick="javascript.history.back(1)" /></td> + <td><input py:if="nextaction=='confirm'" type="button" value="Go Back" onClick="history.go(-1)" /></td> <td><input type="submit" name="${nextaction}" value="Submit" /></td> </tr> </table> - </form> + </form> + </div> + <div> + <h2>Information on Range Voting</h2> + <p>Fedora Project has implemented <a href="http://rangevoting.org/">Range Voting</a> for this election, in particular the "Range (score-summing, blanks treated as zero score, no quorum rule)" range voting system.</p> + <p>To cast your vote in this election simply select a value between 0 and ${len(candidates)} with 0 as 'least or no preference' and ${len(candidates)} as 'highest preference'.</p> + <p>At the end of the election, the highest ranking candidate(s) will be marked as the winners.</p> + <p>For more information about Range Voting, visit the <a href="http://rangevoting.org/">Center for Range Voting</a>.</p> + </div> </body> </html> Modified: trunk/elections.sql =================================================================== --- trunk/elections.sql 2008-06-11 12:30:41 UTC (rev 45) +++ trunk/elections.sql 2008-06-11 13:49:51 UTC (rev 46) @@ -21,10 +21,11 @@ ); create table legalVoters ( +id serial, election_id integer not null, group_name text not null, foreign key (election_id) references elections (id) --- primary key (election_id) +primary key (id) ); create table candidates ( Modified: trunk/fedora-elections.spec =================================================================== --- trunk/fedora-elections.spec 2008-06-11 12:30:41 UTC (rev 45) +++ trunk/fedora-elections.spec 2008-06-11 13:49:51 UTC (rev 46) @@ -2,14 +2,14 @@ %{!?pyver: %define pyver %(%{__python} -c "import sys ; print sys.version[:3]")} Name: fedora-elections -Version: 0.0.5 -Release: 2%{?dist} +Version: 0.1.0 +Release: 1%{?dist} Summary: Elections Application for Fedora Project Group: Development/Languages License: GPLv2 URL: http://www.fedorahosted.org/elections -Source0: elections-0.0.5.tar.gz +Source0: elections-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -52,7 +52,11 @@ %changelog -* Fri May 23 2008 Nigel Jones <dev(a)nigelj.com> - 0.0.5-2 -- Bug Fixes +* Wed Jun 11 2008 Nigel Jones <dev(a)nigelj.com> - 0.1.0-1 +- Ready for initial deployment + +* Fri Jun 6 2008 Nigel Jones <dev(a)nigelj.com> - 0.0.9-1 +- Bump + * Thu May 22 2008 Nigel Jones <dev(a)nigelj.com> - 0.0.5-1 - Initial RPM - Ready to go!

1 0

r45 - branches/0.1.0-STABLE branches/0.1.0-STABLE/elections branches/0.1.0-STABLE/elections/config branches/0.1.0-STABLE/elections/static/css branches/0.1.0-STABLE/elections/templates branches/0.1.0-STABLE/elections/tests branches/0.1.0-STABLE/examples trunk trunk/elections trunk/elections/config trunk/elections/static/css trunk/elections/templates trunk/elections/tests trunk/examples
by Nigel Jones 11 Jun '08

11 Jun '08

Author: nigelj Date: 2008-06-11 12:30:41 +0000 (Wed, 11 Jun 2008) New Revision: 45 Modified: branches/0.1.0-STABLE/COPYING branches/0.1.0-STABLE/README.txt branches/0.1.0-STABLE/elections.cfg branches/0.1.0-STABLE/elections.sql branches/0.1.0-STABLE/elections/__init__.py branches/0.1.0-STABLE/elections/admin.py branches/0.1.0-STABLE/elections/commands.py branches/0.1.0-STABLE/elections/config/__init__.py branches/0.1.0-STABLE/elections/config/app.cfg branches/0.1.0-STABLE/elections/config/log.cfg branches/0.1.0-STABLE/elections/controllers.py branches/0.1.0-STABLE/elections/json.py branches/0.1.0-STABLE/elections/model.py branches/0.1.0-STABLE/elections/release.py branches/0.1.0-STABLE/elections/static/css/style.css branches/0.1.0-STABLE/elections/templates/__init__.py branches/0.1.0-STABLE/elections/templates/admedit.html branches/0.1.0-STABLE/elections/templates/admnewc.html branches/0.1.0-STABLE/elections/templates/admnewe.html branches/0.1.0-STABLE/elections/templates/login.html branches/0.1.0-STABLE/elections/templates/master.html branches/0.1.0-STABLE/elections/templates/results.html branches/0.1.0-STABLE/elections/tests/__init__.py branches/0.1.0-STABLE/elections/tests/test_controllers.py branches/0.1.0-STABLE/elections/tests/test_model.py branches/0.1.0-STABLE/examples/elections.conf branches/0.1.0-STABLE/examples/elections.wsgi branches/0.1.0-STABLE/fedora-elections.spec branches/0.1.0-STABLE/sample-prod.cfg branches/0.1.0-STABLE/setup.py branches/0.1.0-STABLE/start-elections.py branches/0.1.0-STABLE/test.cfg trunk/COPYING trunk/README.txt trunk/elections.cfg trunk/elections.sql trunk/elections/__init__.py trunk/elections/admin.py trunk/elections/commands.py trunk/elections/config/__init__.py trunk/elections/config/app.cfg trunk/elections/config/log.cfg trunk/elections/controllers.py trunk/elections/json.py trunk/elections/model.py trunk/elections/release.py trunk/elections/static/css/style.css trunk/elections/templates/__init__.py trunk/elections/templates/admedit.html trunk/elections/templates/admnewc.html trunk/elections/templates/admnewe.html trunk/elections/templates/login.html trunk/elections/templates/master.html trunk/elections/templates/results.html trunk/elections/tests/__init__.py trunk/elections/tests/test_controllers.py trunk/elections/tests/test_model.py trunk/examples/elections.conf trunk/examples/elections.wsgi trunk/fedora-elections.spec trunk/sample-prod.cfg trunk/setup.py trunk/start-elections.py trunk/test.cfg Log: Something went wack, I was getting DOS EOLs Property changes on: branches/0.1.0-STABLE/COPYING ___________________________________________________________________ Name: svn:eol-style + native Property changes on: branches/0.1.0-STABLE/README.txt ___________________________________________________________________ Name: svn:eol-style + native Property changes on: branches/0.1.0-STABLE/elections/__init__.py ___________________________________________________________________ Name: svn:eol-style + native Property changes on: branches/0.1.0-STABLE/elections/admin.py ___________________________________________________________________ Name: svn:eol-style + native Property changes on: branches/0.1.0-STABLE/elections/commands.py ___________________________________________________________________ Name: svn:eol-style + native Property changes on: branches/0.1.0-STABLE/elections/config/__init__.py ___________________________________________________________________ Name: svn:eol-style + native Property changes on: branches/0.1.0-STABLE/elections/config/app.cfg ___________________________________________________________________ Name: svn:eol-style + native Property changes on: branches/0.1.0-STABLE/elections/config/log.cfg ___________________________________________________________________ Name: svn:eol-style + native Property changes on: branches/0.1.0-STABLE/elections/controllers.py ___________________________________________________________________ Name: svn:eol-style + native Property changes on: branches/0.1.0-STABLE/elections/json.py ___________________________________________________________________ Name: svn:eol-style + native Property changes on: branches/0.1.0-STABLE/elections/model.py ___________________________________________________________________ Name: svn:eol-style + native Property changes on: branches/0.1.0-STABLE/elections/release.py ___________________________________________________________________ Name: svn:eol-style + native Property changes on: branches/0.1.0-STABLE/elections/static/css/style.css ___________________________________________________________________ Name: svn:eol-style + native Property changes on: branches/0.1.0-STABLE/elections/templates/__init__.py ___________________________________________________________________ Name: svn:eol-style + native Modified: branches/0.1.0-STABLE/elections/templates/admedit.html =================================================================== --- branches/0.1.0-STABLE/elections/templates/admedit.html 2008-06-06 10:48:00 UTC (rev 44) +++ branches/0.1.0-STABLE/elections/templates/admedit.html 2008-06-11 12:30:41 UTC (rev 45) @@ -1,26 +1,26 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" - xmlns:py="http://genshi.edgewall.org/" - xmlns:xi="http://www.w3.org/2001/XInclude"> - <xi:include href="master.html" /> - <head> - <title>Welcome to TurboGears</title> - </head> - <body> - <table> - <tr><td>Election Name:</td><td><input type="text" name="name" value="${e.name}" /></td></tr> - <tr><td>Short Name:</td><td><input type="text" name="shortname" value="${e.shortname}" /></td></tr> - <tr><td>Election Info:</td><td><textarea name="info" rows="5" cols="40">${e.info}</textarea></td></tr> - </table> - <pre> -Election ID: ${e.id} -Election Name: ${e.name} -Election ShortName: ${e.shortname} -Election Info: ${e.info} -URL: ${e.url} -Start Date: ${e.start_date} -End Date: ${e.end_date} -max_seats ${e.max_seats} - </pre> - </body> -</html> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:py="http://genshi.edgewall.org/" + xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="master.html" /> + <head> + <title>Welcome to TurboGears</title> + </head> + <body> + <table> + <tr><td>Election Name:</td><td><input type="text" name="name" value="${e.name}" /></td></tr> + <tr><td>Short Name:</td><td><input type="text" name="shortname" value="${e.shortname}" /></td></tr> + <tr><td>Election Info:</td><td><textarea name="info" rows="5" cols="40">${e.info}</textarea></td></tr> + </table> + <pre> +Election ID: ${e.id} +Election Name: ${e.name} +Election ShortName: ${e.shortname} +Election Info: ${e.info} +URL: ${e.url} +Start Date: ${e.start_date} +End Date: ${e.end_date} +max_seats ${e.max_seats} + </pre> + </body> +</html> Property changes on: branches/0.1.0-STABLE/elections/templates/admedit.html ___________________________________________________________________ Name: svn:eol-style + native Modified: branches/0.1.0-STABLE/elections/templates/admnewc.html =================================================================== --- branches/0.1.0-STABLE/elections/templates/admnewc.html 2008-06-06 10:48:00 UTC (rev 44) +++ branches/0.1.0-STABLE/elections/templates/admnewc.html 2008-06-11 12:30:41 UTC (rev 45) @@ -1,19 +1,19 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" - xmlns:py="http://genshi.edgewall.org/" - xmlns:xi="http://www.w3.org/2001/XInclude"> - <xi:include href="master.html" /> - <head> - <title>Welcome to TurboGears</title> - </head> - <body> - <form action="${tg.url('/admin/newc')}" method="post"> - <table> - <tr><td>Election Id (Numerical):</td><td><input type="text" name="id" /></td></tr> - <tr><td>Candidate Name:</td><td><input type="text" name="name" /></td></tr> - <tr><td>URL:</td><td><input type="text" name="url" /></td></tr> - <tr><td></td><td><input type="submit" name="submit" value="Submit" /></td></tr> - </table> - </form> - </body> -</html> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:py="http://genshi.edgewall.org/" + xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="master.html" /> + <head> + <title>Welcome to TurboGears</title> + </head> + <body> + <form action="${tg.url('/admin/newc')}" method="post"> + <table> + <tr><td>Election Id (Numerical):</td><td><input type="text" name="id" /></td></tr> + <tr><td>Candidate Name:</td><td><input type="text" name="name" /></td></tr> + <tr><td>URL:</td><td><input type="text" name="url" /></td></tr> + <tr><td></td><td><input type="submit" name="submit" value="Submit" /></td></tr> + </table> + </form> + </body> +</html> Property changes on: branches/0.1.0-STABLE/elections/templates/admnewc.html ___________________________________________________________________ Name: svn:eol-style + native Modified: branches/0.1.0-STABLE/elections/templates/admnewe.html =================================================================== --- branches/0.1.0-STABLE/elections/templates/admnewe.html 2008-06-06 10:48:00 UTC (rev 44) +++ branches/0.1.0-STABLE/elections/templates/admnewe.html 2008-06-11 12:30:41 UTC (rev 45) @@ -1,24 +1,24 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" - xmlns:py="http://genshi.edgewall.org/" - xmlns:xi="http://www.w3.org/2001/XInclude"> - <xi:include href="master.html" /> - <head> - <title>Welcome to TurboGears</title> - </head> - <body> - <form action="${tg.url('/admin/newe')}" method="post"> - <table> - <tr><td>Election Name:</td><td><input type="text" name="name" /></td></tr> - <tr><td>Short Name:</td><td><input type="text" name="shortname" /></td></tr> - <tr><td>Election Info:</td><td><textarea name="info" rows="5" cols="40"></textarea></td></tr> - <tr><td>URL:</td><td><input type="text" name="url" /></td></tr> - <tr><td>Start Date:</td><td><input type="text" name="startdate" value="yyyy-mm-dd hh:mm:ss"/></td></tr> - <tr><td>End Date:</td><td><input type="text" name="enddate" value="yyyy-mm-dd hh:mm:ss"/></td></tr> - <tr><td>Seats Available:</td><td><input type="text" name="max_seats"/></td></tr> - <tr><td>Public Results:</td><td><input type="checkbox" name="public_results" /> </td></tr> - <tr><td></td><td><input type="submit" name="submit" value="Submit" /></td></tr> - </table> - </form> - </body> -</html> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:py="http://genshi.edgewall.org/" + xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="master.html" /> + <head> + <title>Welcome to TurboGears</title> + </head> + <body> + <form action="${tg.url('/admin/newe')}" method="post"> + <table> + <tr><td>Election Name:</td><td><input type="text" name="name" /></td></tr> + <tr><td>Short Name:</td><td><input type="text" name="shortname" /></td></tr> + <tr><td>Election Info:</td><td><textarea name="info" rows="5" cols="40"></textarea></td></tr> + <tr><td>URL:</td><td><input type="text" name="url" /></td></tr> + <tr><td>Start Date:</td><td><input type="text" name="startdate" value="yyyy-mm-dd hh:mm:ss"/></td></tr> + <tr><td>End Date:</td><td><input type="text" name="enddate" value="yyyy-mm-dd hh:mm:ss"/></td></tr> + <tr><td>Seats Available:</td><td><input type="text" name="max_seats"/></td></tr> + <tr><td>Public Results:</td><td><input type="checkbox" name="public_results" /> </td></tr> + <tr><td></td><td><input type="submit" name="submit" value="Submit" /></td></tr> + </table> + </form> + </body> +</html> Property changes on: branches/0.1.0-STABLE/elections/templates/admnewe.html ___________________________________________________________________ Name: svn:eol-style + native Property changes on: branches/0.1.0-STABLE/elections/templates/login.html ___________________________________________________________________ Name: svn:eol-style + native Modified: branches/0.1.0-STABLE/elections/templates/master.html =================================================================== --- branches/0.1.0-STABLE/elections/templates/master.html 2008-06-06 10:48:00 UTC (rev 44) +++ branches/0.1.0-STABLE/elections/templates/master.html 2008-06-11 12:30:41 UTC (rev 45) @@ -1,67 +1,67 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" - xmlns:xi="http://www.w3.org/2001/XInclude" - xmlns:py="http://genshi.edgewall.org/" - py:strip=""> - <head py:match="head" py:attrs="select('@*')"> - <meta py:replace="select('*|text()')" /> - <link rel="stylesheet" type="text/css" media="screen" href="${tg.url('/static/css/style.css')}" /> - <link rel="stylesheet" type="text/css" media="screen" href="http://fedoraproject.org/static/css/fedora.css" /> - </head> - <body py:match="body" py:attrs="select('@*')"> - <div id="wrapper"> - - <div id="head"> - <h1><a href="/en/index">Fedora</a></h1> - </div> - - <div id="sidebar"> - <div id="nav"> - <h2>Navigation</h2> - <ul> - <li id="nav-home"><a href="/en/index">Home</a></li> - - <li id="nav-get"><a href="/en/get-fedora">Get Fedora</a></li> - <li id="nav-join"><a href="/en/join-fedora">Join Fedora</a></li> - </ul> - </div> - </div> - - <div id="content"> - - <div py:if="tg.config('identity.on') and not defined('logging_in')" id="pageLogin"> - <span py:if="tg.identity.anonymous"> - <a href="${tg.url('/login')}">Login</a> - </span> - <span py:if="not tg.identity.anonymous"> - Welcome ${tg.identity.user.human_name or tg.identity.user.user_name}. - <a href="${tg.url('/logout')}">Logout</a> - </span> - </div> - <div py:if="tg_flash" class="flash"> - ${tg_flash} - </div> - <div py:replace="select('*|text()')" /> - </div> - - </div> - - <div id="bottom"> - <div id="footer"> - - <p class="copy"> - Copyright © 2008 Red Hat, Inc. and others. All Rights Reserved. Please send any comments or corrections to the <a href="mailto:webmaster@fedoraproject.org">websites team</a>. - </p> - <p class="disclaimer"> - The Fedora Project is maintained and driven by the community and sponsored by Red Hat. This is a community maintained site. Red Hat is not responsible for content. - </p> - <ul> - <li class="first"><a href="/en/sponsors">Sponsors</a></li> - - <li><a href="http://fedoraproject.org/wiki/Legal">Legal</a></li> - <li><a href="http://fedoraproject.org/wiki/Legal/TrademarkGuidelines">Trademark Guidelines</a></li> - </ul> - </div> - </div> - </body> -</html> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:xi="http://www.w3.org/2001/XInclude" + xmlns:py="http://genshi.edgewall.org/" + py:strip=""> + <head py:match="head" py:attrs="select('@*')"> + <meta py:replace="select('*|text()')" /> + <link rel="stylesheet" type="text/css" media="screen" href="${tg.url('/static/css/style.css')}" /> + <link rel="stylesheet" type="text/css" media="screen" href="http://fedoraproject.org/static/css/fedora.css" /> + </head> + <body py:match="body" py:attrs="select('@*')"> + <div id="wrapper"> + + <div id="head"> + <h1><a href="/en/index">Fedora</a></h1> + </div> + + <div id="sidebar"> + <div id="nav"> + <h2>Navigation</h2> + <ul> + <li id="nav-home"><a href="/en/index">Home</a></li> + + <li id="nav-get"><a href="/en/get-fedora">Get Fedora</a></li> + <li id="nav-join"><a href="/en/join-fedora">Join Fedora</a></li> + </ul> + </div> + </div> + + <div id="content"> + + <div py:if="tg.config('identity.on') and not defined('logging_in')" id="pageLogin"> + <span py:if="tg.identity.anonymous"> + <a href="${tg.url('/login')}">Login</a> + </span> + <span py:if="not tg.identity.anonymous"> + Welcome ${tg.identity.user.human_name or tg.identity.user.user_name}. + <a href="${tg.url('/logout')}">Logout</a> + </span> + </div> + <div py:if="tg_flash" class="flash"> + ${tg_flash} + </div> + <div py:replace="select('*|text()')" /> + </div> + + </div> + + <div id="bottom"> + <div id="footer"> + + <p class="copy"> + Copyright © 2008 Red Hat, Inc. and others. All Rights Reserved. Please send any comments or corrections to the <a href="mailto:webmaster@fedoraproject.org">websites team</a>. + </p> + <p class="disclaimer"> + The Fedora Project is maintained and driven by the community and sponsored by Red Hat. This is a community maintained site. Red Hat is not responsible for content. + </p> + <ul> + <li class="first"><a href="/en/sponsors">Sponsors</a></li> + + <li><a href="http://fedoraproject.org/wiki/Legal">Legal</a></li> + <li><a href="http://fedoraproject.org/wiki/Legal/TrademarkGuidelines">Trademark Guidelines</a></li> + </ul> + </div> + </div> + </body> +</html> Property changes on: branches/0.1.0-STABLE/elections/templates/master.html ___________________________________________________________________ Name: svn:eol-style + native Property changes on: branches/0.1.0-STABLE/elections/templates/results.html ___________________________________________________________________ Name: svn:eol-style + native Property changes on: branches/0.1.0-STABLE/elections/tests/__init__.py ___________________________________________________________________ Name: svn:eol-style + native Property changes on: branches/0.1.0-STABLE/elections/tests/test_controllers.py ___________________________________________________________________ Name: svn:eol-style + native Property changes on: branches/0.1.0-STABLE/elections/tests/test_model.py ___________________________________________________________________ Name: svn:eol-style + native Property changes on: branches/0.1.0-STABLE/elections.cfg ___________________________________________________________________ Name: svn:eol-style + native Property changes on: branches/0.1.0-STABLE/elections.sql ___________________________________________________________________ Name: svn:eol-style + native Property changes on: branches/0.1.0-STABLE/examples/elections.conf ___________________________________________________________________ Name: svn:eol-style + native Property changes on: branches/0.1.0-STABLE/examples/elections.wsgi ___________________________________________________________________ Name: svn:eol-style + native Property changes on: branches/0.1.0-STABLE/fedora-elections.spec ___________________________________________________________________ Name: svn:eol-style + native Property changes on: branches/0.1.0-STABLE/sample-prod.cfg ___________________________________________________________________ Name: svn:eol-style + native Property changes on: branches/0.1.0-STABLE/setup.py ___________________________________________________________________ Name: svn:eol-style + native Property changes on: branches/0.1.0-STABLE/start-elections.py ___________________________________________________________________ Name: svn:eol-style + native Property changes on: branches/0.1.0-STABLE/test.cfg ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/COPYING ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/README.txt ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/elections/__init__.py ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/elections/admin.py ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/elections/commands.py ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/elections/config/__init__.py ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/elections/config/app.cfg ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/elections/config/log.cfg ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/elections/controllers.py ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/elections/json.py ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/elections/model.py ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/elections/release.py ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/elections/static/css/style.css ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/elections/templates/__init__.py ___________________________________________________________________ Name: svn:eol-style + native Modified: trunk/elections/templates/admedit.html =================================================================== --- trunk/elections/templates/admedit.html 2008-06-06 10:48:00 UTC (rev 44) +++ trunk/elections/templates/admedit.html 2008-06-11 12:30:41 UTC (rev 45) @@ -1,26 +1,26 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" - xmlns:py="http://genshi.edgewall.org/" - xmlns:xi="http://www.w3.org/2001/XInclude"> - <xi:include href="master.html" /> - <head> - <title>Welcome to TurboGears</title> - </head> - <body> - <table> - <tr><td>Election Name:</td><td><input type="text" name="name" value="${e.name}" /></td></tr> - <tr><td>Short Name:</td><td><input type="text" name="shortname" value="${e.shortname}" /></td></tr> - <tr><td>Election Info:</td><td><textarea name="info" rows="5" cols="40">${e.info}</textarea></td></tr> - </table> - <pre> -Election ID: ${e.id} -Election Name: ${e.name} -Election ShortName: ${e.shortname} -Election Info: ${e.info} -URL: ${e.url} -Start Date: ${e.start_date} -End Date: ${e.end_date} -max_seats ${e.max_seats} - </pre> - </body> -</html> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:py="http://genshi.edgewall.org/" + xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="master.html" /> + <head> + <title>Welcome to TurboGears</title> + </head> + <body> + <table> + <tr><td>Election Name:</td><td><input type="text" name="name" value="${e.name}" /></td></tr> + <tr><td>Short Name:</td><td><input type="text" name="shortname" value="${e.shortname}" /></td></tr> + <tr><td>Election Info:</td><td><textarea name="info" rows="5" cols="40">${e.info}</textarea></td></tr> + </table> + <pre> +Election ID: ${e.id} +Election Name: ${e.name} +Election ShortName: ${e.shortname} +Election Info: ${e.info} +URL: ${e.url} +Start Date: ${e.start_date} +End Date: ${e.end_date} +max_seats ${e.max_seats} + </pre> + </body> +</html> Property changes on: trunk/elections/templates/admedit.html ___________________________________________________________________ Name: svn:eol-style + native Modified: trunk/elections/templates/admnewc.html =================================================================== --- trunk/elections/templates/admnewc.html 2008-06-06 10:48:00 UTC (rev 44) +++ trunk/elections/templates/admnewc.html 2008-06-11 12:30:41 UTC (rev 45) @@ -1,19 +1,19 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" - xmlns:py="http://genshi.edgewall.org/" - xmlns:xi="http://www.w3.org/2001/XInclude"> - <xi:include href="master.html" /> - <head> - <title>Welcome to TurboGears</title> - </head> - <body> - <form action="${tg.url('/admin/newc')}" method="post"> - <table> - <tr><td>Election Id (Numerical):</td><td><input type="text" name="id" /></td></tr> - <tr><td>Candidate Name:</td><td><input type="text" name="name" /></td></tr> - <tr><td>URL:</td><td><input type="text" name="url" /></td></tr> - <tr><td></td><td><input type="submit" name="submit" value="Submit" /></td></tr> - </table> - </form> - </body> -</html> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:py="http://genshi.edgewall.org/" + xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="master.html" /> + <head> + <title>Welcome to TurboGears</title> + </head> + <body> + <form action="${tg.url('/admin/newc')}" method="post"> + <table> + <tr><td>Election Id (Numerical):</td><td><input type="text" name="id" /></td></tr> + <tr><td>Candidate Name:</td><td><input type="text" name="name" /></td></tr> + <tr><td>URL:</td><td><input type="text" name="url" /></td></tr> + <tr><td></td><td><input type="submit" name="submit" value="Submit" /></td></tr> + </table> + </form> + </body> +</html> Property changes on: trunk/elections/templates/admnewc.html ___________________________________________________________________ Name: svn:eol-style + native Modified: trunk/elections/templates/admnewe.html =================================================================== --- trunk/elections/templates/admnewe.html 2008-06-06 10:48:00 UTC (rev 44) +++ trunk/elections/templates/admnewe.html 2008-06-11 12:30:41 UTC (rev 45) @@ -1,24 +1,24 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" - xmlns:py="http://genshi.edgewall.org/" - xmlns:xi="http://www.w3.org/2001/XInclude"> - <xi:include href="master.html" /> - <head> - <title>Welcome to TurboGears</title> - </head> - <body> - <form action="${tg.url('/admin/newe')}" method="post"> - <table> - <tr><td>Election Name:</td><td><input type="text" name="name" /></td></tr> - <tr><td>Short Name:</td><td><input type="text" name="shortname" /></td></tr> - <tr><td>Election Info:</td><td><textarea name="info" rows="5" cols="40"></textarea></td></tr> - <tr><td>URL:</td><td><input type="text" name="url" /></td></tr> - <tr><td>Start Date:</td><td><input type="text" name="startdate" value="yyyy-mm-dd hh:mm:ss"/></td></tr> - <tr><td>End Date:</td><td><input type="text" name="enddate" value="yyyy-mm-dd hh:mm:ss"/></td></tr> - <tr><td>Seats Available:</td><td><input type="text" name="max_seats"/></td></tr> - <tr><td>Public Results:</td><td><input type="checkbox" name="public_results" /> </td></tr> - <tr><td></td><td><input type="submit" name="submit" value="Submit" /></td></tr> - </table> - </form> - </body> -</html> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:py="http://genshi.edgewall.org/" + xmlns:xi="http://www.w3.org/2001/XInclude"> + <xi:include href="master.html" /> + <head> + <title>Welcome to TurboGears</title> + </head> + <body> + <form action="${tg.url('/admin/newe')}" method="post"> + <table> + <tr><td>Election Name:</td><td><input type="text" name="name" /></td></tr> + <tr><td>Short Name:</td><td><input type="text" name="shortname" /></td></tr> + <tr><td>Election Info:</td><td><textarea name="info" rows="5" cols="40"></textarea></td></tr> + <tr><td>URL:</td><td><input type="text" name="url" /></td></tr> + <tr><td>Start Date:</td><td><input type="text" name="startdate" value="yyyy-mm-dd hh:mm:ss"/></td></tr> + <tr><td>End Date:</td><td><input type="text" name="enddate" value="yyyy-mm-dd hh:mm:ss"/></td></tr> + <tr><td>Seats Available:</td><td><input type="text" name="max_seats"/></td></tr> + <tr><td>Public Results:</td><td><input type="checkbox" name="public_results" /> </td></tr> + <tr><td></td><td><input type="submit" name="submit" value="Submit" /></td></tr> + </table> + </form> + </body> +</html> Property changes on: trunk/elections/templates/admnewe.html ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/elections/templates/login.html ___________________________________________________________________ Name: svn:eol-style + native Modified: trunk/elections/templates/master.html =================================================================== --- trunk/elections/templates/master.html 2008-06-06 10:48:00 UTC (rev 44) +++ trunk/elections/templates/master.html 2008-06-11 12:30:41 UTC (rev 45) @@ -1,67 +1,67 @@ -<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" - xmlns:xi="http://www.w3.org/2001/XInclude" - xmlns:py="http://genshi.edgewall.org/" - py:strip=""> - <head py:match="head" py:attrs="select('@*')"> - <meta py:replace="select('*|text()')" /> - <link rel="stylesheet" type="text/css" media="screen" href="${tg.url('/static/css/style.css')}" /> - <link rel="stylesheet" type="text/css" media="screen" href="http://fedoraproject.org/static/css/fedora.css" /> - </head> - <body py:match="body" py:attrs="select('@*')"> - <div id="wrapper"> - - <div id="head"> - <h1><a href="/en/index">Fedora</a></h1> - </div> - - <div id="sidebar"> - <div id="nav"> - <h2>Navigation</h2> - <ul> - <li id="nav-home"><a href="/en/index">Home</a></li> - - <li id="nav-get"><a href="/en/get-fedora">Get Fedora</a></li> - <li id="nav-join"><a href="/en/join-fedora">Join Fedora</a></li> - </ul> - </div> - </div> - - <div id="content"> - - <div py:if="tg.config('identity.on') and not defined('logging_in')" id="pageLogin"> - <span py:if="tg.identity.anonymous"> - <a href="${tg.url('/login')}">Login</a> - </span> - <span py:if="not tg.identity.anonymous"> - Welcome ${tg.identity.user.human_name or tg.identity.user.user_name}. - <a href="${tg.url('/logout')}">Logout</a> - </span> - </div> - <div py:if="tg_flash" class="flash"> - ${tg_flash} - </div> - <div py:replace="select('*|text()')" /> - </div> - - </div> - - <div id="bottom"> - <div id="footer"> - - <p class="copy"> - Copyright © 2008 Red Hat, Inc. and others. All Rights Reserved. Please send any comments or corrections to the <a href="mailto:webmaster@fedoraproject.org">websites team</a>. - </p> - <p class="disclaimer"> - The Fedora Project is maintained and driven by the community and sponsored by Red Hat. This is a community maintained site. Red Hat is not responsible for content. - </p> - <ul> - <li class="first"><a href="/en/sponsors">Sponsors</a></li> - - <li><a href="http://fedoraproject.org/wiki/Legal">Legal</a></li> - <li><a href="http://fedoraproject.org/wiki/Legal/TrademarkGuidelines">Trademark Guidelines</a></li> - </ul> - </div> - </div> - </body> -</html> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" + xmlns:xi="http://www.w3.org/2001/XInclude" + xmlns:py="http://genshi.edgewall.org/" + py:strip=""> + <head py:match="head" py:attrs="select('@*')"> + <meta py:replace="select('*|text()')" /> + <link rel="stylesheet" type="text/css" media="screen" href="${tg.url('/static/css/style.css')}" /> + <link rel="stylesheet" type="text/css" media="screen" href="http://fedoraproject.org/static/css/fedora.css" /> + </head> + <body py:match="body" py:attrs="select('@*')"> + <div id="wrapper"> + + <div id="head"> + <h1><a href="/en/index">Fedora</a></h1> + </div> + + <div id="sidebar"> + <div id="nav"> + <h2>Navigation</h2> + <ul> + <li id="nav-home"><a href="/en/index">Home</a></li> + + <li id="nav-get"><a href="/en/get-fedora">Get Fedora</a></li> + <li id="nav-join"><a href="/en/join-fedora">Join Fedora</a></li> + </ul> + </div> + </div> + + <div id="content"> + + <div py:if="tg.config('identity.on') and not defined('logging_in')" id="pageLogin"> + <span py:if="tg.identity.anonymous"> + <a href="${tg.url('/login')}">Login</a> + </span> + <span py:if="not tg.identity.anonymous"> + Welcome ${tg.identity.user.human_name or tg.identity.user.user_name}. + <a href="${tg.url('/logout')}">Logout</a> + </span> + </div> + <div py:if="tg_flash" class="flash"> + ${tg_flash} + </div> + <div py:replace="select('*|text()')" /> + </div> + + </div> + + <div id="bottom"> + <div id="footer"> + + <p class="copy"> + Copyright © 2008 Red Hat, Inc. and others. All Rights Reserved. Please send any comments or corrections to the <a href="mailto:webmaster@fedoraproject.org">websites team</a>. + </p> + <p class="disclaimer"> + The Fedora Project is maintained and driven by the community and sponsored by Red Hat. This is a community maintained site. Red Hat is not responsible for content. + </p> + <ul> + <li class="first"><a href="/en/sponsors">Sponsors</a></li> + + <li><a href="http://fedoraproject.org/wiki/Legal">Legal</a></li> + <li><a href="http://fedoraproject.org/wiki/Legal/TrademarkGuidelines">Trademark Guidelines</a></li> + </ul> + </div> + </div> + </body> +</html> Property changes on: trunk/elections/templates/master.html ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/elections/templates/results.html ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/elections/tests/__init__.py ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/elections/tests/test_controllers.py ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/elections/tests/test_model.py ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/elections.cfg ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/elections.sql ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/examples/elections.conf ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/examples/elections.wsgi ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/fedora-elections.spec ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/sample-prod.cfg ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/setup.py ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/start-elections.py ___________________________________________________________________ Name: svn:eol-style + native Property changes on: trunk/test.cfg ___________________________________________________________________ Name: svn:eol-style + native

1 0

r44 - in branches/0.1.0-STABLE/elections: . templates
by Nigel Jones 06 Jun '08

06 Jun '08

Author: nigelj Date: 2008-06-06 10:48:00 +0000 (Fri, 06 Jun 2008) New Revision: 44 Modified: branches/0.1.0-STABLE/elections/controllers.py branches/0.1.0-STABLE/elections/release.py branches/0.1.0-STABLE/elections/templates/index.html branches/0.1.0-STABLE/elections/templates/results.html Log: Merge r43 to 0.1.0-STABLE & bump release.py (we are getting closer) Modified: branches/0.1.0-STABLE/elections/controllers.py =================================================================== --- branches/0.1.0-STABLE/elections/controllers.py 2008-06-05 12:00:43 UTC (rev 43) +++ branches/0.1.0-STABLE/elections/controllers.py 2008-06-06 10:48:00 UTC (rev 44) @@ -52,11 +52,12 @@ eid = int(eid) election = Elections.query.filter_by(id=eid).all()[0] except ValueError: - election = Elections.query.filter_by(shortname=eid).all()[0] - eid = election.id - except TypeError: - turbogears.flash("This election does not exist, check if you have used the correct URL.") - raise turbogears.redirect("/") + try: + election = Elections.query.filter_by(shortname=eid).all()[0] + eid = election.id + except IndexError: + turbogears.flash("This election does not exist, check if you have used the correct URL.") + raise turbogears.redirect("/") except IndexError: turbogears.flash("This election does not exist, check if you have used the correct URL.") raise turbogears.redirect("/") @@ -76,11 +77,12 @@ eid = int(eid) election = Elections.query.filter_by(id=eid).all()[0] except ValueError: - election = Elections.query.filter_by(shortname=eid).all()[0] - eid = election.id - except TypeError: - turbogears.flash("This election does not exist, check if you have used the correct URL.") - raise turbogears.redirect("/") + try: + election = Elections.query.filter_by(shortname=eid).all()[0] + eid = election.id + except IndexError: + turbogears.flash("This election does not exist, check if you have used the correct URL.") + raise turbogears.redirect("/") except IndexError: turbogears.flash("This election does not exist, check if you have used the correct URL.") raise turbogears.redirect("/") @@ -89,7 +91,7 @@ match = 0 for group in votergroups: - if identity.in_group(group.group_name): + if identity.in_group(group.group_name) or group.group_name == "anyany": match = 1 if match == 0: turbogears.flash("You are not in a FAS group that can vote in this election, more information can be found here.") @@ -126,7 +128,7 @@ turbogears.flash("Invalid Ballot!") raise turbogears.redirect("/") for uvote in uvotes: - Votes(voter=turbogears.identity.current.user_name, candidate_id=uvote, weight=uvotes[uvote], election_id=eid) + Votes(voter=turbogears.identity.current.user_name, candidate_id=uvote, weight=uvotes[uvote], election_id=eid, timestamp=curtime) turbogears.flash("You vote has been recorded, thank you!") raise turbogears.redirect("/") elif "vote" in kw: @@ -167,11 +169,12 @@ eid = int(eid) election = Elections.query.filter_by(id=eid).all()[0] except ValueError: - election = Elections.query.filter_by(shortname=eid).all()[0] - eid = election.id - except TypeError: - turbogears.flash("This election does not exist, check if you have used the correct URL.") - raise turbogears.redirect("/") + try: + election = Elections.query.filter_by(shortname=eid).all()[0] + eid = election.id + except IndexError: + turbogears.flash("This election does not exist, check if you have used the correct URL.") + raise turbogears.redirect("/") except IndexError: turbogears.flash("This election does not exist, check if you have used the correct URL.") raise turbogears.redirect("/") Modified: branches/0.1.0-STABLE/elections/release.py =================================================================== --- branches/0.1.0-STABLE/elections/release.py 2008-06-05 12:00:43 UTC (rev 43) +++ branches/0.1.0-STABLE/elections/release.py 2008-06-06 10:48:00 UTC (rev 44) @@ -24,7 +24,7 @@ # Release information about elections -version = "0.0.5" +version = "0.0.9.1" description = "Elections Application for Fedora Project" # long_description = "More description about your plan" Modified: branches/0.1.0-STABLE/elections/templates/index.html =================================================================== --- branches/0.1.0-STABLE/elections/templates/index.html 2008-06-05 12:00:43 UTC (rev 43) +++ branches/0.1.0-STABLE/elections/templates/index.html 2008-06-06 10:48:00 UTC (rev 44) @@ -7,10 +7,21 @@ <title>${appTitle}</title> </head> <body> - <ul> - - <li py:for="election in elections"><a href="${tg.url('/about/' + election.shortname)}">${election.name}</a></li> - - </ul> + <table> + <tr> + <th></th> + <th>Start Date (UTC)</th> + <th>End Date (UTC)</th> + <th></th> + <th></th> + </tr> + <tr py:for="election in elections"> + <td>${election.name}</td> + <td>${election.start_date}</td> + <td>${election.end_date}</td> + <td><a href="${tg.url('/about/' + str(election.shortname))}">More Information</a></td> + <td><a py:if="election.public_results or curtime > election.end_date" href="${tg.url('/results/' + str(election.shortname))}">Results</a></td> + </tr> + </table> </body> </html> Modified: branches/0.1.0-STABLE/elections/templates/results.html =================================================================== --- branches/0.1.0-STABLE/elections/templates/results.html 2008-06-05 12:00:43 UTC (rev 43) +++ branches/0.1.0-STABLE/elections/templates/results.html 2008-06-06 10:48:00 UTC (rev 44) @@ -9,7 +9,7 @@ <body> <h1>${election.name} Results</h1> <p>${election.info}</p> - <p py:if="candidate.url"><a href="${election.url}">[More Information]</a></p> + <p py:if="election.url"><a href="${election.url}">[More Information]</a></p> <table border="1" cellpadding="1"> <tr py:for="candcount in votecount"> <td>${candcount.candidate.name} <small py:if="candcount.candidate.url"><a href="${candcount.candidate.url}">[info]</a></small></td>

1 0

r43 - in trunk/elections: . templates
by Nigel Jones 05 Jun '08

05 Jun '08

Author: nigelj Date: 2008-06-05 12:00:43 +0000 (Thu, 05 Jun 2008) New Revision: 43 Modified: trunk/elections/controllers.py trunk/elections/templates/index.html trunk/elections/templates/results.html Log: * controllers.py: - Add an extra try block to catch indexerrors when searching for shortnames - Add 'anyany' comparison, this may need to be changed sometime if a fasgroup appears called 'anyany' * templates/results.html - Fix small oopsie * templates/index.html - Make the index look a bit nicer Modified: trunk/elections/controllers.py =================================================================== --- trunk/elections/controllers.py 2008-05-31 06:37:33 UTC (rev 42) +++ trunk/elections/controllers.py 2008-06-05 12:00:43 UTC (rev 43) @@ -52,11 +52,12 @@ eid = int(eid) election = Elections.query.filter_by(id=eid).all()[0] except ValueError: - election = Elections.query.filter_by(shortname=eid).all()[0] - eid = election.id - except TypeError: - turbogears.flash("This election does not exist, check if you have used the correct URL.") - raise turbogears.redirect("/") + try: + election = Elections.query.filter_by(shortname=eid).all()[0] + eid = election.id + except IndexError: + turbogears.flash("This election does not exist, check if you have used the correct URL.") + raise turbogears.redirect("/") except IndexError: turbogears.flash("This election does not exist, check if you have used the correct URL.") raise turbogears.redirect("/") @@ -76,11 +77,12 @@ eid = int(eid) election = Elections.query.filter_by(id=eid).all()[0] except ValueError: - election = Elections.query.filter_by(shortname=eid).all()[0] - eid = election.id - except TypeError: - turbogears.flash("This election does not exist, check if you have used the correct URL.") - raise turbogears.redirect("/") + try: + election = Elections.query.filter_by(shortname=eid).all()[0] + eid = election.id + except IndexError: + turbogears.flash("This election does not exist, check if you have used the correct URL.") + raise turbogears.redirect("/") except IndexError: turbogears.flash("This election does not exist, check if you have used the correct URL.") raise turbogears.redirect("/") @@ -89,7 +91,7 @@ match = 0 for group in votergroups: - if identity.in_group(group.group_name): + if identity.in_group(group.group_name) or group.group_name == "anyany": match = 1 if match == 0: turbogears.flash("You are not in a FAS group that can vote in this election, more information can be found here.") @@ -126,7 +128,7 @@ turbogears.flash("Invalid Ballot!") raise turbogears.redirect("/") for uvote in uvotes: - Votes(voter=turbogears.identity.current.user_name, candidate_id=uvote, weight=uvotes[uvote], election_id=eid) + Votes(voter=turbogears.identity.current.user_name, candidate_id=uvote, weight=uvotes[uvote], election_id=eid, timestamp=curtime) turbogears.flash("You vote has been recorded, thank you!") raise turbogears.redirect("/") elif "vote" in kw: @@ -167,11 +169,12 @@ eid = int(eid) election = Elections.query.filter_by(id=eid).all()[0] except ValueError: - election = Elections.query.filter_by(shortname=eid).all()[0] - eid = election.id - except TypeError: - turbogears.flash("This election does not exist, check if you have used the correct URL.") - raise turbogears.redirect("/") + try: + election = Elections.query.filter_by(shortname=eid).all()[0] + eid = election.id + except IndexError: + turbogears.flash("This election does not exist, check if you have used the correct URL.") + raise turbogears.redirect("/") except IndexError: turbogears.flash("This election does not exist, check if you have used the correct URL.") raise turbogears.redirect("/") Modified: trunk/elections/templates/index.html =================================================================== --- trunk/elections/templates/index.html 2008-05-31 06:37:33 UTC (rev 42) +++ trunk/elections/templates/index.html 2008-06-05 12:00:43 UTC (rev 43) @@ -7,10 +7,21 @@ <title>${appTitle}</title> </head> <body> - <ul> - - <li py:for="election in elections"><a href="${tg.url('/about/' + election.shortname)}">${election.name}</a></li> - - </ul> + <table> + <tr> + <th></th> + <th>Start Date (UTC)</th> + <th>End Date (UTC)</th> + <th></th> + <th></th> + </tr> + <tr py:for="election in elections"> + <td>${election.name}</td> + <td>${election.start_date}</td> + <td>${election.end_date}</td> + <td><a href="${tg.url('/about/' + str(election.shortname))}">More Information</a></td> + <td><a py:if="election.public_results or curtime > election.end_date" href="${tg.url('/results/' + str(election.shortname))}">Results</a></td> + </tr> + </table> </body> </html> Modified: trunk/elections/templates/results.html =================================================================== --- trunk/elections/templates/results.html 2008-05-31 06:37:33 UTC (rev 42) +++ trunk/elections/templates/results.html 2008-06-05 12:00:43 UTC (rev 43) @@ -9,7 +9,7 @@ <body> <h1>${election.name} Results</h1> <p>${election.info}</p> - <p py:if="candidate.url"><a href="${election.url}">[More Information]</a></p> + <p py:if="election.url"><a href="${election.url}">[More Information]</a></p> <table border="1" cellpadding="1"> <tr py:for="candcount in votecount"> <td>${candcount.candidate.name} <small py:if="candcount.candidate.url"><a href="${candcount.candidate.url}">[info]</a></small></td>

1 0

Getting the elections app ready (UI)
by Nigel Jones 05 Jun '08

05 Jun '08

Hi guys, Just wanted to poke you guys to see if anyone is interested from a Websites Team POV on improving the UI for the elections application (https://publictest10.fedoraproject.org/elections/) I'm gradually implementing one or two changes but I'd really appreciate some help/advice as I'm really rubbish at UI stuff. The main things on the TODO can be found at https://fedorahosted.org/elections/ticket/4 mainly the redesign of the vote form and results pages (some method of showing the proportion of the total votes (I can expose the total count easy enough), there also needs to be room for explanation of the voting method (range voting) for people who don't understand it. Any mock-ups/ideas/whatevers would be *greatly* appreciated. Thanks, Nigel Jones

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

elections-devel June 2008