modif des marges hautes et basses des encarts

README.md

@@ -68,6 +68,7 @@ saut de ligne dans texte libre (à la fin de chaque ligne) : `<br>`
 
 `[imgsmall]`
 `[imgsmall_bottom]`
+`[imgsmallsmall]`
 ![imgsmall](screenshots/smallimg.png)
 
 `[fullpage2imgs]`

php/php.ini

@@ -691,7 +691,7 @@ auto_globals_jit = On
 ; Its value may be 0 to disable the limit. It is ignored if POST data reading
 ; is disabled through enable_post_data_reading.
 ; http://php.net/post-max-size
-post_max_size = 8M
+post_max_size = 4G
 
 ; Automatically add files before PHP document.
 ; http://php.net/auto-prepend-file

user/config/plugins/automagic-images.yaml

@@ -1,4 +1,4 @@
-enabled: true
+enabled: false
 adapter: imagick
 remove_original: false
 sizes:

user/data/feed/3a6d0284e743dc4a9b86f97d6dd1a3bf.yaml

@@ -1,4 +1,4 @@
-last_checked: 1690412093
+last_checked: 1690504495
 data:
   -
     title: 'macOS 13.0 Ventura Apache Setup: Upgrading Homebrew'

user/data/notifications/3a6d0284e743dc4a9b86f97d6dd1a3bf.yaml

@@ -1,4 +1,4 @@
-last_checked: 1690412089
+last_checked: 1690504263
 data:
   feed:
     -

user/themes/carnet-atterrissage/css/mep_carnet.css

@@ -112,15 +112,20 @@
   top: 110mm;
 }
 
+.pagedjs_first_page .free p {
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
 .last-page {
-  background-image: url(../assets/bruit_couv.png), linear-gradient(to left, 
+/*   background-image: url(../assets/bruit_couv.png), linear-gradient(to left, 
   #95a358 0%, 
   #9ca151 14%, 
   #a59d4a 28%, 
   #af9944 42%, 
   #b8963d 57%, 
   #c19238 71%, 
-  #cb8e31 85%);
+  #cb8e31 85%); */
   display: flex;
   justify-content: center;
   align-items: center;
@@ -162,7 +167,7 @@ a {
 h2 {
   font-family: 'Ortica';
   font-weight: lighter;
-  padding: 0 10%;
+  padding: 0 8%;
   font-size: 24pt;
   break-before: left;
   color: white;
@@ -203,7 +208,7 @@ h3 {
   font-size: 28pt;
   line-height: 1.3;
   margin: 0;
-  width: 50%;
+  width: 60%;
 }
 
 h3 .gros-chiffre {
@@ -265,7 +270,11 @@ h4 {
   line-height: 12pt;
   font-size: 9pt;
   text-align: justify;
-  hyphens: auto;
+  hyphens: none;
+}
+
+.labeur {
+  text-align: left;
 }
 
 .free, .free_left {
@@ -278,18 +287,26 @@ h4 {
 }
 
 .citation {
-  padding-left: calc(var(--pagedjs-pagebox-width) / var(--cols) + 8mm);
-  text-align: left;
+  padding-left: calc(var(--pagedjs-pagebox-width) / var(--cols) + 6.5mm);
+  text-align: justify;
+  padding-right: 16mm;
+  hyphens: auto;
+  font-style: italic;
 }
 
-.citation::before {
-  content: '“';
+.citation .guillement_ouvrant {
   position: absolute;
   font-size: 58pt;
   margin-left: -15mm;
   margin-top: 5mm;
 }
 
+.citation .guillement_fermant {
+  position: absolute;
+  font-size: 58pt;
+  right: 3mm;
+}
+
 .citation ul {
   padding: 0;
 }
@@ -310,7 +327,7 @@ h4 {
 
 .labeur ul {
   list-style: none;
-  padding-left: 3mm;
+  padding-left: 6mm;
 }
 
 .pilote {
@@ -326,10 +343,10 @@ h4 {
 .latour_nohead, .lampe_nohead {
   font-family: 'Novel';
   font-weight: normal;
-  margin-top: 0mm !important;
+  margin-top: 5mm !important;
   margin-left: calc(var(--pagedjs-pagebox-width) / var(--cols));
   margin-right: -16mm;
-  margin-bottom: 0mm !important;
+  margin-bottom: 5mm;
   line-height: 12pt;
   font-size: 8pt;
   padding-right: 23mm;
@@ -341,6 +358,15 @@ h4 {
   max-height: 198mm;
 }
 
+.pagedjs_page_content section div div div div:first-child:is(.latour),
+.pagedjs_page_content section div div div div:nth-child(2):is(.latour[data-split-from]) {
+  margin-top: 0mm !important;
+}
+
+.pagedjs_page_content section div div div div:last-child:is(.latour) {
+  margin-bottom: 0mm !important;
+}
+
 .latour p:last-of-type,
 .lampe p:last-of-type,
 .latour_nohead p:last-of-type,
@@ -390,6 +416,12 @@ h4 {
   line-height: 12pt;
   font-size: 9pt;
   font-weight: bold;
+  z-index: 1;
+  position: relative;
+}
+
+.bibliographie a {
+  word-break: break-all;
 }
 
 img {
@@ -401,6 +433,10 @@ img {
   padding-left: calc(var(--pagedjs-pagebox-width) / var(--cols));
 }
 
+.imgsmallsmall {
+  padding-left: calc((var(--pagedjs-pagebox-width) / var(--cols)) + 10mm);
+}
+
 .imgsmall_bottom {
   break-after: page;
 }

user/themes/carnet-atterrissage/js/layout.js

@@ -57,7 +57,10 @@ class setMarginTexts extends Paged.Handler {
             let vignetteSize = bottomVignette.getBoundingClientRect().height;
             if (bottomVignette.previousElementSibling) {
                 let textBottom = bottomVignette.previousElementSibling.getBoundingClientRect().bottom;
-                if (bottomVignette.previousElementSibling.classList.contains('labeur')) {
+                if (bottomVignette.previousElementSibling.classList.contains('labeur') ||
+                bottomVignette.previousElementSibling.classList.contains('citation') ||
+                bottomVignette.previousElementSibling.classList.contains('free') ||
+                bottomVignette.previousElementSibling.classList.contains('temps')) {
                     bottomVignette.style.marginTop = `${(pageBottom - textBottom) - vignetteSize}px`;
                 }
                 bottomVignette.style.transform = 'translateY(12px)';
@@ -132,12 +135,13 @@ class setMarginTexts extends Paged.Handler {
         // encarts
         let encarts = document.querySelectorAll('.latour, .lampe, .latour_nohead, .lampe_nohead');
         for (let encart of encarts) {
-            if (encart.previousElementSibling != null) {
+/*             if (encart.previousElementSibling != null) {
                 encart.style.marginTop = '10mm';
             }
             if (encart.nextElementSibling != null) {
                 encart.style.marginBottom = '10mm';
             }
+ */
 
             if (encart.hasAttribute('data-split-to')) {
                 let plainColor = document.createElement('div');
@@ -153,6 +157,7 @@ class setMarginTexts extends Paged.Handler {
             }
 
             if (encart.hasAttribute('data-split-from')) {
+                encart.style.marginTop = "0mm";
                 let plainColor = document.createElement('div');
                 plainColor.setAttribute('class', 'encart-split');
                 if (encart.closest('.pagedjs_page').classList.contains('pagedjs_right_page')) {
@@ -169,7 +174,7 @@ class setMarginTexts extends Paged.Handler {
         // TITRES ATELIERS
         let h3s = document.querySelectorAll('h3');
         for (let h3 of h3s) {
-            if (h3.nextSibling?.firstChild.tagName === "IMG") {
+            if (h3.nextSibling?.firstChild?.tagName === "IMG") {
                 let coverPhoto;
                 let photoContainer = h3.nextElementSibling;
                 if (h3.nextSibling?.children.length === 2) {
@@ -327,6 +332,23 @@ class setMarginTexts extends Paged.Handler {
             '#cb8e31'
         ]
 
+        let sprays = [
+            '/user/themes/carnet-atterrissage/assets/sprays/spary_couleurs-page001.png',
+            '/user/themes/carnet-atterrissage/assets/sprays/spary_couleurs-page002.png',
+            '/user/themes/carnet-atterrissage/assets/sprays/spary_couleurs-page003.png',
+            '/user/themes/carnet-atterrissage/assets/sprays/spary_couleurs-page004.png',
+            '/user/themes/carnet-atterrissage/assets/sprays/spary_couleurs-page005.png',
+            '/user/themes/carnet-atterrissage/assets/sprays/spary_couleurs-page006.png',
+            '/user/themes/carnet-atterrissage/assets/sprays/spary_couleurs-page007.png',
+            '/user/themes/carnet-atterrissage/assets/sprays/spary_couleurs-page008.png',
+            '/user/themes/carnet-atterrissage/assets/sprays/spary_couleurs-page009.png',
+            '/user/themes/carnet-atterrissage/assets/sprays/spary_couleurs-page010.png',
+            '/user/themes/carnet-atterrissage/assets/sprays/spary_couleurs-page011.png',
+            '/user/themes/carnet-atterrissage/assets/sprays/spary_couleurs-page012.png',
+            '/user/themes/carnet-atterrissage/assets/sprays/spary_couleurs-page013.png',
+            '/user/themes/carnet-atterrissage/assets/sprays/spary_couleurs-page014.png'
+        ]
+
         // set all colors
         let allPages = document.querySelectorAll('.pagedjs_page');
         let atelierColor = '';
@@ -347,6 +369,27 @@ class setMarginTexts extends Paged.Handler {
             if (pageCounter) {
                 pageCounter.style.color = atelierColor;
             }
+            let citations = page.querySelectorAll('.citation');
+            for (let citation of citations) {
+                // dessiner et colorer les guillemets
+                if (citation.innerText.charAt(0) === '“') {
+                    citation.innerText = citation.innerText.substring(1);
+                }
+                if (citation.innerText.charAt(citation.innerText.length - 1) === '”') {
+                    citation.innerText = citation.innerText.substring(0, citation.innerText.length - 1);
+                }
+                let guillemetOuvrant = document.createElement('div');
+                guillemetOuvrant.innerText = '“';
+                guillemetOuvrant.style.color = atelierColor;
+                guillemetOuvrant.classList.add('guillement_ouvrant');
+                citation.prepend(guillemetOuvrant);
+
+                let guillemetFermant = document.createElement('div');
+                guillemetFermant.innerText = '”';
+                guillemetFermant.style.color = atelierColor;
+                guillemetFermant.classList.add('guillement_fermant');
+                citation.append(guillemetFermant);                
+            }
             let atelierTitle = page.querySelector('h3');
             if (atelierTitle) {
                 atelierTitle.style.color = atelierColor;
@@ -358,24 +401,33 @@ class setMarginTexts extends Paged.Handler {
                 let bibliographiePage = bibliographie.parentElement.parentElement.parentElement.parentElement.parentElement.parentElement.parentElement.parentElement.parentElement.parentElement;
                 bibliographiePage.style.backgroundColor = bgColor;
                 let nextPage = bibliographiePage.parentElement?.nextElementSibling?.firstElementChild;
-                if (nextPage) {
-                    nextPage.style.backgroundColor = bgColor;
+                if (!bibliographie.closest('.pagedjs_page').previousElementSibling.querySelector('.bibliographie')) {
+                    if (nextPage) {
+                        nextPage.style.backgroundColor = bgColor;
+                    }
+                    let sprayImg = document.createElement('img');
+                    sprayImg.setAttribute('src', sprays[atelierIndex]);
+                    sprayImg.style.height = "242mm";
+                    sprayImg.style.width = "60mm";
+                    sprayImg.style.position = "absolute";
+                    sprayImg.style.top = "-22mm";
+                    sprayImg.style.right = "-20mm";
+                    sprayImg.style.mixBlendMode = "multiply";
+                    bibliographiePage.parentElement.nextElementSibling?.querySelector('.bibliographie').insertAdjacentElement("afterend", sprayImg);
                 }
-                let sprayImg = document.createElement('img');
-                sprayImg.setAttribute('src', '/user/themes/carnet-atterrissage/assets/sprays/spary_couleurs-page001.png');
-                sprayImg.style.height = "242mm";
-                sprayImg.style.width = "60mm";
-                sprayImg.style.position = "absolute";
-                sprayImg.style.top = "-22mm";
-                sprayImg.style.right = "-20mm";
-                sprayImg.style.mixBlendMode = "multiply";
-                bibliographiePage.parentElement.nextElementSibling?.querySelector('.pagedjs_page_content').prepend(sprayImg);
 
             }
             let h4 = page.querySelector('h4');
             if (h4 && h4?.nextElementSibling?.classList.contains('bibliographie')) {
                 h4.style.color = atelierColor;
             }
+            let serpentins = document.querySelectorAll('img[alt="serpentin"]');
+            for (let serpentin of serpentins) {
+                let page = serpentin.closest('.pagedjs_page');
+                let nextPage = page.nextElementSibling;
+                page.style.backgroundColor = "rgb(245, 245, 245)";
+                nextPage.style.backgroundColor = "rgb(245, 245, 245)";
+            }
             let links = page.querySelectorAll('a');
             for (let link of links) {
                 link.style.color = atelierColor;

user/themes/carnet-atterrissage/js/parsing.js

@@ -14,6 +14,7 @@ let baliseWords = [
     'lampe_nohead',
     'bibliographie',
     'imgsmall',
+    'imgsmallsmall',
     'imgsmall_bottom',
     'fullpage2imgs',
     'fullpageimage',
@@ -60,7 +61,7 @@ for(let i = 0; i < moments.length; i++) {
 
 // cleaner le balisage des éléments contenant plusieurs paragraphes
 let contentToParse = [];
-let labeurs = document.querySelectorAll('.labeur');
+let labeurs = document.querySelectorAll('.labeur, .free');
 for(let labeur of labeurs) {
     contentToParse.push(labeur);
 }
@@ -68,7 +69,17 @@ for(let labeur of labeurs) {
 // créer header icons pour encarts 
 let encarts = document.querySelectorAll('.latour, .latour_nohead, .lampe, .lampe_nohead');
 for(let encart of encarts) {
-  contentToParse.push(encart);
+  
+  encart.innerHTML = encart.innerHTML.replaceAll(' :', '&nbsp;:');
+  encart.innerHTML = encart.innerHTML.replaceAll(' ?', '&nbsp;?');
+  encart.innerHTML = encart.innerHTML.replaceAll(' !', '&nbsp;!');
+  encart.innerHTML = encart.innerHTML.replaceAll('« ', '«&nbsp;');
+  encart.innerHTML = encart.innerHTML.replaceAll(' »', '&nbsp;»');
+  encart.innerHTML = encart.innerHTML.replaceAll('(« ', '(«&nbsp;');
+  encart.innerHTML = encart.innerHTML.replaceAll(' »)', '&nbsp;»)');
+  encart.innerHTML = encart.innerHTML.replaceAll('“', '«&nbsp;');
+  encart.innerHTML = encart.innerHTML.replaceAll('”', '&nbsp;»');
+  encart.innerHTML = encart.innerHTML.replaceAll(' min', '&nbsp;min');
 
   let headContent = encart.firstChild
   let headerEl = document.createElement('div');
@@ -100,6 +111,21 @@ for(let encart of encarts) {
   if (encart.querySelector('.encart-header').nextElementSibling == null) {
     encart.querySelector('.encart-header').style.marginBottom = '0';
   }
+
+/*   console.log(encart.nextElementSibling);
+  if (encart.nextElementSibling?.classList.contains('moment')) {
+    console.log('BAAAAAAAAH');
+    encart.style.color = 'red';
+  }
+ */}
+
+// clean bibliographie
+let bibliographies = document.querySelectorAll('.bibliographie');
+for (let bibliographie of bibliographies) {
+  contentToParse.push(bibliographie);
+  if (bibliographie.nextElementSibling.innerText === "") {
+    bibliographie.nextElementSibling.remove();
+  }
 }
 
 for(let i = 0; i < contentToParse.length; i++) {
@@ -113,15 +139,17 @@ for(let i = 0; i < contentToParse.length; i++) {
   for(j = 0; j < contentToParse[i].childNodes.length; j++) {
       let contentHTML = contentToParse[i].childNodes[j].innerHTML;
       if (contentHTML != undefined) {
-          contentToParse[i].childNodes[j].innerHTML = contentToParse[i].childNodes[j].innerHTML.replaceAll(' :', '&nbsp;:');
-          contentToParse[i].childNodes[j].innerHTML = contentToParse[i].childNodes[j].innerHTML.replaceAll(' ?', '&nbsp;?');
-          contentToParse[i].childNodes[j].innerHTML = contentToParse[i].childNodes[j].innerHTML.replaceAll(' !', '&nbsp;!');
-          contentToParse[i].childNodes[j].innerHTML = contentToParse[i].childNodes[j].innerHTML.replaceAll('« ', '«&nbsp;');
-          contentToParse[i].childNodes[j].innerHTML = contentToParse[i].childNodes[j].innerHTML.replaceAll(' »', '&nbsp;»');
-          contentToParse[i].childNodes[j].innerHTML = contentToParse[i].childNodes[j].innerHTML.replaceAll('“', '«&nbsp;');
-          contentToParse[i].childNodes[j].innerHTML = contentToParse[i].childNodes[j].innerHTML.replaceAll('”', '&nbsp;»');
-          contentToParse[i].childNodes[j].innerHTML = contentToParse[i].childNodes[j].innerHTML.replaceAll(' min', '&nbsp;min');
-      }
+        contentToParse[i].childNodes[j].innerHTML = contentToParse[i].childNodes[j].innerHTML.replaceAll(' :', '&nbsp;:');
+        contentToParse[i].childNodes[j].innerHTML = contentToParse[i].childNodes[j].innerHTML.replaceAll(' ?', '&nbsp;?');
+        contentToParse[i].childNodes[j].innerHTML = contentToParse[i].childNodes[j].innerHTML.replaceAll(' !', '&nbsp;!');
+        contentToParse[i].childNodes[j].innerHTML = contentToParse[i].childNodes[j].innerHTML.replaceAll('« ', '«&nbsp;');
+        contentToParse[i].childNodes[j].innerHTML = contentToParse[i].childNodes[j].innerHTML.replaceAll(' »', '&nbsp;»');
+        contentToParse[i].childNodes[j].innerHTML = contentToParse[i].childNodes[j].innerHTML.replaceAll('(« ', '(«&nbsp;');
+        contentToParse[i].childNodes[j].innerHTML = contentToParse[i].childNodes[j].innerHTML.replaceAll(' »)', '&nbsp;»)');
+        contentToParse[i].childNodes[j].innerHTML = contentToParse[i].childNodes[j].innerHTML.replaceAll('“', '«&nbsp;');
+        contentToParse[i].childNodes[j].innerHTML = contentToParse[i].childNodes[j].innerHTML.replaceAll('”', '&nbsp;»');
+        contentToParse[i].childNodes[j].innerHTML = contentToParse[i].childNodes[j].innerHTML.replaceAll(' min', '&nbsp;min');
+    }
   }
 
   // data align last split
@@ -152,6 +180,7 @@ for (let h3 of h3s) {
           return `<div class="gros-chiffre">${match}</div>`;
         });
     }
+    h3.innerHTML = h3.innerHTML.replace(/ \«/g, '<br>«');
 }
 
 let dessinsPreH3 = document.querySelectorAll('h3 + p img');
@@ -159,3 +188,13 @@ for (let dessin of dessinsPreH3) {
   dessin.style.width = '0px';
   dessin.style.height = '0px';
 }
+
+// pour les serpentins
+let h4s = document.querySelectorAll('h4');
+for (let h4 of h4s) {
+  if (h4.innerText === "Serpentin") {
+    let serpentin = h4.nextElementSibling.nextElementSibling;
+    serpentin.nextElementSibling.remove();
+    h4.remove();
+  }
+}