summaryrefslogtreecommitdiff
path: root/pv
diff options
context:
space:
mode:
Diffstat (limited to 'pv')
-rw-r--r--pv/templates/404.html7
-rw-r--r--pv/templates/500.html11
-rw-r--r--pv/templates/base.html11
-rw-r--r--pv/urls.py11
4 files changed, 6 insertions, 34 deletions
diff --git a/pv/templates/404.html b/pv/templates/404.html
deleted file mode 100644
index 6281ba0..0000000
--- a/pv/templates/404.html
+++ /dev/null
@@ -1,7 +0,0 @@
-{% extends "base.html" %}
-
-{% block title %}Seite nicht gefunden{% endblock %}
-
-{% block content %}
- <p>Es tut uns leid, aber die angeforderte Seite konnte nicht gefunden werden.</p>
-{% endblock %} \ No newline at end of file
diff --git a/pv/templates/500.html b/pv/templates/500.html
deleted file mode 100644
index 98074ab..0000000
--- a/pv/templates/500.html
+++ /dev/null
@@ -1,11 +0,0 @@
-{% extends "base.html" %}
-
-{% block title %}Serverfehler{% endblock %}
-
-{% block content %}
- <p>
- Ein Fehler ist aufgetreten.
- Dieser Fehler wurde an die Serververwalter per E-Mail gemeldet und sollte in Kürze behoben sein.
- Vielen Dank für Ihr Verständnis.
- </p>
-{% endblock %} \ No newline at end of file
diff --git a/pv/templates/base.html b/pv/templates/base.html
deleted file mode 100644
index 2ed539e..0000000
--- a/pv/templates/base.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<html>
-
-<head>
- <title>{% block title %}{% endblock %}</title>
-</head>
-
-<body>
-{% block content %}{% endblock %}
-</body>
-
-</html> \ No newline at end of file
diff --git a/pv/urls.py b/pv/urls.py
index ec1cdff..3c0ab4d 100644
--- a/pv/urls.py
+++ b/pv/urls.py
@@ -2,19 +2,20 @@ from django.conf import settings
from django.conf.urls import patterns, url, include
from django.contrib import admin
-admin.autodiscover()
-
from program.views import json_day_schedule
+admin.autodiscover()
+
urlpatterns = patterns('',
url(r'^admin/', include(admin.site.urls)),
url(r'^program/', include('program.urls')),
url(r'^nop', include('nop.urls')),
url(r'^tinymce/', include('tinymce.urls')),
url(r'^export/day_schedule/(?P<year>\d{4})/(?P<month>\d{1,2})/(?P<day>\d{1,2})/$', json_day_schedule)
-)
+ )
if settings.DEBUG:
urlpatterns += patterns('',
- (r'^site_media/(?P<path>.*)$', 'django.views.static.serve', {'document_root': settings.MEDIA_ROOT})
-)
+ (r'^site_media/(?P<path>.*)$', 'django.views.static.serve',
+ {'document_root': settings.MEDIA_ROOT})
+ )