From ea07bd16930fce581a1438701d015cf2241cb970 Mon Sep 17 00:00:00 2001
From: SK <sk@utsukta.org>
Date: Thu, 15 Jan 2026 02:15:26 +0530
Subject: [PATCH] move html from bookmarks module to its tpl

---
 Zotlabs/Module/Bookmarks.php | 44 ++++++++++++++++--------------------
 view/tpl/bookmarks.tpl       | 11 +++++++++
 2 files changed, 30 insertions(+), 25 deletions(-)
 create mode 100644 view/tpl/bookmarks.tpl

diff --git a/Zotlabs/Module/Bookmarks.php b/Zotlabs/Module/Bookmarks.php
index 659884fed..d77d6138a 100644
--- a/Zotlabs/Module/Bookmarks.php
+++ b/Zotlabs/Module/Bookmarks.php
@@ -83,37 +83,31 @@ class Bookmarks extends \Zotlabs\Web\Controller {
 
 		$channel = \App::get_channel();
 
-		$o = '';
-
-		$o .= '<div class="generic-content-wrapper-styled">';
-
-		$o .= '<h3>' . t('Bookmarks') . '</h3>';
-
-		$x = menu_list(local_channel(),'',MENU_BOOKMARK);
-
-		if($x) {
-			foreach($x as $xx) {
-				$y = menu_fetch($xx['menu_name'],local_channel(),get_observer_hash());
-				$o .= menu_render($y,'',true);
+		$bookmarks = [];
+		$x = menu_list(local_channel(), '', MENU_BOOKMARK);
+		if ($x) {
+			foreach ($x as $xx) {
+				$y = menu_fetch($xx['menu_name'], local_channel(), get_observer_hash());
+				$bookmarks[] = menu_render($y, '', true);
 			}
 		}
 
-		$o .= '<h3>' . t('My Connections Bookmarks') . '</h3>';
-
-
-		$x = menu_list(local_channel(),'',MENU_SYSTEM|MENU_BOOKMARK);
-
-		if($x) {
-			foreach($x as $xx) {
-				$y = menu_fetch($xx['menu_name'],local_channel(),get_observer_hash());
-				$o .= menu_render($y,'',true);
+		$conn_bookmarks = [];
+		$x = menu_list(local_channel(), '', MENU_SYSTEM | MENU_BOOKMARK);
+		if ($x) {
+			foreach ($x as $xx) {
+				$y = menu_fetch($xx['menu_name'], local_channel(), get_observer_hash());
+				$conn_bookmarks[] = menu_render($y, '', true);
 			}
 		}
 
-		$o .= '</div>';
-
-		return $o;
-
+		return replace_macros(get_markup_template('bookmarks.tpl'), [
+			'$title1' => t('Bookmarks'),
+			'$title2' => t('My Connections Bookmarks'),
+			'$bookmarks' => $bookmarks,
+			'$conn_bookmarks' => $conn_bookmarks,
+		]);
+		
 	}
 
 
diff --git a/view/tpl/bookmarks.tpl b/view/tpl/bookmarks.tpl
new file mode 100644
index 000000000..d5e4ea90b
--- /dev/null
+++ b/view/tpl/bookmarks.tpl
@@ -0,0 +1,11 @@
+<div class="generic-content-wrapper-styled">
+	<h3>{{$title1}}</h3>
+	{{foreach $bookmarks as $bm}}
+		{{$bm}}
+	{{/foreach}}
+
+	<h3>{{$title2}}</h3>
+	{{foreach $conn_bookmarks as $bm}}
+		{{$bm}}
+	{{/foreach}}
+</div>