indymedia
/
epicyon
mirror of https://gitlab.com/bashrc2/epicyon
7
4
Fork 1
Code Issues 14 Releases Wiki Activity

Next button on initial welcome screen

merge-requests/30/head
Bob Mottram 2021-02-25 17:06:07 +00:00
parent 21b8e246d1
commit efedbffc3c
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
daemon.py
View File

@ -10711,7 +10711,7 @@ class PubServer(BaseHTTPRequestHandler):
nickname, nickname,
self.server.domain): self.server.domain):
msg = \ msg = \
htmlWelcomeScreen(self.server.baseDir, htmlWelcomeScreen(self.server.baseDir, nickname,
self.server.systemLanguage, self.server.systemLanguage,
self.server.translate) self.server.translate)
msg = msg.encode('utf-8') msg = msg.encode('utf-8')

22
webapp_welcome.py
View File

@ -38,10 +38,9 @@ def welcomeScreenIsComplete(baseDir: str,
completeFile.close() completeFile.close()
def htmlWelcomeScreen(baseDir: str, def htmlWelcomeScreen(baseDir: str, nickname: str,
language: str, translate: {}, language: str, translate: {},
currScreen='welcome', currScreen='welcome') -> str:
nextScreen=None, prevScreen=None) -> str:
"""Returns the welcome screen """Returns the welcome screen
""" """
# set a custom background for the welcome screen # set a custom background for the welcome screen
@ -50,9 +49,6 @@ def htmlWelcomeScreen(baseDir: str,
copyfile(baseDir + '/accounts/welcome-background-custom.jpg', copyfile(baseDir + '/accounts/welcome-background-custom.jpg',
baseDir + '/accounts/welcome-background.jpg') baseDir + '/accounts/welcome-background.jpg')
if not nextScreen:
nextScreen = 'welcome_profile'
welcomeText = 'Welcome to Epicyon' welcomeText = 'Welcome to Epicyon'
welcomeFilename = baseDir + '/accounts/' + currScreen + '.md' welcomeFilename = baseDir + '/accounts/' + currScreen + '.md'
if not os.path.isfile(welcomeFilename): if not os.path.isfile(welcomeFilename):
@ -74,15 +70,17 @@ def htmlWelcomeScreen(baseDir: str,
instanceTitle = \ instanceTitle = \
getConfigParam(baseDir, 'instanceTitle') getConfigParam(baseDir, 'instanceTitle')
welcomeForm = htmlHeaderWithExternalStyle(cssFilename, instanceTitle) welcomeForm = htmlHeaderWithExternalStyle(cssFilename, instanceTitle)
welcomeForm += \
'<form enctype="multipart/form-data" method="POST" ' + \
'accept-charset="UTF-8" ' + \
'action="/users/' + nickname + '/profiledata">\n'
welcomeForm += '<div class="container">' + welcomeText + '</div>\n' welcomeForm += '<div class="container">' + welcomeText + '</div>\n'
welcomeForm += ' <div class="container next">\n' welcomeForm += ' <div class="container next">\n'
if prevScreen: welcomeForm += \
welcomeForm += ' <a href="/' + prevScreen + '">\n' ' <button type="submit" class="button" ' + \
welcomeForm += \ 'name="previewAvatar">' + translate['Next'] + '</button>\n'
' <button>' + translate['Go Back'] + '</button></a>\n'
welcomeForm += ' <a href="/' + nextScreen + '">\n'
welcomeForm += ' <button>' + translate['Next'] + '</button></a>\n'
welcomeForm += ' </div>\n' welcomeForm += ' </div>\n'
welcomeForm += '</div>\n' welcomeForm += '</div>\n'
welcomeForm += '</form>\n'
welcomeForm += htmlFooter() welcomeForm += htmlFooter()
return welcomeForm return welcomeForm