diff --git a/web_dev/sas_web/datenbank/__init__.py b/web_dev/sas_web/datenbank/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/web_dev/sas_web/datenbank/admin.py b/web_dev/sas_web/datenbank/admin.py new file mode 100644 index 0000000..8c38f3f --- /dev/null +++ b/web_dev/sas_web/datenbank/admin.py @@ -0,0 +1,3 @@ +from django.contrib import admin + +# Register your models here. diff --git a/web_dev/sas_web/datenbank/models.py b/web_dev/sas_web/datenbank/models.py new file mode 100644 index 0000000..71a8362 --- /dev/null +++ b/web_dev/sas_web/datenbank/models.py @@ -0,0 +1,3 @@ +from django.db import models + +# Create your models here. diff --git a/web_dev/sas_web/datenbank/templates/datenbank/index.html b/web_dev/sas_web/datenbank/templates/datenbank/index.html new file mode 100644 index 0000000..741ca1e --- /dev/null +++ b/web_dev/sas_web/datenbank/templates/datenbank/index.html @@ -0,0 +1,5 @@ +{% extends "public/default.html" %} + +{% block content %} +
Datenbank
+{% endblock %} diff --git a/web_dev/sas_web/datenbank/tests.py b/web_dev/sas_web/datenbank/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/web_dev/sas_web/datenbank/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/web_dev/sas_web/datenbank/urls.py b/web_dev/sas_web/datenbank/urls.py new file mode 100644 index 0000000..9cb3403 --- /dev/null +++ b/web_dev/sas_web/datenbank/urls.py @@ -0,0 +1,7 @@ +from django.conf.urls import url + +from . import views + +urlpatterns = [ + url(r'^$', views.index, name='index') +] diff --git a/web_dev/sas_web/datenbank/views.py b/web_dev/sas_web/datenbank/views.py new file mode 100644 index 0000000..a603480 --- /dev/null +++ b/web_dev/sas_web/datenbank/views.py @@ -0,0 +1,6 @@ +from django.shortcuts import render + + +# Create your views here. +def index(request): + return render(request, "datenbank/index.html") diff --git a/web_dev/sas_web/meingoethopia/__init__.py b/web_dev/sas_web/meingoethopia/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/web_dev/sas_web/meingoethopia/admin.py b/web_dev/sas_web/meingoethopia/admin.py new file mode 100644 index 0000000..8c38f3f --- /dev/null +++ b/web_dev/sas_web/meingoethopia/admin.py @@ -0,0 +1,3 @@ +from django.contrib import admin + +# Register your models here. diff --git a/web_dev/sas_web/meingoethopia/models.py b/web_dev/sas_web/meingoethopia/models.py new file mode 100644 index 0000000..71a8362 --- /dev/null +++ b/web_dev/sas_web/meingoethopia/models.py @@ -0,0 +1,3 @@ +from django.db import models + +# Create your models here. diff --git a/web_dev/sas_web/meingoethopia/templates/meingoethopia/index.html b/web_dev/sas_web/meingoethopia/templates/meingoethopia/index.html new file mode 100644 index 0000000..9074bd2 --- /dev/null +++ b/web_dev/sas_web/meingoethopia/templates/meingoethopia/index.html @@ -0,0 +1,5 @@ +{% extends "public/default.html" %} + +{% block content %} +Mein Goethopia!
+{% endblock %} diff --git a/web_dev/sas_web/meingoethopia/tests.py b/web_dev/sas_web/meingoethopia/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/web_dev/sas_web/meingoethopia/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/web_dev/sas_web/meingoethopia/urls.py b/web_dev/sas_web/meingoethopia/urls.py new file mode 100644 index 0000000..9cb3403 --- /dev/null +++ b/web_dev/sas_web/meingoethopia/urls.py @@ -0,0 +1,7 @@ +from django.conf.urls import url + +from . import views + +urlpatterns = [ + url(r'^$', views.index, name='index') +] diff --git a/web_dev/sas_web/meingoethopia/views.py b/web_dev/sas_web/meingoethopia/views.py new file mode 100644 index 0000000..f7c0493 --- /dev/null +++ b/web_dev/sas_web/meingoethopia/views.py @@ -0,0 +1,6 @@ +from django.shortcuts import render + + +# Create your views here. +def index(request): + return render(request, "meingoethopia/index.html") diff --git a/web_dev/sas_web/sas_web/contexts.py b/web_dev/sas_web/sas_web/contexts.py new file mode 100644 index 0000000..8bd1573 --- /dev/null +++ b/web_dev/sas_web/sas_web/contexts.py @@ -0,0 +1,5 @@ +from django.core.urlresolvers import resolve + + +def appname(request): + return {'appname': resolve(request.path).app_name} diff --git a/web_dev/sas_web/sas_web/settings.py b/web_dev/sas_web/sas_web/settings.py index f9f17e4..1a14cd7 100644 --- a/web_dev/sas_web/sas_web/settings.py +++ b/web_dev/sas_web/sas_web/settings.py @@ -43,6 +43,8 @@ USE_X_FORWARDED_HOST = True # Application definition INSTALLED_APPS = ( + 'datenbank', + 'meingoethopia', 'startpage', 'django.contrib.admin', 'django.contrib.auth', @@ -76,6 +78,7 @@ TEMPLATES = [ 'django.template.context_processors.request', 'django.contrib.auth.context_processors.auth', 'django.contrib.messages.context_processors.messages', + 'sas_web.contexts.appname', ], }, }, diff --git a/web_dev/sas_web/sas_web/urls.py b/web_dev/sas_web/sas_web/urls.py index d963b2a..e9fc92f 100644 --- a/web_dev/sas_web/sas_web/urls.py +++ b/web_dev/sas_web/sas_web/urls.py @@ -17,6 +17,11 @@ from django.conf.urls import include, url from django.contrib import admin urlpatterns = [ - url(r'^$', include('startpage.urls')), + url(r'^$', include('startpage.urls', namespace='startpage', app_name='startpage')), + url(r'^meingoethopia', include('meingoethopia.urls', + namespace='meingoethopia', + app_name='meingoethopia')), + url(r'^datenbank', include('datenbank.urls', app_name='datenbank', + namespace='datenbank')), url(r'^admin/', include(admin.site.urls)), ] diff --git a/web_dev/sas_web/templates/public/header.html b/web_dev/sas_web/templates/public/header.html index 9ebe378..158b212 100644 --- a/web_dev/sas_web/templates/public/header.html +++ b/web_dev/sas_web/templates/public/header.html @@ -30,9 +30,9 @@