diff --git a/Makefile b/Makefile index cd52d64..7880094 100644 --- a/Makefile +++ b/Makefile @@ -55,6 +55,14 @@ config: @echo " WEB_SERVER_PORT = $(WEB_SERVER_PORT)" @echo " WEB_SERVER_DOCUMENT_ROOT= $(WEB_SERVER_DOCUMENT_ROOT)" @echo "" + @echo "HTML5 Client JavaScript URLs:" + @echo " JQUERY_JS_URL = $(JQUERY_JS_URL)" + @echo " MUSTACHE_JS_URL = $(MUSTACHE_JS_URL)" + @echo " CBUFFER_JS_URL = $(CBUFFER_JS_URL)" + @echo " BOOTSTRAP_JS_URL = $(BOOTSTRAP_JS_URL)" + @echo " D3_JS_URL = $(D3_JS_URL)" + @echo " PAKO_JS_URL = $(PAKO_JS_URL)" + @echo "" @echo "Performance:" @echo " RT_CPU = $(RT_CPU) (CPU core for sampling thread)" @echo " RT_CPU_TOPTALK = $(RT_CPU_TOPTALK) (CPU core for packet capture threads)" diff --git a/html5-client/Makefile b/html5-client/Makefile index d9231c1..f459e4d 100644 --- a/html5-client/Makefile +++ b/html5-client/Makefile @@ -103,6 +103,12 @@ assemble-html: createdirs perl -pe 's|##PCAP-BUTTON##|`cat $(PCAP_BUTTON_PART)`|ge' -i ${TPL} perl -pe 's|##PCAP-DISABLED-MODAL##|`cat $(PCAP_DISABLED_MODAL_PART)`|ge' -i ${TPL} perl -pe 's|##PRODUCT-BRANDING##|${PRODUCT_BRANDING}|ge' -i ${TPL} + perl -pe 's|##JQUERY-JS-URL##|$(JQUERY_JS_URL)|g' -i ${TPL} + perl -pe 's|##MUSTACHE-JS-URL##|$(MUSTACHE_JS_URL)|g' -i ${TPL} + perl -pe 's|##CBUFFER-JS-URL##|$(CBUFFER_JS_URL)|g' -i ${TPL} + perl -pe 's|##BOOTSTRAP-JS-URL##|$(BOOTSTRAP_JS_URL)|g' -i ${TPL} + perl -pe 's|##D3-JS-URL##|$(D3_JS_URL)|g' -i ${TPL} + perl -pe 's|##PAKO-JS-URL##|$(PAKO_JS_URL)|g' -i ${TPL} install: install -d ${DESTDIR}/var/lib/jittertrap/ diff --git a/html5-client/src/html/index.tpl.html b/html5-client/src/html/index.tpl.html index 5bf350c..5a742e8 100644 --- a/html5-client/src/html/index.tpl.html +++ b/html5-client/src/html/index.tpl.html @@ -12,12 +12,12 @@ - - - - - - + + + + + + diff --git a/make.config b/make.config index cc67cfd..23b2c30 100644 --- a/make.config +++ b/make.config @@ -55,6 +55,33 @@ ifndef WEB_SERVER_DOCUMENT_ROOT WEB_SERVER_DOCUMENT_ROOT = /var/lib/jittertrap endif +# Third-party JavaScript URLs used by the HTML5 client. Defaults match files +# copied into output/js by html5-client/Makefile. Override these for packaging +# systems that serve shared JavaScript dependencies from system paths or CDNs. +ifndef JQUERY_JS_URL +JQUERY_JS_URL = js/jquery-3.7.1.min.js +endif + +ifndef MUSTACHE_JS_URL +MUSTACHE_JS_URL = js/mustache.min.js +endif + +ifndef CBUFFER_JS_URL +CBUFFER_JS_URL = js/cbuffer.js +endif + +ifndef BOOTSTRAP_JS_URL +BOOTSTRAP_JS_URL = js/bootstrap.bundle.min.js +endif + +ifndef D3_JS_URL +D3_JS_URL = js/d3.v7.min.js +endif + +ifndef PAKO_JS_URL +PAKO_JS_URL = js/pako.min.js +endif + # ------------------------------------------------------------------------------ # Performance Tuning # ------------------------------------------------------------------------------