monitoring-jekyll-theme 0.6.1 → 0.7.0

data/_includes/index/security.html

@@ -1,18 +1,23 @@
 {% if observatory %}
+
 <div class="progress progress-number flex">
   <div>
     <h4>Securite</h4>
   </div>
   <div>
-    {% assign score = 0 %}
-    {% for rules in observatory %}
-    {% for rule in rules %}
-    {% assign score = score | plus: rule.score_modifier  %}
-    {% endfor %}
-    {% endfor %}
+    {%- assign score = 0 -%}
+    {%- for rules in observatory -%}
+    {%- for rule in rules -%}
+    {%- assign name == rule.name -%}
+    {%- if name.size > 0 -%}
+    {%- assign scoremodifier = rule.score_modifier -%}
+    {%- assign score = score | plus: scoremodifier  -%}
+    {%- endif -%}
+    {%- endfor -%}
+    {%- endfor -%}
     <div class="progress-bar-element">
       <div>
-        <div class="progress-bar-tooltip" style="left: {% if score < -100 %}100{% else %}{{ score | times: -1  }}{% endif %}%;z-index:2">{{ website }}</div>
+        <div class="progress-bar-tooltip" style="left: {% if score < -100 %}100{% else %}{{ score | times: -1 }}{% endif %}%;z-index:2">{{ pages.name }}</div>
       </div>
       <div>
         <!-- <div class="progress-bar-score" style="transform: translate(50%,35%);color: rgba(34,150,30,1);">Good</div> -->

data/_includes/index/styles.html

@@ -6,16 +6,16 @@
     <div>
       <ul>
         <li>
-          <b>{{ lighthouse.audits.metrics.details.items[0].observedFirstMeaningfulPaint | times: 1.000 | divided_by: 1000 | round: 2 }} s</b><br>Debut affichage
+          <b>{{ lighthouse.audits.metrics.details.items[0].observedFirstMeaningfulPaint | times: 1.000 | divided_by: 1000 | round: 2 }}<small>s</small></b><br>Debut affichage
         </li>
         <li>
-          <b>{{ lighthouse.audits.metrics.details.items[0].observedLastVisualChange | times: 1.000 | divided_by: 1000 | round: 2 }} s</b><br>Fin affichage
+          <b>{{ lighthouse.audits.metrics.details.items[0].observedLastVisualChange | times: 1.000 | divided_by: 1000 | round: 2 }}<small>s</small></b><br>Fin affichage
         </li>
         <li>
-          <b>{{ lighthouse.audits.metrics.details.items[0].totalBlockingTime | times: 1.000 | divided_by: 1000 | round: 2 }} s</b><br>Temps de blocage
+          <b>{{ lighthouse.audits.metrics.details.items[0].totalBlockingTime | times: 1.000 | divided_by: 1000 | round: 2 }}<small>s</small></b><br>Temps de blocage
         </li>
         <li>
-          <b>{{ lighthouse.audits.metrics.details.items[0].observedLoad | times: 1.000 | divided_by: 1000 | round: 2 }} s</b><br>Charge
+          <b>{{ lighthouse.audits.metrics.details.items[0].observedLoad | times: 1.000 | divided_by: 1000 | round: 2 }}<small>s</small></b><br>Charge
         </li>
       </ul>
     </div>

data/_includes/keywords.html

@@ -1,11 +1,27 @@
 <h3>Position par mots clefs</h3>
 <div class="screamingfrog">
-{% for website in site.pagestested limit:1 %}
-{% assign whatsmyserp = site.data.[website].whatsmyserp[datelastcrawl] %}
-  <ul class="flex-list">
-  {% for value in whatsmyserp %}
-  <li><b>{{ value.keyword }}</b> {% if value.position %}<span>{{ value.position }}</span>{% endif %}</li>
-  {% endfor %}
-  </ul>
+{% for website in pagestested limit:1 %}
+  {% if whatsmyserp %}
+
+    {% if site.data %}
+    {% assign whatsmyserp = site.data.[website].whatsmyserp[datelastcrawl] | sort: 'position' %}
+    {% else %}
+    {% assign whatsmyserp = [website].whatsmyserp[datelastcrawl] | sort: 'position' %}
+    {% endif %}
+
+    <ul class="flex-list">
+    {% for value in whatsmyserp | sort: 'position' %}
+    {% if value.position %}
+    <li><a href="https://www.google.fr/search?&q={{ value.keyword | replace: ' ', '+'}}" target="_blank"><b>{{ value.keyword }}</b></a> <span>{{ value.position }}</span></li>
+    {% endif %}
+    {% endfor %}
+    {% for value in whatsmyserp | sort: 'position' %}
+    {% if !value.position %}
+    <li><a href="https://www.google.fr/search?&q={{ value.keyword | replace: ' ', '+'}}" target="_blank"><b>{{ value.keyword }}</b></a> <span>--</span></li>
+    {% endif %}
+    {% endfor %}
+    </ul>
+  {% endif %}
 {% endfor %}
 </div>
+

data/_includes/seo.html

@@ -1,9 +1,18 @@
-{% for website in site.pagestested limit: 1 %}
-{% assign gpagespeed = site.data.[website].gpagespeed[datelastcrawl] %}
+{% for website in pagestested limit: 1 %}
+
+{% if site.data %}
+{% assign gpagespeed = sites.data.[website].gpagespeed[datelastcrawl] %}
 {% assign seocli = site.data.[website].seocli[datelastcrawl] %}
 {% assign screamingfrog = site.data.[website].screamingfrog[datelastcrawl] %}
+{% else %}
+{% assign gpagespeed = [website].gpagespeed[datelastcrawl] %}
+{% assign seocli = [website].seocli[datelastcrawl] %}
+{% assign screamingfrog = [website].screamingfrog[datelastcrawl] %}
+{% endif %}
 
 {% assign urlBlocks = gpagespeed.formattedResults.ruleResults.MinimizeRenderBlockingResources.urlBlocks %}
+
+{% if screamingfrog %}
 {% assign liststatus = screamingfrog | sort: 'Status Code' | reverse %}
 {% assign listtitle = screamingfrog | sort: 'Title 1 Length' | reverse %}
 {% assign listmeta = screamingfrog | sort: 'Meta Description 1 Length' | reverse %}
@@ -14,6 +23,7 @@
 {% assign listsizeimage = screamingfrog | sort: 'Size (bytes)' | reverse %}
 {% assign listsizeimage = listsizeimage | where_exp: "item", "item.Content contains 'image'" %}
 {% assign listresponse = screamingfrog | sort: 'Response Time' | reverse %}
+{% endif %}
 
 {% assign status = "" | split: ',' %}
 {% assign title = "" | split: ',' %}
@@ -104,7 +114,7 @@
         {% assign value = topList.[Status Code] %}
         {% if value != "OK" %}<li><a href='{{ topList.Address }}'
             title='{{ topList.Address | replace: "https://www.leforestier-immobilier.com",""}}'>{{ topList.Address | replace: "https://www.leforestier-immobilier.com",""}}</a>
-          <span>{{ value | intcomma: '’' }}</span></li>{% endif %}
+          <span>{{ value }}</span></li>{% endif %}
         {% endfor %}
       </ol>
     </div>
@@ -118,7 +128,7 @@
         {% assign value = topList.["Title 1 Length"] | times: 1 %}
         {% if value > 65 %}<li><a href='{{ topList.Address }}'
             title='{{ topList.Address | replace: "https://www.leforestier-immobilier.com",""}}'>{{ topList.Address | replace: "https://www.leforestier-immobilier.com",""}}</a>
-          <span>{{ value | intcomma: '’' }} Characters</span></li>{% endif %}
+          <span>{{ value }} Characters</span></li>{% endif %}
         {% endfor %}
       </ol>
     </div>
@@ -132,7 +142,7 @@
         {% assign value = topList.["Meta Description 1 Length"] | times: 1 %}
         {% if value > 155 %}<li><a href='{{ topList.Address }}'
             title='{{ topList.Address | replace: "https://www.leforestier-immobilier.com",""}}'>{{ topList.Address | replace: "https://www.leforestier-immobilier.com",""}}</a>
-          <span>{{ value | intcomma: '’' }} Characters</span></li>{% endif %}
+          <span>{{ value }} Characters</span></li>{% endif %}
         {% endfor %}
       </ol>
     </div>
@@ -146,7 +156,7 @@
         {% assign value = topList.["H1-1 length"] | times: 1 %}
         {% if value > 70 %}<li><a href='{{ topList.Address }}'
             title='{{ topList.Address | replace: "https://www.leforestier-immobilier.com",""}}'>{{ topList.Address | replace: "https://www.leforestier-immobilier.com",""}}</a>
-          <span>{{ value | intcomma: '’' }} Characters</span></li>{% endif %}
+          <span>{{ value }} Characters</span></li>{% endif %}
         {% endfor %}
       </ol>
     </div>
@@ -162,7 +172,7 @@
         {% if content != "image/jpeg" and content != "image/png" and content != "image/gif" and topList.Indexability == "Indexable" %}{% if value > 220000 %}
         <li><a href='{{ topList.Address }}'
             title='{{ topList.Address | replace: "https://www.leforestier-immobilier.com",""}}'>{{ topList.Address | replace: "https://www.leforestier-immobilier.com",""}}</a>
-          <span>{{ value | filesize }}</span></li>{% endif %}{% endif %}
+          <span>{{ value}}</span></li>{% endif %}{% endif %}
         {% endfor %}
       </ol>
     </div>
@@ -179,7 +189,7 @@
         <li>
           <a href='{{ topList.Address }}'
             title='{{ topList.Address | replace: "https://www.leforestier-immobilier.com",""}}'>{{ topList.Address | replace: "https://www.leforestier-immobilier.com",""}}</a>
-          <span>{{ value | filesize }}</span></li>{% endif %}{% endif %}
+          <span>{{ value}}</span></li>{% endif %}{% endif %}
         {% endfor %}
       </ol>
     </div>

data/_includes/statistiques.html

@@ -11,7 +11,7 @@
   }
 </script>
 
-{% for website in site.pagestested limit: 1 %}
+{% for website in pagestested limit: 1 %}
 
   {% include value/loadingdata.html %}
 

data/_includes/styles.html

@@ -3,32 +3,42 @@
 
 <div class="table">
 {% for data in file %}
-{% assign stylestats = site.data.accueil.stylestats[data] %}
 
-{% if stylestats %}
-<div class="grid">
-  <div class="box date">
-    <span>Date</span>
-    <p>{{ data | date: "%d %b %y" }}</p>
-  </div>
-  {% for value in stylestats %}
-  {% if value[0] == "size" or value[0] == "rules" or value[0] == "declarations" or value[0] == "declarations" or value[0] == "selectors" or value[0] == "totalUniqueFontSizes" or value[0] == "totalUniqueFontFamilies" or value[0] == "importantKeywords" or value[0] == "simplicity" or value[0] == "averageOfIdentifier" %}
-  <div class="box score">
-    <span class="title">{{ value[0] }}</span>
-    <span class="number">{{ value[1] | round:3 }}</span> <br>
+  {% if site.data %}
+  {% assign stylestats = site.data.accueil.stylestats[data] %}
+  {% else %}
+  {% assign stylestats = accueil.stylestats[data] %}
+  {% endif %}
+
+  {% if stylestats %}
+  <div class="grid">
+    <div class="box date">
+      <span>Date</span>
+      <p>{{ data | date: "%d %b %y" }}</p>
+    </div>
+    {% for value in stylestats %}
+    {% if value[0] == "size" or value[0] == "rules" or value[0] == "declarations" or value[0] == "declarations" or value[0] == "selectors" or value[0] == "totalUniqueFontSizes" or value[0] == "totalUniqueFontFamilies" or value[0] == "importantKeywords" or value[0] == "simplicity" or value[0] == "averageOfIdentifier" %}
+    <div class="box score">
+      <span class="title">{{ value[0] }}</span>
+      <span class="number">{{ value[1] | round:3 }}</span> <br>
+    </div>
+    {% endif %}
+    {% endfor %}
   </div>
   {% endif %}
-  {% endfor %}
-</div>
-{% endif %}
 {% endfor %}
 </div>
 
 <h3>Couleurs</h3>
 <p>Liste des couleurs de la charte graphique. Supprimer les couleurs trop similaires ou non utilisées.</p>
 
+{% if site.data %}
 {% assign stylestats = site.data.accueil.stylestats[datelastcrawl] %}
 {% assign wallace = site.data.accueil.wallace[datelastcrawl] %}
+{% else %}
+{% assign stylestats = accueil.stylestats[datelastcrawl] %}
+{% assign wallace = accueil.wallace[datelastcrawl] %}
+{% endif %}
 
 {% assign totalcolor = "" %}
 {% for color in wallace["values.colors.unique"] %}

data/_includes/value/lastfiledate.html

@@ -1,11 +1,24 @@
 {% comment %}List all the date of files stocked{% endcomment %}
 {% assign files = "" | split: ',' %}
-{% for website in site.pagestested limit:1 %}
-{% for org_hash in site.data.[website].gpagespeed %}
+
+{% assign pagestested = site.data.config.pagestested %}
+
+{{ pagestested }}
+
+{% for website in pagestested limit:1 %}
+
+{% if site.data %}
+{% assign gpagespeed = site.data.[website].gpagespeed %}
+{% else %}
+{{ website }}
+{% endif %}
+
+{% for org_hash in gpagespeed %}
 {% assign files = files | push: org_hash[0] %}
 {% endfor %}
 {% endfor %}
 
+
 {% comment %}List the name of url tested{% endcomment %}
 {{ site.urltested[0] }}
 

data/_includes/value/loadingdata.html

@@ -1,10 +1,14 @@
-{% assign gpagespeed      = site.data.[website].gpagespeed[datelastcrawl] %}
-{% assign lighthouse      = site.data.[website].lighthouse[datelastcrawl] %}
-{% assign moz             = site.data.[website].moz[datelastcrawl]%}
-{% assign stylestats      = site.data.[website].stylestats[datelastcrawl] %}
-{% assign observatory     = site.data.[website].observatory[datelastcrawl] %}
-{% assign wallace         = site.data.[website].wallace[datelastcrawl] %}
-{% assign htmlvalidator   = site.data.[website].htmlvalidator[datelastcrawl] %}
+
+{% comment %}Assign variables{% endcomment %}
+{% assign gpagespeed      = site.data[websitetested][page].gpagespeed[datelastcrawl] %}
+{% assign lighthouse      = site.data[websitetested][page].lighthouse[datelastcrawl] %}
+{% assign moz             = site.data[websitetested][page].moz[datelastcrawl]%}
+{% assign stylestats      = site.data[websitetested][page].stylestats[datelastcrawl] %}
+{% assign observatory     = site.data[websitetested][page].observatory[datelastcrawl] %}
+{% assign wallace         = site.data[websitetested][page].wallace[datelastcrawl] %}
+{% assign htmlvalidator   = site.data[websitetested][page].htmlvalidator[datelastcrawl] %}
+{% assign greenweb        = site.data[websitetested][page].greenweb[datelastcrawl] %}
+{% assign pa11y           = site.data[websitetested][page].pa11y[datelastcrawl] %}
 
 {% comment %}Calcul du score moyen à partir des données httparchive{% endcomment %}
 {% assign domaverage = 600 | times: 3 %}{% assign httpaverage = 74 | times: 2 %}
@@ -31,8 +35,8 @@
 {% assign indexesname = "Accessibilité,Bonnes pratiques,Performance,SEO,PWA,Speed Index" | split: ',' %}
 {% assign indexes = indexes | push: lighthouse.categories.accessibility.score | push: lighthouse.categories.best-practices.score | push: lighthouse.categories.performance.score | push: lighthouse.categories.seo.score | push: lighthouse.categories.pwa.score | push: lighthouse.audits.speed-index.score %}
 
-{% assign ecoaverageposition = ecoaverage | times: 100 | divided_by: ecodiviser %}
-{% assign ecoaverage = ecoaverage | times: 100 | divided_by: ecodiviser | minus: 100 | times: -1%}
-{% assign ecoposition = eco | times: 100 | divided_by: ecodiviser %}
-{% assign eco = eco | times: 100 | divided_by: ecodiviser | minus: 100 | times: -1%}
+{% assign ecoaverageposition = ecoaverage | times: 100 | divided_by: ecodiviser | round %}
+{% assign ecoaverage = ecoaverage | times: 100 | divided_by: ecodiviser | minus: 100 | times: -1 | round %}
+{% assign ecoposition = eco | times: 100 | divided_by: ecodiviser | round %}
+{% assign eco = eco | times: 100 | divided_by: ecodiviser | minus: 100 | times: -1 | round %}
 {% if eco < 0 %}{% assign ecoposition = 105 %}{% endif %}

data/_layouts/default.html

@@ -14,36 +14,24 @@
   <link rel="stylesheet" href="/assets/css/styles.css">
 
   <!-- SEO -->
-  <title>{% if page.title %}{{ page.title }}{% endif %} | {% if page.description %}{{ page.description }} -
+  <title>{% if page.title %}{{ page.title }} | {% endif %}{% if page.description %}{{ page.description }} -
     {% endif %}{{ site.name }}</title>
 
-  {% seo title=false type=WebPage %}
   <meta name="subject" content="{{ site.subject }}">
-  <meta name="generator" content="jekyll v{{ jekyll.version }}">
+  {% if jekyll.version %}<meta name="generator" content="jekyll v{{ jekyll.version }}">{% endif %}
   <meta itemprop="name" content="{% if page.title %}{{ page.title }}{% endif %} | {% if page.description %}{{ page.description }} - {% endif %}{{ site.name }}">
   <meta itemprop="description" content="{{ site.subject }}">
   <meta name="robots" content="{{ site.robots }}">
 
   <!-- Profiles -->
   <link href="/humans.txt" rel="author" type="text/plain" />
-
-  <style>
-    @font-face {
-      font-family: Optiker;
-      font-weight: 300;
-
-      src: url('../../assets/fonts/Optiker-K.woff2');
-      font-display: swap;
-    }
-
-    @font-face {
-      font-family: IBMPlexMono;
-      font-weight: 300;
-
-      src: url('../../assets/fonts/IBMPlexMono-Medium.woff2');
-      unicode-range: U+0030-0039;
-    }
-  </style>
+  <link rel="icon" href="/assets/favicons/favicon.ico">
+  <link rel="apple-touch-icon" sizes="180x180" href="/assets/favicons//apple-icon-180x180.png">
+  <link rel="icon" type="image/png" sizes="192x192"  href="/assets/favicons//android-icon-192x192.png">
+  <link rel="icon" type="image/png" sizes="32x32" href="/assets/favicons/favicon-32x32.png">
+  <link rel="icon" type="image/png" sizes="96x96" href="/assets/favicons/favicon-96x96.png">
+  <link rel="manifest" href="/assets/favicons/manifest.json">
+  <meta name="theme-color" content="#000000">
 
   <script>
     if ("fonts" in document) {
@@ -59,29 +47,12 @@
 </head>
 
 <body>
-
+  {{site.baseurl}}
   <header class="wrapper">
     <h1>
       <a href="/">
-        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" width="48">
-          <title>Loowtus</title>
-          <path fill="#f7b239" d="M331.164 202.563a237.905 237.905 0 00-22.589 19.904c-22.866 22.842-40.65 49.982-52.583 79.495-11.921-29.513-29.717-56.653-52.571-79.495a236.697 236.697 0 00-22.601-19.916c18.218-38.591 43.287-74.739 75.172-106.623 31.896 31.884 56.954 68.043 75.172 106.635z"/>
-          <g fill="#f95428">
-            <path d="M255.992 301.961c-11.403 28.212-17.447 58.604-17.447 89.525 0 2.637.036 5.286.144 7.923-24.335-60-72.27-107.587-131.934-131.705v-.012c-1.144-32.439 4.347-65.636 17.303-97.677 20.831 8.417 39.832 19.434 56.761 32.535a236.697 236.697 0 0122.601 19.916c22.854 22.842 40.651 49.983 52.572 79.495z"/>
-            <path d="M405.24 267.705c-84.745 34.257-145.841 115.895-149.236 213.15-1.011-28.79-7.068-56.22-17.315-81.445a193.863 193.863 0 01-.144-7.923c0-30.921 6.045-61.313 17.447-89.525 11.933-29.513 29.717-56.653 52.583-79.495a237.905 237.905 0 0122.589-19.904c16.942-13.113 35.942-24.13 56.785-32.547 12.956 32.041 18.435 65.238 17.291 97.677v.012z"/>
-          </g>
-          <g fill="#31af0e">
-            <path d="M494.488 250.402c2.818 0 5.635.048 8.477.144-4.6 131.801-115.172 234.908-246.961 230.309 3.396-97.255 64.492-178.893 149.236-213.15 27.634-11.174 57.773-17.303 89.248-17.303zM238.689 399.409c10.247 25.226 16.304 52.655 17.315 81.445-131.801 4.6-242.374-98.507-246.974-230.308 2.842-.096 5.659-.144 8.477-.144 31.475 0 61.626 6.129 89.248 17.303 59.664 24.118 107.599 71.704 131.934 131.704z"/>
-          </g>
-          <g fill="#333">
-            <path d="M503.284 241.523c-30.681-1.073-60.701 3.437-88.907 13.074-.561-30.125-6.613-59.657-18.053-87.969a9.031 9.031 0 00-11.757-4.99c-17.868 7.219-34.602 16.337-50.073 27.239-18.572-36.63-42.787-70.01-72.118-99.331a9.03 9.03 0 00-12.77.001c-29.345 29.345-53.558 62.72-72.116 99.316-15.462-10.895-32.189-20.009-50.052-27.225a9.03 9.03 0 00-11.756 4.99c-11.459 28.358-17.514 57.939-18.059 88.115-27.821-9.561-57.802-14.304-88.907-13.22a9.03 9.03 0 00-8.71 9.34c4.667 133.635 114.858 239.166 247.549 239.166 2.801 0 5.626-.051 8.446-.144 2.827.095 5.639.144 8.447.144 132.679 0 242.882-105.538 247.548-239.166a9.033 9.033 0 00-8.712-9.34zm-106.935 20.035c-25.721 11.127-49.616 26.708-70.719 46.388-33.781 31.501-57.575 70.871-69.666 114.263a245.653 245.653 0 00-8.296-24.517 202.148 202.148 0 01-.089-6.204c0-29.597 5.65-58.577 16.791-86.138 11.67-28.877 28.691-54.616 50.594-76.505 19.65-19.662 42.457-35.391 67.901-46.844 9.235 25.698 13.759 52.392 13.484 79.557zm-140.356-152.7c25.894 27.165 47.344 57.764 63.898 91.151a247.135 247.135 0 00-17.699 16.065 246.083 246.083 0 00-46.193 63.998c-11.872-23.693-27.349-45.161-46.193-63.993a246.736 246.736 0 00-17.714-16.083c16.541-33.357 37.993-63.954 63.901-91.138zm-126.85 73.143c25.446 11.455 48.25 27.185 67.891 46.848 21.086 21.074 37.623 45.703 49.224 73.233-7.739 19.991-12.816 40.654-15.183 61.733-26.621-45.203-67.137-81.123-115.419-102.079-.296-27.226 4.23-53.981 13.487-79.735zM18.56 259.432c57.953.248 112.867 21.972 155.494 61.724 42.63 39.753 68.133 93.01 72.42 150.81-119.468-.562-219.021-93.396-227.914-212.534zm246.967 212.533c4.288-57.799 29.788-111.056 72.42-150.81s97.536-61.479 155.495-61.724c-8.896 119.146-108.437 211.984-227.915 212.534z"/>
-            <circle cx="14.088" cy="206.106" r="9.031"/>
-            <circle cx="124.058" cy="105.841" r="9.031"/>
-            <circle cx="255.992" cy="31.002" r="9.031"/>
-            <circle cx="387.949" cy="105.841" r="9.031"/>
-            <circle cx="497.896" cy="206.106" r="9.031"/>
-          </g>
-        </svg>&nbsp;{{ site.name }}</a>&nbsp;<small>- {{ site.title }}</small>
+        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512" width="48"><path fill="#d6b900" d="M348.012 201.627c-7.942 6.151-32.335 13.735-39.437 20.84-22.866 22.842-40.65 49.982-52.583 79.495-11.921-29.513-29.717-56.653-52.571-79.495-7.103-7.112-25.884-21.252-33.833-27.404 5.114-40.463 54.519-96.267 86.404-128.151 31.896 31.884 86.906 90.507 92.02 134.715z" fill-opacity=".963" stroke="#555"/><g fill="#d44f4f" stroke="#555"><path d="M255.992 301.961c-11.403 28.212-17.447 58.604-17.447 89.525 0 2.637.036 5.286.144 7.923-24.335-60-72.27-107.587-131.934-131.705v-.012c-1.144-32.439 4.347-65.636 17.303-97.677 20.831 8.417 39.832 19.434 56.761 32.535a236.697 236.697 0 0122.601 19.916c22.854 22.842 40.651 49.983 52.572 79.495z"/><path d="M405.24 267.705c-84.745 34.257-145.841 115.895-149.236 213.15-1.011-28.79-7.068-56.22-17.315-81.445a193.863 193.863 0 01-.144-7.923c0-30.921 6.045-61.313 17.447-89.525 11.933-29.513 29.717-56.653 52.583-79.495a237.905 237.905 0 0122.589-19.904c16.942-13.113 35.942-24.13 56.785-32.547 12.956 32.041 18.435 65.238 17.291 97.677v.012z"/></g><path d="M494.5 250.4c2.8 0 5.6 0 8.5.1-4.6 131.8-115.2 234.9-247 230.3 3.4-97.3 64.5-178.9 149.2-213.2 27.6-11.2 57.8-17.3 89.2-17.3zm-255.8 149c10.2 25.2 16.3 52.7 17.3 81.4-131.8 4.6-242.4-98.5-247-230.3 2.8-.1 5.7-.1 8.5-.1 31.5 0 61.6 6.1 89.2 17.3 59.7 24.1 107.6 71.7 131.9 131.7z" fill="#2296aa" stroke="#555" stroke-width="2.2"/></svg>
+        &nbsp;{{ site.name }}</a>&nbsp;<small>{{ site.title }}</small>
     </h1>
   </header>
 

data/_layouts/monitoring.html

@@ -21,8 +21,8 @@ layout: default
 
 {% for action in site.actions %}
 {% unless action.done %}
-<h3>{{ action.date | date_to_long_string }}</h3>
-{{ action | markdownify }}
+<h3>{{ action.date }}</h3>
+{{ action  }}
 {% endunless %}
 {% endfor %}
 
@@ -38,6 +38,8 @@ layout: default
 {% include seo.html %}
 {% endif %}
 
+{{ datelastcrawl }}ss
+
 <!--/ KEYWORDS -->
 {% if site.zone.competitors == true %}
 <h2>Concurrence</h2>

data/_layouts/rank.html

@@ -7,7 +7,7 @@ layout: default
 <div class="list-rank" id="rank">
   <h3>Classement <small>le {{ datelastcrawl }}</small></h3>
   <ul class="list-rank">
-    {% for website in site.pagestested %}
+    {% for website in pagestested %}
     {% include value/loadingdata.html %}
     <li style="order: {{ eco }};">
       <a href="#site-{{ forloop.index0 }}" class="anchor" data-scroll>{{ website | replace: "-", " " }}</a>
@@ -24,7 +24,7 @@ layout: default
 <hr>
 
 <div class="list-stats">
-  {% for website in site.pagestested %}
+  {% for website in pagestested %}
 
   {% include value/loadingdata.html %}
 

data/assets/css/styles.css

@@ -1,3 +1,23 @@
+/*------------------
+  FTON
+------------------*/
+
+@font-face {
+  font-family: Optiker;
+  font-weight: 300;
+
+  src: url('../../assets/fonts/Optiker-K.woff2');
+  font-display: swap;
+}
+
+@font-face {
+  font-family: IBMPlexMono;
+  font-weight: 300;
+
+  src: url('../../assets/fonts/IBMPlexMono-Medium.woff2');
+  unicode-range: U+0030-0039;
+}
+
 /*------------------
   LAYOUT
 ------------------*/
@@ -22,13 +42,11 @@ header {
 
 header a {
   display: block;
-  padding: 0.5em 0 1em 0.5em;
-  text-decoration: none;
   font-weight: 200;
+  text-decoration: none;
 }
 
-header a,
-header small {
+header a, header small {
   font-family: -apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol;
 }
 
@@ -47,8 +65,7 @@ header svg {
   max-width: 75em;
 }
 
-body,
-.article {
+body, .article {
   margin: auto;
   line-height: 1.8125rem;
   font-size: 1rem;
@@ -58,16 +75,18 @@ body,
   TYPOGRAPHY
 ------------------*/
 
-h1,
-.h1 {
+h1, .h1 {
   margin-top: 1.8125rem;
   margin-bottom: 3.625rem;
   line-height: 5.4375rem;
   font-size: 5.1875rem;
 }
 
-h2,
-.h2 {
+.wrapper h1 {
+  text-align: center;
+}
+
+h2, .h2 {
   margin-top: 1.8125rem;
   margin-bottom: 1.8125rem;
   line-height: 3.625rem;
@@ -84,61 +103,58 @@ h2:not(:first-of-type):before {
   background: #555;
 }
 
-h2,h3 {
+h3 {
   font-family: Optiker, sans-serif;
 }
 
-h2+p,
-h3+p {
+h3 + p {
   margin-top: -2.5rem;
   margin-bottom: 1em;
   line-height: 1.2;
   font-size: 0.85em;
 }
 
-h3+p {
+h3 + p {
   margin-top: -1.8125rem;
 }
 
-h2 small,
-h3 small {
+h2 small, h3 small {
   font-family: -apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol;
 }
 
-header h1,
-h3,
-.h3 {
+header h1, h3, .h3 {
   margin-top: 1.8125rem;
   margin-bottom: 1.8125rem;
   line-height: 1.8125rem;
   font-size: 1.75rem;
 }
 
-h4,
-.h4 {
+h4, .h4 {
   margin-top: 1.8125rem;
   margin-bottom: 0;
   line-height: 1.8125rem;
   font-size: 1rem;
 }
 
-header h1,
-header p {
-  display: flex;
-  align-items: baseline;
+header h1, header p {
   margin: 0;
 }
 
+@media screen and (min-width: 768px) {
+  header h1, header p {
+    display: flex;
+    align-items: baseline;
+  }
+  header a {
+    padding: 0.5em 0 1em 0.5em;
+  }
+}
+
 header a {
   color: currentColor;
 }
 
-p,
-ul,
-ol,
-pre,
-table,
-blockquote {
+p, ul, ol, pre, table, blockquote {
   margin-top: 0;
   margin-bottom: 1.5rem;
 }
@@ -156,6 +172,22 @@ a {
   text-align: center;
 }
 
+/*------------------
+  BLOCK
+------------------*/
+
+.presentation {
+  margin: 1.5em auto 2em;
+  padding: 1em 1em 0.1em;
+  max-width: 30em;
+  line-height: 1.2;
+  font-size: 1.5em;
+  text-align: center;
+  color: #fefefe;
+  background: #111;
+  border-radius: 10px;
+}
+
 /*------------------
   LIST
 ------------------*/
@@ -170,21 +202,18 @@ a {
   margin-bottom: -1em;
 }
 
-.list-actions ol,
-.list-actions ul {
+.list-actions ol, .list-actions ul {
   margin: 2rem 0;
   padding: 0;
 }
 
-.list-actions-grid ol,
-.list-actions-grid ul {
+.list-actions-grid ol, .list-actions-grid ul {
   display: grid;
   grid-template-columns: repeat(2, minmax(100px, 1fr));
   grid-gap: 0 1em;
 }
 
-.list-actions ol li,
-.list-actions ul li {
+.list-actions ol li, .list-actions ul li {
   position: relative;
   display: flex;
   justify-content: space-between;
@@ -206,8 +235,7 @@ a {
   word-break: break-all;
 }
 
-.list-actions ol li>*,
-.list-actions ul li>* {
+.list-actions ol li > *, .list-actions ul li > * {
   display: flex;
   align-items: center;
   flex: 0 1 auto;
@@ -215,26 +243,22 @@ a {
   padding: 1em 2em 1em 1em;
 }
 
-.list-actions ol li>*:first-child,
-.list-actions ul li>*:first-child {
+.list-actions ol li > *:first-child, .list-actions ul li > *:first-child {
   position: relative;
   overflow: scroll;
   flex-grow: 999;
   white-space: nowrap;
 }
 
-.list-actions ol li>*:last-child,
-.list-actions ul li>*:last-child {
+.list-actions ol li > *:last-child, .list-actions ul li > *:last-child {
   padding-right: 1em;
 }
 
-.list-actions-title ol li,
-.list-actions-title ul li {
+.list-actions-title ol li, .list-actions-title ul li {
   margin-top: 6em;
 }
 
-.list-actions ol li h4,
-.list-actions ul li h4 {
+.list-actions ol li h4, .list-actions ul li h4 {
   position: absolute;
   top: -1.5em;
   left: 0;
@@ -245,8 +269,7 @@ a {
   background: #333;
 }
 
-.list-actions ol li b,
-.list-actions ul li b {
+.list-actions ol li b, .list-actions ul li b {
   justify-content: center;
   min-width: 6rem;
   max-width: 15rem;
@@ -304,12 +327,12 @@ a {
   align-self: flex-start;
   padding-right: 12px;
   min-width: 1.5em;
+  font-family: IBMPlexMono, optiker, sans-serif;
   font-size: 1.5em;
   font-weight: bold;
   transform: translateY(-50%);
   text-align: center;
   color: currentColor;
-  font-family: IBMPlexMono, optiker, sans-serif;
 
   font-variant-numeric: tabular-nums;
 }
@@ -319,6 +342,79 @@ a {
   flex-direction: column-reverse;
 }
 
+.list-stats-title  {
+  padding-top: 1em;
+  white-space: nowrap;
+}
+
+@media screen and (min-width: 768px) {
+  .list-stats-title {
+    display: flex;
+    flex-wrap: nowrap;
+    align-items: center;
+  }
+}
+
+.list-stats-title > *, .list-stats-title div > * {
+  display: flex;
+  align-items: center;
+  margin: 0;
+  flex: 1;
+}
+
+.list-stats-title .anchor {
+  max-width: 2em;
+}
+
+.list-stats-title > h2 {
+  flex: 5;
+}
+
+/** List Home */
+.list-home {
+  text-align: center;
+}
+
+.list-home ul {
+  display: flex;
+  flex-direction: column;
+  margin: auto;
+  max-width: 40rem;
+  list-style: none;
+}
+
+.list-home li {
+  display: flex;
+  align-items: center;
+  margin-bottom: 1em;
+  padding: 1em;
+  line-height: 1;
+  text-align: left;
+  border-radius: 5px;
+  background: #fff;
+}
+
+.list-home a {
+  font-size: 1.5em;
+  text-decoration: none;
+}
+
+.list-home span {
+  display: flex;
+  flex: 1;
+  justify-content: flex-end;
+}
+.list-home b {
+  padding: 0.45em 0.4em 0.25em;
+  min-width: 2.5em;
+  font-family: IBMPlexMono, optiker, sans-serif;
+  font-size: 1.3rem;
+  text-align: center;
+  color: #fefefe;
+  background: #333;
+}
+
+/** List Rank */
 .list-rank {
   margin: 2em auto;
   padding: 1em 3em 2em;
@@ -346,22 +442,21 @@ a {
 
 .list-rank a {
   margin-right: 0.2em;
-  text-transform: capitalize;
 }
 
 .list-rank span {
   display: flex;
-  justify-content: flex-end;
   flex: 1;
+  justify-content: flex-end;
 }
 .list-rank b {
   padding: 0.45em 0.4em 0.25em;
+  min-width: 2.5em;
   font-family: IBMPlexMono, optiker, sans-serif;
   font-size: 1.3rem;
+  text-align: center;
   color: #fefefe;
   background: #333;
-  min-width: 2.5em;
-  text-align: center;
 }
 
 .grid:not(:nth-last-child(-n+3)) ul li {
@@ -388,21 +483,11 @@ a {
   order: 4;
 }
 
-.list-actions ul li.progressive-web-app~.progressive-web-app,
-.list-actions ul li.performance~.performance,
-.list-actions ul li.best-practices~.best-practices,
-.list-actions ul li.accessibility~.accessibility,
-.list-actions ul li.seo~.seo,
-.list-actions ul li.pwa~.pwa {
+.list-actions ul li.progressive-web-app ~ .progressive-web-app, .list-actions ul li.performance ~ .performance, .list-actions ul li.best-practices ~ .best-practices, .list-actions ul li.accessibility ~ .accessibility, .list-actions ul li.seo ~ .seo, .list-actions ul li.pwa ~ .pwa {
   margin-top: -1px;
 }
 
-.list-actions ul li.progressive-web-app~.progressive-web-app::before,
-.list-actions ul li.performance~.performance::before,
-.list-actions ul li.best-practices~.best-practices::before,
-.list-actions ul li.accessibility~.accessibility::before,
-.list-actions ul li.seo~.seo::before,
-.list-actions ul li.pwa~.pwa::before {
+.list-actions ul li.progressive-web-app ~ .progressive-web-app::before, .list-actions ul li.performance ~ .performance::before, .list-actions ul li.best-practices ~ .best-practices::before, .list-actions ul li.accessibility ~ .accessibility::before, .list-actions ul li.seo ~ .seo::before, .list-actions ul li.pwa ~ .pwa::before {
   display: none;
 }
 
@@ -429,17 +514,17 @@ a {
 
 .grid {
   display: flex;
+  overflow: hidden;
   flex-wrap: wrap;
   margin: 0;
   max-width: 100%;
-  overflow: hidden;
 }
 
 .grid:not(:nth-last-child(-n+3)) {
   display: none !important;
 }
 
-.grid>* {
+.grid > * {
   flex: 1 1 auto;
 }
 
@@ -456,9 +541,9 @@ a {
   display: flex;
   justify-content: center;
   padding: 1em;
+  font-family: IBMPlexMono, optiker, sans-serif;
   text-align: center;
   border: 1px solid;
-  font-family: IBMPlexMono, optiker, sans-serif;
 }
 
 .grid-score span {
@@ -489,7 +574,7 @@ a {
   margin: 0 -1rem 1.5rem;
 }
 
-.flex>* {
+.flex > * {
   flex: 1;
   margin: 0 1rem;
   max-width: calc(100% - 2rem);
@@ -501,7 +586,7 @@ a {
     grid-template-columns: repeat(10, minmax(100px, 150px));
   }
 
-  .flex>* {
+  .flex > * {
     max-width: calc(50% - 2rem);
   }
 }
@@ -519,7 +604,7 @@ a {
   width: 100%;
 }
 
-.flex-list-color>* {
+.flex-list-color > * {
   position: relative;
   float: left;
   height: 2rem;
@@ -547,8 +632,7 @@ a {
   padding: 0;
 }
 
-.flex-list>li,
-.flex-list>div {
+.flex-list > li, .flex-list > div {
   display: flex;
   clear: both;
   margin: 0 0 0.3em;
@@ -556,7 +640,7 @@ a {
   width: 100%;
 }
 
-.flex-list>li a .flex-list>div a {
+.flex-list > li a .flex-list > div a {
   display: block;
   overflow: hidden;
   max-width: 50%;
@@ -564,13 +648,11 @@ a {
   text-overflow: ellipsis;
 }
 
-.flex-list>li>*,
-.flex-list>div>* {
+.flex-list > li > *, .flex-list > div > * {
   flex: 1;
 }
 
-.flex-list>li>*:first-child,
-.flex-list>div>*:first-child {
+.flex-list > li > *:first-child, .flex-list > div > *:first-child {
   padding: 0 1.5em 0 0;
 }
 
@@ -662,9 +744,9 @@ a {
 
 .number {
   line-height: 1.5;
+  font-family: IBMPlexMono, optiker, sans-serif;
   font-size: 1.35rem;
   font-weight: bold;
-  font-family: IBMPlexMono, optiker, sans-serif;
 }
 
 .date p {
@@ -696,7 +778,6 @@ a {
   color: #fefefe;
   background: #22961e !important;
   box-shadow: inset 0 -1px 8px rgba(0, 0, 0, 0.2);
-
 }
 
 .top path {
@@ -747,12 +828,12 @@ a {
   padding-left: 1em;
 }
 
-.axe>div {
+.axe > div {
   display: flex;
   width: 100%;
 }
 
-.axe>div strong {
+.axe > div strong {
   flex: 1;
 }
 
@@ -830,8 +911,7 @@ a {
   ACCORDEON
 ------------------*/
 
-.js-to_expand[aria-hidden=true],
-.js-to_expand[data-hidden=true] {
+.js-to_expand[aria-hidden=true], .js-to_expand[data-hidden=true] {
   display: none;
 }
 
@@ -862,8 +942,7 @@ a {
   content: '-';
 }
 
-.js-expandmore-button[aria-expanded=true]>.expandmore__symbol:before,
-.js-expandmore-button[data-expanded=true]>.expandmore__symbol:before {
+.js-expandmore-button[aria-expanded=true] > .expandmore__symbol:before, .js-expandmore-button[data-expanded=true] > .expandmore__symbol:before {
   content: '− ';
 }
 
@@ -890,11 +969,11 @@ a {
 
 .progress {
   display: grid;
+  overflow: hidden;
   align-items: stretch;
   margin: 0;
   padding: 1rem 1.5rem;
   background: #fff;
-  overflow: hidden;
 }
 
 @media screen and (min-width: 1024px) {
@@ -903,7 +982,7 @@ a {
   }
 }
 
-.progress+.progress {
+.progress + .progress {
   padding-top: 0;
 }
 
@@ -911,9 +990,9 @@ a {
   display: flex;
   flex-wrap: wrap;
   justify-content: space-around;
-  width: 90%;
   margin: auto;
   padding: 0;
+  width: 90%;
 }
 
 .progress li {
@@ -921,7 +1000,7 @@ a {
   list-style: none;
 }
 
-.progress>* {
+.progress > * {
   display: flex;
   align-items: center;
   margin: 0;
@@ -929,14 +1008,13 @@ a {
   max-width: 100%;
   border: 1px solid rgba(0, 0, 0, 0.3);
   box-shadow: inset 0 0 4px rgba(0,0,0,0.12);
-
 }
 
-.progress>*:not(:first-child) {
+.progress > *:not(:first-child) {
   min-height: 7em;
 }
 
-.progress>div:first-child {
+.progress > div:first-child {
   display: flex;
   align-items: center;
   flex: 0 1 20%;
@@ -959,10 +1037,10 @@ a {
 -------------------------*/
 
 .progress.progress-number li {
-  text-align: center;
-  font-weight: bold;
-  font-family: Optiker;
   line-height: 1;
+  font-family: Optiker;
+  font-weight: bold;
+  text-align: center;
 }
 
 .progress.progress-number li b {
@@ -994,17 +1072,17 @@ a {
   min-height: 7em;
 }
 
-.progress-circular ul>li {
+.progress-circular ul > li {
   position: relative;
   display: inline-block;
   flex: 1;
+  margin-bottom: 4.5em;
   height: 100%;
   font-weight: 100;
   text-align: center;
-  margin-bottom: 4.5em;
 }
 
-.progress-circular ul>li:before {
+.progress-circular ul > li:before {
   position: absolute;
   content: attr(data-name);
   bottom: -2em;
@@ -1015,7 +1093,7 @@ a {
   font-weight: bold;
 }
 
-.progress-circular ul>li:after {
+.progress-circular ul > li:after {
   position: absolute;
   z-index: 2;
   content: attr(data-percent);
@@ -1085,15 +1163,15 @@ a {
   /* background: linear-gradient(90deg, rgba(34, 150, 30, 1) 0%, rgba(34, 150, 30, 1)  50%, rgba(176, 2, 2, 1) 51%, rgba(176, 2, 2, 1) 100%); */
 }
 
-.progress-bar-score,
-.progress-bar-tooltip {
+.progress-bar-score, .progress-bar-tooltip {
   position: absolute;
   padding: 0 1em;
   min-width: 1em;
   line-height: 1.3;
-  transform: translate(-50%, -50%);
   font-size: 1.1em;
+  transform: translate(-50%, -50%);
   text-align: center;
+  white-space: nowrap;
 }
 
 .progress-bar-score {
@@ -1121,8 +1199,7 @@ a {
   background: #555;
 }
 
-.progress-bar-score,
-.progress-bar-tooltip {
+.progress-bar-score, .progress-bar-tooltip {
   animation: slide 1s;
 }