diff --git a/citavi_mapper/settings.py b/citavi_mapper/settings.py index 55796a0..3343d42 100644 --- a/citavi_mapper/settings.py +++ b/citavi_mapper/settings.py @@ -26,7 +26,7 @@ DEBUG = True TEMPLATE_DEBUG = True TEMPLATE_DIRS = ( - 'frontend/templates' + 'frontend/templates', ) TEMPLATE_CONTEXT_PROCESSORS = global_settings.TEMPLATE_CONTEXT_PROCESSORS + ('django.core.context_processors.request',) @@ -50,7 +50,6 @@ INSTALLED_APPS = ( 'bootstrap3_datetime', 'django_bootstrap_breadcrumbs', 'frontend', - 'debug_toolbar' ) MIDDLEWARE_CLASSES = ( diff --git a/citavi_mapper/urls.py b/citavi_mapper/urls.py index 0571b10..43bebb0 100644 --- a/citavi_mapper/urls.py +++ b/citavi_mapper/urls.py @@ -7,11 +7,14 @@ admin.autodiscover() from frontend.views import login_wrap, logout_wrap from frontend.views import IndexView, ProjectView, ProjectUpdateView, ProjectPersonView, ProjectMapPersonView +from frontend.views import HelloView urlpatterns = patterns( '', url(r'^$', IndexView.as_view(), name=u'frontend-index'), url(r'^project/$', ProjectView.as_view(), name=u'frontend-projects'), + url(r'^hello/$', HelloView.as_view(), name=u'frontend-hello'), + url(r'^project/(?P\d+)/update$', ProjectUpdateView.as_view(), name=u'frontend-project-update'), url(r'^project/(?P\d+)/map/person$', ProjectPersonView.as_view(), name=u'frontend-project-view-person'), url(r'^project/(?P\d+)/map/person/(?P[\w\d-]+)$', ProjectMapPersonView.as_view(), name=u'frontend-project-map-person'), diff --git a/frontend/templates/hello.html b/frontend/templates/hello.html new file mode 100644 index 0000000..14c2d66 --- /dev/null +++ b/frontend/templates/hello.html @@ -0,0 +1,5 @@ +{% extends "layout/base.html" %} +{% block content %} + hallo
+ zurück +{% endblock %} \ No newline at end of file diff --git a/frontend/templates/index.html b/frontend/templates/index.html index 2f0799d..f638241 100644 --- a/frontend/templates/index.html +++ b/frontend/templates/index.html @@ -4,6 +4,8 @@

Feel free to discover.

diff --git a/frontend/views.py b/frontend/views.py index db4eea4..fe130f1 100644 --- a/frontend/views.py +++ b/frontend/views.py @@ -101,7 +101,10 @@ class ProtectedUpdateView(LoggedInMixin, MyUpdateView): class IndexView(ProtectedTemplateView): template_name = u'index.html' page_title = u'Index' - + +class HelloView(ProtectedTemplateView): + template_name = u'hello.html' + page_title = u'Hello' class ProjectView(ProtectedFormView): template_name = u'projects.html' diff --git a/requirements.txt b/requirements.txt index b98474a..f87a4b5 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ psycopg2 -django +django==1.6.5 django-crispy-forms django-pipeline django-bootstrap-breadcrumbs