Custom dc homepage

server/__init__.py

@@ -517,17 +517,40 @@ def add_language_code(endpoint, values):
       return
     values['hl'] = g.locale
 
+  def get_custom_config_path(custom_dc_template_folder=None):
+    """
+      Return the custom configuration folder path
+      if custom configuration is enabled and a custom template folder is provided.
+      """
+    if cfg.CUSTOM and custom_dc_template_folder:
+      return os.path.join(app.root_path, "config", "custom_dc",
+                          custom_dc_template_folder)
+    return None
+
   # Provides locale and other common parameters in all templates
   @app.context_processor
   def inject_common_parameters():
+    header_json_path = "config/base/header.json"
+    footer_json_path = "config/base/footer.json"
+
+    custom_config_path = get_custom_config_path(custom_dc_template_folder)
+    if custom_config_path:
+      custom_header_override = os.path.join(custom_config_path, "base",
+                                            "header.json")
+      if os.path.exists(custom_header_override):
+        header_json_path = custom_header_override
+
+      custom_footer_override = os.path.join(custom_config_path, "base",
+                                            "footer.json")
+      if os.path.exists(custom_footer_override):
+        footer_json_path = custom_footer_override
+
+    header_menu = libutil.get_json(header_json_path)
+    footer_menu = libutil.get_json(footer_json_path)
+
     common_variables = {
-        #TODO: replace HEADER_MENU with V2
-        'HEADER_MENU':
-            json.dumps(libutil.get_json("config/base/header.json")),
-        'FOOTER_MENU':
-            json.dumps(libutil.get_json("config/base/footer.json")),
-        'HEADER_MENU_V2':
-            json.dumps(libutil.get_json("config/base/header_v2.json")),
+        'HEADER_MENU': json.dumps(header_menu),
+        'FOOTER_MENU': json.dumps(footer_menu),
     }
     locale_variable = dict(locale=get_locale())
     return {**common_variables, **locale_variable}

server/app_env/custom.py

@@ -20,7 +20,7 @@ class Config(_base.Config):
   CUSTOM = True
   NAME = "Custom Data Commons"
   OVERRIDE_CSS_PATH = '/custom_dc/custom/overrides.css'
-  LOGO_PATH = "/custom_dc/custom/logo.png"
+  LOGO_PATH = "/custom_dc/custom/logo.svg"
   MIN_STAT_VAR_GEO_COVERAGE = 1
   SHOW_DISASTER = False
   USE_LLM = False

server/config/base/header.json

@@ -1,89 +1,139 @@
 [
   {
-    "label": "Explore",
+    "id": "tools",
+    "label": "Tools",
     "ariaLabel": "Show exploration tools",
-    "subMenu": [
-      {
-        "href": "{place.place_explorer}",
-        "label": "Place Explorer"
-      },
-      {
-        "href": "{browser.browser_main}",
-        "label": "Knowledge Graph"
-      },
-      {
-        "href": "{tools.visualization}#visType=timeline",
-        "label": "Timelines Explorer"
-      },
-      {
-        "href": "{tools.visualization}#visType=scatter",
-        "label": "Scatter Plot Explorer"
+    "introduction": {
+      "description": "Explore a variety of tools to visualize, analyze, and interact with the Data Commons knowledge graph and its extensive datasets"
+    },
+    "primarySectionGroups": [
+      {
+        "id": "tools-0",
+        "items": [
+          {
+            "title": "Knowledge Graph",
+            "url": "{browser.browser_main}",
+            "description": "Explore what data is available and understand the graph structure"
+          },
+          {
+            "title": "Statistical Variable Explorer",
+            "url": "{tools.stat_var}",
+            "description": "Explore statistical variable details including metadata and observations"
+          },
+          {
+            "title": "Data Download Tool",
+            "url": "{tools.download}",
+            "description": "Download data for selected statistical variables"
+          }
+        ]
       },
       {
-        "href": "{tools.visualization}#visType=map",
-        "label": "Map Explorer"
-      },
-      {
-        "href": "{tools.stat_var}",
-        "label": "Statistical Variable Explorer"
-      },
-      {
-        "href": "{tools.download}",
-        "label": "Data Download Tool"
+        "id": "tools-1",
+        "items": [
+          {
+            "title": "Map Explorer",
+            "url": "{tools.visualization}#visType=map",
+            "description": "Study how a selected statistical variable can vary across geographic regions"
+          },
+          {
+            "title": "Scatter Plot Explorer",
+            "url": "{tools.visualization}#visType=scatter",
+            "description": "Visualize the correlation between two statistical variables"
+          },
+          {
+            "title": "Timelines Explorer",
+            "url": "{tools.visualization}#visType=timeline",
+            "description": "See trends over time for selected statistical variables"
+          }
+        ]
       }
     ]
   },
   {
+    "id": "docs",
     "label": "Documentation",
     "ariaLabel": "Show documentation links",
-    "subMenu": [
-      {
-        "href": "https://docs.datacommons.org",
-        "label": "Documentation"
-      },
-      {
-        "href": "https://docs.datacommons.org/api",
-        "label": "APIs"
+    "introduction": {
+      "description": "Access in-depth tutorials, guides, and API references to unlock the full potential of Data Commons and integrate it into your projects"
+    },
+    "primarySectionGroups": [
+      {
+        "id": "docs-0",
+        "items": [
+          {
+            "title": "Docs",
+            "url": "https://docs.datacommons.org",
+            "description": "Learn how to access and visualize Data Commons data: docs for the website, APIs, and more, for all users and needs"
+          },
+          {
+            "title": "API",
+            "url": "https://docs.datacommons.org/api",
+            "description": "Access Data Commons data programmatically, using REST and Python APIs"
+          }
+        ]
       },
       {
-        "hide": true,
-        "href": "https://docs.datacommons.org/bigquery",
-        "label": "BigQuery"
-      },
-      {
-        "href": "https://docs.datacommons.org/tutorials",
-        "label": "Tutorials"
-      },
-      {
-        "href": "https://docs.datacommons.org/contributing/",
-        "label": "Contribute"
+        "id": "docs-1",
+        "items": [
+          {
+            "title": "Tutorials",
+            "url": "https://docs.datacommons.org/tutorials",
+            "description": "Get familiar with the Data Commons Knowledge Graph and APIs using analysis examples in Google Colab notebooks written in Python"
+          },
+          {
+            "title": "Contributions",
+            "url": "https://docs.datacommons.org/contributing/",
+            "description": "Become part of Data Commons by contributing data, tools, educational materials, or sharing your analysis and insights. Collaborate and help expand the Data Commons Knowledge Graph"
+          }
+        ]
       }
     ]
   },
   {
+    "id": "about",
     "label": "About",
     "ariaLabel": "Show about links",
-    "subMenu": [
-      {
-        "href": "{static.about}",
-        "label": "About Data Commons"
-      },
-      {
-        "href": "https://blog.datacommons.org/",
-        "label": "Blog"
+    "introduction": {
+      "description": "Data Commons is an initiative from Google. Explore diverse data, learn to use its tools through Python examples, and stay updated on the latest news and research"
+    },
+    "primarySectionGroups": [
+      {
+        "id": "about-0",
+        "items": [
+          {
+            "title": "Why Data Commons",
+            "url": "{static.about}",
+            "description": "Discover why Data Commons is revolutionizing data access and analysis. Learn how its unified Knowledge Graph empowers you to explore diverse, standardized data"
+          },
+          {
+            "title": "Data Sources",
+            "url": "{static.data}",
+            "description": "Get familiar with the data available in Data Commons"
+          }
+        ]
       },
       {
-        "href": "{static.data}",
-        "label": "Data Sources"
-      },
-      {
-        "href": "{static.faq}",
-        "label": "FAQ"
-      },
-      {
-        "href": "{static.feedback}",
-        "label": "Feedback"
+        "id": "about-1",
+        "items": [
+          {
+            "title": "FAQ",
+            "url": "{static.faq}",
+            "description": "Find quick answers to common questions about Data Commons, its usage, data sources, and available resources"
+          },
+          {
+            "title": "Blog",
+            "url": "https://blog.datacommons.org/",
+            "description": "Stay up-to-date with the latest news, updates, and insights from the Data Commons team. Explore new features, research, and educational content related to the project"
+          }
+        ]
       }
     ]
+  },
+  {
+    "id": "feedback",
+    "label": "Feedback",
+    "ariaLabel": "Give feedback",
+    "url": "{feedback-prefill}",
+    "exposeInMobileBanner": true
   }
 ]

server/config/base/header_v2.json → server/config/custom_dc/custom/base/header.json

@@ -88,52 +88,5 @@
         ]
       }
     ]
-  },
-  {
-    "id": "about",
-    "label": "About",
-    "ariaLabel": "Show about links",
-    "introduction": {
-      "description": "Data Commons is an initiative from Google. Explore diverse data, learn to use its tools through Python examples, and stay updated on the latest news and research"
-    },
-    "primarySectionGroups": [
-      {
-        "id": "about-0",
-        "items": [
-          {
-            "title": "Why Data Commons",
-            "url": "{static.about}",
-            "description": "Discover why Data Commons is revolutionizing data access and analysis. Learn how its unified Knowledge Graph empowers you to explore diverse, standardized data"
-          },
-          {
-            "title": "Data Sources",
-            "url": "{static.data}",
-            "description": "Get familiar with the data available in Data Commons"
-          }
-        ]
-      },
-      {
-        "id": "about-1",
-        "items": [
-          {
-            "title": "FAQ",
-            "url": "{static.faq}",
-            "description": "Find quick answers to common questions about Data Commons, its usage, data sources, and available resources"
-          },
-          {
-            "title": "Blog",
-            "url": "https://blog.datacommons.org/",
-            "description": "Stay up-to-date with the latest news, updates, and insights from the Data Commons team. Explore new features, research, and educational content related to the project"
-          }
-        ]
-      }
-    ]
-  },
-  {
-    "id": "feedback",
-    "label": "Feedback",
-    "ariaLabel": "Give feedback",
-    "url": "{feedback-prefill}",
-    "exposeInMobileBanner": true
   }
 ]

server/templates/base.html

@@ -116,7 +116,7 @@
 <body {% if is_hide_header_search_bar %}class="no-header-search-bar"{% endif %}>
 
 <div id="metadata-base" class="d-none"
-  data-header="{{ HEADER_MENU_V2 }}"
+  data-header="{{ HEADER_MENU }}"
   data-footer="{{ FOOTER_MENU }}"
   data-logo-path="{{ LOGO_PATH }}"
   data-logo-width="{{ LOGO_WIDTH }}"