From 6c471f48cc1248ce5e15530b53f44e93f74ae782 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Tue, 30 Jul 2019 13:03:40 +0100 Subject: [PATCH] Alternate between profile and timeline by selecting header --- img/icons/search.png | Bin 0 -> 6693 bytes webinterface.py | 13 ++++++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 img/icons/search.png diff --git a/img/icons/search.png b/img/icons/search.png new file mode 100644 index 0000000000000000000000000000000000000000..532c3ea19cce5f27d3c77f809e74e595e2cf0611 GIT binary patch literal 6693 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 literal 0 HcmV?d00001 diff --git a/webinterface.py b/webinterface.py index 33b82f4e..867653db 100644 --- a/webinterface.py +++ b/webinterface.py @@ -300,10 +300,14 @@ def htmlProfile(baseDir: str,httpPrefix: str,authorized: bool, \ followApprovalsSection='' followApprovals='' + linkToTimelineStart='' + linkToTimelineEnd='' if not authorized: loginButton='
' else: + linkToTimelineStart='' + linkToTimelineEnd='' # are there any follow requests? followRequestsFilename=baseDir+'/accounts/'+nickname+'@'+domain+'/followrequests.txt' if os.path.isfile(followRequestsFilename): @@ -334,6 +338,7 @@ def htmlProfile(baseDir: str,httpPrefix: str,authorized: bool, \ actor=profileJson['id'] profileStr= \ + linkToTimelineStart+ \ '
' \ '
' \ ' '+nickname+'@'+domainFull+'' \ @@ -342,7 +347,8 @@ def htmlProfile(baseDir: str,httpPrefix: str,authorized: bool, \ '

'+profileDescription+'

'+ \ loginButton+ \ '
' \ - '
' \ + ''+ \ + linkToTimelineEnd+ \ '
\n' \ '
' \ ' ' \ @@ -523,13 +529,14 @@ def htmlTimeline(session,baseDir: str,wfRequest: {},personCache: {}, \ tlStr=htmlHeader(profileStyle) tlStr+= \ + '' \ '
' \ - '
' \ + '
' \ '
\n'+ \ ' ' \ ' ' \ ' Create a new post'+ \ - ' Add a new follow'+ \ + ' Search and follow'+ \ followApprovals+ \ '
' for item in timelineJson['orderedItems']: