Convert webbuild.js.inc into canonically include script webbuild-2.js

This commit is contained in:
Silvan Calarco 2020-09-29 20:04:01 +02:00
parent 7b72f0a5d3
commit 0c8fa3d288
4 changed files with 6 additions and 17 deletions

View File

@ -54,13 +54,10 @@ print '<link rel="shortcut icon" type="image/x-icon" href="' . get_stylesheet_di
print '<link rel="stylesheet" type="text/css" href="' . get_stylesheet_directory_uri() . '/styles/webbuild.css">' . PHP_EOL; print '<link rel="stylesheet" type="text/css" href="' . get_stylesheet_directory_uri() . '/styles/webbuild.css">' . PHP_EOL;
# webbuild # webbuild
print '<script type="text/javascript" src="' . get_stylesheet_directory_uri() . '/scripts/webbuild/webbuild.js"></script>'; print '<script type="text/javascript" src="' . get_stylesheet_directory_uri() . '/scripts/webbuild/webbuild.js"></script>';
print '<script type="text/javascript" src="' . get_stylesheet_directory_uri() . '/scripts/webbuild/webbuild-2.js"></script>';
# distroquery # distroquery
print '<script type="text/javascript" src="' . get_stylesheet_directory_uri() . '/scripts/distroquery.js"></script>' . PHP_EOL; print '<script type="text/javascript" src="' . get_stylesheet_directory_uri() . '/scripts/distroquery.js"></script>' . PHP_EOL;
$file = fopen(get_stylesheet_directory() . "/webbuild.js.inc", "r");
print fread($file, 20000);
fclose($file);
# webbuild css # webbuild css
print '<link rel="stylesheet" type="text/css" href="' . get_stylesheet_directory_uri() . '/styles/webbuild-post.css"/>'; print '<link rel="stylesheet" type="text/css" href="' . get_stylesheet_directory_uri() . '/styles/webbuild-post.css"/>';

View File

@ -85,13 +85,9 @@ print '<script type="text/javascript" src="' . get_stylesheet_directory_uri() .
print '<script type="text/javascript" src="' . get_stylesheet_directory_uri() . '/scripts/codemirror/addon/search/searchcursor.js"></script>' . PHP_EOL; print '<script type="text/javascript" src="' . get_stylesheet_directory_uri() . '/scripts/codemirror/addon/search/searchcursor.js"></script>' . PHP_EOL;
print '<script type="text/javascript" src="' . get_stylesheet_directory_uri() . '/scripts/codemirror/addon/dialog/dialog.js"></script>' . PHP_EOL; print '<script type="text/javascript" src="' . get_stylesheet_directory_uri() . '/scripts/codemirror/addon/dialog/dialog.js"></script>' . PHP_EOL;
print '<link rel="stylesheet" href="' . get_stylesheet_directory_uri() . '/scripts/codemirror/addon/dialog/dialog.css">' . PHP_EOL; print '<link rel="stylesheet" href="' . get_stylesheet_directory_uri() . '/scripts/codemirror/addon/dialog/dialog.css">' . PHP_EOL;
# webbuild js
print '<script type="text/javascript" src="' . get_stylesheet_directory_uri() . '/scripts/webbuild/webbuild.js"></script>' . PHP_EOL; print '<script type="text/javascript" src="' . get_stylesheet_directory_uri() . '/scripts/webbuild/webbuild.js"></script>' . PHP_EOL;
print '<script type="text/javascript" src="' . get_stylesheet_directory_uri() . '/scripts/webbuild/webbuild-2.js"></script>' . PHP_EOL;
$file = fopen(get_stylesheet_directory() . "/webbuild.js.inc", "r");
print fread($file, 20000);
fclose($file);
# webbuild css # webbuild css
print '<link rel="stylesheet" type="text/css" href="' . get_stylesheet_directory_uri() . '/styles/webbuild-post.css"/>'; print '<link rel="stylesheet" type="text/css" href="' . get_stylesheet_directory_uri() . '/styles/webbuild-post.css"/>';

View File

@ -1,5 +1,3 @@
<script type="text/javascript">
<!--
var lastupdate = 0; var lastupdate = 0;
var reloadtime = 15000; var reloadtime = 15000;
var editor; var editor;
@ -129,6 +127,7 @@ function ajax_getvalues(request,confirm) {
if (to > start) { if (to > start) {
var customscroll = document.getElementById("matrix").scrollTop < var customscroll = document.getElementById("matrix").scrollTop <
(document.getElementById("matrix").scrollHeight - document.getElementById("matrix").clientHeight); (document.getElementById("matrix").scrollHeight - document.getElementById("matrix").clientHeight);
console.log(this.responseText.substring(start,to));
document.getElementById("matrix").innerHTML = document.getElementById("matrix").innerHTML =
"<div id=matrixoutput><pre>" + this.responseText.substring(start,to).replace("</pre>","&lt;/pre&gt;") + "</pre></div>"; "<div id=matrixoutput><pre>" + this.responseText.substring(start,to).replace("</pre>","&lt;/pre&gt;") + "</pre></div>";
currpos = document.getElementById("matrixoutput").innerHTML.length; currpos = document.getElementById("matrixoutput").innerHTML.length;
@ -228,4 +227,3 @@ function webbuild_status_getvalues() {
xmlhttp.send(null); xmlhttp.send(null);
setTimeout("webbuild_status_getvalues()", webbuild_status_reloadtime); setTimeout("webbuild_status_getvalues()", webbuild_status_reloadtime);
} }
</script>

View File

@ -160,12 +160,10 @@ function replaceHTML(el, html) {
function getDownload(request) { function getDownload(request) {
if (host != undefined) { if (host != undefined) {
webbuildhost=host; var url = "/cgi-bin/webbuild-" + host + ".cgi";
} else { } else {
alert("ERROR: webbuildhost is undefined!"); var url = "/cgi-bin/webbuild";
return;
} }
var url = "/cgi-bin/webbuild-" + webbuildhost + ".cgi";
if (request != "") if (request != "")
request=request+"&USER="+user+"&USER_EMAIL="+user_email+"&SECRET="+encodeURIComponent(secret); request=request+"&USER="+user+"&USER_EMAIL="+user_email+"&SECRET="+encodeURIComponent(secret);