getting real.

47 files changed, 42 insertions, 15 deletions

diff --git a/README.rst b/README.rst
index 8480e0b..674be87 100644
--- a/README.rst
+++ b/README.rst
@@ -7,8 +7,8 @@ Installation
 
 To get setup you must have the following installed:
 
- * Python 2.6
- * virtualenv 1.5
+ * Python 2.7
+ * virtualenv 1.11
 
 Setting up the environment
 --------------------------
diff --git a/__init__.py b/helsinki/__init__.py
index e69de29..e69de29 100644
--- a/__init__.py
+++ b/helsinki/__init__.py
diff --git a/settings.py b/helsinki/settings.py
index 0393cd2..beb9bd1 100644
--- a/settings.py
+++ b/helsinki/settings.py
@@ -53,7 +53,7 @@ MIDDLEWARE_CLASSES = (
     'django.contrib.messages.middleware.MessageMiddleware',
 )
 
-ROOT_URLCONF = 'urls'
+ROOT_URLCONF = 'helsinki.urls'
 
 TEMPLATE_DIRS = (
     os.path.join(PROJECT_DIR, "templates"),
diff --git a/site_media/buttons/default-11.png b/helsinki/site_media/buttons/default-11.png
index 4a96051..4a96051 100644
--- a/site_media/buttons/default-11.png
+++ b/helsinki/site_media/buttons/default-11.png
diff --git a/site_media/buttons/default-17.png b/helsinki/site_media/buttons/default-17.png
index ff9c23b..ff9c23b 100644
--- a/site_media/buttons/default-17.png
+++ b/helsinki/site_media/buttons/default-17.png
diff --git a/site_media/js/jquery-1.6.1/jquery.min.js b/helsinki/site_media/js/jquery-1.6.1/jquery.min.js
index b2ac174..b2ac174 100644
--- a/site_media/js/jquery-1.6.1/jquery.min.js
+++ b/helsinki/site_media/js/jquery-1.6.1/jquery.min.js
diff --git a/site_media/js/jqueryui-custom-1.8.14/images/ui-bg_diagonals-thick_18_b81900_40x40.png b/helsinki/site_media/js/jqueryui-custom-1.8.14/images/ui-bg_diagonals-thick_18_b81900_40x40.png
index 954e22d..954e22d 100644
--- a/site_media/js/jqueryui-custom-1.8.14/images/ui-bg_diagonals-thick_18_b81900_40x40.png
+++ b/helsinki/site_media/js/jqueryui-custom-1.8.14/images/ui-bg_diagonals-thick_18_b81900_40x40.png
diff --git a/site_media/js/jqueryui-custom-1.8.14/images/ui-bg_diagonals-thick_20_666666_40x40.png b/helsinki/site_media/js/jqueryui-custom-1.8.14/images/ui-bg_diagonals-thick_20_666666_40x40.png
index 64ece57..64ece57 100644
--- a/site_media/js/jqueryui-custom-1.8.14/images/ui-bg_diagonals-thick_20_666666_40x40.png
+++ b/helsinki/site_media/js/jqueryui-custom-1.8.14/images/ui-bg_diagonals-thick_20_666666_40x40.png
diff --git a/site_media/js/jqueryui-custom-1.8.14/images/ui-bg_flat_10_000000_40x100.png b/helsinki/site_media/js/jqueryui-custom-1.8.14/images/ui-bg_flat_10_000000_40x100.png
index abdc010..abdc010 100644
--- a/site_media/js/jqueryui-custom-1.8.14/images/ui-bg_flat_10_000000_40x100.png
+++ b/helsinki/site_media/js/jqueryui-custom-1.8.14/images/ui-bg_flat_10_000000_40x100.png
diff --git a/site_media/js/jqueryui-custom-1.8.14/images/ui-bg_glass_100_f6f6f6_1x400.png b/helsinki/site_media/js/jqueryui-custom-1.8.14/images/ui-bg_glass_100_f6f6f6_1x400.png
index 9b383f4..9b383f4 100644
--- a/site_media/js/jqueryui-custom-1.8.14/images/ui-bg_glass_100_f6f6f6_1x400.png
+++ b/helsinki/site_media/js/jqueryui-custom-1.8.14/images/ui-bg_glass_100_f6f6f6_1x400.png
diff --git a/site_media/js/jqueryui-custom-1.8.14/images/ui-bg_glass_100_fdf5ce_1x400.png b/helsinki/site_media/js/jqueryui-custom-1.8.14/images/ui-bg_glass_100_fdf5ce_1x400.png
index a23baad..a23baad 100644
--- a/site_media/js/jqueryui-custom-1.8.14/images/ui-bg_glass_100_fdf5ce_1x400.png
+++ b/helsinki/site_media/js/jqueryui-custom-1.8.14/images/ui-bg_glass_100_fdf5ce_1x400.png
diff --git a/site_media/js/jqueryui-custom-1.8.14/images/ui-bg_glass_65_ffffff_1x400.png b/helsinki/site_media/js/jqueryui-custom-1.8.14/images/ui-bg_glass_65_ffffff_1x400.png
index 42ccba2..42ccba2 100644
--- a/site_media/js/jqueryui-custom-1.8.14/images/ui-bg_glass_65_ffffff_1x400.png
+++ b/helsinki/site_media/js/jqueryui-custom-1.8.14/images/ui-bg_glass_65_ffffff_1x400.png
diff --git a/site_media/js/jqueryui-custom-1.8.14/images/ui-bg_gloss-wave_35_f6a828_500x100.png b/helsinki/site_media/js/jqueryui-custom-1.8.14/images/ui-bg_gloss-wave_35_f6a828_500x100.png
index 39d5824..39d5824 100644
--- a/site_media/js/jqueryui-custom-1.8.14/images/ui-bg_gloss-wave_35_f6a828_500x100.png
+++ b/helsinki/site_media/js/jqueryui-custom-1.8.14/images/ui-bg_gloss-wave_35_f6a828_500x100.png
diff --git a/site_media/js/jqueryui-custom-1.8.14/images/ui-bg_highlight-soft_100_eeeeee_1x100.png b/helsinki/site_media/js/jqueryui-custom-1.8.14/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
index f127367..f127367 100644
--- a/site_media/js/jqueryui-custom-1.8.14/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
+++ b/helsinki/site_media/js/jqueryui-custom-1.8.14/images/ui-bg_highlight-soft_100_eeeeee_1x100.png
diff --git a/site_media/js/jqueryui-custom-1.8.14/images/ui-bg_highlight-soft_75_ffe45c_1x100.png b/helsinki/site_media/js/jqueryui-custom-1.8.14/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
index 359397a..359397a 100644
--- a/site_media/js/jqueryui-custom-1.8.14/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
+++ b/helsinki/site_media/js/jqueryui-custom-1.8.14/images/ui-bg_highlight-soft_75_ffe45c_1x100.png
diff --git a/site_media/js/jqueryui-custom-1.8.14/images/ui-icons_222222_256x240.png b/helsinki/site_media/js/jqueryui-custom-1.8.14/images/ui-icons_222222_256x240.png
index b273ff1..b273ff1 100644
--- a/site_media/js/jqueryui-custom-1.8.14/images/ui-icons_222222_256x240.png
+++ b/helsinki/site_media/js/jqueryui-custom-1.8.14/images/ui-icons_222222_256x240.png
diff --git a/site_media/js/jqueryui-custom-1.8.14/images/ui-icons_228ef1_256x240.png b/helsinki/site_media/js/jqueryui-custom-1.8.14/images/ui-icons_228ef1_256x240.png
index a641a37..a641a37 100644
--- a/site_media/js/jqueryui-custom-1.8.14/images/ui-icons_228ef1_256x240.png
+++ b/helsinki/site_media/js/jqueryui-custom-1.8.14/images/ui-icons_228ef1_256x240.png
diff --git a/site_media/js/jqueryui-custom-1.8.14/images/ui-icons_ef8c08_256x240.png b/helsinki/site_media/js/jqueryui-custom-1.8.14/images/ui-icons_ef8c08_256x240.png
index 85e63e9..85e63e9 100644
--- a/site_media/js/jqueryui-custom-1.8.14/images/ui-icons_ef8c08_256x240.png
+++ b/helsinki/site_media/js/jqueryui-custom-1.8.14/images/ui-icons_ef8c08_256x240.png
diff --git a/site_media/js/jqueryui-custom-1.8.14/images/ui-icons_ffd27a_256x240.png b/helsinki/site_media/js/jqueryui-custom-1.8.14/images/ui-icons_ffd27a_256x240.png
index e117eff..e117eff 100644
--- a/site_media/js/jqueryui-custom-1.8.14/images/ui-icons_ffd27a_256x240.png
+++ b/helsinki/site_media/js/jqueryui-custom-1.8.14/images/ui-icons_ffd27a_256x240.png
diff --git a/site_media/js/jqueryui-custom-1.8.14/images/ui-icons_ffffff_256x240.png b/helsinki/site_media/js/jqueryui-custom-1.8.14/images/ui-icons_ffffff_256x240.png
index 42f8f99..42f8f99 100644
--- a/site_media/js/jqueryui-custom-1.8.14/images/ui-icons_ffffff_256x240.png
+++ b/helsinki/site_media/js/jqueryui-custom-1.8.14/images/ui-icons_ffffff_256x240.png
diff --git a/site_media/js/jqueryui-custom-1.8.14/jquery-ui.css b/helsinki/site_media/js/jqueryui-custom-1.8.14/jquery-ui.css
index a5ee428..a5ee428 100644
--- a/site_media/js/jqueryui-custom-1.8.14/jquery-ui.css
+++ b/helsinki/site_media/js/jqueryui-custom-1.8.14/jquery-ui.css
diff --git a/site_media/js/jqueryui-custom-1.8.14/jquery-ui.min.js b/helsinki/site_media/js/jqueryui-custom-1.8.14/jquery-ui.min.js
index fde1b73..fde1b73 100644
--- a/site_media/js/jqueryui-custom-1.8.14/jquery-ui.min.js
+++ b/helsinki/site_media/js/jqueryui-custom-1.8.14/jquery-ui.min.js
diff --git a/site_media/js/jqueryui-custom-1.8.14/jquery.ui.datepicker-de.js b/helsinki/site_media/js/jqueryui-custom-1.8.14/jquery.ui.datepicker-de.js
index ac2d516..ac2d516 100644
--- a/site_media/js/jqueryui-custom-1.8.14/jquery.ui.datepicker-de.js
+++ b/helsinki/site_media/js/jqueryui-custom-1.8.14/jquery.ui.datepicker-de.js
diff --git a/site_media/programcalendar.js b/helsinki/site_media/programcalendar.js
index c4d91fc..c4d91fc 100644
--- a/site_media/programcalendar.js
+++ b/helsinki/site_media/programcalendar.js
diff --git a/templates/404.html b/helsinki/templates/404.html
index 6281ba0..6281ba0 100644
--- a/templates/404.html
+++ b/helsinki/templates/404.html
diff --git a/templates/500.html b/helsinki/templates/500.html
index 98074ab..98074ab 100644
--- a/templates/500.html
+++ b/helsinki/templates/500.html
diff --git a/templates/base.html b/helsinki/templates/base.html
index 2ed539e..2ed539e 100644
--- a/templates/base.html
+++ b/helsinki/templates/base.html
diff --git a/templates/program/boxes/broadcastformat.html b/helsinki/templates/program/boxes/broadcastformat.html
index 76ee382..76ee382 100644
--- a/templates/program/boxes/broadcastformat.html
+++ b/helsinki/templates/program/boxes/broadcastformat.html
diff --git a/templates/program/boxes/current.html b/helsinki/templates/program/boxes/current.html
index ba1df21..ba1df21 100644
--- a/templates/program/boxes/current.html
+++ b/helsinki/templates/program/boxes/current.html
diff --git a/templates/program/boxes/musicfocus.html b/helsinki/templates/program/boxes/musicfocus.html
index 01fffae..01fffae 100644
--- a/templates/program/boxes/musicfocus.html
+++ b/helsinki/templates/program/boxes/musicfocus.html
diff --git a/templates/program/boxes/recommendations.html b/helsinki/templates/program/boxes/recommendations.html
index 2174654..2174654 100644
--- a/templates/program/boxes/recommendations.html
+++ b/helsinki/templates/program/boxes/recommendations.html
diff --git a/templates/program/boxes/showinformation.html b/helsinki/templates/program/boxes/showinformation.html
index ac4dc2c..ac4dc2c 100644
--- a/templates/program/boxes/showinformation.html
+++ b/helsinki/templates/program/boxes/showinformation.html
diff --git a/templates/program/boxes/showtopic.html b/helsinki/templates/program/boxes/showtopic.html
index 3a1938d..3a1938d 100644
--- a/templates/program/boxes/showtopic.html
+++ b/helsinki/templates/program/boxes/showtopic.html
diff --git a/templates/program/day_schedule.html b/helsinki/templates/program/day_schedule.html
index bb97004..bb97004 100644
--- a/templates/program/day_schedule.html
+++ b/helsinki/templates/program/day_schedule.html
diff --git a/templates/program/host_detail.html b/helsinki/templates/program/host_detail.html
index bbe801e..bbe801e 100644
--- a/templates/program/host_detail.html
+++ b/helsinki/templates/program/host_detail.html
diff --git a/templates/program/host_list.html b/helsinki/templates/program/host_list.html
index d1c8427..d1c8427 100644
--- a/templates/program/host_list.html
+++ b/helsinki/templates/program/host_list.html
diff --git a/templates/program/recommendations.html b/helsinki/templates/program/recommendations.html
index ba9a719..ba9a719 100644
--- a/templates/program/recommendations.html
+++ b/helsinki/templates/program/recommendations.html
diff --git a/templates/program/show_detail.html b/helsinki/templates/program/show_detail.html
index c75b322..c75b322 100644
--- a/templates/program/show_detail.html
+++ b/helsinki/templates/program/show_detail.html
diff --git a/templates/program/show_list.html b/helsinki/templates/program/show_list.html
index 167a470..167a470 100644
--- a/templates/program/show_list.html
+++ b/helsinki/templates/program/show_list.html
diff --git a/templates/program/styles.css b/helsinki/templates/program/styles.css
index 9448df2..9448df2 100644
--- a/templates/program/styles.css
+++ b/helsinki/templates/program/styles.css
diff --git a/templates/program/timeslot_detail.html b/helsinki/templates/program/timeslot_detail.html
index 856aef3..856aef3 100644
--- a/templates/program/timeslot_detail.html
+++ b/helsinki/templates/program/timeslot_detail.html
diff --git a/templates/program/week_schedule.html b/helsinki/templates/program/week_schedule.html
index 456b0ae..456b0ae 100644
--- a/templates/program/week_schedule.html
+++ b/helsinki/templates/program/week_schedule.html
diff --git a/templates/program/week_schedule_timeslot.html b/helsinki/templates/program/week_schedule_timeslot.html
index 852466b..852466b 100644
--- a/templates/program/week_schedule_timeslot.html
+++ b/helsinki/templates/program/week_schedule_timeslot.html
diff --git a/urls.py b/helsinki/urls.py
index e55dddc..e55dddc 100644
--- a/urls.py
+++ b/helsinki/urls.py
diff --git a/helsinki/wsgi.py b/helsinki/wsgi.py
new file mode 100644
index 0000000..3d00c6a
--- /dev/null
+++ b/helsinki/wsgi.py
@@ -0,0 +1,28 @@
+"""
+WSGI config for helsinki project.
+
+This module contains the WSGI application used by Django's development server
+and any production WSGI deployments. It should expose a module-level variable
+named ``application``. Django's ``runserver`` and ``runfcgi`` commands discover
+this application via the ``WSGI_APPLICATION`` setting.
+
+Usually you will have the standard Django WSGI application here, but it also
+might make sense to replace the whole Django WSGI application with a custom one
+that later delegates to the Django one. For example, you could introduce WSGI
+middleware here, or combine a Django application with an application of another
+framework.
+
+"""
+import os
+
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "helsinki.settings")
+
+# This application object is used by any WSGI server configured to use this
+# file. This includes Django's development server, if the WSGI_APPLICATION
+# setting points here.
+from django.core.wsgi import get_wsgi_application
+application = get_wsgi_application()
+
+# Apply WSGI middleware here.
+# from helloworld.wsgi import HelloWorldApplication
+# application = HelloWorldApplication(application)
diff --git a/manage.py b/manage.py
index 5e78ea9..1fbadd7 100755
--- a/manage.py
+++ b/manage.py
@@ -1,11 +1,10 @@
 #!/usr/bin/env python
-from django.core.management import execute_manager
-try:
-    import settings # Assumed to be in the same directory.
-except ImportError:
-    import sys
-    sys.stderr.write("Error: Can't find the file 'settings.py' in the directory containing %r. It appears you've customized things.\nYou'll have to run django-admin.py, passing it your settings module.\n(If the file settings.py does indeed exist, it's causing an ImportError somehow.)\n" % __file__)
-    sys.exit(1)
+import os
+import sys
 
 if __name__ == "__main__":
-    execute_manager(settings)
+    os.environ.setdefault("DJANGO_SETTINGS_MODULE", "helsinki.settings")
+
+    from django.core.management import execute_from_command_line
+
+    execute_from_command_line(sys.argv)
diff --git a/requirements.txt b/requirements.txt
index 6fd9477..8567bc6 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,6 @@
-Django==1.2.7
-MySQL-python==1.2.3
-PIL==1.1.7
+Django==1.4.10
+MySQL-python==1.2.5
+Pillow==2.3.0
 PyYAML==3.10
-django-tinymce==1.5.1a2
+django-tinymce==1.5.2
 python-dateutil==1.5