r55 - branches/0.1.0-STABLE/elections
by Nigel Jones
Author: nigelj
Date: 2008-06-15 11:32:36 +0000 (Sun, 15 Jun 2008)
New Revision: 55
Modified:
branches/0.1.0-STABLE/elections/controllers.py
Log:
Typo fix reported by dtimms
Modified: branches/0.1.0-STABLE/elections/controllers.py
===================================================================
--- branches/0.1.0-STABLE/elections/controllers.py 2008-06-14 00:38:34 UTC (rev 54)
+++ branches/0.1.0-STABLE/elections/controllers.py 2008-06-15 11:32:36 UTC (rev 55)
@@ -212,7 +212,7 @@
if identity.was_login_attempted():
msg="The credentials you supplied were not correct or did not grant access to this resource."
elif identity.get_identity_errors():
- msg="You must provide your credentials before accessing his resource."
+ msg="You must provide your credentials before accessing this resource."
else:
msg="Please log in."
forward_url= request.headers.get("Referer", "/")
15 years, 10 months
Re: [elections-devel] sorry
by Nigel Jones
Luca Foppiano wrote:
> Hi all,
> I'm sorry for my absence and for my short work, but I was full of work
> and 24 hours wasn't enough. Now I have more time and I can help
> you better.
>
> What's plans for the future? simply close all ticket or you have a more
> general roadmap?
>
> If there aren't problems I want to get
> https://fedorahosted.org/elections/ticket/4 ticket. It's ok?
>
> bye
> Luca
>
>
>
Hey, we are now using
https://fedorahosted.org/mailman/listinfo/elections-devel instead of the
svnelections-members address.
There is a 0.2.0 Milestone in Trac, but this is subject to change, I've
got this segment of the roadmap planned out (from the start actually),
but some external factors (time) have come into play.
I've got some changes coming, they shouldn't effect Ticket #4 too much,
but I just don't want it to become a recursive ticket.
So in essence, if you want to work on it, fine by me, but it might be
more prudent to wait until I can get the 0.2.0 (or other arbitrary
version number I decide to use) forwards roadmap out (I intend 0.2.0 to
still be relatively minor and painless).
After Friday morning, (Thursday night for the rest of you) I'll have a
lot more time to get this sort of stuff up.
- Nigel
15 years, 10 months
[Fedora Elections] #16: Cannot edit ballot after entering bad data
by fedora-badges
#16: Cannot edit ballot after entering bad data
---------------------+------------------------------------------------------
Reporter: jhrozek | Owner: nigelj
Type: defect | Status: new
Priority: major | Milestone: Release 0.1.0
Component: General | Version:
Keywords: |
---------------------+------------------------------------------------------
To reproduce:
* Enter the Real Presidential Nominee ballot
* vote, but input bad data
* I did input -1 5 4 3 2
* you are correctly reminded that "One or more votes had incorrect data,
please verify your ballot carefully!" but you can't change the numbers
entered afterwards
* I did reproduce this with both FF (latest F8 version) and Konqueror
* going back helps but it would be nice to be able to modify the data
on the same page. And mabe even highlight those that are bad.
--
Ticket URL: <https://fedorahosted.org/elections/ticket/16>
Fedora Elections <https://fedorahosted.org/elections/>
Fedora Elections
15 years, 10 months
r54 - branches/0.1.0-STABLE/elections trunk/elections trunk/elections/static/css
by Nigel Jones
Author: nigelj
Date: 2008-06-14 00:38:34 +0000 (Sat, 14 Jun 2008)
New Revision: 54
Modified:
branches/0.1.0-STABLE/elections/controllers.py
trunk/elections/controllers.py
trunk/elections/static/css/style.css
Log:
String and CSS updates
Modified: branches/0.1.0-STABLE/elections/controllers.py
===================================================================
--- branches/0.1.0-STABLE/elections/controllers.py 2008-06-14 00:21:03 UTC (rev 53)
+++ branches/0.1.0-STABLE/elections/controllers.py 2008-06-14 00:38:34 UTC (rev 54)
@@ -93,7 +93,7 @@
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.")
+ turbogears.flash("You are not in a FAS group that can vote in this election, more information can be found at the bottom of this page.")
raise turbogears.redirect("/about/" + str(eid))
candidates = Candidates.query.filter_by(election_id=eid).order_by(Candidates.name).all()
@@ -186,7 +186,7 @@
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.")
+ turbogears.flash("We are sorry, the results for this election cannot be viewed because they 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/controllers.py
===================================================================
--- trunk/elections/controllers.py 2008-06-14 00:21:03 UTC (rev 53)
+++ trunk/elections/controllers.py 2008-06-14 00:38:34 UTC (rev 54)
@@ -93,7 +93,7 @@
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.")
+ turbogears.flash("You are not in a FAS group that can vote in this election, more information can be found at the bottom of this page.")
raise turbogears.redirect("/about/" + str(eid))
candidates = Candidates.query.filter_by(election_id=eid).order_by(Candidates.name).all()
@@ -186,7 +186,7 @@
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.")
+ turbogears.flash("We are sorry, the results for this election cannot be viewed because they 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/static/css/style.css
===================================================================
--- trunk/elections/static/css/style.css 2008-06-14 00:21:03 UTC (rev 53)
+++ trunk/elections/static/css/style.css 2008-06-14 00:38:34 UTC (rev 54)
@@ -0,0 +1,9 @@
+.flash
+{
+ border: 1px solid #DDDDDD;
+ padding: 1.5ex;
+ margin: 1ex 0;
+ color: #000000;
+ background: #EEFFBB;
+}
+
15 years, 10 months
r53 - branches/0.1.0-STABLE/elections/static/css
by Ricky Zhou
Author: ricky
Date: 2008-06-14 00:21:03 +0000 (Sat, 14 Jun 2008)
New Revision: 53
Modified:
branches/0.1.0-STABLE/elections/static/css/style.css
Log:
Make the flash nicer.
Modified: branches/0.1.0-STABLE/elections/static/css/style.css
===================================================================
--- branches/0.1.0-STABLE/elections/static/css/style.css 2008-06-13 04:31:11 UTC (rev 52)
+++ branches/0.1.0-STABLE/elections/static/css/style.css 2008-06-14 00:21:03 UTC (rev 53)
@@ -0,0 +1,9 @@
+.flash
+{
+ border: 1px solid #DDDDDD;
+ padding: 1.5ex;
+ margin: 1ex 0;
+ color: #000000;
+ background: #EEFFBB;
+}
+
15 years, 10 months
r52 - branches/0.1.0-STABLE/elections trunk/elections
by Nigel Jones
Author: nigelj
Date: 2008-06-13 04:31:11 +0000 (Fri, 13 Jun 2008)
New Revision: 52
Modified:
branches/0.1.0-STABLE/elections/controllers.py
trunk/elections/controllers.py
Log:
Controllers update to close Ticket #18 \(Typo after voting has been done\)
Modified: branches/0.1.0-STABLE/elections/controllers.py
===================================================================
--- branches/0.1.0-STABLE/elections/controllers.py 2008-06-12 23:00:12 UTC (rev 51)
+++ branches/0.1.0-STABLE/elections/controllers.py 2008-06-13 04:31:11 UTC (rev 52)
@@ -128,7 +128,7 @@
raise turbogears.redirect("/")
for uvote in uvotes:
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!")
+ turbogears.flash("Your vote has been recorded, thank you!")
raise turbogears.redirect("/")
elif "vote" in kw:
turbogears.flash("Please confirm your vote!")
Modified: trunk/elections/controllers.py
===================================================================
--- trunk/elections/controllers.py 2008-06-12 23:00:12 UTC (rev 51)
+++ trunk/elections/controllers.py 2008-06-13 04:31:11 UTC (rev 52)
@@ -128,7 +128,7 @@
raise turbogears.redirect("/")
for uvote in uvotes:
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!")
+ turbogears.flash("Your vote has been recorded, thank you!")
raise turbogears.redirect("/")
elif "vote" in kw:
turbogears.flash("Please confirm your vote!")
15 years, 10 months
