respect URL Base in http preloads and inline html links

4 years ago · b037b08152
parent 95a6b48c3e
commit b037b08152
3 changed files with 9 additions and 5 deletions
--- a/html/admin.html
+++ b/html/admin.html
@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="en" class="{{ .cssClass }}">
    <head>
-        <link rel="stylesheet" type="text/css" href="css/bundle.css">
+        <link rel="stylesheet" type="text/css" href="{{ .urlBase }}/css/bundle.css">
        <script>
            window.URLBase = "{{ .urlBase }}";
            window.notificationsEnabled = {{ .notifications }};
@ -40,7 +40,7 @@
        <div id="modal-about" class="modal">
            <div class="modal-content content card">
                <span class="heading">{{ .strings.aboutProgram }} <span class="modal-close">&times;</span></span>
-                <img src="/banner.svg" class="mt-1" alt="jfa-go banner">
+                <img src="{{ .urlBase }}/banner.svg" class="mt-1" alt="jfa-go banner">
                <p><i class="icon ri-github-fill"></i><a href="https://github.com/hrfee/jfa-go">jfa-go</a></p>
                <p>{{ .strings.version }} <span class="code monospace">{{ .version }}</span></p>
                <p>{{ .strings.commitNoun }} <span class="code monospace">{{ .commit }}</span></p>
--- a/main.go
+++ b/main.go
@ -567,6 +567,8 @@ func start(asDaemon, firstCall bool) {
 			app.info.Fatalf("Failed to load language files: %+v\n", err)
 		}
 	}
+	cssHeader = app.loadCSSHeader()
+
 	app.info.Println("Loading routes")
 	if debugMode {
 		gin.SetMode(gin.DebugMode)
--- a/views.go
+++ b/views.go
@ -11,17 +11,19 @@ import (
 )

 var css = []string{"bundle.css", "remixicon.css"}
-var cssHeader = func() string {
+var cssHeader string
+
+func (app *appContext) loadCSSHeader() string {
 	l := len(css)
 	h := ""
 	for i, f := range css {
-		h += "</css/" + f + ">; rel=preload; as=style"
+		h += "<" + app.URLBase + "/css/" + f + ">; rel=preload; as=style"
 		if l > 1 && i != (l-1) {
 			h += ", "
 		}
 	}
 	return h
-}()
+}

 func gcHTML(gc *gin.Context, code int, file string, templ gin.H) {
 	gc.Header("Cache-Control", "no-cache")