Don't show the autogenerated code for serve

Looks ugly; the only reason there's a value there in the first place is because of the SQL constraint on the column.
arp242 · May 28, 2020 · 94aa265 · 94aa265
1 parent bc48d48
commit 94aa265
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 4 deletions.
diff --git a/pack/pack.go b/pack/pack.go
diff --git a/site.go b/site.go
@@ -379,6 +379,14 @@ func (s Site) Domain() string {
 	return cfg.Domain
 }
 
+// Display format: just the domain (cname or code+domain).
+func (s Site) Display() string {
+	if s.Cname != nil {
+		return *s.Cname
+	}
+	return fmt.Sprintf("%s.%s", s.Code, zhttp.RemovePort(cfg.Domain))
+}
+
 // URL to this site.
 func (s Site) URL() string {
 	if s.Cname != nil {

diff --git a/tpl/_backend_top.gohtml b/tpl/_backend_top.gohtml
@@ -3,7 +3,7 @@
 <head>
 	{{template "_favicon.gohtml" .}}
 	<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-	<title>{{.Site.Code}} – GoatCounter</title>
+	<title>{{if .GoatcounterCom}}{{.Site.Code}} – {{end}}GoatCounter</title>
 	<link rel="stylesheet" href="{{.Static}}/all.min.css?v={{.Version}}">
 	<link rel="stylesheet" href="{{.Static}}/pikaday.css?v={{.Version}}">
 	<link rel="stylesheet" href="{{.Static}}/style_backend.css?v={{.Version}}">

diff --git a/tpl/user.gohtml b/tpl/user.gohtml
@@ -1,6 +1,6 @@
 {{template "_backend_top.gohtml" .}}
 
-<h1>Sign in at {{.Site.Code}}</h1>
+<h1>Sign in at {{.Site.Display}}</h1>
 {{template "_backend_signin.gohtml" .}}
 
 {{template "_backend_bottom.gohtml" .}}