diff options
| author | Christian Pointner <equinox@helsinki.at> | 2016-05-27 20:03:04 (GMT) |
|---|---|---|
| committer | Christian Pointner <equinox@helsinki.at> | 2016-05-27 20:03:04 (GMT) |
| commit | 4a66728a9bbe88704c6e01ec8dd683cdb0a4c0c6 (patch) | |
| tree | 9c62c09230aec03187cc13d2ac78d299bd96096b /pv | |
| parent | a1487772e667436e2274dece86cb40d2e58632a7 (diff) | |
| parent | c27b374386463c56f41815869d6209f9a422b858 (diff) | |
Merge branch 'master' into stable
Diffstat (limited to 'pv')
| -rw-r--r-- | pv/templates/404.html | 7 | ||||
| -rw-r--r-- | pv/templates/500.html | 11 | ||||
| -rw-r--r-- | pv/templates/base.html | 11 | ||||
| -rw-r--r-- | pv/urls.py | 11 |
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 @@ -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}) + ) |