diff --git a/eos/base/election.py b/eos/base/election.py index fe2c4f4..df9b0ff 100644 --- a/eos/base/election.py +++ b/eos/base/election.py @@ -1,5 +1,5 @@ # Eos - Verifiable elections -# Copyright © 2017 RunasSudo (Yingtong Li) +# Copyright © 2017-2019 RunasSudo (Yingtong Li) # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as published by @@ -107,14 +107,15 @@ class UserVoter(Voter): return self.user.name class Question(EmbeddedObject): + _ver = StringField(default='0.7') + prompt = StringField() + description = StringField() class Result(EmbeddedObject): pass class ListChoiceQuestion(Question): - _ver = StringField(default='0.5') - choices = EmbeddedObjectListField() min_choices = IntField() max_choices = IntField() diff --git a/eosweb/core/static/nunjucks/question/approval/selections_make.html b/eosweb/core/static/nunjucks/question/approval/selections_make.html index b6ea23f..e0a89e1 100644 --- a/eosweb/core/static/nunjucks/question/approval/selections_make.html +++ b/eosweb/core/static/nunjucks/question/approval/selections_make.html @@ -18,6 +18,10 @@

{{ questionNum + 1 }}. {{ election.questions.__getitem__(questionNum).prompt }}

+{% if election.questions.__getitem__(questionNum).description %} +

{{ election.questions.__getitem__(questionNum).description | urlize | safe }}

+{% endif %} +

Vote for {% if election.questions.__getitem__(questionNum).min_choices == election.questions.__getitem__(questionNum).max_choices %} diff --git a/eosweb/core/static/nunjucks/question/preferential/selections_make.html b/eosweb/core/static/nunjucks/question/preferential/selections_make.html index 993e4fc..387904e 100644 --- a/eosweb/core/static/nunjucks/question/preferential/selections_make.html +++ b/eosweb/core/static/nunjucks/question/preferential/selections_make.html @@ -18,6 +18,10 @@

{{ questionNum + 1 }}. {{ election.questions.__getitem__(questionNum).prompt }}

+{% if election.questions.__getitem__(questionNum).description %} +

{{ election.questions.__getitem__(questionNum).description | urlize | safe }}

+{% endif %} +

Vote for {% if election.questions.__getitem__(questionNum).min_choices == election.questions.__getitem__(questionNum).max_choices %}