Line endings

main
Bob Mottram 2020-07-26 09:46:22 +01:00
parent d9c20676a0
commit 286c9c1d6f
1 changed files with 30 additions and 30 deletions

View File

@ -5504,61 +5504,61 @@ def htmlPersonOptions(translate: {}, baseDir: str,
translate['Donate'] + '</button></a>' translate['Donate'] + '</button></a>'
optionsStr = htmlHeader(cssFilename, profileStyle) optionsStr = htmlHeader(cssFilename, profileStyle)
optionsStr += '<div class="options">' optionsStr += '<div class="options">\n'
optionsStr += ' <div class="optionsAvatar">' optionsStr += ' <div class="optionsAvatar">\n'
optionsStr += ' <center>' optionsStr += ' <center>\n'
optionsStr += ' <a href="' + optionsActor + '">' optionsStr += ' <a href="' + optionsActor + '">\n'
optionsStr += ' <img loading="lazy" src="' + optionsProfileUrl + '"/></a>' optionsStr += ' <img loading="lazy" src="' + optionsProfileUrl + '"/></a>\n'
optionsStr += \ optionsStr += \
' <p class="optionsText">' + translate['Options for'] + \ ' <p class="optionsText">' + translate['Options for'] + \
' @' + getNicknameFromActor(optionsActor) + '@' + \ ' @' + getNicknameFromActor(optionsActor) + '@' + \
optionsDomain + '</p>' optionsDomain + '</p>\n'
if emailAddress: if emailAddress:
optionsStr += \ optionsStr += \
'<p class="imText">' + translate['Email'] + \ '<p class="imText">' + translate['Email'] + \
': <a href="mailto:' + \ ': <a href="mailto:' + \
emailAddress + '">' + emailAddress + '</a></p>' emailAddress + '">' + emailAddress + '</a></p>\n'
if xmppAddress: if xmppAddress:
optionsStr += \ optionsStr += \
'<p class="imText">' + translate['XMPP'] + \ '<p class="imText">' + translate['XMPP'] + \
': <a href="xmpp:' + xmppAddress + '">' + xmppAddress + '</a></p>' ': <a href="xmpp:' + xmppAddress + '">' + xmppAddress + '</a></p>\n'
if matrixAddress: if matrixAddress:
optionsStr += \ optionsStr += \
'<p class="imText">' + translate['Matrix'] + ': ' + \ '<p class="imText">' + translate['Matrix'] + ': ' + \
matrixAddress + '</p>' matrixAddress + '</p>\n'
if ssbAddress: if ssbAddress:
optionsStr += \ optionsStr += \
'<p class="imText">SSB: ' + ssbAddress + '</p>' '<p class="imText">SSB: ' + ssbAddress + '</p>\n'
if blogAddress: if blogAddress:
optionsStr += \ optionsStr += \
'<p class="imText">Blog: <a href="' + blogAddress + '">' + \ '<p class="imText">Blog: <a href="' + blogAddress + '">' + \
blogAddress + '</a></p>' blogAddress + '</a></p>\n'
if toxAddress: if toxAddress:
optionsStr += \ optionsStr += \
'<p class="imText">Tox: ' + toxAddress + '</p>' '<p class="imText">Tox: ' + toxAddress + '</p>\n'
if PGPfingerprint: if PGPfingerprint:
optionsStr += '<p class="pgp">PGP: ' + \ optionsStr += '<p class="pgp">PGP: ' + \
PGPfingerprint.replace('\n', '<br>') + '</p>' PGPfingerprint.replace('\n', '<br>') + '</p>\n'
if PGPpubKey: if PGPpubKey:
optionsStr += '<p class="pgp">' + \ optionsStr += '<p class="pgp">' + \
PGPpubKey.replace('\n', '<br>') + '</p>' PGPpubKey.replace('\n', '<br>') + '</p>\n'
optionsStr += ' <form method="POST" action="' + \ optionsStr += ' <form method="POST" action="' + \
originPathStr + '/personoptions">' originPathStr + '/personoptions">\n'
optionsStr += ' <input type="hidden" name="pageNumber" value="' + \ optionsStr += ' <input type="hidden" name="pageNumber" value="' + \
str(pageNumber) + '">' str(pageNumber) + '">\n'
optionsStr += ' <input type="hidden" name="actor" value="' + \ optionsStr += ' <input type="hidden" name="actor" value="' + \
optionsActor + '">' optionsActor + '">\n'
optionsStr += ' <input type="hidden" name="avatarUrl" value="' + \ optionsStr += ' <input type="hidden" name="avatarUrl" value="' + \
optionsProfileUrl + '">' optionsProfileUrl + '">\n'
if optionsNickname: if optionsNickname:
handle = optionsNickname + '@' + optionsDomainFull handle = optionsNickname + '@' + optionsDomainFull
petname = getPetName(baseDir, nickname, domain, handle) petname = getPetName(baseDir, nickname, domain, handle)
optionsStr += \ optionsStr += \
translate['Petname'] + ': ' + \ translate['Petname'] + ': ' + \
'<input type="text" name="optionpetname" value="' + \ '<input type="text" name="optionpetname" value="' + \
petname + '">' \ petname + '">\n' \
'<button type="submit" class="button" name="submitPetname">' + \ '<button type="submit" class="button" name="submitPetname">' + \
translate['Submit'] + '</button><br>' translate['Submit'] + '</button><br>\n'
if isFollowingActor(baseDir, nickname, domain, optionsActor): if isFollowingActor(baseDir, nickname, domain, optionsActor):
if receivingCalendarEvents(baseDir, nickname, domain, if receivingCalendarEvents(baseDir, nickname, domain,
@ -5582,28 +5582,28 @@ def htmlPersonOptions(translate: {}, baseDir: str,
optionsStr += optionsLinkStr optionsStr += optionsLinkStr
optionsStr += \ optionsStr += \
' <button type="submit" class="button" name="submitView">' + \ ' <button type="submit" class="button" name="submitView">' + \
translate['View'] + '</button>' translate['View'] + '</button>\n'
optionsStr += donateStr optionsStr += donateStr
optionsStr += \ optionsStr += \
' <button type="submit" class="button" name="submit' + \ ' <button type="submit" class="button" name="submit' + \
followStr + '">' + translate[followStr] + '</button>' followStr + '">' + translate[followStr] + '</button>\n'
optionsStr += \ optionsStr += \
' <button type="submit" class="button" name="submit' + \ ' <button type="submit" class="button" name="submit' + \
blockStr + '">' + translate[blockStr] + '</button>' blockStr + '">' + translate[blockStr] + '</button>\n'
optionsStr += \ optionsStr += \
' <button type="submit" class="button" name="submitDM">' + \ ' <button type="submit" class="button" name="submitDM">' + \
translate['DM'] + '</button>' translate['DM'] + '</button>\n'
optionsStr += \ optionsStr += \
' <button type="submit" class="button" name="submit' + \ ' <button type="submit" class="button" name="submit' + \
snoozeButtonStr + '">' + translate[snoozeButtonStr] + '</button>' snoozeButtonStr + '">' + translate[snoozeButtonStr] + '</button>\n'
optionsStr += \ optionsStr += \
' <button type="submit" class="button" name="submitReport">' + \ ' <button type="submit" class="button" name="submitReport">' + \
translate['Report'] + '</button>' translate['Report'] + '</button>\n'
optionsStr += ' </form>' optionsStr += ' </form>\n'
optionsStr += '</center>' optionsStr += '</center>\n'
optionsStr += '</div>' optionsStr += '</div>\n'
optionsStr += '</div>' optionsStr += '</div>\n'
optionsStr += htmlFooter() optionsStr += htmlFooter()
return optionsStr return optionsStr