![' + translate['Previous month'] + \
'](/icons' + \
'/prev.png "' + translate['Previous month'] + '")
![' + \
translate['Edit Links'] + ' |](/icons/edit.png "' + \
translate['Edit Links'] + '"){kind=icon}
![' + \
translate['Theme Designer'] + ' |](/icons/theme.png "' + \
translate['Theme Designer'] + '"){kind=icon}
![' + \
translate['Approve follow requests'] + \
@@ -640,101 +642,102 @@ def html_timeline(css_cache: {}, defaultTimeline: str,
'](/icons/person.png){kind=icon}
\n'
break
- _log_timeline_timing(enableTimingLog, timelineStartTime, boxName, '3')
+ _log_timeline_timing(enable_timing_log, timeline_start_time, box_name, '3')
# moderation / reports button
- moderationButtonStr = ''
+ moderation_button_str = ''
if moderator and not minimal:
- moderationButtonStr = \
- ''
# shares, bookmarks and events buttons
- sharesButtonStr = ''
- wantedButtonStr = ''
- bookmarksButtonStr = ''
- eventsButtonStr = ''
+ shares_button_str = ''
+ wanted_button_str = ''
+ bookmarks_button_str = ''
+ events_button_str = ''
if not minimal:
- sharesButtonStr = \
- '\n'
- accessKeysForm += \
+ access_keysForm += \
'
\n'
+ access_keysForm += html_footer()
+ return access_keysForm
diff --git a/webapp_calendar.py b/webapp_calendar.py
index d0aafd760..c4c7e1663 100644
--- a/webapp_calendar.py
+++ b/webapp_calendar.py
@@ -52,14 +52,14 @@ def html_calendar_delete_confirm(css_cache: {}, translate: {}, base_dir: str,
return None
delete_postStr = None
- cssFilename = base_dir + '/epicyon-profile.css'
+ css_filename = base_dir + '/epicyon-profile.css'
if os.path.isfile(base_dir + '/epicyon.css'):
- cssFilename = base_dir + '/epicyon.css'
+ css_filename = base_dir + '/epicyon.css'
instanceTitle = \
get_config_param(base_dir, 'instanceTitle')
delete_postStr = \
- html_header_with_external_style(cssFilename, instanceTitle, None)
+ html_header_with_external_style(css_filename, instanceTitle, None)
delete_postStr += \
'' + translate['Key Shortcuts'] + '
\n' - accessKeysForm += \ + access_keysForm += \ '' + translate['These access keys may be used'] + \ '
' - accessKeysForm += ' \n' + access_keysForm += '' + postTime + ' ' + str(year) + '/' + \
str(monthNumber) + \
@@ -111,9 +111,9 @@ def _html_calendar_day(person_cache: {}, css_cache: {}, translate: {},
except OSError:
print('EX: _html_calendar_day unable to delete ' + calendarFile)
- cssFilename = base_dir + '/epicyon-calendar.css'
+ css_filename = base_dir + '/epicyon-calendar.css'
if os.path.isfile(base_dir + '/calendar.css'):
- cssFilename = base_dir + '/calendar.css'
+ css_filename = base_dir + '/calendar.css'
calActor = actor
if '/users/' in actor:
@@ -121,7 +121,7 @@ def _html_calendar_day(person_cache: {}, css_cache: {}, translate: {},
instanceTitle = get_config_param(base_dir, 'instanceTitle')
calendarStr = \
- html_header_with_external_style(cssFilename, instanceTitle, None)
+ html_header_with_external_style(css_filename, instanceTitle, None)
calendarStr += '' + pageStr + ''
- return '' + numStr + ' '
+ pages_width = 3
+ min_page_number = page_number - pages_width
+ if min_page_number < 1:
+ min_page_number = 1
+ max_page_number = min_page_number + 1 + (pages_width * 2)
+ num_str = ''
+ for page in range(min_page_number, max_page_number):
+ if num_str:
+ num_str += ' ⸻ '
+ page_str = str(page)
+ if page == page_number:
+ page_str = '' + str(page) + ''
+ num_str += \
+ '' + page_str + ''
+ return '' + num_str + ' '
-def html_timeline(css_cache: {}, defaultTimeline: str,
+def html_timeline(css_cache: {}, default_timeline: str,
recent_posts_cache: {}, max_recent_posts: int,
- translate: {}, pageNumber: int,
- itemsPerPage: int, session, base_dir: str,
+ translate: {}, page_number: int,
+ items_per_page: int, session, base_dir: str,
cached_webfingers: {}, person_cache: {},
- nickname: str, domain: str, port: int, timelineJson: {},
- boxName: str, allow_deletion: bool,
+ nickname: str, domain: str, port: int, timeline_json: {},
+ box_name: str, allow_deletion: bool,
http_prefix: str, project_version: str,
- manuallyApproveFollowers: bool,
+ manually_approve_followers: bool,
minimal: bool,
yt_replace_domain: str,
twitter_replacement_domain: str,
@@ -443,105 +445,105 @@ def html_timeline(css_cache: {}, defaultTimeline: str,
rss_icon_at_top: bool,
publish_button_at_top: bool,
authorized: bool,
- moderationActionStr: str,
+ moderation_action_str: str,
theme: str,
peertube_instances: [],
allow_local_network_access: bool,
text_mode_banner: str,
- accessKeys: {}, system_language: str,
+ access_keys: {}, system_language: str,
max_like_count: int,
shared_items_federated_domains: [],
signing_priv_key_pem: str,
cw_lists: {}, lists_enabled: str) -> str:
"""Show the timeline as html
"""
- enableTimingLog = False
+ enable_timing_log = False
- timelineStartTime = time.time()
+ timeline_start_time = time.time()
- accountDir = acct_dir(base_dir, nickname, domain)
+ account_dir = acct_dir(base_dir, nickname, domain)
# should the calendar icon be highlighted?
- newCalendarEvent = False
- calendarImage = 'calendar.png'
- calendarPath = '/calendar'
- calendarFile = accountDir + '/.newCalendar'
- if os.path.isfile(calendarFile):
- newCalendarEvent = True
- calendarImage = 'calendar_notify.png'
- with open(calendarFile, 'r') as calfile:
- calendarPath = calfile.read().replace('##sent##', '')
- calendarPath = calendarPath.replace('\n', '').replace('\r', '')
+ new_calendar_event = False
+ calendar_image = 'calendar.png'
+ calendar_path = '/calendar'
+ calendar_file = account_dir + '/.newCalendar'
+ if os.path.isfile(calendar_file):
+ new_calendar_event = True
+ calendar_image = 'calendar_notify.png'
+ with open(calendar_file, 'r') as calfile:
+ calendar_path = calfile.read().replace('##sent##', '')
+ calendar_path = calendar_path.replace('\n', '').replace('\r', '')
# should the DM button be highlighted?
- newDM = False
- dmFile = accountDir + '/.newDM'
- if os.path.isfile(dmFile):
- newDM = True
- if boxName == 'dm':
+ new_dm = False
+ dm_file = account_dir + '/.newDM'
+ if os.path.isfile(dm_file):
+ new_dm = True
+ if box_name == 'dm':
try:
- os.remove(dmFile)
+ os.remove(dm_file)
except OSError:
- print('EX: html_timeline unable to delete ' + dmFile)
+ print('EX: html_timeline unable to delete ' + dm_file)
# should the Replies button be highlighted?
- newReply = False
- replyFile = accountDir + '/.newReply'
- if os.path.isfile(replyFile):
- newReply = True
- if boxName == 'tlreplies':
+ new_reply = False
+ reply_file = account_dir + '/.newReply'
+ if os.path.isfile(reply_file):
+ new_reply = True
+ if box_name == 'tlreplies':
try:
- os.remove(replyFile)
+ os.remove(reply_file)
except OSError:
- print('EX: html_timeline unable to delete ' + replyFile)
+ print('EX: html_timeline unable to delete ' + reply_file)
# should the Shares button be highlighted?
- newShare = False
- newShareFile = accountDir + '/.newShare'
- if os.path.isfile(newShareFile):
- newShare = True
- if boxName == 'tlshares':
+ new_share = False
+ new_share_file = account_dir + '/.newShare'
+ if os.path.isfile(new_share_file):
+ new_share = True
+ if box_name == 'tlshares':
try:
- os.remove(newShareFile)
+ os.remove(new_share_file)
except OSError:
- print('EX: html_timeline unable to delete ' + newShareFile)
+ print('EX: html_timeline unable to delete ' + new_share_file)
# should the Wanted button be highlighted?
- newWanted = False
- newWantedFile = accountDir + '/.newWanted'
- if os.path.isfile(newWantedFile):
- newWanted = True
- if boxName == 'tlwanted':
+ new_wanted = False
+ new_wanted_file = account_dir + '/.newWanted'
+ if os.path.isfile(new_wanted_file):
+ new_wanted = True
+ if box_name == 'tlwanted':
try:
- os.remove(newWantedFile)
+ os.remove(new_wanted_file)
except OSError:
- print('EX: html_timeline unable to delete ' + newWantedFile)
+ print('EX: html_timeline unable to delete ' + new_wanted_file)
# should the Moderation/reports button be highlighted?
- newReport = False
- newReportFile = accountDir + '/.newReport'
- if os.path.isfile(newReportFile):
- newReport = True
- if boxName == 'moderation':
+ new_report = False
+ new_report_file = account_dir + '/.newReport'
+ if os.path.isfile(new_report_file):
+ new_report = True
+ if box_name == 'moderation':
try:
- os.remove(newReportFile)
+ os.remove(new_report_file)
except OSError:
- print('EX: html_timeline unable to delete ' + newReportFile)
+ print('EX: html_timeline unable to delete ' + new_report_file)
- separatorStr = ''
- if boxName != 'tlmedia':
- separatorStr = html_post_separator(base_dir, None)
+ separator_str = ''
+ if box_name != 'tlmedia':
+ separator_str = html_post_separator(base_dir, None)
# the css filename
- cssFilename = base_dir + '/epicyon-profile.css'
+ css_filename = base_dir + '/epicyon-profile.css'
if os.path.isfile(base_dir + '/epicyon.css'):
- cssFilename = base_dir + '/epicyon.css'
+ css_filename = base_dir + '/epicyon.css'
# filename of the banner shown at the top
- bannerFile, bannerFilename = \
+ banner_file, _ = \
get_banner_file(base_dir, nickname, domain, theme)
- _log_timeline_timing(enableTimingLog, timelineStartTime, boxName, '1')
+ _log_timeline_timing(enable_timing_log, timeline_start_time, box_name, '1')
# is the user a moderator?
if not moderator:
@@ -551,88 +553,88 @@ def html_timeline(css_cache: {}, defaultTimeline: str,
if not editor:
editor = is_editor(base_dir, nickname)
- _log_timeline_timing(enableTimingLog, timelineStartTime, boxName, '2')
+ _log_timeline_timing(enable_timing_log, timeline_start_time, box_name, '2')
# the appearance of buttons - highlighted or not
- inboxButton = 'button'
- blogsButton = 'button'
- featuresButton = 'button'
- newsButton = 'button'
- dmButton = 'button'
- if newDM:
- dmButton = 'buttonhighlighted'
- repliesButton = 'button'
- if newReply:
- repliesButton = 'buttonhighlighted'
- mediaButton = 'button'
- bookmarksButton = 'button'
+ inbox_button = 'button'
+ blogs_button = 'button'
+ features_button = 'button'
+ news_button = 'button'
+ dm_button = 'button'
+ if new_dm:
+ dm_button = 'buttonhighlighted'
+ replies_button = 'button'
+ if new_reply:
+ replies_button = 'buttonhighlighted'
+ media_button = 'button'
+ bookmarks_button = 'button'
# eventsButton = 'button'
- sentButton = 'button'
- sharesButton = 'button'
- if newShare:
- sharesButton = 'buttonhighlighted'
- wantedButton = 'button'
- if newWanted:
- wantedButton = 'buttonhighlighted'
- moderationButton = 'button'
- if newReport:
- moderationButton = 'buttonhighlighted'
- if boxName == 'inbox':
- inboxButton = 'buttonselected'
- elif boxName == 'tlblogs':
- blogsButton = 'buttonselected'
- elif boxName == 'tlfeatures':
- featuresButton = 'buttonselected'
- elif boxName == 'tlnews':
- newsButton = 'buttonselected'
- elif boxName == 'dm':
- dmButton = 'buttonselected'
- if newDM:
- dmButton = 'buttonselectedhighlighted'
- elif boxName == 'tlreplies':
- repliesButton = 'buttonselected'
- if newReply:
- repliesButton = 'buttonselectedhighlighted'
- elif boxName == 'tlmedia':
- mediaButton = 'buttonselected'
- elif boxName == 'outbox':
- sentButton = 'buttonselected'
- elif boxName == 'moderation':
- moderationButton = 'buttonselected'
- if newReport:
- moderationButton = 'buttonselectedhighlighted'
- elif boxName == 'tlshares':
- sharesButton = 'buttonselected'
- if newShare:
- sharesButton = 'buttonselectedhighlighted'
- elif boxName == 'tlwanted':
- wantedButton = 'buttonselected'
- if newWanted:
- wantedButton = 'buttonselectedhighlighted'
- elif boxName == 'tlbookmarks' or boxName == 'bookmarks':
- bookmarksButton = 'buttonselected'
+ sent_button = 'button'
+ shares_button = 'button'
+ if new_share:
+ shares_button = 'buttonhighlighted'
+ wanted_button = 'button'
+ if new_wanted:
+ wanted_button = 'buttonhighlighted'
+ moderation_button = 'button'
+ if new_report:
+ moderation_button = 'buttonhighlighted'
+ if box_name == 'inbox':
+ inbox_button = 'buttonselected'
+ elif box_name == 'tlblogs':
+ blogs_button = 'buttonselected'
+ elif box_name == 'tlfeatures':
+ features_button = 'buttonselected'
+ elif box_name == 'tlnews':
+ news_button = 'buttonselected'
+ elif box_name == 'dm':
+ dm_button = 'buttonselected'
+ if new_dm:
+ dm_button = 'buttonselectedhighlighted'
+ elif box_name == 'tlreplies':
+ replies_button = 'buttonselected'
+ if new_reply:
+ replies_button = 'buttonselectedhighlighted'
+ elif box_name == 'tlmedia':
+ media_button = 'buttonselected'
+ elif box_name == 'outbox':
+ sent_button = 'buttonselected'
+ elif box_name == 'moderation':
+ moderation_button = 'buttonselected'
+ if new_report:
+ moderation_button = 'buttonselectedhighlighted'
+ elif box_name == 'tlshares':
+ shares_button = 'buttonselected'
+ if new_share:
+ shares_button = 'buttonselectedhighlighted'
+ elif box_name == 'tlwanted':
+ wanted_button = 'buttonselected'
+ if new_wanted:
+ wanted_button = 'buttonselectedhighlighted'
+ elif box_name in ('tlbookmarks', 'bookmarks'):
+ bookmarks_button = 'buttonselected'
# get the full domain, including any port number
- fullDomain = get_full_domain(domain, port)
+ full_domain = get_full_domain(domain, port)
- usersPath = '/users/' + nickname
- actor = http_prefix + '://' + fullDomain + usersPath
+ users_path = '/users/' + nickname
+ actor = http_prefix + '://' + full_domain + users_path
- showIndividualPostIcons = True
+ show_individual_post_icons = True
# show an icon for new follow approvals
- followApprovals = ''
- followRequestsFilename = \
+ follow_approvals = ''
+ follow_requests_filename = \
acct_dir(base_dir, nickname, domain) + '/followrequests.txt'
- if os.path.isfile(followRequestsFilename):
- with open(followRequestsFilename, 'r') as f:
- for line in f:
+ if os.path.isfile(follow_requests_filename):
+ with open(follow_requests_filename, 'r') as foll_file:
+ for line in foll_file:
if len(line) > 0:
# show follow approvals icon
- followApprovals = \
- '' + \
+ 'accesskey="' + access_keys['followButton'] + '">' + \
'\n'
break
- _log_timeline_timing(enableTimingLog, timelineStartTime, boxName, '3')
+ _log_timeline_timing(enable_timing_log, timeline_start_time, box_name, '3')
# moderation / reports button
- moderationButtonStr = ''
+ moderation_button_str = ''
if moderator and not minimal:
- moderationButtonStr = \
- ''
# shares, bookmarks and events buttons
- sharesButtonStr = ''
- wantedButtonStr = ''
- bookmarksButtonStr = ''
- eventsButtonStr = ''
+ shares_button_str = ''
+ wanted_button_str = ''
+ bookmarks_button_str = ''
+ events_button_str = ''
if not minimal:
- sharesButtonStr = \
- '
\n'
break
- _log_timeline_timing(enableTimingLog, timelineStartTime, boxName, '3')
+ _log_timeline_timing(enable_timing_log, timeline_start_time, box_name, '3')
# moderation / reports button
- moderationButtonStr = ''
+ moderation_button_str = ''
if moderator and not minimal:
- moderationButtonStr = \
- ''
# shares, bookmarks and events buttons
- sharesButtonStr = ''
- wantedButtonStr = ''
- bookmarksButtonStr = ''
- eventsButtonStr = ''
+ shares_button_str = ''
+ wanted_button_str = ''
+ bookmarks_button_str = ''
+ events_button_str = ''
if not minimal:
- sharesButtonStr = \
- '