Fixes after rebase

webapp_column_left.py

@@ -9,7 +9,7 @@ __status__ = "Production"
 import os
 from utils import getConfigParam
 from utils import getNicknameFromActor
-from posts import isEditor
+from utils import isEditor
 from posts import isModerator
 from webapp_utils import sharesTimelineJson
 from webapp_utils import htmlPostSeparator
@@ -279,7 +279,7 @@ def htmlLinksMobile(cssCache: {}, baseDir: str,
 
     htmlStr = htmlHeaderWithExternalStyles(cssFiles)
 
-    bannerFile, bannerFilename = getBannerFile(baseDir, nickname, domain)
+    bannerFile, bannerFilename = getBannerFile(baseDir, nickname, domain, theme)
     usersPath = '/users/' + nickname
 
     # Certain Epciyon pages should only be accessible via the 'User' page for News instances

webapp_column_right.py

@@ -17,7 +17,6 @@ from utils import getNicknameFromActor
 from utils import isEditor
 from posts import isModerator
 from webapp_utils import getRightImageFile
-from webapp_utils import getImageFile
 from webapp_utils import htmlHeaderWithExternalStyle, htmlHeaderWithExternalStyles
 from webapp_utils import htmlHeaderBanner
 from webapp_utils import htmlFooter
@@ -454,7 +453,7 @@ def htmlNewswireMobile(cssCache: {}, baseDir: str, nickname: str,
 
     htmlStr = htmlHeaderWithExternalStyles(cssFiles)
 
-    bannerFile, bannerFilename = getBannerFile(baseDir, nickname, domain)
+    bannerFile, bannerFilename = getBannerFile(baseDir, nickname, domain, theme)
     usersPath = '/users/' + nickname
 
     # Certain Epciyon pages should only be accessible via the 'User' page for News instances

webapp_frontscreen.py

@@ -108,7 +108,7 @@ def htmlFrontScreen(rssIconAtTop: bool,
         domainFull = domain + ':' + str(port)
 
     # If this is the news account then show a different banner
-    bannerFile, bannerFilename = getBannerFile(baseDir, nickname, domain)
+    bannerFile, bannerFilename = getBannerFile(baseDir, nickname, domain, theme)
 
     # NOTE: This currently more-or-less assumes being run only if 'news' instance
     profileHeaderStr = htmlHeaderBanner(defaultTimeline, 'frontpage', baseDir, '/users/news',
@@ -121,9 +121,8 @@ def htmlFrontScreen(rssIconAtTop: bool,
     leftColumnStr = \
         getLeftColumnContent(baseDir, 'news', domainFull,
                              httpPrefix, translate,
-                             iconsPath, False,
+                             False, False, None, rssIconAtTop, True,
-                             False, None, rssIconAtTop, True,
+                             True, theme)
-                             True)
     profileHeaderStr += '  <div class="section links">\n' + \
         leftColumnStr + '  </div>\n'
 
@@ -154,7 +153,7 @@ def htmlFrontScreen(rssIconAtTop: bool,
 
 # NOTE: Redundant
 #    bannerFile, bannerFilename = \
-#        getBannerFile(baseDir, nickname, domain)
+#        getBannerFile(baseDir, nickname, domain, theme)
 
     profileStr += \
         _htmlFrontScreenPosts(recentPostsCache, maxRecentPosts,
@@ -177,7 +176,7 @@ def htmlFrontScreen(rssIconAtTop: bool,
                               httpPrefix, translate,
                               False, False, newswire, False,
                               False, None, False, False,
-                              False, True, authorized, True)
+                              False, True, authorized, True, theme)
 
     profileFooterStr = '  <div class="section newswire">' + \
         rightColumnStr + '  </div>\n'