[func] filebrowser html link
[func] published status [func] nav button publishingmain
parent
266cdd4df3
commit
fc4b72c853
|
|
@ -10,7 +10,7 @@ from admin_ordering.admin import OrderableAdmin
|
||||||
|
|
||||||
@admin.register(Button)
|
@admin.register(Button)
|
||||||
class ButtonModelAdmin(OrderableAdmin, admin.ModelAdmin):
|
class ButtonModelAdmin(OrderableAdmin, admin.ModelAdmin):
|
||||||
list_display = ['__str__', 'ordering']
|
list_display = ['__str__', 'published', 'ordering']
|
||||||
list_editable = ['ordering']
|
list_editable = ['ordering']
|
||||||
ordering_field_hide_input = True
|
ordering_field_hide_input = True
|
||||||
exclude = ['ordering']
|
exclude = ['ordering']
|
||||||
|
|
@ -18,7 +18,7 @@ class ButtonModelAdmin(OrderableAdmin, admin.ModelAdmin):
|
||||||
|
|
||||||
@admin.register(UpperButton)
|
@admin.register(UpperButton)
|
||||||
class UpperButtonModelAdmin(OrderableAdmin, admin.ModelAdmin):
|
class UpperButtonModelAdmin(OrderableAdmin, admin.ModelAdmin):
|
||||||
list_display = ['__str__', 'ordering']
|
list_display = ['__str__', 'published', 'ordering']
|
||||||
list_editable = ['ordering']
|
list_editable = ['ordering']
|
||||||
ordering_field_hide_input = True
|
ordering_field_hide_input = True
|
||||||
exclude = ['ordering']
|
exclude = ['ordering']
|
||||||
|
|
|
||||||
|
|
@ -14,8 +14,8 @@ from db.mbkb.models import *
|
||||||
|
|
||||||
def load_config(request):
|
def load_config(request):
|
||||||
return {
|
return {
|
||||||
'nav': Button.objects.all(),
|
'nav': Button.objects.filter(published=True),
|
||||||
'uppernav': UpperButton.objects.all(),
|
'uppernav': UpperButton.objects.filter(published=True),
|
||||||
'gpw': GrandPrixW.load(),
|
'gpw': GrandPrixW.load(),
|
||||||
'posts': Post.objects.filter(published=True),
|
'posts': Post.objects.filter(published=True),
|
||||||
'daneadresowe': Data.load(),
|
'daneadresowe': Data.load(),
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,23 @@
|
||||||
|
# Generated by Django 4.0.5 on 2022-10-21 17:02
|
||||||
|
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
('core', '0011_upperbutton_alter_button_options'),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.AddField(
|
||||||
|
model_name='button',
|
||||||
|
name='published',
|
||||||
|
field=models.BooleanField(default=True, verbose_name='Przycisk opublikowany'),
|
||||||
|
),
|
||||||
|
migrations.AddField(
|
||||||
|
model_name='upperbutton',
|
||||||
|
name='published',
|
||||||
|
field=models.BooleanField(default=True, verbose_name='Przycisk opublikowany'),
|
||||||
|
),
|
||||||
|
]
|
||||||
|
|
@ -10,6 +10,7 @@ from db.membership.models import Membership
|
||||||
|
|
||||||
|
|
||||||
class Button(OrderableModel):
|
class Button(OrderableModel):
|
||||||
|
published = models.BooleanField('Przycisk opublikowany', default=True)
|
||||||
title = models.CharField('Tekst na przycisku', max_length=50)
|
title = models.CharField('Tekst na przycisku', max_length=50)
|
||||||
href = models.CharField('Link', max_length=50)
|
href = models.CharField('Link', max_length=50)
|
||||||
blank = models.BooleanField('Otwórz w nowej karcie')
|
blank = models.BooleanField('Otwórz w nowej karcie')
|
||||||
|
|
@ -35,6 +36,7 @@ class Button(OrderableModel):
|
||||||
|
|
||||||
|
|
||||||
class UpperButton(OrderableModel):
|
class UpperButton(OrderableModel):
|
||||||
|
published = models.BooleanField('Przycisk opublikowany', default=True)
|
||||||
title = models.CharField('Tytuł przycisku', max_length=50)
|
title = models.CharField('Tytuł przycisku', max_length=50)
|
||||||
photo = FileBrowseField(
|
photo = FileBrowseField(
|
||||||
'Ikona', directory='gorneprzyciski/', max_length=200, blank=True)
|
'Ikona', directory='gorneprzyciski/', max_length=200, blank=True)
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,8 @@
|
||||||
|
|
||||||
|
from django.contrib import admin
|
||||||
|
from .models import Calendar
|
||||||
|
|
||||||
|
|
||||||
|
@admin.register(Calendar)
|
||||||
|
class CalendarAdmin(admin.ModelAdmin):
|
||||||
|
list_display = ('__str__', 'published', 'current')
|
||||||
|
|
@ -7,7 +7,7 @@ from .models import *
|
||||||
|
|
||||||
@admin.register(Post)
|
@admin.register(Post)
|
||||||
class PostModelAdmin(OrderableAdmin, admin.ModelAdmin):
|
class PostModelAdmin(OrderableAdmin, admin.ModelAdmin):
|
||||||
list_display = ['__str__', 'link', 'ordering']
|
list_display = ['__str__', 'link', 'published', 'ordering']
|
||||||
list_editable = ['ordering']
|
list_editable = ['ordering']
|
||||||
ordering_field_hide_input = True
|
ordering_field_hide_input = True
|
||||||
exclude = ['ordering']
|
exclude = ['ordering']
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,7 @@ from .models import *
|
||||||
|
|
||||||
@admin.register(MBKB)
|
@admin.register(MBKB)
|
||||||
class MBKBModelAdmin(OrderableAdmin, admin.ModelAdmin):
|
class MBKBModelAdmin(OrderableAdmin, admin.ModelAdmin):
|
||||||
list_display = ['__str__', 'ordering']
|
list_display = ['__str__', 'published', 'ordering']
|
||||||
list_editable = ['ordering']
|
list_editable = ['ordering']
|
||||||
ordering_field_hide_input = True
|
ordering_field_hide_input = True
|
||||||
exclude = ['ordering']
|
exclude = ['ordering']
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,7 @@
|
||||||
|
from django.contrib import admin
|
||||||
|
from .models import Membership
|
||||||
|
|
||||||
|
|
||||||
|
@admin.register(Membership)
|
||||||
|
class MembershipAdmin(admin.ModelAdmin):
|
||||||
|
list_display = ('__str__', 'published', 'current')
|
||||||
|
|
@ -7,7 +7,7 @@ from .models import *
|
||||||
|
|
||||||
@admin.register(Tournament)
|
@admin.register(Tournament)
|
||||||
class TournamentModelAdmin(OrderableAdmin, admin.ModelAdmin):
|
class TournamentModelAdmin(OrderableAdmin, admin.ModelAdmin):
|
||||||
list_display = ['__str__', 'link', 'ordering']
|
list_display = ['__str__', 'link', 'published', 'ordering']
|
||||||
list_editable = ['ordering']
|
list_editable = ['ordering']
|
||||||
ordering_field_hide_input = True
|
ordering_field_hide_input = True
|
||||||
exclude = ['ordering']
|
exclude = ['ordering']
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,7 @@ from .models import *
|
||||||
|
|
||||||
@admin.register(Youth)
|
@admin.register(Youth)
|
||||||
class YouthModelAdmin(OrderableAdmin, admin.ModelAdmin):
|
class YouthModelAdmin(OrderableAdmin, admin.ModelAdmin):
|
||||||
list_display = ['__str__', 'link', 'ordering']
|
list_display = ['__str__', 'link', 'published', 'ordering']
|
||||||
list_editable = ['ordering']
|
list_editable = ['ordering']
|
||||||
ordering_field_hide_input = True
|
ordering_field_hide_input = True
|
||||||
exclude = ['ordering']
|
exclude = ['ordering']
|
||||||
|
|
|
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -262,7 +262,7 @@ msgstr "Wersje obrazu"
|
||||||
#: filebrowser/templates/filebrowser/detail.html:125
|
#: filebrowser/templates/filebrowser/detail.html:125
|
||||||
#: filebrowser/templates/filebrowser/include/tableheader.html:31
|
#: filebrowser/templates/filebrowser/include/tableheader.html:31
|
||||||
msgid "Thumbnail"
|
msgid "Thumbnail"
|
||||||
msgstr "Miniatura"
|
msgstr "Miniatura lub link"
|
||||||
|
|
||||||
#: filebrowser/templates/filebrowser/detail.html:126
|
#: filebrowser/templates/filebrowser/detail.html:126
|
||||||
#: filebrowser/templates/filebrowser/include/filelisting.html:100
|
#: filebrowser/templates/filebrowser/include/filelisting.html:100
|
||||||
|
|
|
||||||
|
|
@ -98,6 +98,8 @@
|
||||||
<td class="fb_thumbnail">
|
<td class="fb_thumbnail">
|
||||||
{% if fileobject.filetype == "Image" %}
|
{% if fileobject.filetype == "Image" %}
|
||||||
<a href="{{ fileobject.url }}" class="fb_viewlink"><img src="{{ thumbnail_version.url }}" title="{% trans 'View Image' %}" /></a>
|
<a href="{{ fileobject.url }}" class="fb_viewlink"><img src="{{ thumbnail_version.url }}" title="{% trans 'View Image' %}" /></a>
|
||||||
|
{% elif fileobject.filetype == "Strona internetowa" %}
|
||||||
|
<a href="{{ fileobject.url }}" target="_blank" style="text-overflow: ellipsis;">{{ fileobject.url }}</a>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</td>
|
</td>
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -171,5 +171,12 @@ TINYMCE_SPELLCHECKER = True
|
||||||
|
|
||||||
FILEBROWSER_DIRECTORY = ''
|
FILEBROWSER_DIRECTORY = ''
|
||||||
FILEBROWSER_EXCLUDE = [r'^_versions']
|
FILEBROWSER_EXCLUDE = [r'^_versions']
|
||||||
|
FILEBROWSER_EXTENSIONS = {
|
||||||
|
'Image': ['.jpg', '.jpeg', '.gif', '.png', '.tif', '.tiff', '.webp'],
|
||||||
|
'Document': ['.pdf', '.doc', '.rtf', '.txt', '.xls', '.csv'],
|
||||||
|
'Video': ['.mov', '.wmv', '.mpeg', '.mpg', '.avi', '.rm', '.webm'],
|
||||||
|
'Audio': ['.mp3', '.mp4', '.wav', '.aiff', '.midi', '.m4p'],
|
||||||
|
'Strona internetowa': ['.html']
|
||||||
|
}
|
||||||
|
|
||||||
TABBED_ADMIN_USE_JQUERY_UI = True
|
TABBED_ADMIN_USE_JQUERY_UI = True
|
||||||
|
|
|
||||||
|
|
@ -10,7 +10,7 @@ from .models import TournamentPage
|
||||||
class BandAdmin(TabbedModelAdmin):
|
class BandAdmin(TabbedModelAdmin):
|
||||||
model = TournamentPage
|
model = TournamentPage
|
||||||
|
|
||||||
list_display = ['name', 'link']
|
list_display = ['name', 'link', 'published']
|
||||||
|
|
||||||
tab_general = (
|
tab_general = (
|
||||||
(None, {
|
(None, {
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue