From 8a6667792516beff412e8c6182e2f4e78d7e36c3 Mon Sep 17 00:00:00 2001 From: Cyrille LOUARN Date: Sun, 5 Nov 2023 12:55:31 +0100 Subject: [PATCH] [1.9.32] - Working on creating modules (header, navbar, sidebar, footer) --- CHANGELOG.md | 3 + debian/control | 2 +- src/usr/bin/tyto | 2 +- .../__pycache__/domain.cpython-311.pyc | Bin 24645 -> 24658 bytes .../program/__pycache__/tyto.cpython-311.pyc | Bin 1476 -> 2518 bytes .../program/__pycache__/wip.cpython-311.pyc | Bin 20487 -> 25286 bytes src/var/lib/tyto/program/domain.py | 3 +- src/var/lib/tyto/program/tyto.py | 57 +++++ src/var/lib/tyto/program/wip.py | 195 ++++++++++++++---- src/var/lib/tyto/tpl_files/styles.css | 56 +++-- .../__pycache__/logs_fr.cpython-311.pyc | Bin 3313 -> 4650 bytes src/var/lib/tyto/translations/logs_en.py | 99 ++++++--- src/var/lib/tyto/translations/logs_fr.py | 93 +++++++-- 13 files changed, 411 insertions(+), 99 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 48306b7..1945be0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -10,6 +10,9 @@ Tyto - Littérateur # CURRENTLY IN DEV (in devel branch) ! +## [1.9.32] +- Working on creating modules (header, navbar, sidebar, header) + ## [1.9.31] - Fix replacing markers starting LINE with HTML - Added tpl_files directory diff --git a/debian/control b/debian/control index 11f4cc1..0b08938 100644 --- a/debian/control +++ b/debian/control @@ -1,5 +1,5 @@ Package: tyto -Version: 1.9.31 +Version: 1.9.32 Section: custom Priority: optional Architecture: all diff --git a/src/usr/bin/tyto b/src/usr/bin/tyto index 461195b..54aaa26 100755 --- a/src/usr/bin/tyto +++ b/src/usr/bin/tyto @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Version: 1.9.31 +# Version: 1.9.32 # Updated: 2023-10-18 1697613100 # Tyto - Littérateur diff --git a/src/var/lib/tyto/program/__pycache__/domain.cpython-311.pyc b/src/var/lib/tyto/program/__pycache__/domain.cpython-311.pyc index 2401256c75bc997ce1ba6fae2d5b2fb3e39aafc3..3368d15f39ff28b118d961e1a07dbdd0982d1368 100644 GIT binary patch delta 55 zcmX?lfbr4+M&9MTyj%=GP{8b#`f4MuLIk7LX1xe`MxMOHvZTZ!1zUy6)Z)!Pk@wgb K(Adi`{9k0ohzV zmfk#h^DOnIM~`|{$X}5^!S`l1iAlSV%+CAX&+mQ7&-Fi>l`ocM7T_s=c+Ed;TvWD= zZx>HK?`*br*xmL6cCY=A-EZ%*t@a)>-WBTGUw?hSmC+wYq2TN{8l;wzM#D9o{o|-B z&tpyoGVtM!2k~jxKeB77?UMNe5U0#FYpLlp^{dl~*g3>7F(iT=*{P7+>qeoZBIJqf zn&_-Psw5NHkmPVm9GXbc^|?!E$l#U=2Jfn;rF^-YryL;XEN)RT_dpE$;>k70({?*U zm)3Py3h8s(t)(zo3w+dkJki7UqDbD9Q`@1cVnp9Cb~cx`!z?aQ;{!Vx_m;*{<3h;7 z>0p^d%||omxv6$UU(9y+Mo;_HkNVLeVLa_7B9pE_gjX|aYkfk|tg4PJOu&mtmDA#V<87ipyMSMufcxgl9VO zBE7PC|7|J05$ErvULwL+!I`UAN z6a$f-jQxofMC{DxxqjzY-SwoLqw1$I2X(^B-^G^s9R43bEQR#%Wohl|aBA+A*Tyi~s-t delta 74 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 Hmgv6$4(K{3 delta 3417 zcmb_edu&tJ8NbJmYy0|{_>siMkGu#bB~bzt8j?UrLJ3eP?}s3c@imF56Q{>FjYtQ{ zB-&CHq=c^%9ndQMheiUbAa^U9I<5U<&p);%G6UU-YDlf7bVzfiP1~~W@ttD`X||3{ z+qLiSp7XuVcfa#}-?=~h0eNMd*xs>PB>^wt%99 z6ojjI=PzYmUJxS2hg7x}>X3ad9bKmgFt)^{OFy(HF0g0#FYFb;y?|S5M7tw(F3q?N z3R>LdCRw_oL5J|pUtgX@?Mf*;-%`AX2uk@w5kZj6vQE}r(V`;W`D>Ac<*^c0xMy@* z7h1J33Mq$M#!|#TB381+;hfP1FSgj=pecy-5)T_3j;R;JAx|3dY+5KDNWI| zs+Z$O2f9^lYCuu712jQPn1s0}nvTSJqJ74E_F_ZP#FB}?H{yF)jsJ5mk)qL;`p+!H;p!*7RBi3dI@3Yh1!Ul3q)wFmyR--2rE z;cs3EJ}I_9_(?Nd^15_U(ielBCA*QhjJToBSI*gUC1!Zh?Lf{6GBR&GSF-Bg81}%Z zHz-EQC^`EnDn{V*Vy||Y!i+vcI*`%US}dnzM7< zKv$q*UfB-!0}>n$m?06cz_8!>mBzYIZhzY zD`Wu+##(6bezSRDrI4 z2)7t(FY-o&KZt_M|K`El{uR^y6%+E5e`VIca>}_X>s*x+YIJL6g&H8C)mo#W2EGUd zHh*R+ylwJMo4j{@6}NrW)4uA7wkcm-)>k)Kmi4W^>kD3P7>{0VnkdL3t98m(JFC}9 zOMWjPY+z+xU22nU5`5U(G~% z%2&V0QM77UwXU^sb9DLdw31a5d-P*DCWBE#>>-z5%syJC}%rAAn% z>W-%peX4jYk;J@Ewb%$~3N)29`V+{v!s^OzXg<*KWB0o@4~*10>}|rR=19X~%(Iii zN%A$Qt15!}rBjCQbCM2jZ1lp12kfx2Y8e^J9Ikp>qp=CFV{H(O%R9G54OoUBVcj(H z#g1oMo^IdG+a9*M-e`B6Cp4A0hjW@()0}1y?;gC5H9bi123ig`mb=~iQHY*o zaEie&gAw@U@-xG>M;(-QFfvbb)-LmX@E98{sstUQbs?yF-Wn;3LfAofF#59$b~4z- zAjx39095^8LRNZIu_vDB?!lf4zpmc5as!iL;3HTFS&Uh}5Q<-4bD`;c(|GZeb9vUe zJSS`*y5KBFNIoGO*BEey0M^c+epYx=3TD1|;%8*9QLuV$Tl~`&|J^{=0^2aztU;^_YY?l#>iP3*H$lTWCtESU zZl^uwy|FHE{e{A<_hatYxh5j(;|2B!D42aPpT!B>U$whl}Ivy zmBw;0EI#msv5kxzq0zyILHnq+QvW`3?q`0}S}1xqbIc79lMo=Cp*6+%_T* z^N7TLcZ3xmf9bzw(fmK1!mH6{`!ZtB3G;9mei3b|t0UM{=b@jNNJUPVhb66qU_C9s T!_aoL-63oyq%g;kztukgpb=#> diff --git a/src/var/lib/tyto/program/domain.py b/src/var/lib/tyto/program/domain.py index ba17c42..25b3f6b 100644 --- a/src/var/lib/tyto/program/domain.py +++ b/src/var/lib/tyto/program/domain.py @@ -314,7 +314,7 @@ def cf_update_values(write): except: article_code = cf_set("WEBSITE", "article_code", "yes") try: static = cf.getboolean("WEBSITE", "static") except: static = cf_set("WEBSITE", "static", "no") - + # [WEBSITE_MODULES] # ================= @@ -625,6 +625,7 @@ css = tyto separator = | article_code = yes static = no +navbar = yes [WEBSITE_MODULES] navbar = yes diff --git a/src/var/lib/tyto/program/tyto.py b/src/var/lib/tyto/program/tyto.py index 603fe75..9802265 100644 --- a/src/var/lib/tyto/program/tyto.py +++ b/src/var/lib/tyto/program/tyto.py @@ -116,3 +116,60 @@ quote = """
%s %s
""" +page_tpl = """ + + + +%s + + +
+ +%s + +%s + + +
+
+
+

%s

+
+%s +
+%s +
+
+%s +
+ +
+ +""" + +module_header = """ +