Merge branch 'master' of https://github.com/nnrcschmdt/helsinki

README.rst

@@ -10,30 +10,33 @@ To get setup you must have the following installed:
  * Python 2.7
  * virtualenv 1.11
 
+
 Setting up the environment
 --------------------------
 
 Create a virtual environment where the dependencies will live::
 
-    $ virtualenv --no-site-packages helsinki
-    $ source helsinki/bin/activate
-    (helsinki)$
+    $ virtualenv -p python2.7 python
+    $ source python/bin/activate
+    (python)$
 
 Install the project dependencies::
 
-    (helsinki)$ pip install -r requirements.txt
+    (python)$ pip install -r requirements.txt
+
 
 Setting up the database
 -----------------------
 
 By default the project is set up to run on a SQLite database.  You can run::
 
-    (helsinki)$ python manage.py syncdb
-    (helsinki)$ python manage.py loaddata program/fixtures/*.yaml
+    (python)$ python manage.py syncdb
+    (python)$ python manage.py loaddata program/fixtures/*.yaml
+
 
 Running a web server
 --------------------
 
 In development you should run::
 
-    (helsinki)$ python manage.py runserver
+    (python)$ python manage.py runserver

program/utils.py

@@ -3,7 +3,11 @@ from django.conf import settings
 import json
 import urllib
 
+
 def get_automation_id_choices():
-    shows_list = json.load(urllib.urlopen(settings.AUTOMATION_BASE_URL))['shows']
-    shows = [(s['id'], s['title']) for s in shows_list]
-    return shows
\ No newline at end of file
+    base_url = getattr(settings, 'AUTOMATION_BASE_URL', None)
+    shows = []
+    if base_url:
+        shows_list = json.load(urllib.urlopen(base_url))['shows']
+        shows = [(s['id'], s['title']) for s in shows_list]
+    return shows

pv/templates/program/show_detail.html

@@ -67,7 +67,10 @@
     <h2>Sendungstipps</h2>
     <ul class="recommendations-list">
       {% for note in show.notes.all reversed %}
-      <li><a href="{% url timeslot-detail note.timeslot.id %}" title="{{ note.title }}">{{ note.start|date:"d. M Y" }}:</a> {{ note.title }}</li>
+      <li>
+        <a href="{% url timeslot-detail note.timeslot.id %}" title="{{ note.title }}">{{ note.start|date:"d. M Y" }}:</a>
+        <div class="title">{{ note.title }}</div>
+      </li>
       {% endfor %}
     </ul>
    {% endif %}

pv/wsgi.py

@@ -13,7 +13,9 @@ middleware here, or combine a Django application with an application of another
 framework.
 
 """
-import os
+import os, sys
+
+sys.path.append('/var/www/pv/helsinki')
 
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "pv.settings")