Received: from mail.netlandish.com (mail.netlandish.com [174.136.98.166])
	by code.netlandish.com (Postfix) with ESMTP id 908712D7
	for <~netlandish/links-dev@lists.code.netlandish.com>; Fri, 18 Apr 2025 14:44:26 +0000 (UTC)
Received-SPF: Pass (mailfrom) identity=mailfrom; client-ip=209.85.219.175; helo=mail-yb1-f175.google.com; envelope-from=peter@netlandish.com; receiver=<UNKNOWN> 
Authentication-Results: mail.netlandish.com;
	dkim=pass (1024-bit key; unprotected) header.d=netlandish.com header.i=@netlandish.com header.b=hIKFlKOI
Received: from mail-yb1-f175.google.com (mail-yb1-f175.google.com [209.85.219.175])
	by mail.netlandish.com (Postfix) with ESMTP id 75EC51D642E
	for <~netlandish/links-dev@lists.code.netlandish.com>; Fri, 18 Apr 2025 14:44:36 +0000 (UTC)
Received: by mail-yb1-f175.google.com with SMTP id 3f1490d57ef6-e6dd991a0e6so1599651276.1
        for <~netlandish/links-dev@lists.code.netlandish.com>; Fri, 18 Apr 2025 07:44:36 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=netlandish.com; s=google; t=1744987476; x=1745592276; darn=lists.code.netlandish.com;
        h=content-transfer-encoding:mime-version:message-id:date:subject:cc
         :to:from:from:to:cc:subject:date:message-id:reply-to;
        bh=k3lFWJxWagjg4Hc4TbPhcUFSva2ZUSafTMUYs/dMIrI=;
        b=hIKFlKOIQbdA3Irjh7VfvCxEAQtxRyLHNxljaAGxvCkPJ0ry3WJcyFl45V4JOFqeuM
         vtAZUorMmpTjvYxUMxBTggAZogLkN6qiYI+D+3up8ObBu2vMiv7dG6gLYNmSIMck38jV
         Z6lgE0JSt0eiTNRxYHBS7gjV1DfUNHPQb4dTk=
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=1e100.net; s=20230601; t=1744987476; x=1745592276;
        h=content-transfer-encoding:mime-version:message-id:date:subject:cc
         :to:from:x-gm-message-state:from:to:cc:subject:date:message-id
         :reply-to;
        bh=k3lFWJxWagjg4Hc4TbPhcUFSva2ZUSafTMUYs/dMIrI=;
        b=YKqF7iN1mFVo2+R3l7EhP/hNya79eJG+2PfcqL93gk7ExID5s1OyVdh5zXqNYpRlja
         AbtRF+OT5S4NkMnLKdY3mhoKsa+mgso0VU4t2o7lp3Y7xC/6gTxzGOWpQpdW5oZ6EA76
         n1/pYTRqH+EIcps8NvYrhdCM9e3gk6CACOGspGCYgGi/I3ZRGRVDSwbkJO/+9dXJiufu
         94h7eruIOKL2mVnXGIQGZ0L2Nk9LoGnSAEg0kH3dhAOugZIDVkOqkS+6gKRzHEokJZqr
         GcKXa9R75MOH9b9qKat5YoaW1mnOddfVTvgUyysgBg+WbySN4ghTBtaf4LS8TOoHMI5U
         fmAw==
X-Gm-Message-State: AOJu0Yx9Rj5Af3vvXQNJw2YGR6H58dUrha7ulOf9oedrXzKyRVxXQq9v
	QZ0zb/NFFxliqqKG8OaZ13CwIFfmnDU/PYStPaoqCfdluEViu3NijbN02PIdVLE/ify2AUV/j8i
	cSDE=
X-Gm-Gg: ASbGnctAwFSRBk4XhMtrzeGVERp8V8MHSTwGHQvp5CmxgQSXlsbflRZWmm+H/Wf5O5J
	8ABcrOEmvLvja/r63CSTf16hToET+GNN1ErZ7Q8wp8gs9N6BaOyuEPZUUNeoyakHb3T/HA/WzwO
	sWN47ANc9wEoPR+Gla7aJmyylZcUSKZCxh5ChPUnjfA4xYwFzNlH5qc1tz6RqocI4f8RvbvkxsD
	xpUFjvwyBYLWZbJvcueDbVZCJi345/rOc848syuHig/QOmwzNZiQT0N8Z3zWt38C47TzXY5qbbZ
	JS0sojYBH+FxfmD5uIFxb2TPDe73nr0K+N4PYf4=
X-Google-Smtp-Source: AGHT+IF/Ugu2/lX4sxRkgEz3cgfHP5HLBqPyM46QoI6JUr7lcFveX8VAqtKUuytGTjlZ+CM7O8Hhyg==
X-Received: by 2002:a05:6902:1588:b0:e60:c442:afbf with SMTP id 3f1490d57ef6-e7297ea1c88mr4162552276.44.1744987475505;
        Fri, 18 Apr 2025 07:44:35 -0700 (PDT)
Received: from localhost ([2803:2d60:1107:87f:1e:2d9a:aa74:b8b2])
        by smtp.gmail.com with ESMTPSA id 3f1490d57ef6-e7295893c9asm465976276.29.2025.04.18.07.44.34
        (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
        Fri, 18 Apr 2025 07:44:35 -0700 (PDT)
From: Peter Sanchez <peter@netlandish.com>
To: ~netlandish/links-dev@lists.code.netlandish.com
Cc: Peter Sanchez <peter@netlandish.com>
Subject: [PATCH links] Fixing issue with navFlag conflict. Oops
Date: Fri, 18 Apr 2025 08:44:27 -0600
Message-ID: <20250418144432.1744-1-peter@netlandish.com>
X-Mailer: git-send-email 2.47.2
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit

---
 core/routes.go           | 27 ++++++++++++++-------------
 templates/link_list.html |  4 ++--
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/core/routes.go b/core/routes.go
index 54fa248..286d8e9 100644
--- a/core/routes.go
+++ b/core/routes.go
@@ -2018,19 +2018,20 @@ func (s *Service) GetBookmarks(c echo.Context) error {
 
 	navFlag := "bookmarks"
 	gmap := gobwebs.Map{
-		"pd":            pd,
-		"seoData":       seoData,
-		"links":         orgLinks,
-		"navFlag":       navFlag,
-		"currURL":       seoData.URL,
-		"tagCloud":      result.OrgLinks.TagCloud,
-		"pTitle":        result.OrgLinks.Title,
-		"pDescription":  result.OrgLinks.Description,
-		"pURL":          result.OrgLinks.URL,
-		"pCount":        result.OrgLinks.Count,
-		"queries":       template.URL(queries.Encode()),
-		"tagFilter":     strings.Replace(tag, ",", ", ", -1),
-		"hideSaveCount": true,
+		"pd":              pd,
+		"seoData":         seoData,
+		"links":           orgLinks,
+		"navFlag":         navFlag,
+		"currURL":         seoData.URL,
+		"tagCloud":        result.OrgLinks.TagCloud,
+		"pTitle":          result.OrgLinks.Title,
+		"pDescription":    result.OrgLinks.Description,
+		"pURL":            result.OrgLinks.URL,
+		"pCount":          result.OrgLinks.Count,
+		"queries":         template.URL(queries.Encode()),
+		"tagFilter":       strings.Replace(tag, ",", ", ", -1),
+		"hideSaveCount":   true,
+		"bookmarkListing": true,
 	}
 
 	return s.Render(c, http.StatusOK, "link_list.html", gmap)
diff --git a/templates/link_list.html b/templates/link_list.html
index cf9ff5c..838a3eb 100644
--- a/templates/link_list.html
+++ b/templates/link_list.html
@@ -1,6 +1,6 @@
 {{template "base" .}}
 {{ define "title" }}{{ .title }}{{ end }}
-{{ if ne .navFlag "bookmarks" }}
+{{ if (not .bookmarkListing) }}
 <form method="GET"
     action="{{ if .isUserDomain }}/{{ else }}{{if .isPopular}}{{reverse "core:popular_link_list"}}{{else if .isOrgLink}}{{.currURL}}{{else}}{{reverse "core:recent_link_list"}}{{end}}{{ end }}{{if .hasUnreadFilter}}?filter=unread{{else if .hasStarredFilter}}?filter=starred{{end}}"
     id="advanced-search-form"
@@ -75,7 +75,7 @@
     </p>
     {{ end }}
   {{end}}
-  {{ if eq .navFlag "bookmarks" }}
+  {{ if .bookmarkListing }}
   <div class="row">
     <h3>{{ .pTitle }}
     <div class="button outline primary tag tag-popular is-small">{{ .pCount }}</div>
-- 
2.47.2