Allow theme specific welcome files

daemon.py

@@ -10800,7 +10800,8 @@ class PubServer(BaseHTTPRequestHandler):
                 msg = \
                     htmlWelcomeScreen(self.server.baseDir, nickname,
                                       self.server.systemLanguage,
-                                      self.server.translate)
+                                      self.server.translate,
+                                      self.server.themeName)
                 msg = msg.encode('utf-8')
                 msglen = len(msg)
                 self._login_headers('text/html', msglen, callingDomain)
@@ -10827,7 +10828,8 @@ class PubServer(BaseHTTPRequestHandler):
                                        self.server.httpPrefix,
                                        self.server.domainFull,
                                        self.server.systemLanguage,
-                                       self.server.translate)
+                                       self.server.translate,
+                                       self.server.themeName)
                 msg = msg.encode('utf-8')
                 msglen = len(msg)
                 self._login_headers('text/html', msglen, callingDomain)
@@ -10854,7 +10856,8 @@ class PubServer(BaseHTTPRequestHandler):
                                      self.server.httpPrefix,
                                      self.server.domainFull,
                                      self.server.systemLanguage,
-                                     self.server.translate)
+                                     self.server.translate,
+                                     self.server.themeName)
                 msg = msg.encode('utf-8')
                 msglen = len(msg)
                 self._login_headers('text/html', msglen, callingDomain)

webapp_welcome.py

@@ -41,6 +41,7 @@ def welcomeScreenIsComplete(baseDir: str,
 
 def htmlWelcomeScreen(baseDir: str, nickname: str,
                       language: str, translate: {},
+                      themeName: str,
                       currScreen='welcome') -> str:
     """Returns the welcome screen
     """
@@ -53,8 +54,17 @@ def htmlWelcomeScreen(baseDir: str, nickname: str,
     welcomeText = 'Welcome to Epicyon'
     welcomeFilename = baseDir + '/accounts/' + currScreen + '.md'
     if not os.path.isfile(welcomeFilename):
-        defaultFilename = \
-            baseDir + '/defaultwelcome/' + currScreen + '_' + language + '.md'
+        defaultFilename = None
+        if themeName:
+            defaultFilename = \
+                baseDir + '/theme/' + themeName + '/welcome/' + \
+                'welcome_' + language + '.md'
+            if not os.path.isfile(defaultFilename):
+                defaultFilename = None
+        if not defaultFilename:
+            defaultFilename = \
+                baseDir + '/defaultwelcome/' + \
+                currScreen + '_' + language + '.md'
         if not os.path.isfile(defaultFilename):
             defaultFilename = \
                 baseDir + '/defaultwelcome/' + currScreen + '_en.md'

webapp_welcome_final.py

@@ -17,7 +17,8 @@ from webapp_utils import markdownToHtml
 
 def htmlWelcomeFinal(baseDir: str, nickname: str, domain: str,
                      httpPrefix: str, domainFull: str,
-                     language: str, translate: {}) -> str:
+                     language: str, translate: {},
+                     themeName: str) -> str:
     """Returns the final welcome screen after first login
     """
     # set a custom background for the welcome screen
@@ -29,8 +30,16 @@ def htmlWelcomeFinal(baseDir: str, nickname: str, domain: str,
     finalText = 'Welcome to Epicyon'
     finalFilename = baseDir + '/accounts/welcome_final.md'
     if not os.path.isfile(finalFilename):
-        defaultFilename = \
-            baseDir + '/defaultwelcome/final_' + language + '.md'
+        defaultFilename = None
+        if themeName:
+            defaultFilename = \
+                baseDir + '/theme/' + themeName + '/welcome/' + \
+                'final_' + language + '.md'
+            if not os.path.isfile(defaultFilename):
+                defaultFilename = None
+        if not defaultFilename:
+            defaultFilename = \
+                baseDir + '/defaultwelcome/final_' + language + '.md'
         if not os.path.isfile(defaultFilename):
             defaultFilename = baseDir + '/defaultwelcome/final_en.md'
         copyfile(defaultFilename, finalFilename)

webapp_welcome_profile.py

@@ -20,7 +20,8 @@ from webapp_utils import markdownToHtml
 
 def htmlWelcomeProfile(baseDir: str, nickname: str, domain: str,
                        httpPrefix: str, domainFull: str,
-                       language: str, translate: {}) -> str:
+                       language: str, translate: {},
+                       themeName: str) -> str:
     """Returns the welcome profile screen to set avatar and bio
     """
     # set a custom background for the welcome screen
@@ -32,8 +33,16 @@ def htmlWelcomeProfile(baseDir: str, nickname: str, domain: str,
     profileText = 'Welcome to Epicyon'
     profileFilename = baseDir + '/accounts/welcome_profile.md'
     if not os.path.isfile(profileFilename):
-        defaultFilename = \
-            baseDir + '/defaultwelcome/profile_' + language + '.md'
+        defaultFilename = None
+        if themeName:
+            defaultFilename = \
+                baseDir + '/theme/' + themeName + '/welcome/' + \
+                'profile_' + language + '.md'
+            if not os.path.isfile(defaultFilename):
+                defaultFilename = None
+        if not defaultFilename:
+            defaultFilename = \
+                baseDir + '/defaultwelcome/profile_' + language + '.md'
         if not os.path.isfile(defaultFilename):
             defaultFilename = baseDir + '/defaultwelcome/profile_en.md'
         copyfile(defaultFilename, profileFilename)