Merge pull request #11 from thomasjacquin/dev

Dev
AllskyTeam · Nov 19, 2022 · 113c02c · 113c02c
2 parents c19b279 + e653f9e
commit 113c02c
Show file tree

Hide file tree

Showing 57 changed files with 331 additions and 331 deletions.
diff --git a/documentation/FAQ/index.html → html/documentation/FAQ/index.html b/documentation/FAQ/index.html → html/documentation/FAQ/index.html
diff --git a/documentation/Wiki_files/Home.md → html/documentation/Wiki_files/Home.md b/documentation/Wiki_files/Home.md → html/documentation/Wiki_files/Home.md
diff --git a/documentation/Wiki_files/_Sidebar.md → html/documentation/Wiki_files/_Sidebar.md b/documentation/Wiki_files/_Sidebar.md → html/documentation/Wiki_files/_Sidebar.md
diff --git a/...tation/allskyMap/allsky-map-with-pins.png → ...tation/allskyMap/allsky-map-with-pins.png b/...tation/allskyMap/allsky-map-with-pins.png → ...tation/allskyMap/allsky-map-with-pins.png
diff --git a/documentation/allskyMap/index.html → html/documentation/allskyMap/index.html b/documentation/allskyMap/index.html → html/documentation/allskyMap/index.html
diff --git a/documentation/basics/Desktop.png → html/documentation/basics/Desktop.png b/documentation/basics/Desktop.png → html/documentation/basics/Desktop.png
diff --git a/documentation/basics/Linux.html → html/documentation/basics/Linux.html b/documentation/basics/Linux.html → html/documentation/basics/Linux.html
diff --git a/documentation/basics/Pi.html → html/documentation/basics/Pi.html b/documentation/basics/Pi.html → html/documentation/basics/Pi.html
diff --git a/documentation/basics/date--help.png → html/documentation/basics/date--help.png b/documentation/basics/date--help.png → html/documentation/basics/date--help.png
diff --git a/documentation/basics/ls-config.png → html/documentation/basics/ls-config.png b/documentation/basics/ls-config.png → html/documentation/basics/ls-config.png
diff --git a/documentation/basics/ls.png → html/documentation/basics/ls.png b/documentation/basics/ls.png → html/documentation/basics/ls.png
diff --git a/documentation/css/dark.css → html/documentation/css/dark.css b/documentation/css/dark.css → html/documentation/css/dark.css
diff --git a/documentation/css/documentation.css → html/documentation/css/documentation.css b/documentation/css/documentation.css → html/documentation/css/documentation.css
diff --git a/documentation/css/light.css → html/documentation/css/light.css b/documentation/css/light.css → html/documentation/css/light.css
diff --git a/documentation/documentation-favicon.ico → html/documentation/documentation-favicon.ico b/documentation/documentation-favicon.ico → html/documentation/documentation-favicon.ico
diff --git a/documentation/documentation.js → html/documentation/documentation.js b/documentation/documentation.js → html/documentation/documentation.js
@@ -1,152 +1,152 @@
-// Modify URLs on the GitHub server so we can view pages there OR on a Pi.
-// Also, allow files to be included since GitHub doesn't have php.
-
-// branch is updated during installation.
-var branch = "dev";
-
-// On the Pi, URLs will either begin with "/documentation" (which is a web
-// alias to ~/allsky/documentation), or will be a relative path.
-// Either way, use it as is.
-
-// On GitHub, all URLs must have "/documentation/" in them - either because they were defined
-// that way in the html file, or we add them in this script.
-var documentation_URL = "documentation";
-var documentation_URL_full = "/" + documentation_URL + "/";
-
-var onGitHub;
-
-var git_hostname = "htmlpreview.github.io";
-var preURL_href, preURL_src;			// What gets prepended to the desired URL.
-
-var git_preURL_href = "https://" + git_hostname + "/?";
-var git_raw = "https://raw.githubusercontent.com/thomasjacquin/allsky/";
-
-if (location.hostname == git_hostname) {
-	onGitHub = true;
-
-	// On GitHub, the URLs for anchors (href=) and images (src=) are different.
-	// anchors need get_preURL_href prepended to them.
-	// image URLs and files that are included don't need get_preURL_href.
-	preURL_href = git_preURL_href + git_raw + branch;
-	preURL_src = git_raw + branch;
-} else {
-	onGitHub = false;		// on a Pi
-	preURL_href = "";
-	preURL_src = "";
-}
-preURL_include = preURL_src;
-
-var convertURL_called = false;
-
-// Convert URL for all tags with an "allsky=true" attribute.
-// The specified URL will never be a full URL, i.e., it'll start with "/" or a dir/file.
-function convertURL() {
-	if (convertURL_called) return;
-	// TODO: should we only be called once?
-	// What if includeHTML() found multiple files and they all had "allsky" links?
-	convertURL_called = true;
-
-	allTags = document.getElementsByTagName("*");
-	for (var i = 0; i < allTags.length; i++) {
-		var elmnt = allTags[i];
-		/*
-			Search for elements with an "allsky" attribute which means
-			we need to update the URL.
-		*/
-		if (! elmnt.getAttribute("allsky")) continue;	// "allsky" not defined - ignore tag
-
-		var url = null;
-		var preURL;
-
-		// Most of the elements with "allsky" are href, so look for them first.
-		var attribute = "href";
-		url = elmnt.getAttribute(attribute);
-		if (url) {
-			preURL = preURL_href;
-		} else {	// not "href", look for "src".
-			attribute = "src";
-			url = elmnt.getAttribute(attribute);
-			if (url) {
-				preURL = preURL_src;
-			} else {
-				console.log("---- Did not find 'href' or 'src' for " + elmnt);
-				continue;
-			}
-		}
-
-		// See if the url starts with documentation_URL_full which is the root of the documentation.
-		var isDocumentation = (url.indexOf(documentation_URL_full) === 0) ? true : false;
-// if (! isDocumentation) console.log("isDoc=" + isDocumentation + ", url=" + url);
-		if (! isDocumentation) {
-			// Get the directory of the current page.
-			var dir = document.URL.substr(0,document.URL.lastIndexOf('/'))
-			var d = dir.lastIndexOf('/');
-			dir = dir.substr(d+1);
-// console.log("== dir=" + dir);
-
-			// Prepend the documentation string followed by the current directory
-			// if we're not already in the documentation directory.
-			if (url.substr(0,2) === "//") {
-				// Why does htmlpreview start the URL with "//" ?
-				url = "https:" + url;
-			} else if (dir !== documentation_URL) {
-				url = documentation_URL_full + dir + "/" + url;
-			}
-// console.log("== new url=" + url);
-		}
-
-		// Only prepend on GitHub if not already there.
-		if (onGitHub && url.indexOf(preURL) < 0) {
-			url = preURL + url;
-// console.log("== new url after adding preURL=" + url);
-		}
-		// else on Pi so nothing to do since the URL is already correct.
-
-		elmnt[attribute] = url;
-	}
-}
-
-
-// Include a file (e.g., header, footer, sidebar) in a page using Javascript.
-function includeHTML() {
-	/* Search all HTML elements looking for ones that specify a file should be included. */
-	allTags = document.getElementsByTagName("*");
-	for (var i = 0; i < allTags.length; i++) {
-		var elmnt = allTags[i];
-		/*search for elements with a certain atrribute:*/
-		var file = elmnt.getAttribute("w3-include-html");
-		if (file) {
-			/* Make an HTTP request using the attribute value as the file name */
-			var xhttp = new XMLHttpRequest();
-			xhttp.onreadystatechange = function() {
-				if (this.readyState == 4) {
-					if (this.status == 200)
-						elmnt.innerHTML = this.responseText;
-					else if (this.status == 400 || this.status == 404)
-						elmnt.innerHTML = this.status + ": Page not found.";
-					/*
-						Remove the attribute, and call this function once more
-						to see if there are any new entries to process and to handle
-						any other original entries.
-					 */
-					elmnt.removeAttribute("w3-include-html");
-					includeHTML();
-					if (! convertURL_called) convertURL();
-				}
-			}
-
-			if (onGitHub) {
-				var pre = preURL_include;
-				if (file.substr(0,1) !== "/") {
-					pre += "/";
-				}
-				file = pre + file;
-			}  // else on Pi so nothing to do since the URL is already correct.
-			xhttp.open("GET", file, true);
-			xhttp.send();
-
-			/* Exit the function: */
-			return;
-		}
-	}
-}
+// Modify URLs on the GitHub server so we can view pages there OR on a Pi.
+// Also, allow files to be included since GitHub doesn't have php.
+
+// branch is updated during installation.
+var branch = "dev";
+
+// On the Pi, URLs will either begin with "/documentation" (which is a web
+// alias to ~/allsky/documentation), or will be a relative path.
+// Either way, use it as is.
+
+// On GitHub, all URLs must have "/documentation/" in them - either because they were defined
+// that way in the html file, or we add them in this script.
+var documentation_URL = "documentation";
+var documentation_URL_full = "/" + documentation_URL + "/";
+
+var onGitHub;
+
+var git_hostname = "htmlpreview.github.io";
+var preURL_href, preURL_src;			// What gets prepended to the desired URL.
+
+var git_preURL_href = "https://" + git_hostname + "/?";
+var git_raw = "https://raw.githubusercontent.com/thomasjacquin/allsky/";
+
+if (location.hostname == git_hostname) {
+	onGitHub = true;
+
+	// On GitHub, the URLs for anchors (href=) and images (src=) are different.
+	// anchors need get_preURL_href prepended to them.
+	// image URLs and files that are included don't need get_preURL_href.
+	preURL_href = git_preURL_href + git_raw + branch;
+	preURL_src = git_raw + branch;
+} else {
+	onGitHub = false;		// on a Pi
+	preURL_href = "";
+	preURL_src = "";
+}
+preURL_include = preURL_src;
+
+var convertURL_called = false;
+
+// Convert URL for all tags with an "allsky=true" attribute.
+// The specified URL will never be a full URL, i.e., it'll start with "/" or a dir/file.
+function convertURL() {
+	if (convertURL_called) return;
+	// TODO: should we only be called once?
+	// What if includeHTML() found multiple files and they all had "allsky" links?
+	convertURL_called = true;
+
+	allTags = document.getElementsByTagName("*");
+	for (var i = 0; i < allTags.length; i++) {
+		var elmnt = allTags[i];
+		/*
+			Search for elements with an "allsky" attribute which means
+			we need to update the URL.
+		*/
+		if (! elmnt.getAttribute("allsky")) continue;	// "allsky" not defined - ignore tag
+
+		var url = null;
+		var preURL;
+
+		// Most of the elements with "allsky" are href, so look for them first.
+		var attribute = "href";
+		url = elmnt.getAttribute(attribute);
+		if (url) {
+			preURL = preURL_href;
+		} else {	// not "href", look for "src".
+			attribute = "src";
+			url = elmnt.getAttribute(attribute);
+			if (url) {
+				preURL = preURL_src;
+			} else {
+				console.log("---- Did not find 'href' or 'src' for " + elmnt);
+				continue;
+			}
+		}
+
+		// See if the url starts with documentation_URL_full which is the root of the documentation.
+		var isDocumentation = (url.indexOf(documentation_URL_full) === 0) ? true : false;
+// if (! isDocumentation) console.log("isDoc=" + isDocumentation + ", url=" + url);
+		if (! isDocumentation) {
+			// Get the directory of the current page.
+			var dir = document.URL.substr(0,document.URL.lastIndexOf('/'))
+			var d = dir.lastIndexOf('/');
+			dir = dir.substr(d+1);
+// console.log("== dir=" + dir);
+
+			// Prepend the documentation string followed by the current directory
+			// if we're not already in the documentation directory.
+			if (url.substr(0,2) === "//") {
+				// Why does htmlpreview start the URL with "//" ?
+				url = "https:" + url;
+			} else if (dir !== documentation_URL) {
+				url = documentation_URL_full + dir + "/" + url;
+			}
+// console.log("== new url=" + url);
+		}
+
+		// Only prepend on GitHub if not already there.
+		if (onGitHub && url.indexOf(preURL) < 0) {
+			url = preURL + url;
+// console.log("== new url after adding preURL=" + url);
+		}
+		// else on Pi so nothing to do since the URL is already correct.
+
+		elmnt[attribute] = url;
+	}
+}
+
+
+// Include a file (e.g., header, footer, sidebar) in a page using Javascript.
+function includeHTML() {
+	/* Search all HTML elements looking for ones that specify a file should be included. */
+	allTags = document.getElementsByTagName("*");
+	for (var i = 0; i < allTags.length; i++) {
+		var elmnt = allTags[i];
+		/*search for elements with a certain atrribute:*/
+		var file = elmnt.getAttribute("w3-include-html");
+		if (file) {
+			/* Make an HTTP request using the attribute value as the file name */
+			var xhttp = new XMLHttpRequest();
+			xhttp.onreadystatechange = function() {
+				if (this.readyState == 4) {
+					if (this.status == 200)
+						elmnt.innerHTML = this.responseText;
+					else if (this.status == 400 || this.status == 404)
+						elmnt.innerHTML = this.status + ": Page not found.";
+					/*
+						Remove the attribute, and call this function once more
+						to see if there are any new entries to process and to handle
+						any other original entries.
+					 */
+					elmnt.removeAttribute("w3-include-html");
+					includeHTML();
+					if (! convertURL_called) convertURL();
+				}
+			}
+
+			if (onGitHub) {
+				var pre = preURL_include;
+				if (file.substr(0,1) !== "/") {
+					pre += "/";
+				}
+				file = pre + file;
+			}  // else on Pi so nothing to do since the URL is already correct.
+			xhttp.open("GET", file, true);
+			xhttp.send();
+
+			/* Exit the function: */
+			return;
+		}
+	}
+}
diff --git a/documentation/explanations/SSL.html → html/documentation/explanations/SSL.html b/documentation/explanations/SSL.html → html/documentation/explanations/SSL.html
diff --git a/...tion/explanations/angleSunriseSunset.html → ...tion/explanations/angleSunriseSunset.html b/...tion/explanations/angleSunriseSunset.html → ...tion/explanations/angleSunriseSunset.html
diff --git a/...on/explanations/constellationOverlay.html → ...on/explanations/constellationOverlay.html b/...on/explanations/constellationOverlay.html → ...on/explanations/constellationOverlay.html
diff --git a/documentation/explanations/darkFrames.html → ...ocumentation/explanations/darkFrames.html b/documentation/explanations/darkFrames.html → ...ocumentation/explanations/darkFrames.html
diff --git a/...ons/exposureGainBrightnessSaturation.html → ...ons/exposureGainBrightnessSaturation.html b/...ons/exposureGainBrightnessSaturation.html → ...ons/exposureGainBrightnessSaturation.html
diff --git a/...mentation/explanations/imageOverlays.html → ...mentation/explanations/imageOverlays.html b/...mentation/explanations/imageOverlays.html → ...mentation/explanations/imageOverlays.html
diff --git a/documentation/explanations/keograms.html → .../documentation/explanations/keograms.html b/documentation/explanations/keograms.html → .../documentation/explanations/keograms.html
diff --git a/documentation/explanations/startrails.html → ...ocumentation/explanations/startrails.html b/documentation/explanations/startrails.html → ...ocumentation/explanations/startrails.html
diff --git a/documentation/images/README.txt → html/documentation/images/README.txt b/documentation/images/README.txt → html/documentation/images/README.txt
diff --git a/documentation/images/saveChangesButton.png → ...ocumentation/images/saveChangesButton.png b/documentation/images/saveChangesButton.png → ...ocumentation/images/saveChangesButton.png
diff --git a/...tion/images/showAdvancedOptionsButton.png → ...tion/images/showAdvancedOptionsButton.png b/...tion/images/showAdvancedOptionsButton.png → ...tion/images/showAdvancedOptionsButton.png
diff --git a/documentation/index.html → html/documentation/index.html b/documentation/index.html → html/documentation/index.html
diff --git a/documentation/installations/Allsky.html → html/documentation/installations/Allsky.html b/documentation/installations/Allsky.html → html/documentation/installations/Allsky.html
diff --git a/...entation/installations/AllskyWebsite.html → ...entation/installations/AllskyWebsite.html b/...entation/installations/AllskyWebsite.html → ...entation/installations/AllskyWebsite.html
diff --git a/documentation/installations/Code.png → html/documentation/installations/Code.png b/documentation/installations/Code.png → html/documentation/installations/Code.png
diff --git a/...tation/miscellaneous/cleaningWebsite.html → ...tation/miscellaneous/cleaningWebsite.html b/...tation/miscellaneous/cleaningWebsite.html → ...tation/miscellaneous/cleaningWebsite.html
diff --git a/...mentation/miscellaneous/nomenclature.html → ...mentation/miscellaneous/nomenclature.html b/...mentation/miscellaneous/nomenclature.html → ...mentation/miscellaneous/nomenclature.html
diff --git a/...entation/miscellaneous/pickingCamera.html → ...entation/miscellaneous/pickingCamera.html b/...entation/miscellaneous/pickingCamera.html → ...entation/miscellaneous/pickingCamera.html
diff --git a/documentation/miscellaneous/tips.html → html/documentation/miscellaneous/tips.html b/documentation/miscellaneous/tips.html → html/documentation/miscellaneous/tips.html
diff --git a/...mentation/settings/AllskySettingsPage.png → ...mentation/settings/AllskySettingsPage.png b/...mentation/settings/AllskySettingsPage.png → ...mentation/settings/AllskySettingsPage.png