From c62283c60ad402456e5cda824b85e5ed31430738 Mon Sep 17 00:00:00 2001
From: Bob Mottram <bob@freedombone.net>
Date: Thu, 25 Feb 2021 12:24:26 +0000
Subject: [PATCH] Rearrange welcome profile

---
 webapp_welcome_profile.py | 36 +++++++++++++++++++-----------------
 1 file changed, 19 insertions(+), 17 deletions(-)

diff --git a/webapp_welcome_profile.py b/webapp_welcome_profile.py
index e0ca34da4..2fe237f6d 100644
--- a/webapp_welcome_profile.py
+++ b/webapp_welcome_profile.py
@@ -71,6 +71,25 @@ def htmlWelcomeProfile(baseDir: str, nickname: str, domain: str,
     profileForm += 'accept="' + imageFormats + '">\n'
 
     profileForm += '</center>\n'
+
+    actorFilename = baseDir + '/accounts/' + nickname + '@' + domain + '.json'
+    actorJson = loadJson(actorFilename)
+    displayNickname = actorJson['name']
+    profileForm += '  <label class="labels">' + \
+        translate['Nickname'] + '</label><br>\n'
+    profileForm += '  <input type="text" name="displayNickname" value="' + \
+        displayNickname + '"><br>\n'
+
+    profileForm += '<center>\n'
+    bioStr = \
+        actorJson['summary'].replace('<p>', '').replace('</p>', '')
+    profileForm += '  <label class="labels">' + \
+        translate['Your bio'] + '</label><br>\n'
+    profileForm += '  <textarea id="message" name="bio" ' + \
+        'style="height:200px">' + bioStr + '</textarea>\n'
+
+    profileForm += '</center>\n'
+
     profileForm += '<div class="container">' + profileText + '</div>\n'
     profileForm += '  <div class="container next">\n'
     profileForm += \
@@ -82,23 +101,6 @@ def htmlWelcomeProfile(baseDir: str, nickname: str, domain: str,
     profileForm += '  </div>\n'
     profileForm += '</div>\n'
 
-    actorFilename = baseDir + '/accounts/' + nickname + '@' + domain + '.json'
-    actorJson = loadJson(actorFilename)
-    displayNickname = actorJson['name']
-    profileForm += '  <label class="labels">' + \
-        translate['Nickname'] + '</label>\n'
-    profileForm += '  <input type="text" name="displayNickname" value="' + \
-        displayNickname + '"><br>\n'
-
-    profileForm += '<center>\n'
-    bioStr = \
-        actorJson['summary'].replace('<p>', '').replace('</p>', '')
-    profileForm += '  <label class="labels">' + \
-        translate['Your bio'] + '</label>\n'
-    profileForm += '  <textarea id="message" name="bio" ' + \
-        'style="height:200px">' + bioStr + '</textarea>\n'
-
-    profileForm += '</center>\n'
     profileForm += '</form>\n'
     profileForm += htmlFooter()
     return profileForm