miki

commit bf7340b4ea4a2d445f20bc7ab568fb283fa48b5c
parent bc2ecc91dbb07b24e462232e42b64c748e6ae0a0
Author: weetat <wtenison@protonmail.com>
Date:   Mon, 24 Feb 2025 03:47:13 +0000

Moved header to template file.

Diffstat:
M
src/filesystem/filesystem.go
 | 
2
+-
M
src/network/network.go
 | 
11
+++++------
A
web/global/header.tmpl.html
 | 
24
++++++++++++++++++++++++
M
web/home/index.html
 | 
22
+---------------------

4 files changed, 31 insertions(+), 28 deletions(-)
diff --git a/src/filesystem/filesystem.go b/src/filesystem/filesystem.go
@@ -92,7 +92,7 @@ func MakeDirectoryPkg(resSig DirectorySignature) (DirectoryPackage, error) {
 	// Include any sub-directory file dependencies.
 	_resPkg.DependencyFiles = append(_resPkg.DependencyFiles, _resFileDirDeps...)
 
-	log.Printf("INFO\tMakeDirectoryPkg:%v\n", _resPkg)
+	// log.Printf("INFO\tMakeDirectoryPkg:%v\n", _resPkg)
 	return _resPkg, nil
 }
 
diff --git a/src/network/network.go b/src/network/network.go
@@ -63,12 +63,11 @@ func Init() {
 	})
 
 	mux.HandleFunc("/home", func(w http.ResponseWriter, r *http.Request) {
-		log.Printf("CALL\tmain:mux.HandleFunc:%s\n", r.URL)
 
 		// Produce URL path to directory relation.
 		_r, _err := mfs.MakeDirectorySig(filepath.Join(mfs.Paths.WebDirectory, "/home"), 0, mfs.FilePatternHTML)
 		if _err != nil {
-			log.Printf("_ERROR\tmain:HandleFunc(\"/\"):MakeResourceSig():%s\n", _err)
+			log.Printf("_ERROR\tHandleFunc(\"/\"):MakeResourceSig():%s\n", _err)
 			http.NotFound(w, r)
 			return
 		}
@@ -76,7 +75,7 @@ func Init() {
 		// Collect HTML template files from directory.
 		_rPkg, _err := mfs.MakeDirectoryPkg(_r)
 		if _err != nil {
-			log.Printf("_ERROR\tmain:HandleFunc(\"/\"):MakeResourcePkg():%s\n", _err)
+			log.Printf("_ERROR\tHandleFunc(\"/\"):MakeResourcePkg():%s\n", _err)
 			http.NotFound(w, r)
 			return
 		}
@@ -85,18 +84,18 @@ func Init() {
 
 		_tmpl, _err := template.ParseFiles(_rPkg.DependencyFiles...)
 		if _err != nil {
-			log.Printf("_ERROR\tmain:HandleFunc(\"/\"):MakeResourcePkg():%s\n", _err)
+			log.Printf("_ERROR\tHandleFunc(\"/\"):MakeResourcePkg():%s\n", _err)
 			http.Error(w, "_ERROR:HandleFunc(\"/\"):template.ParseFiles()", 500)
 			return
 		}
 
 		if _err = _tmpl.ExecuteTemplate(w, "index.html", _rPkg.DependencyData); _err != nil {
-			log.Printf("_ERROR\tmain:HandleFunc(\"/\"):MakeResourcePkg():%s\n", _err)
+			log.Printf("_ERROR\tHandleFunc(\"/\"):MakeResourcePkg():%s\n", _err)
 			http.Error(w, "_ERROR:HandleFunc(\"/\"):template.ExecuteTemplate()", 500)
 			return
 		}
 
-		log.Printf("DONE\tmain:mux.HandleFunc:%s\n", r.URL)
+		log.Printf("DONE\tHandleFunc:%s\n", r.URL)
 	})
 
 	mux.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
diff --git a/web/global/header.tmpl.html b/web/global/header.tmpl.html
@@ -0,0 +1,23 @@
+{{define "header"}}
+<header>
+    <section class="_content">
+
+        <div id="left" class="collapsible_">
+            <div class="_button">MENU</div>
+            <div class="_content">
+                <p>TEST MENU</p> 
+            </div>
+        </div>
+
+        <div id="title">TEST</div>
+
+        <div id="right" class="collapsible_">
+            <div class="_button">SEARCH</div>
+            <div class="_content">
+                <p>TEST SEARCH</p>
+            </div>
+        </div>
+
+    </section>
+</header>
+{{end}}
+\ No newline at end of file
diff --git a/web/home/index.html b/web/home/index.html
@@ -10,27 +10,7 @@
 
 <body>
 
-    <header>
-        <section class="_content">
-
-            <div id="left" class="collapsible_">
-                <div class="_button">MENU</div>
-                <div class="_content">
-                    <p>TEST MENU</p> 
-                </div>
-            </div>
-
-            <div id="title">TEST</div>
-
-            <div id="right" class="collapsible_">
-                <div class="_button">SEARCH</div>
-                <div class="_content">
-                    <p>TEST SEARCH</p>
-                </div>
-            </div>
-
-        </section>
-    </header>
+    {{template "header"}}
 
     <section class="_content">