@@ -1 +1 @@ -Subproject commit 8afd83184a70a56c690070fac3f710dd07386b14 +Subproject commit 90e01354798c688b8738f4dcd6c4f387450560c6 helios @@ -1 +1 @@ -Subproject commit c9bd15a107a96f63b45e55f39f8c9061268959ec +Subproject commit 103409762808eb3a798f3c7a42583add37226bc5 heliosbooth @@ -1 +1 @@ -Subproject commit d3abd920c1cecb2a9fcb004c1a12ac69e37532dd +Subproject commit 02772e5c3a72597197923138f10054cc76f15c6b heliosverifier @@ -17,6 +17,11 @@ indexes: - name: election - name: uuid +- kind: Voter + properties: + - name: election + - name: voter_id + - kind: CastVote properties: - name: voter index.yaml @@ -11,7 +11,7 @@ import auth.models helios.TEMPLATE_BASE = "single-election/templates/base.html" helios.ADMIN_ONLY = True -helios.ADMIN = auth.models.User.get_or_create(user_type = 'password', user_id = 'benadida', info={'password':'test'}) +helios.ADMIN = auth.models.User.get_or_create(user_type = 'cas', user_id = 'yaro', info={}) # authentication limited to passwords auth.ENABLED_AUTH_SYSTEMS = ['cas', 'password'] initialization.py.sample @@ -132,11 +132,12 @@ SITE_TITLE = 'Helios Single Election Server' SINGLE_ELECTION_TITLE = 'Helios Single Election' SINGLE_ELECTION_UUID = 'FILL-ME-IN' SINGLE_ELECTION_SHORT_NAME = 'FILL-ME-IN' +SINGLE_ELECTION_DESCRIPTION = 'FILL-ME-IN' SINGLE_ELECTION_PARAMS = { 'short_name' : SINGLE_ELECTION_SHORT_NAME, 'name' : SINGLE_ELECTION_TITLE, - 'description' : 'Election for the Fall 2009 Princeton Freshman Class Officers', + 'description' : SINGLE_ELECTION_DESCRIPTION, 'uuid' : SINGLE_ELECTION_UUID, 'openreg': False, 'tally_type': 'homomorphic', settings.py.sample @@ -73,7 +73,7 @@ table.pretty th, td { .highlight-box { background:#ccc; padding: 10px; - color:#eee; + color: black; border: 1px solid #888; } single-election/media/main.css 63eecd1609b63bc9a3adbf1ad1ee8452558fe99e 6b6cc785789b616ca415155fffb017ab8f862c87 Ben Adida ben@BigDaddy.local http://github.com/benadida/helios-single-election-server/commit/145c34c57fce7a215faca6f1c6aaa4a57ff5bab8 145c34c57fce7a215faca6f1c6aaa4a57ff5bab8 2009-11-04T17:00:47-08:00 2009-11-04T17:00:47-08:00 Merge branch 'master' of git@github.com:benadida/helios-single-election-server a125774d632561aa96dcd2f01859ace4eb39c1d4 Ben Adida ben@BigDaddy.local