JPT
/
citavi_mapper
0
0
Fork 0
Code Issues Pull Requests Activity

hello view

This commit is contained in:
Johanna 2014-11-17 11:06:35 +01:00
parent de7fc7173c
commit ee034e976f
6 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
citavi_mapper/settings.py
View File

@ -26,7 +26,7 @@ DEBUG = True
TEMPLATE_DEBUG = True TEMPLATE_DEBUG = True
TEMPLATE_DIRS = ( TEMPLATE_DIRS = (
'frontend/templates' 'frontend/templates',
) )
TEMPLATE_CONTEXT_PROCESSORS = global_settings.TEMPLATE_CONTEXT_PROCESSORS + ('django.core.context_processors.request',) TEMPLATE_CONTEXT_PROCESSORS = global_settings.TEMPLATE_CONTEXT_PROCESSORS + ('django.core.context_processors.request',)
@ -50,7 +50,6 @@ INSTALLED_APPS = (
'bootstrap3_datetime', 'bootstrap3_datetime',
'django_bootstrap_breadcrumbs', 'django_bootstrap_breadcrumbs',
'frontend', 'frontend',
'debug_toolbar'
) )
MIDDLEWARE_CLASSES = ( MIDDLEWARE_CLASSES = (

3
citavi_mapper/urls.py
View File

@ -7,11 +7,14 @@ admin.autodiscover()
from frontend.views import login_wrap, logout_wrap from frontend.views import login_wrap, logout_wrap
from frontend.views import IndexView, ProjectView, ProjectUpdateView, ProjectPersonView, ProjectMapPersonView from frontend.views import IndexView, ProjectView, ProjectUpdateView, ProjectPersonView, ProjectMapPersonView
from frontend.views import HelloView
urlpatterns = patterns( urlpatterns = patterns(
'', '',
url(r'^$', IndexView.as_view(), name=u'frontend-index'), url(r'^$', IndexView.as_view(), name=u'frontend-index'),
url(r'^project/$', ProjectView.as_view(), name=u'frontend-projects'), url(r'^project/$', ProjectView.as_view(), name=u'frontend-projects'),
url(r'^hello/$', HelloView.as_view(), name=u'frontend-hello'),
url(r'^project/(?P<project_id>\d+)/update$', ProjectUpdateView.as_view(), name=u'frontend-project-update'), url(r'^project/(?P<project_id>\d+)/update$', ProjectUpdateView.as_view(), name=u'frontend-project-update'),
url(r'^project/(?P<project_id>\d+)/map/person$', ProjectPersonView.as_view(), name=u'frontend-project-view-person'), url(r'^project/(?P<project_id>\d+)/map/person$', ProjectPersonView.as_view(), name=u'frontend-project-view-person'),
url(r'^project/(?P<project_id>\d+)/map/person/(?P<person_uuid>[\w\d-]+)$', ProjectMapPersonView.as_view(), name=u'frontend-project-map-person'), url(r'^project/(?P<project_id>\d+)/map/person/(?P<person_uuid>[\w\d-]+)$', ProjectMapPersonView.as_view(), name=u'frontend-project-map-person'),

5
frontend/templates/hello.html Normal file
View File

@ -0,0 +1,5 @@
{% extends "layout/base.html" %}
{% block content %}
hallo <br>
<a href="{% url 'frontend-index' %}">zurück</a>
{% endblock %}

2
frontend/templates/index.html
View File

@ -4,6 +4,8 @@
<p> <p>
<ul> <ul>
<li><a href="{% url 'frontend-projects' %}">Citavi projects</a></li> <li><a href="{% url 'frontend-projects' %}">Citavi projects</a></li>
<li><a href="{% url 'frontend-hello' %}">hello</a></li>
</ul> </ul>
Feel free to discover.<br> Feel free to discover.<br>
</p> </p>

5
frontend/views.py
View File

@ -101,7 +101,10 @@ class ProtectedUpdateView(LoggedInMixin, MyUpdateView):
class IndexView(ProtectedTemplateView): class IndexView(ProtectedTemplateView):
template_name = u'index.html' template_name = u'index.html'
page_title = u'Index' page_title = u'Index'
class HelloView(ProtectedTemplateView):
template_name = u'hello.html'
page_title = u'Hello'
class ProjectView(ProtectedFormView): class ProjectView(ProtectedFormView):
template_name = u'projects.html' template_name = u'projects.html'

2
requirements.txt
View File

@ -1,5 +1,5 @@
psycopg2 psycopg2
django django==1.6.5
django-crispy-forms django-crispy-forms
django-pipeline django-pipeline
django-bootstrap-breadcrumbs django-bootstrap-breadcrumbs