diff --git a/blogapp/templates/blogapp/blogdetail.html b/blogapp/templates/blogapp/blogdetail.html index 508d239..4a0da56 100644 --- a/blogapp/templates/blogapp/blogdetail.html +++ b/blogapp/templates/blogapp/blogdetail.html @@ -2,58 +2,51 @@ {% block content %} {% autoescape off %} - - - - - - +

{{blogentry.header}}

+posted by {{blogentry.user.username}} on {{blogentry.date}} + +

+{{blogentry.intro|linebreaks}}
+{{blogentry.body|linebreaks}}

+{% endautoescape %} +{% if false %} +Comments total: {{newsentry.newscomment_set.all.count}}
+{% for newscomment in newsentry.newscomment_set.all %} +
-

{{blogentry.header}}

- posted by {{blogentry.user.username}} on {{blogentry.date}} - -

- {{blogentry.intro|linebreaks}}
- {{blogentry.body|linebreaks}}

- {% endautoescape %} - {% if not isfrontpage %} - Comments total: {{newsentry.newscomment_set.all.count}}
- {% for newscomment in newsentry.newscomment_set.all %} - - - - - -

{{newscomment.user.username}}
{{ newscomment.commenttext|linebreaks|urlize }}
Datum: {{newscomment.date}}
- {% endfor %} - - - {% if commentform %} - - - - - {% else %} - - - - - {% endif %} - -
{{user.username}}
 -
- {% csrf_token %} - {{ commentform.newscomment }}
- -
-
- Please log in to post. -
- {% endif %} -
+ + + +

{{newscomment.user.username}}
{{ newscomment.commenttext|linebreaks|urlize }}
Datum: {{newscomment.date}}
+{% endfor %} + + + +{% if commentform %} + + + + +{% else %} + + + + +{% endif %} + +
{{user.username}}
 +
+ {% csrf_token %} + {{ commentform.newscomment }}
+ +
+
+ Please log in to post. +
+{% endif %} {% endblock %} diff --git a/blogapp/templates/blogapp/blogindex.html b/blogapp/templates/blogapp/blogindex.html index ca5b528..53768ad 100644 --- a/blogapp/templates/blogapp/blogindex.html +++ b/blogapp/templates/blogapp/blogindex.html @@ -8,15 +8,13 @@ {% if blogentries %} {% for blogentry in blogentries %} -

- {{ blogentry.header }}
- posted on: {{blogentry.date}} by {{blogentry.user.username}} -

{{blogentry.intro|linebreaks}}

Read more...
-

+

{{ blogentry.header }}

+posted on: {{blogentry.date}} by {{blogentry.user.username}} +

{{blogentry.intro|linebreaks}}

Read more...
{% endfor %} {% else %} -

No entries are available.

+

No entries are available.

{% endif %} {% endautoescape %} {% endblock %} diff --git a/imageapp/__init__.py b/imageapp/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/imageapp/admin.py b/imageapp/admin.py new file mode 100644 index 0000000..8c38f3f --- /dev/null +++ b/imageapp/admin.py @@ -0,0 +1,3 @@ +from django.contrib import admin + +# Register your models here. diff --git a/imageapp/apps.py b/imageapp/apps.py new file mode 100644 index 0000000..4265a20 --- /dev/null +++ b/imageapp/apps.py @@ -0,0 +1,5 @@ +from django.apps import AppConfig + + +class ImageappConfig(AppConfig): + name = 'imageapp' diff --git a/imageapp/migrations/__init__.py b/imageapp/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/imageapp/models.py b/imageapp/models.py new file mode 100644 index 0000000..71a8362 --- /dev/null +++ b/imageapp/models.py @@ -0,0 +1,3 @@ +from django.db import models + +# Create your models here. diff --git a/imageapp/tests.py b/imageapp/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/imageapp/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/imageapp/views.py b/imageapp/views.py new file mode 100644 index 0000000..91ea44a --- /dev/null +++ b/imageapp/views.py @@ -0,0 +1,3 @@ +from django.shortcuts import render + +# Create your views here. diff --git a/pageapp/__init__.py b/pageapp/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/pageapp/admin.py b/pageapp/admin.py new file mode 100644 index 0000000..bbfba5d --- /dev/null +++ b/pageapp/admin.py @@ -0,0 +1,18 @@ +from django import forms +from django.forms import ModelForm, Textarea +from pageapp.models import page +from django.contrib import admin + +class pageAdminForm(forms.ModelForm): + class Meta: + model = page + fields = '__all__' + widgets = { + 'body': forms.Textarea(attrs={'cols': 80, 'rows': 20}), + } + +class pageAdmin(admin.ModelAdmin): + form = pageAdminForm + list_display = ('header', ) + +admin.site.register(page, pageAdmin) diff --git a/pageapp/apps.py b/pageapp/apps.py new file mode 100644 index 0000000..2d18757 --- /dev/null +++ b/pageapp/apps.py @@ -0,0 +1,5 @@ +from django.apps import AppConfig + + +class PageappConfig(AppConfig): + name = 'pageapp' diff --git a/pageapp/migrations/0001_initial.py b/pageapp/migrations/0001_initial.py new file mode 100644 index 0000000..c82b0af --- /dev/null +++ b/pageapp/migrations/0001_initial.py @@ -0,0 +1,25 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.9 on 2016-08-16 11:06 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ] + + operations = [ + migrations.CreateModel( + name='page', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=20)), + ('header', models.CharField(max_length=50)), + ('body', models.CharField(max_length=10000)), + ], + ), + ] diff --git a/pageapp/migrations/__init__.py b/pageapp/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/pageapp/models.py b/pageapp/models.py new file mode 100644 index 0000000..df8e3a8 --- /dev/null +++ b/pageapp/models.py @@ -0,0 +1,10 @@ +from django.db import models + +# Create your models here. + +class page(models.Model): + name = models.CharField(max_length = 20) + header = models.CharField(max_length = 50) + body = models.CharField(max_length = 10000) + + diff --git a/pageapp/templates/pageapp/page.html b/pageapp/templates/pageapp/page.html new file mode 100644 index 0000000..d952415 --- /dev/null +++ b/pageapp/templates/pageapp/page.html @@ -0,0 +1,10 @@ +{% extends "base.html" %} + +{% block content %} +{% autoescape off %} +

{{page.header}}

+{{page.body|linebreaks}} +{% endautoescape %} +{% endblock %} + + diff --git a/pageapp/tests.py b/pageapp/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/pageapp/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/pageapp/views.py b/pageapp/views.py new file mode 100644 index 0000000..164e06e --- /dev/null +++ b/pageapp/views.py @@ -0,0 +1,17 @@ +from pageapp.models import page +from django.shortcuts import render_to_response, get_object_or_404 +from django.template import RequestContext + + +def getpage(request, page_id): + pagedetail = get_object_or_404(page, pk=page_id) + return render_to_response('pageapp/page.html', {'page': pagedetail}, context_instance=RequestContext(request)) + +def aboutpage(request): + about = get_object_or_404(page, pk=1) + return render_to_response('pageapp/page.html', {'page': about}, context_instance=RequestContext(request)) + +def contactpage(request): + contact = get_object_or_404(page, pk=2) + return render_to_response('pageapp/page.html', {'page': contact}, context_instance=RequestContext(request)) + diff --git a/polysite/settings.py b/polysite/settings.py index 05e7afb..3e1a067 100644 --- a/polysite/settings.py +++ b/polysite/settings.py @@ -32,6 +32,7 @@ ALLOWED_HOSTS = [] INSTALLED_APPS = [ 'blogapp.apps.BlogappConfig', + 'pageapp.apps.PageappConfig', 'django.contrib.admin', 'django.contrib.auth', 'django.contrib.contenttypes', diff --git a/polysite/urls.py b/polysite/urls.py index fdbb9c8..5ebe9c2 100644 --- a/polysite/urls.py +++ b/polysite/urls.py @@ -15,8 +15,13 @@ Including another URLconf """ from django.conf.urls import url, include from django.contrib import admin +from pageapp.views import aboutpage, contactpage +from blogapp.views import listall urlpatterns = [ url(r'^blog/', include('blogapp.urls')), url(r'^admin/', admin.site.urls), + url(r'^about/', aboutpage, name='about'), + url(r'^contact/', contactpage, name='contact'), + url(r'^', listall), ] diff --git a/static/general.css b/static/general.css new file mode 100644 index 0000000..d9f4cff --- /dev/null +++ b/static/general.css @@ -0,0 +1,53 @@ +body { + color: #555; + line-height: 1.5; + padding: 4em 1em; + margin-left: auto; + margin-right: auto; + max-width: 50em; + font-family: "Helvetica", "Arial", sans-serif; +} + +h1, +h2, +strong { + margin-top: 1em; + padding-top: 1em; + color: #333; +} + +a { + color: #ff0066; + text-decoration: none; +} + +div#nav{ + height:1.5em; + clear:both; + padding-top:.5em; + font-size:1.5em; +} +div#nav ul{ + margin:0; + padding:0; + list-style:none; +} +div#nav li{ + width: 10.5em; + margin-left: auto; + margin-right: auto; + display:inline-block; + text-align:center; +} + +div#main{ + padding-top: 1em; +} + +img#intext{ + padding-top:1em; + padding-bottom:1em; + display: block; + margin-left: auto; + margin-right: auto; +} diff --git a/templates/base.html b/templates/base.html index 7a3694c..21bd5f0 100644 --- a/templates/base.html +++ b/templates/base.html @@ -2,136 +2,30 @@ {% load staticfiles %} - + {% block head %}{% endblock %} polylux - -
- + +
+
-
- + - - - - - - - - - - -
- - - - - -{% for page in pages %} - -{% endfor %} - - - -
Home
- 		Blog
- 		Static Page
- 		Forum
-
-
- - - - - - -
-
- - - - - - - - - - - -
{% block headline %} {% endblock %}
- 		- User stuff - -
- {% if errormsg %} - - - - - - -
Error:
-
    -
  • {{ errormsg }}
    -
    • -
-
- {% endif %} -{% block content %} {% endblock %}
-
- {% block sidebar %} - {% if eventlist %} - Aktivitäten: - - {% for evententry in eventlist %} - - {% endfor %} -
- {% ifchanged evententry.date.date %}
{{evententry.date|date:"d. M."}}:
{% endifchanged %}{{evententry.user.username}} {{ evententry.eventmessage }} -
-

- {% endif %} +
+{% block content %} +{% endblock %} +
- {% if appointmentlist %} - Termine: - - {% for obj in appointmentlist %} - - {% endfor %} -
- {{obj.eventname}}
- {% ifequal obj.eventstart.date obj.eventend.date%} - {{obj.eventstart|date:"d. M. H"}}Uhr - {% else %} - {{obj.eventstart|date:"d. M."}}-{{obj.eventend|date:"d. M."}} - {% endifequal %} - ({{ obj.getUsersAttending.count }} Gäste) - -
- {% endif %} - {% endblock %} -
- - ofl Webpage
- (c) polylux
- Site realized utilizing Django, a great and powerful python-based web development framework.
- Thanks to davidst for hosting this site. - - 		-
-
- -
- -