Merge pull request #9908 from schu96/9337/fix/mybooks-follow-button

Show toolbar and follow button for list visitor
internetarchive · Nov 14, 2024 · 474bdca · 474bdca
2 parents 425184f + 78c16bf
commit 474bdca
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 19 deletions.
diff --git a/openlibrary/i18n/messages.pot b/openlibrary/i18n/messages.pot
@@ -1724,8 +1724,8 @@ msgstr ""
 
 #: EditionNavBar.html SearchNavigation.html account/sidebar.html
 #: lib/nav_head.html lists/home.html lists/widget.html recentchanges/index.html
-#: type/edition/view.html type/list/embed.html type/list/view_body.html
-#: type/user/view.html type/work/view.html
+#: type/edition/view.html type/list/embed.html type/user/view.html
+#: type/work/view.html
 msgid "Lists"
 msgstr ""
 

diff --git a/openlibrary/templates/account/view.html b/openlibrary/templates/account/view.html
@@ -52,7 +52,7 @@ <h1 class="details-title">$header_title</h1>
               $ share_links = ctx.get('share_links')
               $:macros.ShareModal(share_links, page_url, share_content, "share-modal-wrapper", show_embed=False)
         </div>
-      $if page:
+      $if page and mb.is_my_page:
         $:macros.databarView(page)
     </header>
 

diff --git a/openlibrary/templates/type/list/view.html b/openlibrary/templates/type/list/view.html
@@ -8,13 +8,9 @@
 $if check_owner and username:
     $ is_owner = username == lst['key'].split('/')[2]
 
-$if check_owner and is_owner:
-    $ template = MyBooksTemplate(username, 'list').render(
-    $     header_title=lst.get('name', 'List'),
-    $     template=render_template("type/list/view_body", lst, is_owner=True),
-    $     page=lst,
+$ template = MyBooksTemplate(lst['key'].split('/')[2], 'list').render(
+    $   header_title= "",
+    $   template=render_template("type/list/view_body", lst, is_owner),
+    $   page=lst
     $ )
-    $:template
-
-$else:
-    $:render_template("type/list/view_body", lst, is_owner)
+$:template
diff --git a/openlibrary/templates/type/list/view_body.html b/openlibrary/templates/type/list/view_body.html
@@ -38,13 +38,6 @@
 $if not is_owner:
     <div id="contentHead" style="margin-bottom:0;">
         $ owner = list.get_owner()
-        $:macros.databarView(list, edit=not owner)
-        <div class="superNav">
-            $if owner:
-                <a href="$owner.key">$owner.displayname</a>
-                /
-                <a href="$owner.key/lists">$_('Lists')</a>
-        </div>
         <h1>$list.name</h1>
         <p class="collapse sansserif">
             $ component_times['render_seed_count'] = time()