Prioritize the important parts of titles

web/channel.go

@@ -97,6 +97,8 @@ func (env *Env) getChannel(writer http.ResponseWriter, req *http.Request) {
 		Page:        page,
 		Count:       count,
 		LastUpdated: time.Time{},
+		Source:      "",
+		Channel:     channel,
 	}
 	html.Feed(writer, data)
 }

web/html/feed.html

@@ -1,4 +1,4 @@
-{{ define "title" }}{{ if .Items }}({{ len .Items }}) {{ end }}Intake{{ end }}
+{{ define "title" }}{{ if .Items }}({{ len .Items }}) {{ end }}{{ if .Source}}{{ .Source }} - {{ else if .Channel }}{{ .Channel }} - {{ end }}Intake{{ end }}
 
 {{ define "content" -}}
 <nav class="center">

web/html/fetch.html

@@ -1,4 +1,4 @@
-{{ define "title" }}Intake - fetch result for {{ .Source }}{{ end }}
+{{ define "title" }}{{ .Source }} fetch result - Intake{{ end }}
 
 {{ define "content" -}}
 <nav class="center">

web/html/html.go

@@ -124,6 +124,8 @@ type FeedData struct {
 	Count       int
 	LastUpdated time.Time
 	EditLink    string
+	Source      string
+	Channel     string
 }
 
 func Feed(writer io.Writer, data FeedData) {

web/html/itemPage.html

@@ -1,4 +1,4 @@
-{{ define "title" }}{{ if .Item.Title }}{{ .Item.Title }}{{ else }}{{ .Item.Source }}/{{ .Item.Id }}{{ end }} - Intake [{{ .Item.Source }}]{{ end }}
+{{ define "title" }}{{ if .Item.Title }}{{ .Item.Title }} - {{ .Item.Source }}{{ else }}{{ .Item.Source }}/{{ .Item.Id }}{{ end }} - Intake{{ end }}
 
 {{ define "content" -}}
 <nav class="center">

web/html/login.html

@@ -1,4 +1,4 @@
-{{ define "title" }}Intake - Login{{ end }}
+{{ define "title" }}Login - Intake{{ end }}
 
 {{ define "content" -}}
 <nav class="center">

web/source.go

@@ -46,6 +46,8 @@ func (env *Env) getSource(writer http.ResponseWriter, req *http.Request) {
 		Count:       count,
 		LastUpdated: lastUpdated,
 		EditLink:    "/source/" + source + "/edit",
+		Source:      source,
+		Channel:     "",
 	}
 	html.Feed(writer, data)
 }