Changes mailing list generation and fixes display

_layouts/fc_discuss_archives.html

@@ -9,21 +9,19 @@ css: plugin
 
     <div id="container" class="mainContainer">
       <div class="pageContent pages">
-        <div class="wrap">
-          <h1 class="subTitle">Frama-C-discuss mailing list archives</h1>
+        <h1 class="subTitle">Frama-C-discuss mailing list archives</h1>
 
-          <p class="description">
-            This page gathers the archives of the old Frama-C-discuss archives,
-            that was hosted by
-            <a href="https://www.inria.fr">Inria</a>'s gforge before its demise
-            at the end of 2020. To search for mails newer than September 2020,
-            please visit the page of the new mailing list on
-            <a href="https://groupes.renater.fr/sympa/arc/frama-c-discuss"
-              >Renater</a
-            >.
-          </p>
-          <div class="multicol">{{ content }}</div>
-        </div>
+        <p class="description">
+          This page gathers the archives of the old Frama-C-discuss archives,
+          that was hosted by
+          <a href="https://www.inria.fr">Inria</a>'s gforge before its demise at
+          the end of 2020. To search for mails newer than September 2020, please
+          visit the page of the new mailing list on
+          <a href="https://groupes.renater.fr/sympa/arc/frama-c-discuss"
+            >Renater</a
+          >.
+        </p>
+        {{ content }}
       </div>
       {% include footer.html %}
       <div class="clear"></div>

fc-discuss/Makefile

@@ -4,9 +4,14 @@ OUTROOT:=..
 OUTTARGET:=$(OUTROOT)/$(OUTDIR)
 HTML:=$(ARCHIVES:%.txt.gz=$(OUTTARGET)/%/maillist.html)
 
-$(OUTTARGET)/archives.md: $(HTML) archives-header.md Makefile
+$(OUTTARGET)/archives.html: $(HTML) Makefile
 	rm -fr $@
-	cp archives-header.md $@
+	echo "---" >> $@
+	echo "layout: fc_discuss_archives" >> $@
+	echo "title: Archives of the old Frama-C-discuss mailing list" >> $@
+	echo "---" >> $@
+	echo "<div class="wrap">" >> $@
+	echo "<div class="multicol">" >> $@
 	$(foreach file,$(HTML), \
 	  BASE=$(file:$(OUTTARGET)/%/maillist.html=%); \
 	  echo "<div>" >> $@; \
@@ -17,6 +22,8 @@ $(OUTTARGET)/archives.md: $(HTML) archives-header.md Makefile
 	  echo "</ul>" >> $@; \
 	  echo "</div>" >> $@; \
          )
+	echo "</div>" >> $@
+	echo "</div>" >> $@
 
 $(OUTTARGET)/%/maillist.html: %.txt.gz mhonarc-config.rc
 	mkdir -p $(dir $@)

fc-discuss/archives-header.md

----
-layout: fc_discuss_archives
-title: Archives of the old Frama-C-discuss mailing list
----

html/fc-discuss/archives.md → html/fc-discuss/archives.html

@@ -2,6 +2,8 @@
 layout: fc_discuss_archives
 title: Archives of the old Frama-C-discuss mailing list
 ---
+<div class=wrap>
+<div class=multicol>
 <div>
 <h2>2008-January</h2>
 <ul>
@@ -1073,3 +1075,5 @@ title: Archives of the old Frama-C-discuss mailing list
 <li><a href="2020-October/threads.html">By thread</a></li>
 </ul>
 </div>
+</div>
+</div>