Author: humbedooh
Date: Mon Mar 23 11:04:13 2015
New Revision: 1668590
URL: http://svn.apache.org/r1668590
Log:
- fix baseurl
- add monitor emails to main election page
Modified:
steve/trunk/pysteve/www/cgi-bin/rest_voter.py
steve/trunk/pysteve/www/htdocs/js/steve_rest.js
Modified: steve/trunk/pysteve/www/cgi-bin/rest_voter.py
URL:
http://svn.apache.org/viewvc/steve/trunk/pysteve/www/cgi-bin/rest_voter.py?rev=1668590&r1=1668589&r2=1668590&view=diff
==============================================================================
--- steve/trunk/pysteve/www/cgi-bin/rest_voter.py (original)
+++ steve/trunk/pysteve/www/cgi-bin/rest_voter.py Mon Mar 23 11:04:13 2015
@@ -88,7 +88,7 @@ if pathinfo:
response.respond(500, {'message': 'Could not load base
data: %s' % err})
if 'hash' in basedata:
del basedata['hash']
- response.respond(200, {'base_data': basedata, 'issues': js,
'baseurl': "https://%s/steve/election?%s"; % (os.environ['SERVER_NAME'],
election)})
+ response.respond(200, {'base_data': basedata, 'issues': js,
'baseurl': config.get("general", "rooturl")})
else:
response.respond(404, {'message': 'No such election'})
Modified: steve/trunk/pysteve/www/htdocs/js/steve_rest.js
URL:
http://svn.apache.org/viewvc/steve/trunk/pysteve/www/htdocs/js/steve_rest.js?rev=1668590&r1=1668589&r2=1668590&view=diff
==============================================================================
--- steve/trunk/pysteve/www/htdocs/js/steve_rest.js (original)
+++ steve/trunk/pysteve/www/htdocs/js/steve_rest.js Mon Mar 23 11:04:13 2015
@@ -647,6 +647,15 @@ function renderElectionFrontpage(respons
par.appendChild(btn)
}
+ if (response.base_data.monitors && response.base_data.monitors.length >
0) {
+ var p = document.createElement('div')
+ p.setAttribute("style", "width: 100%; float: left; text-align:
center;")
+ p.innerHTML = "Should you experience issues with your voting,
or if you have any questions, please don't hesitate to contact the vote
monitors: "
+ var m = response.base_data.monitors.join(", ")
+ p.innerHTML += "<a href='mailto:"; + m +
"?subject=Issues%20with%20election%20" + response.base_data.id + "%20at%20" +
response.baseurl + "'>" + m + "</a>."
+ par.appendChild(p)
+ }
+
}
