diff --git a/server_ui/templates/about.html b/server_ui/templates/about.html
new file mode 100644
index 0000000000000000000000000000000000000000..e1b79669634a184db25856cd18011e178a9a55c3
--- /dev/null
+++ b/server_ui/templates/about.html
@@ -0,0 +1,74 @@
+{% extends 'server_ui/templates/base.html' %}
+{% block title %}{{ settings.SITE_TITLE }}{% endblock %}
+
+{% block header %}
+{% endblock %}
+
+{% block content %}
+
+<div class="large-12-columns">
+
+<div class="row"><h2>About Helios Voting</h2></div>
+
+<div class="row">
+<p>Helios is a non-partisan organization led by <a href="http://ben.adida.net">Ben Adida</a>.</p>
+</div>
+
+<div class="row"> </div>
+
+<div class="row">
+<h5>Code Contributors</h5>
+
+Ben Adida, Olivier de Marneffe, Olivier Pereira
+</div>
+<div class="row"> </div>
+<div class="row">
+<h5>Advisors</h5>
+</div>
+
+<div class="row"><h6 class="subheader">Jim Adler</h6>
+<p>Jim Adler is the Chief Privacy Officer and General Manager of Data Systems at Intelius. As part of the Executive Leadership Team, Mr. Adler is the chief consumer advocate for the company with responsibility for the data systems that power Intelius’ products. Mr. Adler is a national leader on privacy, cryptography, e-voting and security issues having testified before the Federal Trade Commission (FTC), US Congress, National Institute of Standards and Technology (NIST), and leading academic institutions. Prior to Intelius, Mr. Adler served as President and Chief Technology Officer at Identity.net, an Internet company giving consumers control of their online identity and reputation. From 1998 to 2005, Mr. Adler was the founder and CEO of VoteHere, a pioneer in the development of private and secure electronic voting, both online and offline. Under his management, VoteHere’s groundbreaking cryptographic technology resulted in more than 50 issued patents, and deployed that technology for more than 15 million voters worldwide.</p>
+</div>
+
+<div class="row"> </div>
+
+<div class="row"><h6 class="subheader">Lawrence Lessig</h6>
+<p>
+Lawrence Lessig is the Director of the Edmond J. Safra Foundation Center for Ethics at Harvard University, and a Professor of Law at Harvard Law School. For much of his academic career, Lessig has focused on law and technology, especially as it affects copyright. His current academic work addresses the question of “institutional corruption” — roughly, influences within an economy of influence that weaken the effectiveness of an institution, or weaken public trust. His current work at the EJ Safra Lab oversees a 5 year research project addressing institutional corruption in a number of institutional contexts. [<a href="http://www.lessig.org/info/bio/">more</a>]
+</p>
+</div>
+
+<div class="row"> </div>
+
+<div class="row"><h6 class="subheader">Josh Benaloh</h6>
+<p>
+Dr. Benaloh is Senior Cryptographer at Microsoft Research and an elected director of the International Association for Cryptologic Research. He earned his S.B degree from the Massachusetts Institute of Technology and M.S., M.Phil., and Ph.D. degrees from Yale University where his 1987 doctoral dissertation, Verifiable Secret-Ballot Elections, introduced the use of homomorphic encryption to enable end-to-end verifiable election technologies. Dr. Benaloh’s numerious research publications in cryptography and voting have pioneered new tehnologies including the “cast or cancel” paradigm which brings voters into the verification process with minimal burden. He has served on the program committees of dozens of cryptography and election-related conferences and workshops and is a frequent speaker on the history, development, and mechanisms behind verifiable voting.
+</p>
+</div>
+
+<div class="row"> </div>
+
+<div class="row"><h6 class="subheader">Andy Neff</h6>
+<p>
+Dr. Neff is the author of several ground-breaking contributions to the study of computer algorithms, specifically as they apply to voting protocols. At VoteHere, where he was CTO, Dr. Neff created the first ballot mixing and anonymization technique efficient enough for practical use, developed a new ballot representation which allows for a reduction in ballot size by several factors with privacy intact, and led the technical vision of the VoteHere election product. Dr. Neff regularly serves on the program committees of top voting conferences and holds a PhD in Mathematics from Princeton University.
+</p>
+</div>
+
+<div class="row"> </div>
+
+<div class="row"><h6 class="subheader">Olivier Pereira</h6>
+<p>
+Olivier Pereira is a research associate of the Belgian science foundation F.R.S.-FNRS and an associate professor at Université catholique de Louvain. His research interests lie in the area of cryptography and distributed computing, addressing the issue of enabling people to jointly realize tasks in a secure way. He has been leading the development, integration and deployment of Helios in several large scale elections, and gave invited presentations and keynote talks about verifiable elections in a dozen of leading institutions around the world. He is a co-author of the Bevoting study on electronic voting systems produced for the Belgian Federal and Regional Administrations.
+</p>
+</div>
+
+<div class="row"><h6 class="subheader">Dan Wallach</h6>
+<p>
+Dan Wallach is an associate professor in the Department of Computer Science at Rice University in Houston, Texas and is the director of NSF’s ACCURATE (A Center for Correct, Usable, Reliable, Auditable and Transparent Elections). His research involves computer security and the issues of building secure and robust software systems for the Internet. He has testified about voting security issues before government bodies in the U.S., Mexico, and the European Union, has served as an expert witness in a number of voting technology lawsuits, and participated in California’s “top-to-bottom” audit of its voting systems.
+</p>
+</div>
+
+</div>
+
+
+{% endblock %}
diff --git a/server_ui/templates/base.html b/server_ui/templates/base.html
index 3cc4a543338e15a5355c7523f214547a5186bf32..5381e7f263eed7743d016860cceab216a664717f 100644
--- a/server_ui/templates/base.html
+++ b/server_ui/templates/base.html
@@ -5,7 +5,7 @@
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width">
- <title>{% block title %}{% endblock %} - Helios</title>
+ <title>Helios: {% block title %}{% endblock %}</title>
<link rel="stylesheet" href="/static/foundation/css/foundation.css">
@@ -40,6 +40,8 @@
<section class="top-bar-section">
<!-- Right Nav Section -->
<ul>
+ <li><a href="/">{{settings.SITE_TITLE}}</a></li>
+ {% if settings.MASTER_HELIOS %}
<li class="divider"></li>
<li><a href="/about">about</a></li>
<li class="divider"></li>
@@ -48,7 +50,7 @@
<li><a href="/docs">docs</a></li>
<li class="divider"></li>
<li><a href="/faq">FAQ</a></li>
- <li class="divider"></li>
+ {% endif %}
</ul>
</section>
</nav>
diff --git a/server_ui/templates/docs.html b/server_ui/templates/docs.html
new file mode 100644
index 0000000000000000000000000000000000000000..f0ef9d5a9fe498afdb91509fa6188c4d05c387a3
--- /dev/null
+++ b/server_ui/templates/docs.html
@@ -0,0 +1,19 @@
+{% extends 'server_ui/templates/base.html' %}
+{% block title %}{{ settings.SITE_TITLE }}{% endblock %}
+
+{% block header %}
+{% endblock %}
+
+{% block content %}
+
+<div class="large-12-columns">
+
+<div class="row"><h2>Documentation</h2></div>
+
+<div class="row">
+
+</div>
+
+</div>
+
+{% endblock %}
diff --git a/server_ui/templates/faq.html b/server_ui/templates/faq.html
new file mode 100644
index 0000000000000000000000000000000000000000..c79699de0da937b8eca4d4dba2c1b440ece0f7ae
--- /dev/null
+++ b/server_ui/templates/faq.html
@@ -0,0 +1,61 @@
+{% extends 'server_ui/templates/base.html' %}
+{% block title %}{{ settings.SITE_TITLE }}{% endblock %}
+
+{% block header %}
+{% endblock %}
+
+{% block content %}
+
+<div class="large-12-columns">
+
+<div class="row"><h2>FAQ</h2></div>
+
+<div class="row">
+<b>What makes Helios different/better than other voting systems?</b>
+
+<p>Helios is truly verifiable. Each voter obtains a smart ballot tracker which can be checked against the Ballot Tracking Center to ensure that the ballot was received and tallied appropriately. What this means is that no one, not even the administrators of the Helios Voting system, can alter your vote.
+</p>
+</div>
+
+<div class="row"> </div>
+
+<div class="row">
+<b>I’ve heard of “voter-verifiable” before, what’s different about Helios?</b>
+<p>Many voting systems claim to be voter-verifiable. We believe voter-verifiability is critically important, and we support the efforts of other organizations to help improve the voting machines used in public-office elections. However, we believe that more extensive verifiability is needed, with voters able to ensure that the tallying process, not just the recording of their ballot, was performed correctly. We call that “true verifiability.” Others have called this concept “end-to-end verifiability” or “open-audit.”</p>
+</div>
+
+<div class="row"> </div>
+
+<div class="row">
+<b>How secret is my vote on Helios?</b>
+<p>Helios takes great care to protect the secrecy of your vote. On most modern web browsers, your vote is encrypted inside your browser, before it is even sent to the server. Even on older browsers, your vote is encrypted before you log into Helios. In all cases, your vote is stored in the database only in encrypted form. Helios then uses advanced cryptographic techniques to combine all of the encrypted votes into an encrypted tally, and only the tally is decrypted. This means that your ballot is never individually decrypted. To provide for the highest level of privacy, Helios lets election administrators designate multiple trustees. All trustees must be involved in decryption, which further ensures that only the tally, never the individual votes, are decrypted.</p>
+</div>
+
+<div class="row"> </div>
+
+<div class="row">
+<b>What’s so “smart” about the Helios Ballot Tracker?</b>
+<p>A typical tracking number, say for shipping a package, is more or less a random number: it means nothing other than the label on your package. It’s conceivable that your package gets there, tracking number intact, but its contents destroyed. In the digital world, we’re able to produce a special kind of tracking number that is far from random: it is a fingerprint of the encryption of your vote. So, if your smart ballot tracker makes it all the way to the tally, you know that not only did your ballot make it into the tally, you also know that it wasn’t tampered with in the process. That’s what makes it smart.</p>
+</div>
+
+<div class="row"> </div>
+
+<div class="row">
+<b>Is Helios the only system that provides this level of verifiability?</b>
+<p>No, there are other systems. Scantegrity and Punchscan provide true verifiability in paper-based voting systems. We like those systems, and we like the people behind those systems. VoteHere, a company that has since folded, was a pioneer in this area, too. The Helios System packs a number of innovations focused on enabling true verifiability for online elections to help everyone get a taste if this groundbreaking technology. But we are not the only game in town.</p>
+</div>
+
+<div class="row"> </div>
+
+<div class="row">
+<b>Should we start using Helios for public-office elections? Maybe US President 2016?</b>
+<p>No, you should not. Online elections are appropriate when one does not expect a large attempt at defrauding or coercing voters. For some elections, notably US Federal and State elections, the stakes are too high, and we recommend against capturing votes over the Internet. This has nothing to do with Helios itself: we just don’t trust that people’s home computers are secure enough to withstand significant attacks.</p>
+
+<p>If you’d like to use a truly verifiable voting system for your public-office election, we recommend an in-person election. Helios could be adapted to the in-person, precinct voting setting, but we have not done this work yet, and we intend to focus on online elections first.</p>
+</div>
+
+
+</div>
+
+
+{% endblock %}
diff --git a/server_ui/templates/index.html b/server_ui/templates/index.html
index e7420bbd5af7c1dafc4357fb026f2283d8e919bd..8899ffd1f9a2f83271b3209bd478cf2029073b8c 100644
--- a/server_ui/templates/index.html
+++ b/server_ui/templates/index.html
@@ -8,8 +8,30 @@
{% block content %}
<div class="row"><div class="large-5 columns large-centered"><a href="/"><img border="0" src="/static/logo.png" /></a></div></div>
-
+<div class="row"> </div>
<div class="large-9 columns">
+ {% if settings.MASTER_HELIOS %}
+<p>Helios offers <b>verifiable online elections</b>.</p>
+
+<p>We believe democracy is important, whether it’s your book club, parent-teacher association, student government, workers’ union, or state. So we’ve made truly verifiable elections as easy as everything else on the Web.</p>
+
+<p>
+Helios elections are:
+<ul class="disc">
+<li><b>private</b>: no one knows how you voted.</li>
+<li><b>verifiable</b>: each voter gets a tracking number.</li>
+<li><b>proven</b>: Helios is open-source, vetted by top-tier experts, and in use by major organizations.</li>
+</ul>
+
+<p>
+More than <b>100,000 votes</b> have been cast using Helios.
+</p>
+
+{% if create_p %}
+<a class="button" href="{% url helios.views.election_new %}">create an election</a>
+{% endif %}
+
+ {% else %}
<p style="font-size: 1.4em;">
{{settings.WELCOME_MESSAGE|safe}}
</p>
@@ -28,6 +50,7 @@
{% else %}
<h4>no featured elections at the moment</h4>
{% endif %}
+{% endif %}
</div>
diff --git a/server_ui/urls.py b/server_ui/urls.py
index fa83c3829a31a335e5450117dfd059243167cdc2..fdd8071477b688cf6e023c08e23b178df8dcf11c 100644
--- a/server_ui/urls.py
+++ b/server_ui/urls.py
@@ -6,4 +6,6 @@ from views import *
urlpatterns = patterns('',
(r'^$', home),
(r'^about$', about),
+ (r'^docs$', docs),
+ (r'^faq$', faq),
)
diff --git a/server_ui/views.py b/server_ui/views.py
index b8e0f0b7ed8c009d7906dfebad817cc004141969..965fbe84f6cfe4763c30a0003bb1c600e47c1467 100644
--- a/server_ui/views.py
+++ b/server_ui/views.py
@@ -54,5 +54,11 @@ def home(request):
'login_box' : login_box})
def about(request):
- return HttpResponse(request, "about")
+ return render_template(request, "about")
+
+def docs(request):
+ return render_template(request, "docs")
+
+def faq(request):
+ return render_template(request, "faq")
diff --git a/settings.py b/settings.py
index c0d35fd14688776dbe463caf848f928bb86a1255..d3055fa4773c5494d6e860fa6cdb88c73f7ab7d8 100644
--- a/settings.py
+++ b/settings.py
@@ -17,6 +17,9 @@ ADMINS = (
MANAGERS = ADMINS
+# is this the master Helios web site?
+MASTER_HELIOS = (get_from_env('MASTER_HELIOS', '1') == '1')
+
DATABASES = {
'default': {
'ENGINE': 'django.db.backends.postgresql_psycopg2',
@@ -138,7 +141,7 @@ SECURE_URL_HOST = get_from_env("SECURE_URL_HOST", "http://localhost:8000")
SOCIALBUTTONS_URL_HOST= get_from_env("SOCIALBUTTONS_URL_HOST", "http://localhost:8000")
# election stuff
-SITE_TITLE = get_from_env('SITE_TITLE', 'Helios Election Server')
+SITE_TITLE = get_from_env('SITE_TITLE', 'Helios Voting')
# FOOTER links
FOOTER_LINKS = json.loads(get_from_env('FOOTER_LINKS', '[]'))