From 00af4704c84c6731a945a848deea58e5446108ef Mon Sep 17 00:00:00 2001 From: TheoLechemia Date: Mon, 2 Aug 2021 11:08:30 +0200 Subject: [PATCH 01/26] ftpclient : add missing import --- geopaysagesftpclient/geopaysagesftpclient/db.py | 2 +- geopaysagesftpclient/geopaysagesftpclient/images.py | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/geopaysagesftpclient/geopaysagesftpclient/db.py b/geopaysagesftpclient/geopaysagesftpclient/db.py index 091d8e27..5b45f06f 100644 --- a/geopaysagesftpclient/geopaysagesftpclient/db.py +++ b/geopaysagesftpclient/geopaysagesftpclient/db.py @@ -1,7 +1,7 @@ from sqlalchemy import engine_from_config, text from sqlalchemy.engine import Engine from configparser import ConfigParser - +from geopaysagesftpclient import printfailure from geopaysagesftpclient.patterns import date_from_group_dict def sqlalchemy_engine_from_config(configfile:str) -> Engine: diff --git a/geopaysagesftpclient/geopaysagesftpclient/images.py b/geopaysagesftpclient/geopaysagesftpclient/images.py index 35cf1a46..70716b6b 100644 --- a/geopaysagesftpclient/geopaysagesftpclient/images.py +++ b/geopaysagesftpclient/geopaysagesftpclient/images.py @@ -1,5 +1,8 @@ from iptcinfo3 import IPTCInfo, c_datasets from PIL import Image, ImageFile + +from geopaysagesftpclient import printfailure + ImageFile.LOAD_TRUNCATED_IMAGES = True def retrieve_copyright_notice(fn:str) -> dict: From 4f4262b7405d25dab6b3e861e970825ab84ab87e Mon Sep 17 00:00:00 2001 From: TheoLechemia Date: Mon, 2 Aug 2021 11:09:18 +0200 Subject: [PATCH 02/26] add favicon in public page --- .gitignore | 1 + backend/static/custom/logo/favicon.ico.sample | Bin 0 -> 4286 bytes backend/tpl/layout.html | 2 ++ install_app.sh | 1 + 4 files changed, 4 insertions(+) create mode 100644 backend/static/custom/logo/favicon.ico.sample diff --git a/.gitignore b/.gitignore index 276e072a..8a32253f 100755 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ backend/static/custom/css/custom-style.css backend/static/custom/css/page-style.css backend/static/custom/logo/logo_txt_blanc.png backend/static/custom/logo/logo_txt_color.png +backend/static/custom/logo/favicon.ico messages.pot messages.po diff --git a/backend/static/custom/logo/favicon.ico.sample b/backend/static/custom/logo/favicon.ico.sample new file mode 100644 index 0000000000000000000000000000000000000000..075ed6c8238134817c71c218b9aca0d10c7eef40 GIT binary patch literal 4286 zcmc&&c~n+)8vbyZw5ib)%zZ=CsmUd6Y{og}*fKVbT8`#4Wm?wh=;^4PYO=B{$C6D1 zWC=wC6%;}iLlG4OWED|BWK-FZRdzmho_U`aKc)I3rx{N_&;9PbAHVOu+w(l{do>u$ z!SP`Eu}kUGg`}X+1~J7X}0FW_5R?zN82xNwJ98@fmKU zB%&2=lJ)rHRXHmzS%MHwp6FCx}zD}vu# z4j-{^JN#F$8e)Lmr~%mX`^jSGe!X{`Gz7LI24Kfv1FU-aWG{Xme|HTk1S70Pd0GmR zcH8K6FSB~tT33rCXImsXTA{1612ux9n6EyC>-4d3e{vEWCq0DSQ-^8Z?Z?~?hlzvr ze%FNGs1LNOwXo=;_ii)Cr!t^%?2!`0Q%fzk^J64MmLP<=@u z5}mBzI&F+R%S>~+cg`b7bl8EM&gr&r009nvIH#ROHJ3>YPllX3R0|kT3h^&p^Pde?z*@K4b;^=`&d4 z?#|91`B7JxhwKo45O-l4*GkMI5%K9p6hxiIdDorF1OBL^#i%xnHPvd57@^&EV>665 ztB@CQ65mPA9VZWgwYiyM!gtAh^(So8Tesq<1Nqh6iwpEA!>@n{>EPKh54x>@|O&?hwVyLP7hSulmiD1G0YQfNG zI0#00PVv|+^-b32_SOVGv$?Wda@&H|hI-{H`NAAiSE;?k5aTTu-A!_~!3oLHsei3U z;Hnn|}IbxVh*qP zA4JWyobO?T{3Oo2pP426A1K_j!0ss)u(s$cy3ilaza4?JLmp@>E7d%ie%vVeATMl( z_e1a-%Qa8L8tczK!Rv@En}p|MR9ACCk4j#f(cVj=xF^o`OX1T@sb_yUJz|ca)yu%W z@jJI8bp0yP!v~aaIo}0Hz6uqm^ntbZTk$+>EX=U~>FKHmakkq~m33KbNPVZiIZZZ4 z)R!NjzPQlj`t37y{lN2cU^ntUIEwC2kIAQsj5NjF*)Kjs;Odv)He)QJzxqV$$394$ z5;u{bzpogu5p8mqFi5#gZSU%6NAfog@RGRr4A!>y;_r<&t3?|;6hB@Ip3wf29rCTz zutf2}JQc>C6`eT)@8_OG_y_BhpUf?FjXlVJ#a}?3v^MY2?!Z+`Q4|-YIAnf8*T0V9 z#B+*2;>M&8#5gsEnjP@UBH_<;twXKUqe<~<)H*hnm!YmGU-g!K`1+|(jg7HT)A!7_ z)cCC)GGO1_M{!PO2=$G$-RSPO>TW{#8D$3?eM`&f7GB}Q3m@|han+EAxB zWPF@ioF5wwzva(~UMvM?8TOF&=4PFh7~>@`H+?YBQ{l;)fWH+V;_H zU)c}XgSd~iV@!?ZrK-yre%{i%EoC<7FM2#gb%3#7mhV|xF6O83T%`6r&M2nYk#SH< z8Dqk(ui-v>5{|yMMEkzG;EA&+_p<(Z5n;NI^}3Ogq`ip(=CsW^rg%6bRbot# z{^dFEakxA-LT4fy(aE4Se^=YL4cx^=RaS=PhVusXl|A~{+yBtHj+pdcxe(zJ7ctHJ zaUSsyj_sW@MQ23fhV!YT=o{xp&D&krHEm%%ySrs(=<1mnI74y9+rBd6 z*^QDpRD7{E?*qFL_bE@wN6u&L5BX=qrB7c&OU+H?#!uPRzYDhboq-q8JE}~&*>9?7i+y$`!nY<_VNFAF?RMC_8ra^y2K~;t=!{5%Hz}ndlZ|d zcQfXyR^~TioISKU=L+cW&t2pw-}T5b(_%kh%zPKxHU2>)iQba`)I!?4XG>yNzRTRe z-o^QcJYX;6I~Lz@+8TTM#=Y=??@XoV + + {% if debug: %} diff --git a/install_app.sh b/install_app.sh index cc71bb45..a38b617c 100755 --- a/install_app.sh +++ b/install_app.sh @@ -26,6 +26,7 @@ cp backend/static/custom/css/page-style.css.sample backend/static/custom/css/pag cp backend/static/custom/css/page-sample.css.sample backend/static/custom/css/page-sample.css cp backend/static/custom/logo/logo_txt_blanc.png.sample backend/static/custom/logo/logo_txt_blanc.png cp backend/static/custom/logo/logo_txt_color.png.sample backend/static/custom/logo/logo_txt_color.png +cp backend/static/custom/logo/favicon.icon.sample backend/static/custom/logo/favicon.icon cp i18n/messages.pot.sample i18n/messages.pot cp i18n/fr/LC_MESSAGES/messages.mo.sample i18n/fr/LC_MESSAGES/messages.mo cp i18n/fr/LC_MESSAGES/messages.po.sample i18n/fr/LC_MESSAGES/messages.po From 253e003986b6563578f2599d913ef9eaa41fd3ef Mon Sep 17 00:00:00 2001 From: TheoLechemia Date: Mon, 2 Aug 2021 11:31:42 +0200 Subject: [PATCH 03/26] add css variable --- backend/static/css/comparator-v2.css | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/static/css/comparator-v2.css b/backend/static/css/comparator-v2.css index 72fb542b..4aabd644 100644 --- a/backend/static/css/comparator-v2.css +++ b/backend/static/css/comparator-v2.css @@ -45,7 +45,7 @@ } .page-site .app-comparator .mode-selector-label { - background: rgba(120, 190, 32, 0.8); + background: var(--color-secondary); color: #fff; padding: 6px 0 0 12px; } From 6204c8f45b65943a36188032abf2e8429e7a63f6 Mon Sep 17 00:00:00 2001 From: TheoLechemia Date: Mon, 2 Aug 2021 11:53:22 +0200 Subject: [PATCH 04/26] remove title from header --- backend/static/css/style.css | 11 ++++++++--- backend/tpl/layout.html | 8 ++++---- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/backend/static/css/style.css b/backend/static/css/style.css index c06a3819..43f5d2ef 100644 --- a/backend/static/css/style.css +++ b/backend/static/css/style.css @@ -444,13 +444,18 @@ h1 .light, h2 .light, h3 .light, h4 .light, h5 .light, h6 .light { /* HEADER */ -header h1 { + + +.header-title { text-transform: uppercase; - font-size: 1.5em; line-height: 20px; + } + +.header-title h1 { +font-size: 1.75em; } -header h3 { +header-title h3 { line-height: 20px; } diff --git a/backend/tpl/layout.html b/backend/tpl/layout.html index 5ee758f7..30821f85 100644 --- a/backend/tpl/layout.html +++ b/backend/tpl/layout.html @@ -65,11 +65,11 @@ -
{% block header_title %} - {% endblock %} -
- + +
{% block header_title %} + {% endblock %} +
{% block content %}{% endblock %}