From 5b8b8540533373ca4abb9c6067f7cf2dabdbae7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabrice=20PENHO=C3=8BT?= Date: Wed, 8 Nov 2023 17:22:01 +0100 Subject: [PATCH] =?UTF-8?q?Debug=20probl=C3=A8me=20layout=20pug=20quand=20?= =?UTF-8?q?aucune=20illustration=20n'est=20fournie?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- views/wikilerni/home.pug | 1 + .../includes/listing-questionnaires.pug | 17 ++++++---- views/wikilerni/layout.pug | 32 +++++++++---------- views/wikilerni/newQuestionnaires.pug | 2 -- 4 files changed, 28 insertions(+), 24 deletions(-) diff --git a/views/wikilerni/home.pug b/views/wikilerni/home.pug index 8650c45..1e4fec9 100644 --- a/views/wikilerni/home.pug +++ b/views/wikilerni/home.pug @@ -2,6 +2,7 @@ extends layout.pug block append scripts script(src="/JS/polyfill.app.js" defer) + block content div(id="home" class="cardboard") p diff --git a/views/wikilerni/includes/listing-questionnaires.pug b/views/wikilerni/includes/listing-questionnaires.pug index 0c7450c..552a377 100644 --- a/views/wikilerni/includes/listing-questionnaires.pug +++ b/views/wikilerni/includes/listing-questionnaires.pug @@ -19,7 +19,6 @@ div(id="triple-column") } let rotation=0, lastCar; col=1; - for colQuestionaires in questionnaires_col div(class="column-"+col) for questionnaire in colQuestionaires @@ -29,10 +28,16 @@ div(id="triple-column") if(lastCar > 4) rotation*=-1; let imgAttributes = { alt: txtIllustration.defaultAlt }; - if(tool.isEmpty(questionnaire.Illustrations[0].alt)===false) - imgAttributes.alt=questionnaire.Illustrations[0].alt; - if(tool.isEmpty(questionnaire.Illustrations[0].title)===false) - imgAttributes.title=questionnaire.Illustrations[0].title; + if(tool.isEmpty(questionnaire.Illustrations[0].alt !==undefined)) + { + if(tool.isEmpty(questionnaire.Illustrations[0].alt)===false) + imgAttributes.alt=questionnaire.Illustrations[0].alt; + } + if(tool.isEmpty(questionnaire.Illustrations[0].title !==undefined)) + { + if(tool.isEmpty(questionnaire.Illustrations[0].title)===false) + imgAttributes.title=questionnaire.Illustrations[0].title; + } let introduction=tool.shortenIfLongerThan(striptags(questionnaire.Questionnaire.introduction.replace("
", " ").replace("

", " ")), 200); div(class="quiz cardboard" style="transform: rotate("+rotation+"deg);") @@ -44,4 +49,4 @@ div(id="triple-column") p#intro #{introduction} p a(href="/quiz/"+questionnaire.Questionnaire.slug+".html" class="button cardboard") #{txtGeneral.btnLinkToQuestionnaire} - - col++; \ No newline at end of file + - col++; \ No newline at end of file diff --git a/views/wikilerni/layout.pug b/views/wikilerni/layout.pug index d1d44ee..4382b03 100644 --- a/views/wikilerni/layout.pug +++ b/views/wikilerni/layout.pug @@ -24,19 +24,19 @@ html(lang=(pageLang) ? pageLang : config.adminLang) link(rel="alternate" type="application/atom+xml" title=config.siteName href="/atom.xml") if(linkCanonical) link(rel="canonical" href=linkCanonical) - body(class="cardboard") - header(class="cardboard") - a(href="/" title=configTpl.homePageTxt) - img(src="/themes/wikilerni/img/wikilerni-purple-2-128.png" alt=config.siteName+" (logo)") - ul(id="headLinks") - - const nbItemHead=configTpl.headLinks.length; const lang=config.adminLang+""; - for item in configTpl.headLinks - li - a(href="/"+item.url)&attributes(item.attributes) #{item.anchor} - block content - - const nbItemFoot = configTpl.footLinks.length; - footer(class="cardboard") - ul(id="footLinks") - for item in configTpl.footLinks - li - a()&attributes(item.attributes) #{item.anchor} \ No newline at end of file + body(class="cardboard") + header(class="cardboard") + a(href="/" title=configTpl.homePageTxt) + img(src="/themes/wikilerni/img/wikilerni-purple-2-128.png" alt=config.siteName+" (logo)") + ul(id="headLinks") + - const nbItemHead=configTpl.headLinks.length; const lang=config.adminLang+""; + for item in configTpl.headLinks + li + a(href="/"+item.url)&attributes(item.attributes) #{item.anchor} + block content + - const nbItemFoot = configTpl.footLinks.length; + footer(class="cardboard") + ul(id="footLinks") + for item in configTpl.footLinks + li + a()&attributes(item.attributes) #{item.anchor} \ No newline at end of file diff --git a/views/wikilerni/newQuestionnaires.pug b/views/wikilerni/newQuestionnaires.pug index 33bb088..7a579f2 100644 --- a/views/wikilerni/newQuestionnaires.pug +++ b/views/wikilerni/newQuestionnaires.pug @@ -8,7 +8,5 @@ block content img(id="logo" src="/themes/wikilerni/img/wikilerni-purple-2-512.png" alt="Logo WikiLerni") h2(class="cardboard") #{config.siteName+" - "+configTpl.siteSlogan} div#listsIntro !{configTpl.newsListTitle} - // p - // a(href="/"+configTpl.subscribePage class="button cardboard" title=configTpl.homeBtnSubscribeTxt) #{configTpl.homeBtnSubscribeTxt} - nbQuestionnairesList=configTpl.maxQuestionnairesByPage; include includes/listing-questionnaires.pug \ No newline at end of file