diff --git a/web_dev/sas_web/news/templates/news/index.html b/web_dev/sas_web/news/templates/news/index.html index 668d1a1..1ac5a35 100644 --- a/web_dev/sas_web/news/templates/news/index.html +++ b/web_dev/sas_web/news/templates/news/index.html @@ -2,86 +2,6 @@ {% load static %} {% block content %} -

-
- - - - - - - {% if parteien|length == 0 %} - - - - {% endif %} - {% for row in parteien %} - - {% for entry in row %} - - {% endfor %} - - {% endfor %} -
- - -
-

Parteien

-
-

- Keine Parteien gefunden -

-
-
- - Verfassung - -
-

{{ entry.partei.name }}

-
-
-
-
- - -
- - - - - - - {% if praesidenten|length == 0 %} - - - - {% endif %} - {% for row in praesidenten %} - - {% for entry in row %} - - {% endfor %} - - {% endfor %} -
- - -
-

Präsidentschaftskandidaten

-
-

- Keine Präsidenten gefunden -

-
-
- - Verfassung - -
-

{{ entry.praesident.name }}

-
-
-
-
+

Hi

{% endblock %} diff --git a/web_dev/sas_web/news/urls.py b/web_dev/sas_web/news/urls.py index db76316..9cb3403 100644 --- a/web_dev/sas_web/news/urls.py +++ b/web_dev/sas_web/news/urls.py @@ -3,7 +3,5 @@ from django.conf.urls import url from . import views urlpatterns = [ - url(r'^$', views.index, name='index'), - url(r'^partei/(?P[0-9]+)', views.partei, name='partei'), - url(r'^praesident/(?P[0-9]+)', views.praesident, name='praesident') + url(r'^$', views.index, name='index') ] diff --git a/web_dev/sas_web/news/views.py b/web_dev/sas_web/news/views.py index c3e115f..d0e71e0 100644 --- a/web_dev/sas_web/news/views.py +++ b/web_dev/sas_web/news/views.py @@ -1,29 +1,6 @@ from django.shortcuts import render -import math - -from .models import ParteiWerbung, PraesidentWerbung # Create your views here. def index(request): - partei_objs = ParteiWerbung.objects.all() - parteien = group(partei_objs, 3) - - praesident_objs = PraesidentWerbung.objects.all() - praesidenten = group(praesident_objs, 3) - return render(request, "news/index.html", - {'parteien': parteien, 'praesidenten': praesidenten}) - - -def partei(request, partei_id): - return render(request, "news/partei.html", - {'entry': ParteiWerbung.objects.get(pk=partei_id)}) - - -def praesident(request, praesident_id): - return render(request, "news/praesident.html", - {'entry': PraesidentWerbung.objects.get(pk=praesident_id)}) - - -def group(l, n): - return [l[k*n:k*n+n] for k in range(math.ceil(len(l) / n))] + return render(request, "news/index.html")