From b1bf30652281dddab90c40f992bc3fd16057f2ca Mon Sep 17 00:00:00 2001 From: erichhasl Date: Sat, 18 Nov 2017 15:49:30 +0100 Subject: [PATCH] fill datenbank app --- .gitignore | 2 + web_dev/sas_web/database.css | 46 ------------------- web_dev/sas_web/database.html | 43 ----------------- web_dev/sas_web/datenbank/admin.py | 7 +++ web_dev/sas_web/datenbank/models.py | 6 +++ .../datenbank/static/datenbank/css/index.css | 45 ++++++++++++++++++ .../datenbank/templates/datenbank/index.html | 32 ++++++++++++- web_dev/sas_web/datenbank/views.py | 11 ++++- web_dev/sas_web/sas_web/urls.py | 6 ++- 9 files changed, 106 insertions(+), 92 deletions(-) delete mode 100644 web_dev/sas_web/database.css delete mode 100644 web_dev/sas_web/database.html create mode 100644 web_dev/sas_web/datenbank/static/datenbank/css/index.css diff --git a/.gitignore b/.gitignore index e21c1c0..e3ada8c 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,5 @@ my.cnf venv */*/*/migrations/* + +web_dev/media/* diff --git a/web_dev/sas_web/database.css b/web_dev/sas_web/database.css deleted file mode 100644 index 0d79434..0000000 --- a/web_dev/sas_web/database.css +++ /dev/null @@ -1,46 +0,0 @@ -#datenbank_html { - margin-left: 2%; - width: 96%; - } - tabledatabase { - width: 100%; - - } - .trdatabase { - padding-top: 50px; - padding-bottom: 50px; - } - .tddatabase { - padding-left: 10px; - padding-right: 10px; - padding-bottom: 10px; - padding-top: 10px; - } - thumbnail { - display: inline-block; - border: 1px solid black; - width: 20%; - } - - img { - max-width: 100%; - height: auto; - } - - div.polaroid { - border: 2px solid #e7e7e7; - width: 80%; - background-color: white; - box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19); - margin-bottom: 25px; - } - - div.container { - text-align: center; - padding: 10px 20px; - font-family: Helvetica, serif; - font-size: 12px; - } - #description { - text-align: center; - } diff --git a/web_dev/sas_web/database.html b/web_dev/sas_web/database.html deleted file mode 100644 index ac3fa3e..0000000 --- a/web_dev/sas_web/database.html +++ /dev/null @@ -1,43 +0,0 @@ -
- - - - - - - - - -
-

- Dies ist eine Datenbank mit allen Dokumenten, die die Goethopische Agentur für politische Bildung herausgebracht hat. Jedes der Elemente ist auf das dazugehörige PDF-Dokument verlinkt. -

-
-
- - Verfassung - -
-

Die Verfassung von Goethopia

-
-
- 		-
- - Geschaeftsordnung - -
-

Die Geschäftsordnung des Parlaments

-
-
- 		-
- - Informationsblatt 1 - -
-

Informationsblatt der APB, Ausgabe 1

-
-
-
-
diff --git a/web_dev/sas_web/datenbank/admin.py b/web_dev/sas_web/datenbank/admin.py index 8c38f3f..78eb0bd 100644 --- a/web_dev/sas_web/datenbank/admin.py +++ b/web_dev/sas_web/datenbank/admin.py @@ -1,3 +1,10 @@ from django.contrib import admin +from .models import Entry + + # Register your models here. +class EntryAdmin(admin.ModelAdmin): + pass + +admin.site.register(Entry, EntryAdmin) diff --git a/web_dev/sas_web/datenbank/models.py b/web_dev/sas_web/datenbank/models.py index 71a8362..446fc0f 100644 --- a/web_dev/sas_web/datenbank/models.py +++ b/web_dev/sas_web/datenbank/models.py @@ -1,3 +1,9 @@ from django.db import models + # Create your models here. +class Entry(models.Model): + title = models.CharField(max_length=100) + pub_date = models.DateTimeField('Veröffentlichungsdatum') + image = models.ImageField('Vorschaubild', upload_to='thumbnails') + element = models.FileField('Datei', upload_to='datastorage') diff --git a/web_dev/sas_web/datenbank/static/datenbank/css/index.css b/web_dev/sas_web/datenbank/static/datenbank/css/index.css new file mode 100644 index 0000000..640c0e5 --- /dev/null +++ b/web_dev/sas_web/datenbank/static/datenbank/css/index.css @@ -0,0 +1,45 @@ +#datenbank_html { + margin-left: 2%; + width: 96%; +} +.tabledatabase { + width: 100%; +} +.trdatabase { + padding-top: 50px; + padding-bottom: 50px; +} +.tddatabase { + padding-left: 10px; + padding-right: 10px; + padding-bottom: 10px; + padding-top: 10px; +} +.thumbnail { + display: inline-block; + border: 1px solid black; + width: 20%; +} + +img { + max-width: 100%; + height: auto; +} + +div.polaroid { + border: 2px solid #e7e7e7; + width: 80%; + background-color: white; + box-shadow: 0 4px 8px 0 rgba(0, 0, 0, 0.2), 0 6px 20px 0 rgba(0, 0, 0, 0.19); + margin-bottom: 25px; +} + +div.container { + text-align: center; + padding: 10px 20px; + font-family: Helvetica, serif; + font-size: 12px; +} +#description { + text-align: center; +} diff --git a/web_dev/sas_web/datenbank/templates/datenbank/index.html b/web_dev/sas_web/datenbank/templates/datenbank/index.html index 741ca1e..f4eb6c1 100644 --- a/web_dev/sas_web/datenbank/templates/datenbank/index.html +++ b/web_dev/sas_web/datenbank/templates/datenbank/index.html @@ -1,5 +1,35 @@ {% extends "public/default.html" %} +{% load static %} {% block content %} -

Datenbank

+ +
+ + + + + {% for row in rows %} + + {% for entry in row %} + + {% endfor %} + + {% endfor %} +
+

+ Dies ist eine Datenbank mit allen Dokumenten, die die + Goethopische Agentur für politische Bildung herausgebracht hat. + Jedes der Elemente ist auf das dazugehörige PDF-Dokument verlinkt. +

+
+
+ + Verfassung + +
+

{{ entry.title }}

+
+
+
+
{% endblock %} diff --git a/web_dev/sas_web/datenbank/views.py b/web_dev/sas_web/datenbank/views.py index a603480..ef5782e 100644 --- a/web_dev/sas_web/datenbank/views.py +++ b/web_dev/sas_web/datenbank/views.py @@ -1,6 +1,15 @@ from django.shortcuts import render +import math + +from .models import Entry # Create your views here. def index(request): - return render(request, "datenbank/index.html") + rows = group(Entry.objects.all(), 3) + print("rows", rows) + return render(request, "datenbank/index.html", {'rows': rows}) + + +def group(l, n): + return [l[k*n:k*n+n] for k in range(math.ceil(len(l) / n))] diff --git a/web_dev/sas_web/sas_web/urls.py b/web_dev/sas_web/sas_web/urls.py index e9fc92f..f624ed6 100644 --- a/web_dev/sas_web/sas_web/urls.py +++ b/web_dev/sas_web/sas_web/urls.py @@ -15,8 +15,12 @@ Including another URLconf """ from django.conf.urls import include, url from django.contrib import admin +from django.conf.urls.static import static +from django.conf import settings -urlpatterns = [ +urlpatterns = static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) + +urlpatterns += [ url(r'^$', include('startpage.urls', namespace='startpage', app_name='startpage')), url(r'^meingoethopia', include('meingoethopia.urls', namespace='meingoethopia',