From a50f9c8b75f9ec84695cb0810d7462b87f12a31b Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Fri, 8 Jul 2022 17:33:38 +0100 Subject: [PATCH] Show page numbers on following lists --- webapp_profile.py | 5 +++++ webapp_timeline.py | 18 +++++++++++------- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/webapp_profile.py b/webapp_profile.py index 9da1602bb..2a42c7612 100644 --- a/webapp_profile.py +++ b/webapp_profile.py @@ -74,6 +74,7 @@ from webapp_utils import end_edit_section from blog import get_blog_address from webapp_post import individual_post_as_html from webapp_timeline import html_individual_share +from webapp_timeline import page_number_buttons from blocking import get_cw_list_variable from blocking import is_blocked from content import bold_reading_string @@ -1223,6 +1224,10 @@ def _html_profile_following(translate: {}, base_dir: str, http_prefix: str, translate['Page down'] + '" alt="' + \ translate['Page down'] + '">\n' + \ ' \n' + # list of page numbers + profile_str += \ + page_number_buttons(actor, feed_name, page_number, + 'buttonheader') return profile_str diff --git a/webapp_timeline.py b/webapp_timeline.py index 651a290f2..3ff1d5671 100644 --- a/webapp_timeline.py +++ b/webapp_timeline.py @@ -428,8 +428,8 @@ def _html_timeline_end(base_dir: str, nickname: str, domain_full: str, return tl_str -def _page_number_buttons(users_path: str, box_name: str, - page_number: int) -> str: +def page_number_buttons(users_path: str, box_name: str, + page_number: int, header: str) -> str: """Shows selactable page numbers at the bottom of the screen """ pages_width = 3 @@ -451,7 +451,7 @@ def _page_number_buttons(users_path: str, box_name: str, curr_page_str = 'Current Page, ' num_str += \ '' + page_str + '' return '
\n' + \ @@ -908,7 +908,8 @@ def html_timeline(css_cache: {}, default_timeline: str, if page_number > 1: tl_str += text_mode_separator tl_str += '
' + \ - _page_number_buttons(users_path, box_name, page_number) + page_number_buttons(users_path, box_name, page_number, + 'timelineposts') tl_str += \ '
\n' + \ ' \n' + \ '
\n' - tl_str += _page_number_buttons(users_path, box_name, page_number) + tl_str += page_number_buttons(users_path, box_name, page_number, + 'timelineposts') tl_str += '
' tl_str += text_mode_separator elif item_ctr == 0: @@ -1152,7 +1154,8 @@ def _html_shares_timeline(translate: {}, page_number: int, items_per_page: int, if page_number > 1: timeline_str += '
' + \ - _page_number_buttons(actor, 'tl' + shares_file_type, page_number) + page_number_buttons(actor, 'tl' + shares_file_type, page_number, + 'timelineposts') timeline_str += \ '
\n' + \ ' \n' + \ '
\n' timeline_str += \ - _page_number_buttons(actor, 'tl' + shares_file_type, page_number) + page_number_buttons(actor, 'tl' + shares_file_type, page_number, + 'timelineposts') timeline_str += '
' return timeline_str