From fc0cda1ad971db3f5818d6f89b3d702157f89344 Mon Sep 17 00:00:00 2001 From: Ben Adida <ben@BigDaddy.local> Date: Fri, 4 Sep 2009 16:15:22 -0700 Subject: [PATCH] made things more modular --- settings.py.sample | 2 ++ single-election/__init__.py | 2 +- single-election/templates/index.html | 8 ++++---- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/settings.py.sample b/settings.py.sample index 32b706f..0b7b86a 100644 --- a/settings.py.sample +++ b/settings.py.sample @@ -128,6 +128,8 @@ TEMPLATE_DEBUG = True URL_HOST = "https://FILL-ME-IN-helios.appspot.com" # election stuff +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' diff --git a/single-election/__init__.py b/single-election/__init__.py index 248656b..797a2f2 100644 --- a/single-election/__init__.py +++ b/single-election/__init__.py @@ -13,4 +13,4 @@ helios.ADMIN_ONLY = True helios.ADMIN = auth.models.User.get_or_create(user_type = 'password', user_id = 'benadida', info={'password':'test'}) # authentication limited to passwords -auth.ENABLED_AUTH_SYSTEMS = ['password'] \ No newline at end of file +auth.ENABLED_AUTH_SYSTEMS = ['cas'] \ No newline at end of file diff --git a/single-election/templates/index.html b/single-election/templates/index.html index 4a8e0cb..139cbb2 100644 --- a/single-election/templates/index.html +++ b/single-election/templates/index.html @@ -2,13 +2,13 @@ {% block title %}Single Election Helios{% endblock %} {% block header %} -<h2>Single Election</h2> +<h2>{{ settings.SITE_TITLE }}</h2> {% endblock %} {% block content %} <p> - Welcome to the SINGLE HELIOS ELECTION Server. + Welcome to the {{settings.SITE_TITLE}} Server. </p> <p> @@ -20,12 +20,12 @@ <p> Because Helios is built to be used on the Web, it is appropriate <em><b>only for low-coercion elections</b></em>. Specifically, Helios is not appropriate at this time for governmental elections where the stakes are particularly high, - and the risk of one voter attempting to influence another are very real. + and the risk of one voter attempting to influence another is very real. </p> <p style="font-size: 1.4em;"> Proceed to -<a href="{% url helios.views.one_election_view settings.SINGLE_ELECTION_UUID %}">the SINGLE HELIOS ELECTION</a>. +<a href="{% url helios.views.one_election_view settings.SINGLE_ELECTION_UUID %}">the {{settings.SINGLE_ELECTION_TITLE}}</a>. </p> {% endblock %} -- GitLab