indymedia
/
epicyon
mirror of https://gitlab.com/bashrc2/epicyon
7
4
Fork 1
Code Issues 14 Releases Wiki Activity

Avoid overlap between timeline pages

merge-requests/30/head
Bob Mottram 2022-12-26 21:43:37 +00:00
parent b22c8c6531
commit 83affc43ee
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
webapp_timeline.py
View File

@ -951,6 +951,7 @@ def html_timeline(default_timeline: str,
last_post_id = '' last_post_id = ''
last_item_str = ''
if timeline_json: if timeline_json:
# if this is the media timeline then add an extra gallery container # if this is the media timeline then add an extra gallery container
if box_name == 'tlmedia': if box_name == 'tlmedia':
@ -1032,20 +1033,19 @@ def html_timeline(default_timeline: str,
if curr_tl_str: if curr_tl_str:
if curr_tl_str not in tl_items_str: if curr_tl_str not in tl_items_str:
last_item_str = text_mode_separator + curr_tl_str
last_post_id = \ last_post_id = \
remove_id_ending(item['id']).replace('/', '#') remove_id_ending(item['id']).replace('/', '#')
item_ctr += 1 item_ctr += 1
if not reverse_sequence: if not reverse_sequence:
tl_items_str += text_mode_separator + curr_tl_str tl_items_str += last_item_str
if separator_str: if separator_str:
tl_items_str += separator_str tl_items_str += separator_str
else: else:
tl_items_str = \ tl_items_str = last_item_str + tl_items_str
text_mode_separator + curr_tl_str + \
tl_items_str
if separator_str: if separator_str:
tl_items_str = \ tl_items_str = \
text_mode_separator + curr_tl_str + \ last_item_str + \
separator_str + tl_items_str separator_str + tl_items_str
tl_str += tl_items_str tl_str += tl_items_str
@ -1058,7 +1058,12 @@ def html_timeline(default_timeline: str,
# page down arrow # page down arrow
if item_ctr > 0: if item_ctr > 0:
tl_str += text_mode_separator # if showing the page down icon then remove the last item so that
# firstpost does not overlap on the next timeline
if last_item_str:
tl_str = tl_str.replace(last_item_str, '')
else:
tl_str += text_mode_separator
first_post = '' first_post = ''
if last_post_id: if last_post_id:
first_post = ';firstpost=' + last_post_id.replace('#', '--') first_post = ';firstpost=' + last_post_id.replace('#', '--')