diff --git a/.worktime b/.worktime index cd3c49d..fc5688f 100644 --- a/.worktime +++ b/.worktime @@ -8,4 +8,5 @@ 24.07.2022 - 3h 30 mins 25.07.2022 - 3h 30 mins 26.07.2022 - 1h 30 mins -27.07.2022 - 4h \ No newline at end of file +27.07.2022 - 4h +01.08.2022 - 30 mins \ No newline at end of file diff --git a/core/admin.py b/core/admin.py index 6f406f9..d23957e 100644 --- a/core/admin.py +++ b/core/admin.py @@ -16,6 +16,14 @@ class ButtonModelAdmin(OrderableAdmin, admin.ModelAdmin): exclude = ['ordering'] +@admin.register(UpperButton) +class UpperButtonModelAdmin(OrderableAdmin, admin.ModelAdmin): + list_display = ['__str__', 'ordering'] + list_editable = ['ordering'] + ordering_field_hide_input = True + exclude = ['ordering'] + + apps = [ 'main', 'administration', diff --git a/core/context_processors.py b/core/context_processors.py index 0159074..30648f5 100644 --- a/core/context_processors.py +++ b/core/context_processors.py @@ -14,8 +14,9 @@ from db.atu.models import * def load_config(request): return { 'nav': Button.objects.all(), + 'uppernav': UpperButton.objects.all(), 'gpw': GrandPrixW.load(), - 'posts': Post.objects.all(), + 'posts': Post.objects.filter(published=True), 'czlonkowie': Member.objects.all(), 'statut': Statute.objects.first(), 'ogloszenia': Announcement.objects.all(), @@ -29,8 +30,8 @@ def load_config(request): }, 'calendars': Calendar.objects.all(), 'gpb': GrandPrixB.load(), - 'tournaments': Tournament.objects.all(), - 'memberships': Membership.objects.all(), + 'tournaments': Tournament.objects.filter(published=True), + 'memberships': Membership.objects.filter(published=True), 'youth': Youth.load(), 'atu': Atu.load() } diff --git a/core/migrations/0011_upperbutton_alter_button_options.py b/core/migrations/0011_upperbutton_alter_button_options.py new file mode 100644 index 0000000..721d311 --- /dev/null +++ b/core/migrations/0011_upperbutton_alter_button_options.py @@ -0,0 +1,35 @@ +# Generated by Django 4.0.5 on 2022-07-31 22:37 + +from django.db import migrations, models +import filebrowser.fields + + +class Migration(migrations.Migration): + + dependencies = [ + ('core', '0010_initial'), + ] + + operations = [ + migrations.CreateModel( + name='UpperButton', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('ordering', models.IntegerField(default=0, verbose_name='Kolejność')), + ('title', models.CharField(max_length=50, verbose_name='Tytuł przycisku')), + ('photo', filebrowser.fields.FileBrowseField(blank=True, max_length=200, verbose_name='Ikona')), + ('href', models.CharField(max_length=50, verbose_name='Link')), + ('blank', models.BooleanField(verbose_name='Otwórz w nowej karcie')), + ], + options={ + 'verbose_name': 'Przycisk górny (łabs, atu, itd...)', + 'verbose_name_plural': 'Przyciski górne (łabs, atu, itd...)', + 'ordering': ['ordering'], + 'abstract': False, + }, + ), + migrations.AlterModelOptions( + name='button', + options={'ordering': ['ordering'], 'verbose_name': 'Przycisk nawigacji (zielony)', 'verbose_name_plural': 'Przyciski nawigacji (zielone)'}, + ), + ] diff --git a/core/models.py b/core/models.py index 73f3023..36d457c 100644 --- a/core/models.py +++ b/core/models.py @@ -1,7 +1,7 @@ from django.db import models from tinymce.models import HTMLField from admin_ordering.models import OrderableModel -from core.utils import SingletonModel +from filebrowser.fields import FileBrowseField # Create your models here. @@ -15,5 +15,20 @@ class Button(OrderableModel): return self.title or '-' class Meta(OrderableModel.Meta): - verbose_name = 'Przycisk na stronie głównej' - verbose_name_plural = 'Przyciski na stronie głównej' + verbose_name = 'Przycisk nawigacji (zielony)' + verbose_name_plural = 'Przyciski nawigacji (zielone)' + + +class UpperButton(OrderableModel): + title = models.CharField('Tytuł przycisku', max_length=50) + photo = FileBrowseField( + 'Ikona', directory='gorneprzyciski/', max_length=200, blank=True) + href = models.CharField('Link', max_length=50) + blank = models.BooleanField('Otwórz w nowej karcie') + + def __str__(self): + return self.title or '-' + + class Meta(OrderableModel.Meta): + verbose_name = 'Przycisk górny (łabs, atu, itd...)' + verbose_name_plural = 'Przyciski górne (łabs, atu, itd...)' diff --git a/core/templates/base.html b/core/templates/base.html index 5bbc201..b709490 100644 --- a/core/templates/base.html +++ b/core/templates/base.html @@ -52,46 +52,26 @@ {% endif %} -