From 3b1b5cbd8687e8cf7e923dc2ea42dbc1278a760c Mon Sep 17 00:00:00 2001
From: Thomas Lamprecht <t.lamprecht@proxmox.com>
Date: Fri, 28 May 2021 16:03:59 +0200
Subject: [PATCH] mediawiki: load JS helper in plugin instead of including it
 in the html out

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
---
 asciidoc/mediawiki.conf                                      | 4 ----
 debian/tree/pve-docs-mediawiki/PVEDocs/include/PVEDocs.php   | 5 ++++-
 .../tree/pve-docs-mediawiki/PVEDocs/mw-asciidoc.js           | 0
 3 files changed, 4 insertions(+), 5 deletions(-)
 rename asciidoc/mediawiki-asciidoc.js => debian/tree/pve-docs-mediawiki/PVEDocs/mw-asciidoc.js (100%)

diff --git a/asciidoc/mediawiki.conf b/asciidoc/mediawiki.conf
index 98b182f..59a4ba8 100644
--- a/asciidoc/mediawiki.conf
+++ b/asciidoc/mediawiki.conf
@@ -540,10 +540,6 @@ bodydata=<td class="tableblock halign-{colalign=left}">|</td>
 </div>
 
 [header]
-<!-- asciidoc HEADER -->
-<script type="text/javascript">
-include1::mediawiki-asciidoc.js[]
-</script>
 template::[toc]
 <div id="asciidoccontent">
 <style type="text/css" scoped>
diff --git a/debian/tree/pve-docs-mediawiki/PVEDocs/include/PVEDocs.php b/debian/tree/pve-docs-mediawiki/PVEDocs/include/PVEDocs.php
index b7acb34..23cbb50 100644
--- a/debian/tree/pve-docs-mediawiki/PVEDocs/include/PVEDocs.php
+++ b/debian/tree/pve-docs-mediawiki/PVEDocs/include/PVEDocs.php
@@ -34,7 +34,10 @@ class PVEDocs {
             die("no such manual page");
         }
 
-        $content = file_get_contents("/usr/share/pve-docs/$doc");
+        // load JS helper for TOC/footnote generation and load actual HTML content fom docs
+        $content = "\n<script type=\"text/javascript\">\n".file_get_contents("/usr/lib/pve-docs/PVEDocs/mw-asciidoc.js") ."</script>";
+
+        $content .= file_get_contents("/usr/share/pve-docs/$doc");
 
         // from https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/HTMLets/+/11e5ef1ea2820319458dc67174ca76d6e00b10cc/HTMLets.php#140
         $output = '<!--- @PVEDOCS_BASE64@ '.base64_encode($content).' @PVEDOCS_BASE64@ -->';
diff --git a/asciidoc/mediawiki-asciidoc.js b/debian/tree/pve-docs-mediawiki/PVEDocs/mw-asciidoc.js
similarity index 100%
rename from asciidoc/mediawiki-asciidoc.js
rename to debian/tree/pve-docs-mediawiki/PVEDocs/mw-asciidoc.js