Permalink
Browse files

new evote version

  • Loading branch information...
mdipierro committed Apr 30, 2016
1 parent 1aa58ae commit 3d1f5eb4ea04faa2c10fcab27bf94eaafd393069
Showing with 1,544 additions and 3,131 deletions.
  1. +0 −3 email.txt
  2. +0 −24 models/0.py
  3. +0 −14 models/db_votes.py
  4. +2 −1 models/menu.py
  5. +0 −1 msg
  6. BIN patch.zip
  7. +7 −8 private/appconfig.ini
  8. +0 −155 safe-diff
  9. +0 −5 static/css/bootstrap-theme.min.css
  10. +0 −5 static/css/bootstrap.min.css
  11. +9 −5 static/css/calendar.css
  12. +0 −22 static/css/custom.css
  13. +359 −0 static/css/stupid.css
  14. +0 −315 static/css/web2py-bootstrap3.css
  15. +0 −361 static/css/web2py-bootstrap3.css.bak2
  16. +19 −127 static/css/web2py.css
  17. +0 −313 static/css/web2py.css.bak2
  18. BIN static/font/fontawesome-webfont.eot
  19. +0 −255 static/font/fontawesome-webfont.svg
  20. BIN static/font/fontawesome-webfont.ttf
  21. BIN static/font/fontawesome-webfont.woff
  22. BIN static/fonts/glyphicons-halflings-regular.eot
  23. +0 −288 static/fonts/glyphicons-halflings-regular.svg
  24. BIN static/fonts/glyphicons-halflings-regular.ttf
  25. BIN static/fonts/glyphicons-halflings-regular.woff
  26. BIN static/fonts/glyphicons-halflings-regular.woff2
  27. BIN static/images/woman.jpg
  28. BIN static/images/woman_psf.jpg
  29. +0 −8 static/js/analytics.min.js
  30. +0 −7 static/js/bootstrap.min.js
  31. +5 −4 static/js/jquery.js
  32. +0 −4 static/js/modernizr-2.8.3.min.js
  33. +0 −6 static/js/respond-1.4.2.min.js
  34. +0 −44 static/js/share.js
  35. +0 −82 static/js/web2py-bootstrap3.js
  36. +713 −679 static/js/web2py.js
  37. +17 −11 views/default/ballot.html
  38. +36 −29 views/default/ballots.html
  39. +8 −2 views/default/close_election.html
  40. +7 −1 views/default/contactus.html
  41. +72 −57 views/default/edit.html
  42. +73 −69 views/default/elections.html
  43. +25 −19 views/default/features.html
  44. +37 −32 views/default/index.html
  45. +7 −1 views/default/invalid_link.html
  46. +7 −1 views/default/no_more_ballots.html
  47. +7 −1 views/default/not_authorized.html
  48. +8 −4 views/default/recorded.html
  49. +8 −3 views/default/reminders.html
  50. +3 −3 views/default/reminders_callback.html
  51. +12 −7 views/default/results.html
  52. +11 −5 views/default/start.html
  53. +2 −2 views/default/start_callback.html
  54. +7 −1 views/default/support.html
  55. +18 −17 views/default/user.html
  56. +7 −2 views/default/vote.html
  57. +7 −1 views/default/voted_already.html
  58. +51 −127 views/layout.html
View

This file was deleted.

Oops, something went wrong.
View

This file was deleted.

Oops, something went wrong.
View
@@ -38,17 +38,3 @@
Field('signature')) # signature of ballot (voted or blank)
# if resticted to some users get the list of users
def load_users_emails(filename=myconf.take('app.users_filename')):
import urllib, os
if not filename:
return None
elif filename.startswith('http://') or filename.startswith('https://'):
emails = urllib.urlopen(filename).read().split('\n')
else:
if not filename.startswith('/'):
filename = os.path.join(request.folder, filename)
emails = open(filename).read().split('\n')
emails = [email.strip() for email in emails if email.strip()]
return emails
users_emails = cache.ram('users_emails',load_users_emails,3600)
View
@@ -23,9 +23,10 @@
#########################################################################
response.menu = [
(T('Home'), False, URL('default', 'index')),
(T('EVote'), False, URL('default', 'index')),
(T('Elections'), False, URL('default', 'elections')),
(T('Features'), False, URL('default', 'features')),
(T('Support'), False, URL('default', 'support')),
(T('Source Code'), False, 'https://github.com/mdipierro/evote'),
]
View
1 msg

This file was deleted.

Oops, something went wrong.
View
BIN patch.zip
Binary file not shown.
View
@@ -3,14 +3,14 @@
development = False
title = E-Vote
subtitle = Free Secure Trusted Verifiable Online Voting
as_service = True
google_analytics_id =
as_service = False
google_analytics_id =
users_filename =
[meta]
author = Massimo Di pierro
description = Electornic Voting System
keywords = Secure, Electornic, Voting
description = Electronic Voting System
keywords = Secure, Electronic, Voting
; db configuration
[db]
@@ -20,10 +20,9 @@ pool_size = 1
; smtp address and credentials
[smtp]
server = smtp.gmail.com:587
sender = you@gmail.com
login = username:password
sender = you@example.com
server = localhost
login =
; form styling
[forms]
View
155 safe-diff

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.

This file was deleted.

Oops, something went wrong.
View
@@ -1,7 +1,11 @@
.calendar{z-index:2000;position:relative;display:none;background:#fff;border:2px solid #000;font-size:11px;color:#000;cursor:default;font-family:Arial,Helvetica,sans-serif;
border-radius: 10px;
-moz-border-radius: 10px;
-webkit-border-radius: 10px;
}.calendar table{margin:0px;font-size:11px;color:#000;cursor:default;font-family:tahoma,verdana,sans-serif;}.calendar .button{text-align:center;padding:1px;color:#fff;background:#000;}.calendar .nav{background:#000;color:#fff}.calendar thead .title{font-weight:bold;padding:1px;background:#000;color:#fff;text-align:center;}.calendar thead .name{padding:2px;text-align:center;background:#bbb;}.calendar thead .weekend{color:#f00;}.calendar thead .hilite {background-color:#666;}.calendar thead .active{padding:2px 0 0 2px;background-color:#c4c0b8;}.calendar tbody .day{width:2em;text-align:right;padding:2px 4px 2px 2px;}.calendar tbody .day.othermonth{color:#aaa;}.calendar tbody .day.othermonth.oweekend{color:#faa;}.calendar table .wn{padding:2px 3px 2px 2px;background:#bbb;}.calendar tbody .rowhilite td{background:#ddd;}.calendar tbody td.hilite{background:#bbb;}.calendar tbody td.active{background:#bbb;}.calendar tbody td.selected{font-weight:bold;background:#ddd;}.calendar tbody td.weekend{color:#f00;}.calendar tbody td.today{font-weight:bold;color:#00f;}.calendar tbody .disabled{color:#999;}.calendar tbody .emptycell{visibility:hidden;}.calendar tbody .emptyrow{display:none;}.calendar tfoot .ttip{background:#bbb;padding:1px;background:#000;color:#fff;text-align:center;}.calendar tfoot .hilite{background:#ddd;}.calendar tfoot .active{}.calendar .combo{position:absolute;display:none;width:4em;top:0;left:0;cursor:default;background:#e4e0d8;padding:1px;z-index:2001;}.calendar .combo .label,.calendar .combo .label-IEfix{text-align:center;padding:1px;}.calendar .combo .label-IEfix{width:4em;}.calendar .combo .active{background:#c4c0b8;}.calendar .combo .hilite{background:#048;color:#fea;}.calendar td.time{padding:1px 0;text-align:center;background-color:#bbb;}.calendar td.time .hour,.calendar td.time .minute,.calendar td.time .ampm{padding:0 3px 0 4px;font-weight:bold;}.calendar td.time .ampm{text-align:center;}.calendar td.time .colon{padding:0 2px 0 3px;font-weight:bold;}.calendar td.time span.hilite{}.calendar td.time span.active{border-color:#f00;background-color:#000;color:#0f0;}.hour,.minute{font-size:2em;}
.calendar {z-index:2000;position:relative;margin-top:140px;display:none;background-color:white;border:1px solid #000;color:#000;cursor:default;box-shadow:0 0 10px #666}.calendar * {text-align: center;font-size:10px!important; color:black}
.calendar table {border-collapse:collapse}
.calendar tbody tr:hover {background-color:#fbf6d9}
.calendar td, th {padding:5px; vertical-align:top; text-align:left; border:0}
.calendar thead tr {background-color:#f1f1f1}
.calendar tbody tr {border-bottom:2px solid #f1f1f1}
.calendar th {font-weight:string; padding:5px; vertical-align:bottom; text-align:left}
.calendar thead th {vertical-align:bottom}
.calendar tbody th {vertical-align:top}
#CP_hourcont{z-index:2000;padding:0;position:absolute;border:1px dashed #666;background-color:#eee;display:none;}#CP_minutecont{z-index:2000;background-color:#ddd;padding:1px;position:absolute;width:45px;display:none;}.floatleft{float:left;}.CP_hour{z-index:2000;padding:1px;font-family:Arial,Helvetica,sans-serif;font-size:9px;white-space:nowrap;cursor:pointer;width:35px;}.CP_minute{z-index:2000;padding:1px;font-family:Arial,Helvetica,sans-serif;font-size:9px;white-space:nowrap;cursor:pointer;width:auto;}.CP_over{background-color:#fff;z-index:2000}
View

This file was deleted.

Oops, something went wrong.
Oops, something went wrong.

0 comments on commit 3d1f5eb

Please sign in to comment.