From f6cbb6c3409b406b61d6acb846e602d9a2d9eb2a Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Mon, 5 Jul 2021 20:46:55 +0100 Subject: [PATCH] Tidying --- webapp_column_left.py | 36 +++++++++++++----------------------- 1 file changed, 13 insertions(+), 23 deletions(-) diff --git a/webapp_column_left.py b/webapp_column_left.py index eea4ace02..09b73f782 100644 --- a/webapp_column_left.py +++ b/webapp_column_left.py @@ -51,10 +51,8 @@ def _getLeftColumnShares(baseDir: str, if '<' in sharedesc or '?' in sharedesc: continue contactActor = item['actor'] - shareLink = actor + \ - '?replydm=sharedesc:' + \ - sharedesc.replace(' ', '_') + \ - '?mention=' + contactActor + shareLink = actor + '?replydm=sharedesc:' + \ + sharedesc.replace(' ', '_') + '?mention=' + contactActor linksList.append(sharedesc + ' ' + shareLink) ctr += 1 if ctr >= maxSharesInLeftColumn: @@ -89,16 +87,14 @@ def getLeftColumnContent(baseDir: str, nickname: str, domainFull: str, if os.path.isfile(leftColumnImageFilename): editImageClass = 'leftColEditImage' htmlStr += \ - '\n
\n' + \ - ' \n \n' + \ '
\n' if showBackButton: htmlStr += \ - '
' + \ - ' ' + \ + '
' + \ '\n' @@ -112,14 +108,11 @@ def getLeftColumnContent(baseDir: str, nickname: str, domainFull: str, if editor: # show the edit icon htmlStr += \ - ' ' + \ - '' + \
+            '<img class=\n' + translate['Edit Links'] + '" src="/icons/edit.png" />\n' # RSS icon if nickname != 'news': @@ -134,10 +127,8 @@ def getLeftColumnContent(baseDir: str, nickname: str, domainFull: str, else: rssTitle = translate['RSS feed for this site'] rssIconStr = \ - ' ' + \ - '' + rssTitle + \
-        '' + rssTitle + '\n' if rssIconAtTop: htmlStr += rssIconStr @@ -326,8 +317,7 @@ def htmlLinksMobile(cssCache: {}, baseDir: str, theme, accessKeys) else: if editor: - htmlStr += '


\n' - htmlStr += '
\n ' + htmlStr += '


\n
\n ' htmlStr += translate['Select the edit icon to add web links'] htmlStr += '\n
\n' @@ -376,7 +366,8 @@ def htmlEditLinks(cssCache: {}, translate: {}, baseDir: str, path: str, translate['Switch to timeline view'] + '" alt="' + \ translate['Switch to timeline view'] + '" ' + \ 'accesskey="' + accessKeys['menuTimeline'] + '">\n' - editLinksForm += '\n' + \ '\n' @@ -411,8 +402,7 @@ def htmlEditLinks(cssCache: {}, translate: {}, baseDir: str, path: str, '
' editLinksForm += \ ' ' + 'style="height:80vh" spellcheck="false">' + linksStr + '' editLinksForm += \ '
'