Add top_html config option

karmakaze · karmakaze · commit 1537b9858bc4 · 2018-11-13T21:39:41.000-05:00
diff --git a/cmds/houndd/main.go b/cmds/houndd/main.go
@@ -3,6 +3,7 @@ package main
 import (
 	"encoding/json"
 	"flag"
+	"html/template"
 	"log"
 	"net/http"
 	"os"
@@ -81,8 +82,10 @@ func makeTemplateData(cfg *config.Config) (interface{}, error) {
 	var data struct {
 		ReposAsJson string
 		FaviconURL  string
+		TopHTML     template.HTML
 	}
 	data.FaviconURL = cfg.FaviconURL
+	data.TopHTML = template.HTML(cfg.TopHTML)
 
 	res := map[string]*config.Repo{}
 	for name, repo := range cfg.Repos {
diff --git a/config/config.go b/config/config.go
@@ -64,6 +64,7 @@ type Config struct {
 	JwtCookieName         string           `json:"jwt_cookie_name"`
 	JwtSecretKey          string           `json:"jwt_secret_key"`
 	FaviconURL            string           `json:"favicon_url"`
+	TopHTML               string           `json:"top_html"`
 }
 
 // SecretMessage is just like json.RawMessage but it will not
diff --git a/ui/assets/excluded_files.tpl.html b/ui/assets/excluded_files.tpl.html
@@ -3,10 +3,16 @@
     <head>
         <meta charset="utf-8">
         <title>Gitgrep - Excluded Files</title>
+        {{ if not (eq .FaviconURL "") }}
+        <link rel="icon" type="image/x-icon" href="{{ .FaviconURL }}"/>
+        {{ end }}
         <link rel="stylesheet" href="css/octicons/octicons.css">
         <link rel="stylesheet" href="css/hound.css">
     </head>
     <body>
+        {{ if not (eq .TopHTML "") }}
+        {{ .TopHTML }}
+        {{ end }}
         <div id="root"></div>
 
         <script src="js/react-{{.ReactVersion}}.min.js"></script>
diff --git a/ui/assets/index.tpl.html b/ui/assets/index.tpl.html
@@ -14,6 +14,9 @@
               title="Gitgrep" />
     </head>
     <body>
+        {{ if not (eq .TopHTML "") }}
+        {{ .TopHTML }}
+        {{ end }}
         <div id="root">
             <div id="result">
             </div>
diff --git a/ui/ui.go b/ui/ui.go
@@ -101,6 +101,7 @@ func renderForDev(w io.Writer, root string, c *content, cfg *config.Config, r *h
 		"Source":        html_template.HTML(buf.String()),
 		"Host":          r.Host,
 		"FaviconURL":    cfg.FaviconURL,
+		"TopHTML":       html_template.HTML(cfg.TopHTML),
 	})
 }
 
@@ -162,6 +163,7 @@ func renderForPrd(w io.Writer, c *content, cfg *config.Config, cfgJson string, r
 		"Source":        html_template.HTML(buf.String()),
 		"Host":          r.Host,
 		"FaviconURL":    cfg.FaviconURL,
+		"TopHTML":       html_template.HTML(cfg.TopHTML),
 	})
 }
 

Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,7 @@ type Config struct {`
`64`	`64`	JwtCookieName string `json:"jwt_cookie_name"`
`65`	`65`	JwtSecretKey string `json:"jwt_secret_key"`
`66`	`66`	FaviconURL string `json:"favicon_url"`
	`67`	+ TopHTML string `json:"top_html"`
`67`	`68`	`}`
`68`	`69`
`69`	`70`	`// SecretMessage is just like json.RawMessage but it will not`
Original file line number	Diff line number	Diff line change
`@@ -101,6 +101,7 @@ func renderForDev(w io.Writer, root string, c content, cfg config.Config, r *h`
`101`	`101`	`"Source": html_template.HTML(buf.String()),`
`102`	`102`	`"Host": r.Host,`
`103`	`103`	`"FaviconURL": cfg.FaviconURL,`
	`104`	`+ "TopHTML": html_template.HTML(cfg.TopHTML),`
`104`	`105`	`})`
`105`	`106`	`}`
`106`	`107`
`@@ -162,6 +163,7 @@ func renderForPrd(w io.Writer, c content, cfg config.Config, cfgJson string, r`
`162`	`163`	`"Source": html_template.HTML(buf.String()),`
`163`	`164`	`"Host": r.Host,`
`164`	`165`	`"FaviconURL": cfg.FaviconURL,`
	`166`	`+ "TopHTML": html_template.HTML(cfg.TopHTML),`
`165`	`167`	`})`
`166`	`168`	`}`
`167`	`169`