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;
+}
+
Show replies by date