From fc4b72c85356b0abb51f0851aa3a2587739e3711 Mon Sep 17 00:00:00 2001 From: yaemiku Date: Fri, 21 Oct 2022 19:26:04 +0200 Subject: [PATCH] [func] filebrowser html link [func] published status [func] nav button publishing --- core/admin.py | 4 +-- core/context_processors.py | 4 +-- ..._button_published_upperbutton_published.py | 23 ++++++++++++++++++ core/models.py | 2 ++ db/calendar/admin.py | 8 ++++++ db/main/admin.py | 2 +- db/mbkb/admin.py | 2 +- db/membership/admin.py | 7 ++++++ db/tournaments/admin.py | 2 +- db/youth/admin.py | 2 +- filebrowser/locale/de/LC_MESSAGES/django.mo | Bin 6693 -> 6652 bytes filebrowser/locale/it/LC_MESSAGES/django.mo | Bin 6256 -> 6215 bytes filebrowser/locale/nl/LC_MESSAGES/django.mo | Bin 0 -> 454 bytes .../locale/pl_PL/LC_MESSAGES/django.mo | Bin 6376 -> 5842 bytes .../locale/pl_PL/LC_MESSAGES/django.po | 2 +- .../filebrowser/include/filelisting.html | 2 ++ pdlzbs/settings.py | 7 ++++++ tournamentpages/admin.py | 2 +- 18 files changed, 59 insertions(+), 10 deletions(-) create mode 100644 core/migrations/0012_button_published_upperbutton_published.py create mode 100644 db/calendar/admin.py create mode 100644 db/membership/admin.py create mode 100644 filebrowser/locale/nl/LC_MESSAGES/django.mo diff --git a/core/admin.py b/core/admin.py index 36e8c01..f79d680 100644 --- a/core/admin.py +++ b/core/admin.py @@ -10,7 +10,7 @@ from admin_ordering.admin import OrderableAdmin @admin.register(Button) class ButtonModelAdmin(OrderableAdmin, admin.ModelAdmin): - list_display = ['__str__', 'ordering'] + list_display = ['__str__', 'published', 'ordering'] list_editable = ['ordering'] ordering_field_hide_input = True exclude = ['ordering'] @@ -18,7 +18,7 @@ class ButtonModelAdmin(OrderableAdmin, admin.ModelAdmin): @admin.register(UpperButton) class UpperButtonModelAdmin(OrderableAdmin, admin.ModelAdmin): - list_display = ['__str__', 'ordering'] + list_display = ['__str__', 'published', 'ordering'] list_editable = ['ordering'] ordering_field_hide_input = True exclude = ['ordering'] diff --git a/core/context_processors.py b/core/context_processors.py index 4ccec35..5b65ffc 100644 --- a/core/context_processors.py +++ b/core/context_processors.py @@ -14,8 +14,8 @@ from db.mbkb.models import * def load_config(request): return { - 'nav': Button.objects.all(), - 'uppernav': UpperButton.objects.all(), + 'nav': Button.objects.filter(published=True), + 'uppernav': UpperButton.objects.filter(published=True), 'gpw': GrandPrixW.load(), 'posts': Post.objects.filter(published=True), 'daneadresowe': Data.load(), diff --git a/core/migrations/0012_button_published_upperbutton_published.py b/core/migrations/0012_button_published_upperbutton_published.py new file mode 100644 index 0000000..287a0a9 --- /dev/null +++ b/core/migrations/0012_button_published_upperbutton_published.py @@ -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'), + ), + ] diff --git a/core/models.py b/core/models.py index 072fbea..afb2209 100644 --- a/core/models.py +++ b/core/models.py @@ -10,6 +10,7 @@ from db.membership.models import Membership class Button(OrderableModel): + published = models.BooleanField('Przycisk opublikowany', default=True) title = models.CharField('Tekst na przycisku', max_length=50) href = models.CharField('Link', max_length=50) blank = models.BooleanField('Otwórz w nowej karcie') @@ -35,6 +36,7 @@ class Button(OrderableModel): class UpperButton(OrderableModel): + published = models.BooleanField('Przycisk opublikowany', default=True) title = models.CharField('Tytuł przycisku', max_length=50) photo = FileBrowseField( 'Ikona', directory='gorneprzyciski/', max_length=200, blank=True) diff --git a/db/calendar/admin.py b/db/calendar/admin.py new file mode 100644 index 0000000..46b82e2 --- /dev/null +++ b/db/calendar/admin.py @@ -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') diff --git a/db/main/admin.py b/db/main/admin.py index 73c29e0..0bf09a4 100644 --- a/db/main/admin.py +++ b/db/main/admin.py @@ -7,7 +7,7 @@ from .models import * @admin.register(Post) class PostModelAdmin(OrderableAdmin, admin.ModelAdmin): - list_display = ['__str__', 'link', 'ordering'] + list_display = ['__str__', 'link', 'published', 'ordering'] list_editable = ['ordering'] ordering_field_hide_input = True exclude = ['ordering'] diff --git a/db/mbkb/admin.py b/db/mbkb/admin.py index fac2c3b..3782cf1 100644 --- a/db/mbkb/admin.py +++ b/db/mbkb/admin.py @@ -7,7 +7,7 @@ from .models import * @admin.register(MBKB) class MBKBModelAdmin(OrderableAdmin, admin.ModelAdmin): - list_display = ['__str__', 'ordering'] + list_display = ['__str__', 'published', 'ordering'] list_editable = ['ordering'] ordering_field_hide_input = True exclude = ['ordering'] diff --git a/db/membership/admin.py b/db/membership/admin.py new file mode 100644 index 0000000..95edb77 --- /dev/null +++ b/db/membership/admin.py @@ -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') diff --git a/db/tournaments/admin.py b/db/tournaments/admin.py index 9e209f2..83e22bc 100644 --- a/db/tournaments/admin.py +++ b/db/tournaments/admin.py @@ -7,7 +7,7 @@ from .models import * @admin.register(Tournament) class TournamentModelAdmin(OrderableAdmin, admin.ModelAdmin): - list_display = ['__str__', 'link', 'ordering'] + list_display = ['__str__', 'link', 'published', 'ordering'] list_editable = ['ordering'] ordering_field_hide_input = True exclude = ['ordering'] diff --git a/db/youth/admin.py b/db/youth/admin.py index 84c261d..a37bbb9 100644 --- a/db/youth/admin.py +++ b/db/youth/admin.py @@ -7,7 +7,7 @@ from .models import * @admin.register(Youth) class YouthModelAdmin(OrderableAdmin, admin.ModelAdmin): - list_display = ['__str__', 'link', 'ordering'] + list_display = ['__str__', 'link', 'published', 'ordering'] list_editable = ['ordering'] ordering_field_hide_input = True exclude = ['ordering'] diff --git a/filebrowser/locale/de/LC_MESSAGES/django.mo b/filebrowser/locale/de/LC_MESSAGES/django.mo index 51babf190238a0d688cfe11b3454d566d4f85109..25f771c180c635f367c6e1bd289a0617b332de6c 100644 GIT binary patch delta 748 zcmXZa%_~G<6vy#{@pgy2ztwophAc!WN|YFxGD;~jNd_C)AZ2l7L6%s|g0LYLGMW4V zR;bC2t>x^b2n)*hms`_(&hyMY=Q+=rd)o2S9{)&pV`*lQ0<&f_`z$o8#rh(%7VN_| zT*MqaMjxJIHeRA1Z*UE7F%!Fr%^d7ShIzx9(n6GR71ZmK_fw+jIm)a>MvMF6*xc@ zIK?WwMlNef)F@vtfGJdCzViRkJ6O%S4E0>Qx8IFAcmS2>MhRL8Hc<(2oWw_*$7bdi z#XVHwH>$x3#-YYKQ6ud~H5^7YGJzR5?Kz8@YVHhFBn1wCm27(cx z=0<|ZHo1@%itfyX3#HsB1xgb12eb0a~3V7R*x^nTNlip zR++V#*^O$x*oW;nf*~$o34X&%_#Lm{A(rEBoWMU=j6*eMWtd0h6|fX1QF*Vh66b0x zwmO0j?#3Fbzy>OD%ejj!tbd>iouG&R@IHFAW|wgs`*8yK*bYApc!bUP7u9frO;zVw zU2IlCkmQ02M5x3xau~bkt`A}(>l~`Vm#9fhJKvyA^cI!3h}vKkReu8?;8(Y9x_aJF zGA3x{MmMH0k9q~4PzAP81@^EBe<6pq6Vxb6>Ny1_P>uPh(MNb4Z=;@j;;s*)CNYM} zi)RUZg3qXgBYcdfn8N|)m&Grr#G8yk4R)d$8$^xt8LHtIs79u+2wyvAP!pbazC)gW zWFHBXu#76Wf;!UU)d*|c{n2qQlX{V4Flj&!P{JqUwf{e4xY>_4u#R2KjM diff --git a/filebrowser/locale/it/LC_MESSAGES/django.mo b/filebrowser/locale/it/LC_MESSAGES/django.mo index 39f53c806bd8ce85137d12cda2f0e6bdd8d1e986..ea0ea720237276d77c53d4f7797e987dfd4a0fc1 100644 GIT binary patch delta 740 zcmXZay(`3V9Ki7p=WxWi^BB@^k*Dao;Rfk)!XTED82kk+29)WS?aGAZ7P3gTtCL8| zU5P9nCK+^D46Zzkr{w+V_nBVb=g&jmugFa#Q!IDWWg?&TA_F3lY7ptf6YRxD?8XvS zq7xGFV-Hs2AaYe=n8XR&Puu>!d1PkHbFAWgJ|wO*Gq_`+77JK`MLYP70p=y_z>2UJ z*ui$@eW(wOV;rY#zJ*+oT_kroM1B7h>oAW&dn zkqgv^ayEZLz4wgTsW+^_Kidybh29S$A*J7R;|w(OB+lUy4&xQh<1gx;n58WauAnBi zZSJ84K1S_K);vQW^GnpflQVBo|IR&9NK&2|XhyH775(54`p8Njj+!H=4^84Y&R`UG Ta1^i2%Ivv+J&;`pwgvtHa6L$o delta 779 zcmXZaxi3Uf6vy#1#`cJPEHNUJ*u&$!p_oh|gl0M!TcMCCCW0WbH6*X{7tkmulqy1F zX*5J5qLUCIBC*60jivEDajVZ=-aYqsPu_|1?rgoJct<{ww_K4%5!uccslaQj#~-Z0 zssfR8jA0t~U?vVAM`ak}IBE8e%>Ie-+<0lc!wkNEE)Y+O8GN#kjaH#ZDi)(&P>vQ> zVGwPz9>a3xanwQ+*p72%zKfKUL*xx|hFbpybMP7S@Vn6af0Ei`XEv}Cw^1+rL=EH*{C76sF>qLjqPBb-^~EcwiPy0b zH&I`FiW=k|wa}B9|DvArkybmEjagWS`h6Jnd<4lLy+&_@fhJ$Teq6>VKH?x&(+>S7 z7BPgYsKNG)$EX)ypmyfUc#D4K52*jnlko$!vtLNCxcInT6J?;jD2UD2gj#sWm_#i! zh21!hVLZSNd^NW0?4`|HwS9KibTTnJIyGr`CuWn;P}p%>ZP&G1osb)ewnZ8p*Ku~5 H@`BbM8fs9( diff --git a/filebrowser/locale/nl/LC_MESSAGES/django.mo b/filebrowser/locale/nl/LC_MESSAGES/django.mo new file mode 100644 index 0000000000000000000000000000000000000000..ac571d9868be95e3699b97569f4833d51c02dc91 GIT binary patch literal 454 zcmZXPPfNov7{(`h>d~`@2p%>xO*>F#W<_)x3>=P8y=QIKW~NC<-mddIc=hY~SxlX5 z2Os#6H+lc$eZEgmzB*nGyrF^+C<6r(t%@%3fo z6+ANsIJHbU$v|6*94{;8vQj9H?hFGfviFCLR;&hHF%Ui#GPw7Rs;F7Pamram(Wr*3 zMBNg=P(qrf385V-R(u;~x*}%h#t}pQn;`OU7*Ue+g4uL7K6sA9D0tEexblmB81Dr5 z7Ko8ds3FQqW*vv*HJ#wWp|1UV#VsDIOy@!s6b+UF_DfTwWH6VtWfD)ct(<=_zgL&^ RhiDfjU4_mQ6!(Tf=Lc)BioXB= literal 0 HcmV?d00001 diff --git a/filebrowser/locale/pl_PL/LC_MESSAGES/django.mo b/filebrowser/locale/pl_PL/LC_MESSAGES/django.mo index ef678d806420d2add5c8fab6322f5481db8dd4e1..bbd00fc8162cf280780251f82f8424c74f2cbb48 100644 GIT binary patch delta 1929 zcmYk-eN0Vp9LMqB)lDTS*Co$xTzM#wM4sg_Nh)b=8Dm|oxr)fJxNMA#KiKgw!^Gxc zwq|xsh(D|ue_+dI!(x_yw3+!6f8hN&_h<84-}5@ZbI<)fe9!mXzU02168Y%!o-wpa zVkGgXk1;!NeLM$RAi%TWtBgBtG& z2ASX7qC!*#%1{|uhuT1+bvG(A`%(9uw%5;NI{jAE zJohm&fs-yyhT~7HKtIb|i*;Cn9XJ*fSxpeLkXua|vSw3b4WTm9h?=+=RTKMA3p{|z z&=Dl5#_7-V*B35wK?7d3H?*Oyci=pHf-~{AHJ?#t(+}e(k1^M6|0rovkv>6X^aE(@4A}mV;;d1ahram{2~ zjr1!<)=dtfRzT=Aq{vMv@qg3*hQ6O$f$quv2o9;Z6BE45@(LtXQxy3m}!_VC8C5@%vsP1H%t k^*EWn9A|@XNVLV*?M(`Vn>Po-^$lB{>hy}}=k$2bUqGFttpET3 delta 2458 zcmZ|QX>1f_9LMpeQYZxqwOA09IxY%O&|w8d5uP6Y=de#-#DhiCjpp6&O>Auj7sQxh-GC3d$9ejUj8c;sk8A z<-N$ybZ`k_H>%0^QT5M{nKl>5Oyb5R>nN(?H#i-Cz(V{B^RbYE>Q6^*nNpmCWvJ)% zI1AUI>b2l{?6Bphv6%AnI9*dcLuM*B-bFR|vGpRVfh#xzzr-T^#oo`KVoV9;si=<2 ztQDvUEJRIUDeAp-_W5??XLfOE)KYhl(Ev`M8a#!!;M=$eNAY?rqLP-b5~tx()WFuD zI@*pJNIPmpI#ClySsy~J%n+*HaZIbi3uI>FNmNJg;R5^&Z@>xkwg<~_FW!qyID+L^ z!t^xY706gkJF-Z|wZ>2@l0tQyMxB+zMXbLD@F+LSokTQm6)xqXzUM zYDTA#Nt<)1Q=LWCt7PAFe~EQ9YJgj;J5cYpU@7iL4LnGb(URPcYUp89heN2(@d;Ez zr*R&hMZI_tx8Y@E@@CP@v9q%ZucN#T**()~?L*Z|qWU?4`U=uV$*>ycSyV@-P$N8J z%O9c+*(azMub>+G0yX2G?0xmB4kzL5Sb}PIpS2ekQa*%rcmkOq-#;03{3EKPUr_^? z%tfcQ4E1~k>M*Xg6>_@Fsk1ao9J&HQi8Dxy+6fVGbke~UAONYMyKghIjqmACS z<145$@jK4NS+t^o)u9gKX4GCbqXy81I?W-gYoB{oA2opoP%C&CwQ`SPiN61*$SlT_ zw!%f!3ztwGj^Z8o9oFG0zR`^s!3I2yc{rZ#CZoOGNvt9?87;lqR9Zr;BWOU2D2&TCZ>4Z2 zq1oL=C^Zw>ujML`v;|7Li5lWALd*Z}w3LFDxSn8F|4I65s57F2sl%(JzXvllf9;*p zo-uNNa`g{`bC^59x~=^hPki!b4N*>9Lo6fo$?hP=Q`L9|*&S0xY$7;PWiX|LBVKd24G;o5L)9psw zz;(*!FLeEIXu$36jCCD!!@(lIe1o$o5^-WZPH@0=dSa1CEa^pi9WQYEeJAPhtjo3U zcQ<4{DyWo9J@qYWnG$!J4HyT7z!+#dMmA}4?L3GEQXe@9JgbumRfE(}k zeBX;jHJVU3?D{?(dcM=+McjEN?)r&HVDX3Fn6@OZvZbmq?uG*1soES0+y-ZPbxmzm zO-)s8wNq2yP*=aWx~951Gg@>Z^TG7?8BL*RZz9x7y@5#QuBKsU#`3&S<6z2(hUh*S zjXB{1bUWxI{6sW+Bs=s!tI_HYru?AKbDdB=7K&K}7%;bo68 zsLbx-WreM&@L+1>ne0#|T|9eYbC(;A4rhw5 {% if fileobject.filetype == "Image" %} + {% elif fileobject.filetype == "Strona internetowa" %} + {{ fileobject.url }} {% endif %} diff --git a/pdlzbs/settings.py b/pdlzbs/settings.py index cacdd54..02c7c57 100644 --- a/pdlzbs/settings.py +++ b/pdlzbs/settings.py @@ -171,5 +171,12 @@ TINYMCE_SPELLCHECKER = True FILEBROWSER_DIRECTORY = '' 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 diff --git a/tournamentpages/admin.py b/tournamentpages/admin.py index 41e8d3e..bcf117c 100644 --- a/tournamentpages/admin.py +++ b/tournamentpages/admin.py @@ -10,7 +10,7 @@ from .models import TournamentPage class BandAdmin(TabbedModelAdmin): model = TournamentPage - list_display = ['name', 'link'] + list_display = ['name', 'link', 'published'] tab_general = ( (None, {