moved things to make python happy, added a few details

app.yaml.sample

@@ -19,13 +19,13 @@ handlers:
   secure: always
   
 - url: /static
-  static_dir: server-ui/media
+  static_dir: server_ui/media
   secure: always
 
 # this overrides the style for the booth
 # without having to fork the code
 - url: /booth/css
-  static_dir: server-ui/media/boothcss
+  static_dir: server_ui/media/boothcss
   secure: always
   
 - url: /booth

initialization.py.sample

@@ -7,9 +7,9 @@ import helios
 import auth
 import auth.models
 
-#from server-ui import glue
+#from server_ui import glue
 
-helios.TEMPLATE_BASE = "server-ui/templates/base.html"
+helios.TEMPLATE_BASE = "server_ui/templates/base.html"
 helios.ADMIN_ONLY = True
 helios.ADMIN = auth.models.User.get_or_create(user_type = 'cas', user_id = 'yaro', info={})
 

server-ui/glue.py → server_ui/glue.py

@@ -9,7 +9,7 @@ import helios.views, helios.signals
 
 import views
 
-def vote_cast_update_status(user, voter, election, cast_vote, **kwargs):
+def vote_cast_send_message(user, voter, election, cast_vote, **kwargs):
   # prepare the message
   subject = "%s - vote cast" % election.name
   
@@ -21,7 +21,7 @@ You have successfully cast a vote in
 Your ballot tracking number is:
 
   %s
-""" % (election.name, cast_vote.vote_hash
+""" % (election.name, cast_vote.vote_hash)
   
   if election.use_voter_aliases:
     body += """
@@ -39,7 +39,7 @@ Your voter alias is : %s
   # send it via the notification system associated with the auth system
   user.send_message(subject, body)
   
-helios.signals.vote_cast.connect(vote_cast_update_status)
+helios.signals.vote_cast.connect(vote_cast_send_message)
 
 def election_tallied(election, **kwargs):
   pass

server-ui/templates/confirm.html → server_ui/templates/confirm.html

-{% extends 'server-ui/templates/base.html' %}
+{% extends 'server_ui/templates/base.html' %}
 {% block title %}Confirm Vote{% endblock %}
 
 {% block content %}
@@ -38,7 +38,7 @@ function show_waiting() {
 </form>
 
 <p>
-    Forgot your password? <a href="{% url auth.auth_systems.password.password_forgotten_view %}?return_url={% url server-ui.views.cast_confirm %}">Have it emailed to you</a>.<br />(don't worry, we won't forget your vote).
+    Forgot your password? <a href="{% url auth.auth_systems.password.password_forgotten_view %}?return_url={% url server_ui.views.cast_confirm %}">Have it emailed to you</a>.<br />(don't worry, we won't forget your vote).
 </p>
 </div>
 

server-ui/templates/done.html → server_ui/templates/done.html

-{% extends 'server-ui/templates/base.html' %}
+{% extends 'server_ui/templates/base.html' %}
 {% block title %}Confirm Vote{% endblock %}
 
 {% block content %}

server-ui/templates/election_tallied.html → server_ui/templates/election_tallied.html

-{% extends 'server-ui/templates/base.html' %}
+{% extends 'server_ui/templates/base.html' %}
 
 {% block content %}
 

server-ui/templates/index.html → server_ui/templates/index.html

-{% extends 'server-ui/templates/base.html' %}
+{% extends 'server_ui/templates/base.html' %}
 {% block title %}{{ settings.SITE_TITLE }}{% endblock %}
 
 {% block header %}

server-ui/view_utils.py → server_ui/view_utils.py

@@ -26,5 +26,5 @@ def render_template(request, template_name, vars = {}):
   if request.session.has_key('csrf_token'):
     vars_with_user['csrf_token'] = request.session['csrf_token']
   
-  return render_to_response('server-ui/templates/%s.html' % template_name, vars_with_user)
+  return render_to_response('server_ui/templates/%s.html' % template_name, vars_with_user)
   

server-ui/views.py → server_ui/views.py

 """
-server-ui specific views
+server_ui specific views
 """
 
 from helios.models import *

settings.py.sample

@@ -117,7 +117,7 @@ INSTALLED_APPS = (
     'appengine_django',
     'auth',
     'helios',
-    'server-ui',
+    'server_ui',
 )
 
 

urls.py

@@ -5,5 +5,5 @@ from django.contrib import admin
 urlpatterns = patterns('',
     (r'^auth/', include('auth.urls')),
     (r'^helios/', include('helios.urls')),
-    (r'^', include('server-ui.urls')),
+    (r'^', include('server_ui.urls')),
 )
\ No newline at end of file