Adapt to changes from recent merges ['tlfeatures']

- Also tweak some display text

webapp_headerbuttons.py

@@ -115,17 +115,19 @@ def headerButtonsTimeline(defaultTimeline: str,
         'highlightLabel': newReply}
     ))
 
-    if (defaultTimeline == 'tlnews' and boxName in userPages) \
-            or (not defaultTimeline == 'tlnews' and not minimal):
+    if (defaultTimeline == 'tlfeatures' and boxName in userPages) \
+            or (not defaultTimeline == 'tlfeatures' and not minimal):
         activeButtonList.append(('tlnews',
             {'pageRef': '/tlnews',
             'translateText': 'News'}
         ))
-        # The following translationText should be 'Article' for News instances
         activeButtonList.append(('tlblogs',
             {'pageRef': '/tlblogs',
             'translateText': 'Blogs'}
         ))
+        # The blog translation text should be 'Article' for News instances
+        if defaultTimeline == 'tlfeatures':
+            activeButtonList[-1][1]['translateText'] = 'Article'
         activeButtonList.append(('tlmedia',
             {'pageRef': '/tlmedia',
             'translateText': 'Media'}
@@ -151,7 +153,7 @@ def headerButtonsTimeline(defaultTimeline: str,
             ))
 
     # Single out the "instance-type" button, and move to front of list
-    # NOTE: Current instance types are: 'tlblogs', 'tlmedia', 'tlnews'
+    # NOTE: Current instance types are: 'tlblogs', 'tlmedia', 'tlfeatures'
     for i, (name, config) in enumerate(activeButtonList):
         if name == defaultTimeline:
             tmp = activeButtonList.pop(i)
@@ -162,7 +164,7 @@ def headerButtonsTimeline(defaultTimeline: str,
     # start of headericons list
 
     # Override iconsAsButtons setting for News instance
-    if defaultTimeline == 'tlnews':
+    if defaultTimeline == 'tlfeatures':
         iconsAsButtons = True
 
     # Only append to iconList if necessary
@@ -224,7 +226,7 @@ def headerButtonsTimeline(defaultTimeline: str,
     ))
     activeButtonList.append(('links',
         {'pageRef': '/linksmobile',
-        'translateText': 'Edit Links',
+        'translateText': 'Links',
         'class': 'mobile-view',
         'iconClass': 'icon-links'}
     ))
@@ -236,7 +238,7 @@ def headerButtonsTimeline(defaultTimeline: str,
             {'pageRef': '/newdm',
             'translateText': 'Create a new DM'}
         ))
-    elif boxName == 'tlblogs' or boxName == 'tlnews':
+    elif boxName == 'tlblogs' or boxName == 'tlfeatures':
         activeButtonList.append(('newblog',
             {'pageRef': '/newblog',
             'translateText': 'Create a new post'}
@@ -272,7 +274,7 @@ def headerButtonsTimeline(defaultTimeline: str,
     ))
 
     # TODO: Less hacky solution - or make sure "settings" button has an icon
-    if defaultTimeline == 'tlnews':
+    if defaultTimeline == 'tlfeatures':
         activeButtonList.append(('editprofile',
             {'pageRef': '/editprofile',
             'translateText': 'Settings'}
@@ -367,13 +369,12 @@ def headerButtonsTimeline(defaultTimeline: str,
 def headerNewsTabs(boxName: str,
                    translate: {},
                    usersPath: str,
-                   moderator: bool,
                    baseDir: str,
                    userPages: []) -> str:
     navTabList = []
 
-    navTabList.append(('tlnews',
-        {'pageRef': '/tlnews',
+    navTabList.append(('tlfeatures',
+        {'pageRef': '/tlfeatures',
         'translateText': 'Features'}
     ))
     navTabList.append(('newswiremobile',