48 files changed, 116 insertions, 63 deletions

diff --git a/README.rst b/README.rst
index 842c545..0667df6 100644
--- a/README.rst
+++ b/README.rst
@@ -1,5 +1,8 @@
+Radio Helsinki Program Management
+=================================
+
 Requirements
-============
+------------
 
 - Django 1.2.5: http://pypi.python.org/pypi/Django/1.2.5
 - PIL: http://pypi.python.org/pypi/PIL/1.1.6
@@ -8,3 +11,9 @@ Requirements
 - MySQL-python: http://pypi.python.org/pypi/MySQL-python/1.2.3
 - django-haystack: http://pypi.python.org/pypi/django-haystack/1.1.0
 - pysolr: http://pypi.python.org/pypi/pysolr/2.0.13
+
+Author
+------
+
+Ernesto Rico-Schmidt
+Contributions: Johannes Raggam
diff --git a/TODO b/TODO
index 8b33005..7ffd2ac 100644
--- a/TODO
+++ b/TODO
@@ -2,4 +2,3 @@
 * integrate tinyMCE into admin site
 * integrate open ID
 * integrate Disqus
-* i18n
diff --git a/__init__.py b/__init__.py
deleted file mode 100644
index e69de29..0000000
--- a/__init__.py
+++ /dev/null
diff --git a/program/tests.py b/docs/CHANGES.rst
index e69de29..e69de29 100644
--- a/program/tests.py
+++ b/docs/CHANGES.rst
diff --git a/LICENSE b/docs/LICENSE.rst
index 5596645..5596645 100644
--- a/LICENSE
+++ b/docs/LICENSE.rst
diff --git a/helsinki/__init__.py b/helsinki/__init__.py
new file mode 100644
index 0000000..f48ad10
--- /dev/null
+++ b/helsinki/__init__.py
@@ -0,0 +1,6 @@
+# See http://peak.telecommunity.com/DevCenter/setuptools#namespace-packages
+try:
+    __import__('pkg_resources').declare_namespace(__name__)
+except ImportError:
+    from pkgutil import extend_path
+    __path__ = extend_path(__path__, __name__)
diff --git a/program/__init__.py b/helsinki/program/__init__.py
index e69de29..e69de29 100644
--- a/program/__init__.py
+++ b/helsinki/program/__init__.py
diff --git a/program/admin.py b/helsinki/program/admin.py
index 6c64dd3..6c64dd3 100644
--- a/program/admin.py
+++ b/helsinki/program/admin.py
diff --git a/program/fixtures/broadcastformats.yaml b/helsinki/program/fixtures/broadcastformats.yaml
index 84fa335..84fa335 100644
--- a/program/fixtures/broadcastformats.yaml
+++ b/helsinki/program/fixtures/broadcastformats.yaml
diff --git a/program/fixtures/hosts.yaml b/helsinki/program/fixtures/hosts.yaml
index 4cccf3a..4cccf3a 100644
--- a/program/fixtures/hosts.yaml
+++ b/helsinki/program/fixtures/hosts.yaml
diff --git a/program/fixtures/musicfocus.yaml b/helsinki/program/fixtures/musicfocus.yaml
index 90de149..90de149 100644
--- a/program/fixtures/musicfocus.yaml
+++ b/helsinki/program/fixtures/musicfocus.yaml
diff --git a/program/fixtures/rrules.yaml b/helsinki/program/fixtures/rrules.yaml
index 4095e07..4095e07 100644
--- a/program/fixtures/rrules.yaml
+++ b/helsinki/program/fixtures/rrules.yaml
diff --git a/program/fixtures/showinformation.yaml b/helsinki/program/fixtures/showinformation.yaml
index cbde529..cbde529 100644
--- a/program/fixtures/showinformation.yaml
+++ b/helsinki/program/fixtures/showinformation.yaml
diff --git a/program/fixtures/shows.yaml b/helsinki/program/fixtures/shows.yaml
index f520b26..f520b26 100644
--- a/program/fixtures/shows.yaml
+++ b/helsinki/program/fixtures/shows.yaml
diff --git a/program/fixtures/showtopics.yaml b/helsinki/program/fixtures/showtopics.yaml
index 8f12508..8f12508 100644
--- a/program/fixtures/showtopics.yaml
+++ b/helsinki/program/fixtures/showtopics.yaml
diff --git a/manage.py b/helsinki/program/manage.py
index 5e78ea9..5e78ea9 100755
--- a/manage.py
+++ b/helsinki/program/manage.py
diff --git a/program/management/commands/__init__.py b/helsinki/program/management/__init__.py
index 3aa4ca5..3aa4ca5 100644
--- a/program/management/commands/__init__.py
+++ b/helsinki/program/management/__init__.py
diff --git a/program/management/__init__.py b/helsinki/program/management/commands/__init__.py
index 3aa4ca5..3aa4ca5 100644
--- a/program/management/__init__.py
+++ b/helsinki/program/management/commands/__init__.py
diff --git a/program/management/commands/importhosts.py b/helsinki/program/management/commands/importhosts.py
index 39a8afd..39a8afd 100644
--- a/program/management/commands/importhosts.py
+++ b/helsinki/program/management/commands/importhosts.py
diff --git a/program/management/commands/importnotes.py b/helsinki/program/management/commands/importnotes.py
index 19ddfed..19ddfed 100644
--- a/program/management/commands/importnotes.py
+++ b/helsinki/program/management/commands/importnotes.py
diff --git a/program/management/commands/importprogramslots.py b/helsinki/program/management/commands/importprogramslots.py
index 52aa73a..52aa73a 100644
--- a/program/management/commands/importprogramslots.py
+++ b/helsinki/program/management/commands/importprogramslots.py
diff --git a/program/management/commands/importshows.py b/helsinki/program/management/commands/importshows.py
index b013dab..b013dab 100644
--- a/program/management/commands/importshows.py
+++ b/helsinki/program/management/commands/importshows.py
diff --git a/program/models.py b/helsinki/program/models.py
index 5f0f835..5f0f835 100644
--- a/program/models.py
+++ b/helsinki/program/models.py
diff --git a/program/search_indexes.py b/helsinki/program/search_indexes.py
index 8c21e14..8c21e14 100644
--- a/program/search_indexes.py
+++ b/helsinki/program/search_indexes.py
diff --git a/search_sites.py b/helsinki/program/search_sites.py
index fe5127a..fe5127a 100644
--- a/search_sites.py
+++ b/helsinki/program/search_sites.py
diff --git a/settings.py b/helsinki/program/settings.py
index 11de59f..43a3d1d 100644
--- a/settings.py
+++ b/helsinki/program/settings.py
@@ -52,7 +52,7 @@ MIDDLEWARE_CLASSES = (
     'django.contrib.messages.middleware.MessageMiddleware',
 )
 
-ROOT_URLCONF = 'helsinki.urls'
+ROOT_URLCONF = 'helsinki.program.urls'
 
 TEMPLATE_DIRS = (
     os.path.join(os.path.dirname(__file__), "templates"),
diff --git a/site_media/styles/base.css b/helsinki/program/site_media/styles/base.css
index 51194b1..51194b1 100644
--- a/site_media/styles/base.css
+++ b/helsinki/program/site_media/styles/base.css
diff --git a/templates/404.html b/helsinki/program/templates/404.html
index 6281ba0..6281ba0 100644
--- a/templates/404.html
+++ b/helsinki/program/templates/404.html
diff --git a/templates/500.html b/helsinki/program/templates/500.html
index 98074ab..98074ab 100644
--- a/templates/500.html
+++ b/helsinki/program/templates/500.html
diff --git a/templates/base.html b/helsinki/program/templates/base.html
index 2ed539e..2ed539e 100644
--- a/templates/base.html
+++ b/helsinki/program/templates/base.html
diff --git a/templates/program/current_box.html b/helsinki/program/templates/program/current_box.html
index 226264e..a2341d3 100644
--- a/templates/program/current_box.html
+++ b/helsinki/program/templates/program/current_box.html
@@ -1,14 +1,16 @@
+<!doctype html>
 <html>
 <head>
-    <title>Current program box</title>
-    <link href="/site_media/styles/base.css" media="screen" rel="stylesheet" type="text/css" />
+  <meta charset="utf-8"/>
+  <title>Current program box</title>
+  <link href="/site_media/styles/base.css" media="screen" rel="stylesheet" type="text/css" />
 </head>
 <body>
 
-<div id="current">
-    <div id="current-title">Programm derzeit</div>
-
-    <div id="current-timeslot">
+  {% if current or next or after_next %}
+  <dl class="portlet program-current">
+    <dt class="portletHeader">Programm derzeit</dt>
+    <dd class="portletItem current-timeslot">
         <div class="start">{{ current.start|date:"H:i" }}</div>
         <div class="show {{ current.show.broadcastformat.slug }}">
             <div class="name"><a href="{% url timeslot-detail current.id %}">{{ current.show.name }}</a></div>
@@ -20,22 +22,21 @@
             {% endif %}
         {% endif %}
         </div>
-    </div>
-
-    <div id="next-timeslot">
+    </dd>
+    <dd class="portletItem next-timeslot">
         <div class="start">{{ next.start|date:"H:i" }}</div>
         <div class="show {{ next.show.broadcastformat.slug }}">
             <div class="name"><a href="{% url timeslot-detail next.id %}">{{ next.show.name }}</a></div>
         </div>
-    </div>
-
-    <div id="after-next-timeslot">
+    </dd>
+    <dd class="portletItem next-timeslot">
         <div class="start">{{ after_next.start|date:"H:i" }}</div>
         <div class="show {{ after_next.show.broadcastformat.slug }}">
             <div class="name"><a href="{% url timeslot-detail after_next.id %}">{{ after_next.show.name }}</div></a>
         </div>
-    </div>
-</div>
+    </dd>
+  </dl> 
+  {% endif %}
 
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/templates/program/day_schedule.html b/helsinki/program/templates/program/day_schedule.html
index 3e7d4bc..3e7d4bc 100644
--- a/templates/program/day_schedule.html
+++ b/helsinki/program/templates/program/day_schedule.html
diff --git a/templates/program/host_detail.html b/helsinki/program/templates/program/host_detail.html
index eff52d6..eff52d6 100644
--- a/templates/program/host_detail.html
+++ b/helsinki/program/templates/program/host_detail.html
diff --git a/templates/program/host_list.html b/helsinki/program/templates/program/host_list.html
index 5ab5c3f..5ab5c3f 100644
--- a/templates/program/host_list.html
+++ b/helsinki/program/templates/program/host_list.html
diff --git a/templates/program/recommendations.html b/helsinki/program/templates/program/recommendations.html
index 483962c..c34d5e5 100644
--- a/templates/program/recommendations.html
+++ b/helsinki/program/templates/program/recommendations.html
@@ -6,9 +6,10 @@
 <body>
 
 <div id="recommendations">
+    <div id="recommendations-title">Programmhinweise</div>
 {% for recommendation in recommendation_list %}
-    <div class="recommendation">
-        <div class="timeslot-start-end">{{ recommendation.timeslot.start|date:"d.m.Y H:i" }} - {{ recommendation.timeslot.end|date:"H:i" }}</div>
+    <div class="recommendation {{ recommendation.show.broadcastformat.slug }}">
+        <div class="timeslot-start-end">{{ recommendation.timeslot.start|date:"d.m. H:i" }}-{{ recommendation.timeslot.end|date:"H:i" }}</div>
         <div class="show-name"><a href="{%  url show-detail recommendation.show.slug %}">{{ recommendation.show.name }}</a></div>
         {% if recommendation.show.short_description != 'FIXME' %}
         <div class="show-short-description">{{ recommendation.show.short_description }}</div>
diff --git a/helsinki/program/templates/program/recommendations_box.html b/helsinki/program/templates/program/recommendations_box.html
new file mode 100644
index 0000000..5a0f40d
--- /dev/null
+++ b/helsinki/program/templates/program/recommendations_box.html
@@ -0,0 +1,22 @@
+<!doctype html>
+<html>
+<head>
+  <meta charset="utf-8"/>
+  <title>Recomendations box</title>
+  <link href="/site_media/styles/base.css" media="screen" rel="stylesheet" type="text/css" />
+</head>
+<body>
+  {% if recommendations %}
+  <dl id="recommendations" class="portlet program-recommendations">
+    <dt class="portletHeader">Programmhinweise</dt>
+    {% for recommendation in recommendations %}
+    <dd class="portletItem program-recommendation {{ recommendation.show.broadcastformat.slug }}">
+        <h3 class="show-name"><a href="{%  url show-detail recommendation.show.slug %}">{{ recommendation.show.name }}</a></h3>
+        <p class="timeslot-start-end">{{ recommendation.timeslot.start|date:"d.m. H:i" }}-{{ recommendation.timeslot.end|date:"H:i" }}</p>
+        <p class="note-title"><a href="{%  url timeslot-detail recommendation.timeslot.id %}">{{ recommendation.title }}</a></p>
+    </dd>
+    {% endfor %}
+  </dl>
+  {% endif %}
+</body>
+</html>
diff --git a/templates/program/show_detail.html b/helsinki/program/templates/program/show_detail.html
index 9cd2d8e..9cd2d8e 100644
--- a/templates/program/show_detail.html
+++ b/helsinki/program/templates/program/show_detail.html
diff --git a/templates/program/show_list.html b/helsinki/program/templates/program/show_list.html
index 9539035..1f061d0 100644
--- a/templates/program/show_list.html
+++ b/helsinki/program/templates/program/show_list.html
@@ -40,7 +40,7 @@
 </div>
 
 <div id="shows">
-{% for show in show_list %}
+{% for show in shows %}
     <div class="show">
         <div class="abbrevs">&nbsp;
             {% for topic in show.showtopic.all %}
diff --git a/templates/program/timeslot_detail.html b/helsinki/program/templates/program/timeslot_detail.html
index f8dee29..f8dee29 100644
--- a/templates/program/timeslot_detail.html
+++ b/helsinki/program/templates/program/timeslot_detail.html
diff --git a/templates/program/week_schedule.html b/helsinki/program/templates/program/week_schedule.html
index f6e8f57..f6e8f57 100644
--- a/templates/program/week_schedule.html
+++ b/helsinki/program/templates/program/week_schedule.html
diff --git a/templates/search/indexes/program/note_text.txt b/helsinki/program/templates/search/indexes/program/note_text.txt
index 2421b4f..2421b4f 100644
--- a/templates/search/indexes/program/note_text.txt
+++ b/helsinki/program/templates/search/indexes/program/note_text.txt
diff --git a/templates/search/indexes/program/show_text.txt b/helsinki/program/templates/search/indexes/program/show_text.txt
index f08b515..f08b515 100644
--- a/templates/search/indexes/program/show_text.txt
+++ b/helsinki/program/templates/search/indexes/program/show_text.txt
diff --git a/urls.py b/helsinki/program/urls.py
index 5aaf499..06018e2 100644
--- a/urls.py
+++ b/helsinki/program/urls.py
@@ -8,7 +8,7 @@ admin.autodiscover()
 
 urlpatterns = patterns('',
     (r'^admin/', include(admin.site.urls)),
-    (r'^program/', include('helsinki.program.urls')),
+    (r'^program', include('helsinki.program.urls_program')),
 )
 if settings.DEBUG:
     urlpatterns += patterns('',
diff --git a/helsinki/program/urls_program.py b/helsinki/program/urls_program.py
new file mode 100644
index 0000000..e2d8ae8
--- /dev/null
+++ b/helsinki/program/urls_program.py
@@ -0,0 +1,20 @@
+from django.conf.urls.defaults import *
+
+from django.views.generic.list_detail import object_detail, object_list
+
+from models import Host, Show, TimeSlot
+from views import current_show, day_schedule, recommendations, show_list, today_schedule, week_schedule
+
+urlpatterns = patterns('',
+    ('^/today/$', today_schedule),
+    ('^/(?P<year>\d{4})/(?P<month>\d{1,2})/(?P<day>\d{1,2})/$', day_schedule),
+    ('^/(?P<year>\d{4})/(?P<week>\d{1,2})/$', week_schedule),
+    ('^/current_box/$', current_show),
+    ('^/hosts/$', object_list, dict(template_object_name='host', queryset=Host.objects.all())),
+    url('^/hosts/(?P<object_id>\d+)/$', object_detail, dict(template_object_name='host', queryset=Host.objects.all()), name='host-detail'),
+    ('^/tips/$', recommendations),
+    ('^/tips_box/$', recommendations, dict(template_name='program/recommendations_box.html')),
+    ('^/shows/$', show_list),
+    url('^/shows/(?P<slug>[\w-]+)/$', object_detail, dict(template_object_name='show', queryset=Show.objects.all()), name='show-detail'),
+    url('^/(?P<object_id>\d+)/$', object_detail, dict(template_object_name='timeslot', queryset=TimeSlot.objects.all()), name='timeslot-detail'),
+)
diff --git a/program/views.py b/helsinki/program/views.py
index b5f02b6..2e9cd8a 100644
--- a/program/views.py
+++ b/helsinki/program/views.py
@@ -2,7 +2,7 @@ from django.views.generic import list_detail
 from django.views.generic import simple
 from django.shortcuts import get_object_or_404
 
-from models import BroadcastFormat, MusicFocus, Note, Show, ShowInformation, ShowTopic, TimeSlot
+from helsinki.program.models import BroadcastFormat, MusicFocus, Note, Show, ShowInformation, ShowTopic, TimeSlot
 
 from datetime import date, datetime, time, timedelta
 
diff --git a/program/urls.py b/program/urls.py
deleted file mode 100644
index bf798ec..0000000
--- a/program/urls.py
+++ /dev/null
@@ -1,20 +0,0 @@
-from django.conf.urls.defaults import *
-
-from django.views.generic.list_detail import object_detail, object_list
-
-from models import Host, Show, TimeSlot
-from views import current_show, day_schedule, recommendations, show_list, today_schedule, week_schedule
-
-urlpatterns = patterns('',
-    ('^$', today_schedule),
-    ('^(?P<year>\d{4})/(?P<month>\d{1,2})/(?P<day>\d{1,2})/$', day_schedule),
-    ('^(?P<year>\d{4})/(?P<week>\d{1,2})/$', week_schedule),
-    ('^current_box/$', current_show),
-    ('^hosts/$', object_list, dict(template_object_name='host', queryset=Host.objects.all())),
-    url('^host/(?P<object_id>\d+)/$', object_detail, dict(template_object_name='host', queryset=Host.objects.all()), name='host-detail'),
-    ('^recommendations/$', recommendations),
-    ('^recommendations_box/$', recommendations, dict(template_name='program/recommendations_box.html')),
-    ('^shows/$', show_list),
-    url('^show/(?P<slug>[\w-]+)/$', object_detail, dict(template_object_name='show', queryset=Show.objects.all()), name='show-detail'),
-    url('^(?P<object_id>\d+)/$', object_detail, dict(template_object_name='timeslot', queryset=TimeSlot.objects.all()), name='timeslot-detail'),
-)
diff --git a/setup.py b/setup.py
new file mode 100644
index 0000000..767fcc2
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,35 @@
+from setuptools import setup, find_packages
+import os
+
+version = '0.1'
+
+setup(name='helsinki.program',
+      version=version,
+      description="Program Management for Radio Helsinki, Graz",
+      long_description=open("README.rst").read() + "\n" +
+                       open(os.path.join("docs", "CHANGES.rst")).read(),
+      # Get more strings from http://www.python.org/pypi?:action=list_classifiers
+      classifiers=[
+        "Programming Language :: Python",
+        "Topic :: Software Development :: Libraries :: Python Modules",
+        ],
+      keywords='django radio',
+      author='Ernesto Rico-Schmidt',
+      author_email='',
+      url='https://github.com/nnrcschmdt/helsinki/',
+      license='GPL',
+      packages=find_packages(exclude=['ez_setup']),
+      namespace_packages=['helsinki',],
+      include_package_data=True,
+      zip_safe=False,
+      install_requires=[
+          'setuptools',
+          # -*- Extra requirements: -*-
+          'Django',
+          'python-dateutil',
+          'PyYAML',
+          'MySQL-python',
+          'django-haystack',
+          'pysolr'
+      ],
+)
diff --git a/templates/program/recommendations_box.html b/templates/program/recommendations_box.html
deleted file mode 100644
index 26a7c97..0000000
--- a/templates/program/recommendations_box.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<html>
-<head>
-    <title>Recomendations box</title>
-    <link href="/site_media/styles/base.css" media="screen" rel="stylesheet" type="text/css" />
-</head>
-<body>
-
-<div id="recommendations-box">
-    <div id="recommendations-title">Programmhinweise</div>
-    {% for recommendation in recommendation_list %}
-    <div class="recommendation {{ recommendation.show.broadcastformat.slug }}">
-        <div class="timeslot-start-end">{{ recommendation.timeslot.start|date:"d.m. H:i" }}-{{ recommendation.timeslot.end|date:"H:i" }}</div>
-        <div class="show-name"><a href="{%  url show-detail recommendation.show.slug %}">{{ recommendation.show.name }}</a></div>
-        <div class="note-title"><a href="{%  url timeslot-detail recommendation.timeslot.id %}">{{ recommendation.title }}</a></div>
-    </div>
-    {% endfor %}
-</div>
-
-</body>
-</html>
\ No newline at end of file