embed/initial/base.html

@@ -36,7 +36,6 @@
     <style>
         header {
             background-color: {{.User.Config.HeaderColor}};
-            padding-bottom: 1rem !important;
         }
 
         footer {
@@ -88,19 +87,7 @@
                 {{ end }}
                 </div>
             </div>
-        </div>
-        <div class="container">
-            <nav>
-                <ul>
-                    {{ range $link := .User.Config.HeaderMenu }}
-                        {{ if $link.List }}
-                            <li><a href="{{ listUrl $.User $link.List }}">{{ $link.Title }}</a></li>
-                        {{ else }}
-                            <li><a href="{{ $link.Url }}">{{ $link.Title }}</a></li>
-                        {{ end }}
-                    {{ end }}
-                </ul>
-            </nav>
+
         </div>
     </header>
     <main class="container">

renderer.go

@@ -49,12 +49,6 @@ func noescape(str string) template.HTML {
 	return template.HTML(str)
 }
 
-func listUrl(user User, id string) string {
-	return user.ListUrl(PostList{
-		Id: id,
-	})
-}
-
 func renderEmbedTemplate(templateFile string, data interface{}) (string, error) {
 	templateStr, err := embed_files.ReadFile(templateFile)
 	if err != nil {
@@ -66,7 +60,6 @@ func renderEmbedTemplate(templateFile string, data interface{}) (string, error)
 func renderTemplateStr(templateStr []byte, data interface{}) (string, error) {
 	t, err := template.New("_").Funcs(template.FuncMap{
 		"noescape": noescape,
-		"listUrl":  listUrl,
 	}).Parse(string(templateStr))
 	if err != nil {
 		return "", err
@@ -81,10 +74,7 @@ func renderTemplateStr(templateStr []byte, data interface{}) (string, error) {
 
 func renderIntoBaseTemplate(user User, data PageContent) (string, error) {
 	baseTemplate, _ := user.Template()
-	t, err := template.New("index").Funcs(template.FuncMap{
-		"noescape": noescape,
-		"listUrl":  listUrl,
-	}).Parse(baseTemplate)
+	t, err := template.New("index").Parse(baseTemplate)
 	if err != nil {
 		return "", err
 	}

renderer_test.go

@@ -406,25 +406,3 @@ func TestRenderUserAuthHiddenFields(t *testing.T) {
 	assertions.AssertContains(t, result, "name=\"response_type\" value=\"code\"")
 	assertions.AssertContains(t, result, "name=\"state\" value=\"teststate\"")
 }
-
-func TestRenderHeaderMenuListItem(t *testing.T) {
-	user := getTestUser()
-	user.AddHeaderMenuItem(owl.MenuItem{
-		Title: "Test Entry",
-		List:  "test",
-	})
-	result, _ := owl.RenderIndexPage(user)
-	assertions.AssertContains(t, result, "Test Entry")
-	assertions.AssertContains(t, result, "/lists/test")
-}
-
-func TestRenderHeaderMenuUrlItem(t *testing.T) {
-	user := getTestUser()
-	user.AddHeaderMenuItem(owl.MenuItem{
-		Title: "Test Entry",
-		Url:   "https://example.com",
-	})
-	result, _ := owl.RenderIndexPage(user)
-	assertions.AssertContains(t, result, "Test Entry")
-	assertions.AssertContains(t, result, "https://example.com")
-}

user.go

@@ -28,7 +28,6 @@ type UserConfig struct {
 	PassworHash        string     `yaml:"password_hash"`
 	Lists              []PostList `yaml:"lists"`
 	PrimaryListInclude []string   `yaml:"primary_list_include"`
-	HeaderMenu         []MenuItem `yaml:"header_menu"`
 }
 
 type PostList struct {
@@ -37,12 +36,6 @@ type PostList struct {
 	Include []string `yaml:"include"`
 }
 
-type MenuItem struct {
-	Title string `yaml:"title"`
-	List  string `yaml:"list"`
-	Url   string `yaml:"url"`
-}
-
 func (l *PostList) ContainsType(t string) bool {
 	for _, t2 := range l.Include {
 		if t2 == t {
@@ -397,12 +390,6 @@ func (user User) AddPostList(list PostList) error {
 	return user.SetConfig(config)
 }
 
-func (user User) AddHeaderMenuItem(link MenuItem) error {
-	config := user.Config()
-	config.HeaderMenu = append(config.HeaderMenu, link)
-	return user.SetConfig(config)
-}
-
 func (user User) ResetPassword(password string) error {
 	bytes, err := bcrypt.GenerateFromPassword([]byte(password), 10)
 	if err != nil {