From 3a84af9c3ca731112bfb75e53c5ec83e81a80e52 Mon Sep 17 00:00:00 2001
From: Peter Sanchez <peter@netlandish.com>
Date: Fri, 8 Mar 2024 19:05:53 -0600
Subject: [PATCH] Small arrangement changes and copy updates

---
 core/routes.go      |  9 ++++++---
 core/templates.go   |  4 ++--
 templates/base.html | 16 ++++++++--------
 values.go           |  1 +
 4 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/core/routes.go b/core/routes.go
index 2954712..7ac691a 100644
--- a/core/routes.go
+++ b/core/routes.go
@@ -1360,7 +1360,8 @@ func (s *Service) PopularLinkList(c echo.Context) error {
 	pd := localizer.NewPageData(lt.Translate("Bookmarks"))
 	pd.Data["bookmark"] = lt.Translate("bookmark")
 	pd.Data["popular"] = lt.Translate("Popular Bookmarks")
-	pd.Data["no_links"] = lt.Translate("No Links")
+	pd.Data["no_links"] = lt.Translate(
+		"This ain't a popularity contest or anything but this is weird that there are no links!")
 
 	pLinks := result.PopularLinks
 	rssURL := c.Echo().Reverse(s.RouteName("popular_link_list_rss"))
@@ -1529,7 +1530,9 @@ func (s *Service) UserFeed(c echo.Context) error {
 	pd.Data["by"] = lt.Translate("By")
 	pd.Data["tags"] = lt.Translate("Tags")
 	pd.Data["search"] = lt.Translate("Search")
-	pd.Data["no_links"] = lt.Translate("No Links")
+	pd.Data["no_links"] = lt.Translate(
+		"Your feed is empty :( Go follow some people. Try the Popular or Recent " +
+			"feeds to find some interesting people to follow.")
 	pd.Data["advanced_search"] = lt.Translate("Advanced Search")
 	pd.Data["include_tags"] = lt.Translate("Include Tags")
 	pd.Data["exclude_tags"] = lt.Translate("Exclude Tags")
@@ -1847,7 +1850,7 @@ func (s *Service) OrgLinksList(c echo.Context) error {
 	pd.Data["mark_as_unread"] = lt.Translate("Mark as unread")
 	pd.Data["mark_as_starred"] = lt.Translate("Star")
 	pd.Data["mark_as_non_starred"] = lt.Translate("Unstar")
-	pd.Data["no_links"] = lt.Translate("No Links")
+	pd.Data["no_links"] = lt.Translate("This feed has no links. Booo!")
 	pd.Data["archive"] = lt.Translate("Archive")
 	pd.Data["advanced_search"] = lt.Translate("Advanced Search")
 	pd.Data["include_tags"] = lt.Translate("Include Tags")
diff --git a/core/templates.go b/core/templates.go
index 9b30865..22ae7b5 100644
--- a/core/templates.go
+++ b/core/templates.go
@@ -23,7 +23,7 @@ func AddGlobalTmpl(c echo.Context) gobwebs.Map {
 	lt := localizer.GetSessionLocalizer(c)
 	pd.Data["store_dashboard"] = lt.Translate("Store Dashboard")
 	pd.Data["tour"] = lt.Translate("Tour")
-	pd.Data["bookmarks"] = lt.Translate("My Bookmarks")
+	pd.Data["bookmarks"] = lt.Translate("Bookmarks")
 	pd.Data["recent"] = lt.Translate("Recent")
 	pd.Data["popular"] = lt.Translate("Popular")
 	pd.Data["categories"] = lt.Translate("Categories")
@@ -43,7 +43,7 @@ func AddGlobalTmpl(c echo.Context) gobwebs.Map {
 	pd.Data["manage_lists"] = lt.Translate("Lists")
 	pd.Data["manage_shorts"] = lt.Translate("Short Links")
 	pd.Data["admin"] = lt.Translate("Admin")
-	pd.Data["my_feed"] = lt.Translate("My Feed")
+	pd.Data["my_feed"] = lt.Translate("Feed")
 	gmap["base_pd"] = pd
 	// serverVersion
 	serverVersion := strings.Split(strings.Split(gctx.Server.AppInfo(), " ")[1], "-")
diff --git a/templates/base.html b/templates/base.html
index 6131863..72f93c2 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -70,14 +70,6 @@
                 </li>
                 {{end}}
                 {{if .isAuthorized}}
-                <li>
-                    <a class="menu-item{{if eq .navFlag "bookmarks"}} menu-item--active{{end}}" href="{{reverse "core:home_link_list"}}">
-                        <svg class="menu-item__icon" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor">
-                            <path stroke-linecap="round" stroke-linejoin="round" d="M16.5 3.75V16.5L12 14.25 7.5 16.5V3.75m9 0H18A2.25 2.25 0 0120.25 6v12A2.25 2.25 0 0118 20.25H6A2.25 2.25 0 013.75 18V6A2.25 2.25 0 016 3.75h1.5m9 0h-9" />
-                        </svg>
-                        <span>{{.base_pd.Data.bookmarks}}</span>
-                    </a>
-                </li>
                 <li>
                     <a class="menu-item{{if eq .navFlag "feed"}} menu-item--active{{end}}" href="{{reverse "core:user_feed"}}">
                         <svg class="menu-item__icon" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" class="w-6 h-6">
@@ -86,6 +78,14 @@
                         <span>{{.base_pd.Data.my_feed}}</span>
                     </a>
                 </li>
+                <li>
+                    <a class="menu-item{{if eq .navFlag "bookmarks"}} menu-item--active{{end}}" href="{{reverse "core:home_link_list"}}">
+                        <svg class="menu-item__icon" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor">
+                            <path stroke-linecap="round" stroke-linejoin="round" d="M16.5 3.75V16.5L12 14.25 7.5 16.5V3.75m9 0H18A2.25 2.25 0 0120.25 6v12A2.25 2.25 0 0118 20.25H6A2.25 2.25 0 013.75 18V6A2.25 2.25 0 016 3.75h1.5m9 0h-9" />
+                        </svg>
+                        <span>{{.base_pd.Data.bookmarks}}</span>
+                    </a>
+                </li>
                 <li>
                     <a class="menu-item{{if eq .navFlag "addLink"}} menu-item--active{{end}}" href="{{reverse "core:link_create"}}">
                         <svg class="menu-item__icon" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor">
diff --git a/values.go b/values.go
index 8f60d29..67dd2c1 100644
--- a/values.go
+++ b/values.go
@@ -71,6 +71,7 @@ var InvalidSlugs = []string{
 	"read",
 	"star",
 	"rss",
+	"feed",
 }
 
 // Interval used to display data in analytics engagement chart
-- 
2.45.2