Re-arrange edit profile screen sections

merge-requests/30/head
Bob Mottram 2021-03-06 11:42:29 +00:00
parent 17624f6eec
commit c8a0e2d920
1 changed files with 22 additions and 12 deletions

View File

@ -1211,6 +1211,7 @@ def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str,
'<input type="range" min="1" max="100" ' + \ '<input type="range" min="1" max="100" ' + \
'class="slider" name="skillValue' + \ 'class="slider" name="skillValue' + \
str(skillCtr) + '" value="50"></p>' str(skillCtr) + '" value="50"></p>'
skillsStr += '</div>\n'
cssFilename = baseDir + '/epicyon-profile.css' cssFilename = baseDir + '/epicyon-profile.css'
if os.path.isfile(baseDir + '/epicyon.css'): if os.path.isfile(baseDir + '/epicyon.css'):
@ -1460,6 +1461,18 @@ def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str,
editProfileForm += \ editProfileForm += \
' <input type="text" placeholder="https://..." ' + \ ' <input type="text" placeholder="https://..." ' + \
'name="donateUrl" value="' + donateUrl + '">\n' 'name="donateUrl" value="' + donateUrl + '">\n'
editProfileForm += '<label class="labels">Blog</label><br>\n'
editProfileForm += \
' <input type="text" name="blogAddress" value="' + \
blogAddress + '">\n'
editProfileForm += '</div>\n'
# Contact information
editProfileForm = '<div class="container">'
editProfileForm += '<label class="labels">' + \
translate['Email'] + '</label><br>\n'
editProfileForm += \
' <input type="text" name="email" value="' + emailAddress + '">\n'
editProfileForm += \ editProfileForm += \
'<label class="labels">' + translate['XMPP'] + '</label><br>\n' '<label class="labels">' + translate['XMPP'] + '</label><br>\n'
editProfileForm += \ editProfileForm += \
@ -1476,11 +1489,6 @@ def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str,
' <input type="text" name="ssbAddress" value="' + \ ' <input type="text" name="ssbAddress" value="' + \
ssbAddress + '">\n' ssbAddress + '">\n'
editProfileForm += '<label class="labels">Blog</label><br>\n'
editProfileForm += \
' <input type="text" name="blogAddress" value="' + \
blogAddress + '">\n'
editProfileForm += '<label class="labels">Tox</label><br>\n' editProfileForm += '<label class="labels">Tox</label><br>\n'
editProfileForm += \ editProfileForm += \
' <input type="text" name="toxAddress" value="' + \ ' <input type="text" name="toxAddress" value="' + \
@ -1496,10 +1504,6 @@ def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str,
' <input type="text" name="jamiAddress" value="' + \ ' <input type="text" name="jamiAddress" value="' + \
jamiAddress + '">\n' jamiAddress + '">\n'
editProfileForm += '<label class="labels">' + \
translate['Email'] + '</label><br>\n'
editProfileForm += \
' <input type="text" name="email" value="' + emailAddress + '">\n'
editProfileForm += \ editProfileForm += \
'<label class="labels">' + \ '<label class="labels">' + \
translate['PGP Fingerprint'] + '</label><br>\n' translate['PGP Fingerprint'] + '</label><br>\n'
@ -1618,7 +1622,10 @@ def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str,
' <input type="checkbox" class="profilecheckbox" ' + \ ' <input type="checkbox" class="profilecheckbox" ' + \
'name="hideLikeButton" ' + hideLikeButton + '> ' + \ 'name="hideLikeButton" ' + hideLikeButton + '> ' + \
translate["Don't show the Like button"] + '<br>\n' translate["Don't show the Like button"] + '<br>\n'
editProfileForm += ' </div>\n'
# Content controls
editProfileForm += ' <div class="container">\n'
editProfileForm += \ editProfileForm += \
' <br><b><label class="labels">' + \ ' <br><b><label class="labels">' + \
translate['Filtered words'] + '</label></b>\n' translate['Filtered words'] + '</label></b>\n'
@ -1711,9 +1718,12 @@ def htmlEditProfile(cssCache: {}, translate: {}, baseDir: str, path: str,
'teams with an appropriate combination of skills.' 'teams with an appropriate combination of skills.'
editProfileForm += ' <label class="labels">' + \ editProfileForm += ' <label class="labels">' + \
translate[idx] + '</label>\n' translate[idx] + '</label>\n'
editProfileForm += skillsStr + themesDropdown editProfileForm += skillsStr
editProfileForm += moderatorsStr + editorsStr + peertubeStr editProfileForm += ' <div class="container">\n'
editProfileForm += ' </div>\n' + instanceStr editProfileForm += themesDropdown + moderatorsStr
editProfileForm += editorsStr + peertubeStr
editProfileForm += ' </div>\n'
editProfileForm += instanceStr
editProfileForm += ' <div class="container">\n' editProfileForm += ' <div class="container">\n'
editProfileForm += ' <b><label class="labels">' + \ editProfileForm += ' <b><label class="labels">' + \
translate['Danger Zone'] + '</label></b><br>\n' translate['Danger Zone'] + '</label></b><br>\n'