From b275db163b5b8b429c9209c5bd88e70466948e55 Mon Sep 17 00:00:00 2001 From: Thomas Lamprecht Date: Thu, 25 Jul 2019 18:03:51 +0200 Subject: [PATCH] fixup: TOC JS script is already in html pages for mediawiki not required, it's shipped by the docs files themself This reverts commit 02114e68c2464a67e274090bf8cc0a510bb096a5. --- Makefile | 3 +-- debian/pve-docs-mediawiki.install | 1 - debian/tree/pve-docs-mediawiki/README | 6 ------ 3 files changed, 1 insertion(+), 9 deletions(-) diff --git a/Makefile b/Makefile index c06fd63..b373066 100644 --- a/Makefile +++ b/Makefile @@ -208,14 +208,13 @@ doc-install: index.html $(WIKI_IMPORTS) $(API_VIEWER_SOURCES) verify-images exam install -m 0644 ${API_VIEWER_SOURCES} $(DESTDIR)/usr/share/${DOC_PACKAGE}/api-viewer .PHONY: mediawiki-install -mediawiki-install: pve-docs-mediawiki-import asciidoc/mediawiki-asciidoc.js +mediawiki-install: pve-docs-mediawiki-import install -dm755 $(DESTDIR)/usr/share/$(MEDIAWIKI_PACKAGE) install -dm755 $(DESTDIR)/usr/share/doc/$(MEDIAWIKI_PACKAGE) install -dm755 $(DESTDIR)/usr/bin install -dm755 $(DESTDIR)/usr/share/$(MEDIAWIKI_PACKAGE) install -dm755 $(DESTDIR)/usr/share/doc/$(MEDIAWIKI_PACKAGE) install -m 0755 pve-docs-mediawiki-import $(DESTDIR)/usr/bin/ - install -m 0644 -o www-data asciidoc/mediawiki-asciidoc.js $(DESTDIR)/usr/share/doc/$(MEDIAWIKI_PACKAGE)/mediawiki-asciidoc.js .PHONY: upload upload: ${GEN_DEB} ${DOC_DEB} ${MEDIAWIKI_DEB} diff --git a/debian/pve-docs-mediawiki.install b/debian/pve-docs-mediawiki.install index 47f0517..680f240 100644 --- a/debian/pve-docs-mediawiki.install +++ b/debian/pve-docs-mediawiki.install @@ -1,4 +1,3 @@ /usr/bin/pve-docs-mediawiki-import -/usr/share/doc/pve-docs-mediawiki/mediawiki-asciidoc.js debian/tree/pve-docs-mediawiki/pve-docs.conf /etc/apache2/sites-available/ debian/tree/pve-docs-mediawiki/pvedocs-include.php /usr/lib/pve-docs/ diff --git a/debian/tree/pve-docs-mediawiki/README b/debian/tree/pve-docs-mediawiki/README index 38bfee2..64df764 100644 --- a/debian/tree/pve-docs-mediawiki/README +++ b/debian/tree/pve-docs-mediawiki/README @@ -26,10 +26,4 @@ In the MediaWiki settings PHP file ('/var/www/mediawiki/LocalSettings.php') add: # ----8<---- # for docs-inclusion plugin: require_once("/usr/lib/pve-docs/pvedocs-include.php"); - -# for the JS snippet which generates the Table of Content and footer links -$wgHooks['BeforePageDisplay'][] = function( OutputPage &$out, Skin &$skin ) { - $asciidoc_js = file_get_contents("/usr/share/doc/pve-docs-mediawiki/mediawiki-asciidoc.js"); - $out->addInlineScript($asciidoc_js); -}; # ---->8----