feat: enable header links and disable new and events on homepage (#2836)

mitodl · Nov 30, 2023 · 5ec8a24 · 5ec8a24
1 parent 739b8c5
commit 5ec8a24
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 10 deletions.
diff --git a/cms/models.py b/cms/models.py
@@ -778,6 +778,12 @@ def news_and_events(self):
         """
         Gets the news and events section subpage
         """
+        webinar_or_blog_enabled = settings.FEATURES.get(
+            "WEBINARS", False
+        ) or settings.FEATURES.get("ENABLE_BLOG", False)
+        if webinar_or_blog_enabled:
+            return None
+
         return self._get_child_page_of_type(NewsAndEventsPage)
 
     @property

diff --git a/static/js/components/TopAppBar.js b/static/js/components/TopAppBar.js
@@ -66,15 +66,6 @@ const TopAppBar = ({ currentUser, location, errorPageHeader, courseTopics }: Pro
             id="nav"
             className="collapse navbar-collapse px-0 justify-content-end"
           >
-            {
-              SETTINGS.webinars ? (
-                <li>
-                  <a href={routes.webinars} className="" aria-label="webinars">
-                    Webinars
-                  </a>
-                </li>
-              ) : null
-            }
             <li>
               {
                 SETTINGS.course_dropdown ? (
@@ -86,10 +77,19 @@ const TopAppBar = ({ currentUser, location, errorPageHeader, courseTopics }: Pro
                 )
               }
             </li>
+            {
+              SETTINGS.webinars ? (
+                <li>
+                  <a href={routes.webinars} className="webinar-link" aria-label="webinars">
+                    Webinars
+                  </a>
+                </li>
+              ) : null
+            }
             {
               SETTINGS.enable_blog ? (
                 <li>
-                  <a href={routes.blog} className="" aria-label="blog">
+                  <a href={routes.blog} className="blog-link" aria-label="blog">
                     Blog
                   </a>
                 </li>

diff --git a/static/scss/top-app-bar.scss b/static/scss/top-app-bar.scss
@@ -54,6 +54,10 @@
       text-decoration: none;
       display: block;
 
+      &.blog-link {
+        margin-right: 10px;
+      }
+
       &:hover {
         color: $primary;
       }