diff --git a/kinoostrov/settings.py b/kinoostrov/settings.py index ea61413..3ab79c6 100644 --- a/kinoostrov/settings.py +++ b/kinoostrov/settings.py @@ -42,6 +42,7 @@ INSTALLED_APPS = [ 'akce', 'galerie', 'stranky', + "ckeditor", ] MIDDLEWARE = [ diff --git a/kinoostrov/templates/kinoostrov/base.html b/kinoostrov/templates/kinoostrov/base.html index 6f9b02c..4ea8278 100644 --- a/kinoostrov/templates/kinoostrov/base.html +++ b/kinoostrov/templates/kinoostrov/base.html @@ -1,4 +1,4 @@ -{% load static %} +{% load static stranky %} @@ -46,6 +46,7 @@

Galerie

Formulář pro kolotoč

Formulář pro letní kino

+ {% menu %} diff --git a/kinoostrov/urls.py b/kinoostrov/urls.py index 15a2bb7..fa1b848 100644 --- a/kinoostrov/urls.py +++ b/kinoostrov/urls.py @@ -24,6 +24,7 @@ urlpatterns = [ path('akce/', include('akce.urls')), path('galerie/', include('galerie.urls')), path('kolotoc/', include('kolotoc.urls')), + path("stranky/",include("stranky.urls")), path("",views.index, name="index"), ]+ static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) diff --git a/stranky/admin.py b/stranky/admin.py index 8c38f3f..15035de 100644 --- a/stranky/admin.py +++ b/stranky/admin.py @@ -1,3 +1,13 @@ from django.contrib import admin # Register your models here. +from stranky.models import Stranka, Menu + + +@admin.register(Stranka) +class StrankaAdmin(admin.ModelAdmin): + pass + +@admin.register(Menu) +class MenuAdmin(admin.ModelAdmin): + pass diff --git a/stranky/migrations/0001_initial.py b/stranky/migrations/0001_initial.py new file mode 100644 index 0000000..27afed6 --- /dev/null +++ b/stranky/migrations/0001_initial.py @@ -0,0 +1,25 @@ +# Generated by Django 3.2.4 on 2021-06-03 10:41 + +import ckeditor.fields +from django.db import migrations, models + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ] + + operations = [ + migrations.CreateModel( + name='Strank', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('homepage', models.BooleanField(default=False)), + ('content', ckeditor.fields.RichTextField(blank=True, null=True)), + ('nadpis', models.CharField(max_length=64)), + ('textvmenu', models.CharField(max_length=64)), + ], + ), + ] diff --git a/stranky/migrations/0002_rename_strank_stranka.py b/stranky/migrations/0002_rename_strank_stranka.py new file mode 100644 index 0000000..d160e9f --- /dev/null +++ b/stranky/migrations/0002_rename_strank_stranka.py @@ -0,0 +1,17 @@ +# Generated by Django 3.2.4 on 2021-06-03 10:46 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('stranky', '0001_initial'), + ] + + operations = [ + migrations.RenameModel( + old_name='Strank', + new_name='Stranka', + ), + ] diff --git a/stranky/migrations/0003_menu.py b/stranky/migrations/0003_menu.py new file mode 100644 index 0000000..990540f --- /dev/null +++ b/stranky/migrations/0003_menu.py @@ -0,0 +1,22 @@ +# Generated by Django 3.2.4 on 2021-06-03 10:54 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('stranky', '0002_rename_strank_stranka'), + ] + + operations = [ + migrations.CreateModel( + name='Menu', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('poradi', models.PositiveIntegerField()), + ('stranka', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='stranky.stranka')), + ], + ), + ] diff --git a/stranky/models.py b/stranky/models.py index 71a8362..47f3154 100644 --- a/stranky/models.py +++ b/stranky/models.py @@ -1,3 +1,19 @@ from django.db import models +from ckeditor.fields import RichTextField + # Create your models here. +#TODO:Nadpis stránky, halvnítextstranky(formátovatelný{rich text}),příznak homepage, text v menu +class Stranka(models.Model): + homepage=models.BooleanField(default=False) + content = RichTextField(blank=True,null=True) + nadpis=models.CharField(max_length=64,) + textvmenu=models.CharField(max_length=64) + def __str__(self): + return self.nadpis + +class Menu(models.Model): + stranka=models.ForeignKey(Stranka,on_delete=models.CASCADE) + poradi=models.PositiveIntegerField() + def __str__(self): + return self.stranka \ No newline at end of file diff --git a/stranky/templates/stranky/menu.html b/stranky/templates/stranky/menu.html new file mode 100644 index 0000000..ac5b107 --- /dev/null +++ b/stranky/templates/stranky/menu.html @@ -0,0 +1,5 @@ +{% for polozka in polozky %} +

{{polozka.stranka.textvmenu}}

+ + +{% endfor %} diff --git a/stranky/templatetags/__init__.py b/stranky/templatetags/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/stranky/templatetags/stranky.py b/stranky/templatetags/stranky.py new file mode 100644 index 0000000..fee40e3 --- /dev/null +++ b/stranky/templatetags/stranky.py @@ -0,0 +1,14 @@ +from django import template +from stranky.models import Menu +register = template.Library() + +@register.inclusion_tag("stranky/menu.html") +def menu(): + + polozky = Menu.objects.all() + + return { + "polozky":polozky + } + + diff --git a/stranky/urls.py b/stranky/urls.py new file mode 100644 index 0000000..0390a68 --- /dev/null +++ b/stranky/urls.py @@ -0,0 +1,10 @@ +from django.urls import path + +from stranky import views + +urlpatterns = [ + path("/", views.stranka,name="stranka"), + + +] + diff --git a/stranky/views.py b/stranky/views.py index 91ea44a..ee95c80 100644 --- a/stranky/views.py +++ b/stranky/views.py @@ -1,3 +1,6 @@ from django.shortcuts import render # Create your views here. + +def stranka(request,sid): + pass \ No newline at end of file